Merge pull request #515 from GDGAhmedabad/fix/team-partner-read-json

ref: Change Teams, Partners data source from generated to direct database JSON

Author: JaldeepAsodariya

src/elements/partners-block.ts

@@ -1,19 +1,10 @@
-import { Failure, Initialized, Pending, Success } from '@abraham/remotedata';
-import { computed, customElement, observe, property } from '@polymer/decorators';
+import { customElement } from '@polymer/decorators';
 import '@polymer/iron-icon';
 import '@polymer/paper-button';
 import { html, PolymerElement } from '@polymer/polymer';
 import '@power-elements/lazy-image';
-import { RootState, store } from '../store';
-import { closeDialog, openSubscribeDialog } from '../store/dialogs/actions';
+import { partners } from '../../public/data/firestore-data.json';
 import { ReduxMixin } from '../store/mixin';
-import { PartnerGroupsState, selectPartnerGroups } from '../store/partners';
-import { addPotentialPartner } from '../store/potential-partners/actions';
-import {
-  initialPotentialPartnersState,
-  PotentialPartnersState,
-} from '../store/potential-partners/state';
-import { queueSnackbar } from '../store/snackbars';
 import { loading, partnersBlock } from '../utils/data';
 import '../utils/icons';
 import './shared-styles';
@@ -70,14 +61,7 @@ export class PartnersBlock extends ReduxMixin(PolymerElement) {
       <div class="container">
         <h1 class="container-title">[[partnersBlock.title]]</h1>
 
-        <template is="dom-if" if="[[pending]]">
-          <p>[[loading]]</p>
-        </template>
-        <template is="dom-if" if="[[failure]]">
-          <p>Error loading partners.</p>
-        </template>
-
-        <template is="dom-repeat" items="[[partners.data]]" as="block">
+        <template is="dom-repeat" items="[[partners]]" as="block">
           <h4 class="block-title">[[block.title]]</h4>
           <div class="logos-wrapper">
             <template is="dom-repeat" items="[[block.items]]" as="logo">
@@ -106,42 +90,5 @@ export class PartnersBlock extends ReduxMixin(PolymerElement) {
 
   private loading = loading;
   private partnersBlock = partnersBlock;
-
-  @property({ type: Object })
-  potentialPartners = initialPotentialPartnersState;
-  @property({ type: Object })
-  partners: PartnerGroupsState = new Initialized();
-
-  @computed('partners')
-  get pending() {
-    return this.partners instanceof Pending;
-  }
-
-  @computed('partners')
-  get failure() {
-    return this.partners instanceof Failure;
-  }
-
-  override stateChanged(state: RootState) {
-    this.partners = selectPartnerGroups(state);
-    this.potentialPartners = state.potentialPartners;
-  }
-
-  private addPotentialPartner() {
-    openSubscribeDialog({
-      title: this.partnersBlock.form.title,
-      submitLabel: this.partnersBlock.form.submitLabel,
-      firstFieldLabel: this.partnersBlock.form.fullName,
-      secondFieldLabel: this.partnersBlock.form.companyName,
-      submit: (data) => store.dispatch(addPotentialPartner(data)),
-    });
-  }
-
-  @observe('potentialPartners')
-  private onPotentialPartners(potentialPartners: PotentialPartnersState) {
-    if (potentialPartners instanceof Success) {
-      closeDialog();
-      store.dispatch(queueSnackbar(this.partnersBlock.toast));
-    }
-  }
+  private partners = partners;
 }

src/pages/team-page.ts

@@ -1,15 +1,12 @@
-import { Failure, Pending } from '@abraham/remotedata';
-import { computed, customElement, property } from '@polymer/decorators';
+import { customElement } from '@polymer/decorators';
 import '@polymer/paper-icon-button';
 import { html, PolymerElement } from '@polymer/polymer';
 import '@power-elements/lazy-image';
+import { team as teams } from '../../public/data/firestore-data.json';
 import '../components/hero/simple-hero';
 import '../components/markdown/short-markdown';
 import '../elements/shared-styles';
-import { RootState } from '../store';
 import { ReduxMixin } from '../store/mixin';
-import { selectTeamsAndMembers } from '../store/teams-members/selectors';
-import { initialTeamsMembersState } from '../store/teams-members/state';
 import { heroSettings, loading, team } from '../utils/data';
 import { updateMetadata } from '../utils/metadata';
 
@@ -137,15 +134,8 @@ export class TeamPage extends ReduxMixin(PolymerElement) {
       </div>
 
       <div class="container">
-        <template is="dom-if" if="[[pending]]">
-          <p>[[loading]]</p>
-        </template>
-
-        <template is="dom-if" if="[[failure]]">
-          <p>Error loading teams.</p>
-        </template>
 
-        <template is="dom-repeat" items="[[teamsMembers.data]]" as="team">
+        <template is="dom-repeat" items="[[teams]]" as="team">
           <div class="team-title">[[team.title]]</div>
 
           <div class="team-block">
@@ -184,25 +174,11 @@ export class TeamPage extends ReduxMixin(PolymerElement) {
   private heroSettings = heroSettings.team;
   private loading = loading;
   private team = team;
+  private teams = teams;
 
-  @property({ type: Object })
-  teamsMembers = initialTeamsMembersState;
-
-  @computed('teamsMembers')
-  get pending() {
-    return this.teamsMembers instanceof Pending;
-  }
-
-  @computed('teamsMembers')
-  get failure() {
-    return this.teamsMembers instanceof Failure;
-  }
   override connectedCallback() {
     super.connectedCallback();
     updateMetadata(this.heroSettings.title, this.heroSettings.metaDescription);
   }
 
-  override stateChanged(state: RootState) {
-    this.teamsMembers = selectTeamsAndMembers(state);
-  }
 }