1 files changed, 13 insertions, 20 deletions
diff --git a/src/components/mao-competitions.js b/src/components/mao-competitions.js
index 2f3277f..2103676 100644
--- a/src/components/mao-competitions.js
+++ b/src/components/mao-competitions.js
@@ -16,14 +16,7 @@ import { connect } from 'pwa-helpers/connect-mixin.js';
 import { store } from '../store.js';
 
 //These are the actions needed by this element.
-import { registerComp } from '../actions/firebase.js';
-
-// We are lazy loading its reducer.
-import firebase from '../reducers/firebase.js';
-
-store.addReducers({
-  firebase
-});
+import { registerComp } from '../actions/firebaseFirestore.js';
 
 // These are the shared styles needed by this element.
 import { SharedStyles }       from './shared-styles.js';
@@ -155,8 +148,8 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
             hidden    = "${props.registeredComps.includes('nationals')}"
             on-tap    =  "${() => this.registerNationals()}"
             raised
-            disabled  = "${!props.initialized}">
-              ${props.initialized ? "Register" : "Sign In to Register"}
+            disabled  = "${!props.signedIn}">
+              ${props.signedIn ? "Register" : "Sign In to Register"}
             </paper-button>
 
             <paper-button
@@ -191,8 +184,8 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
             hidden    = "${props.registeredComps.includes('states')}"
             on-tap    =  "${() => this.registerStates()}"
             raised
-            disabled  = "${!props.initialized}">
-              ${props.initialized ? "Register" : "Sign In to Register"}
+            disabled  = "${!props.signedIn}">
+              ${props.signedIn ? "Register" : "Sign In to Register"}
             </paper-button>
 
             <paper-button
@@ -221,7 +214,7 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
             name="December"
             information="Dank regional competition"
             location="Miami, American Heritage"
-            initialized="${props.initialized}"
+            signedIn="${props.signedIn}"
             isRegistered="${props.registeredComps.includes('December')}"
             on-register-comp="${() => store.dispatch(registerComp('December'))}">
             </competition-element>
@@ -233,7 +226,7 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
             name="January"
             information="Other dank comp"
             location="Immokalee, Cypress Bay"
-            initialized="${props.initialized}"
+            signedIn="${props.signedIn}"
             isRegistered="${props.registeredComps.includes('January')}"
             on-register-comp="${() => store.dispatch(registerComp('January'))}">
             </competition-element>
@@ -245,7 +238,7 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
             name="February"
             information="The dankest comp"
             location="Orlando, Science School"
-            initialized="${props.initialized}"
+            signedIn="${props.signedIn}"
             isRegistered="${props.registeredComps.includes('February')}"
             on-register-comp="${() => store.dispatch(registerComp('February'))}">
             </competition-element>
@@ -276,7 +269,7 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
                       it is a 25 multiple-choice question,
                       40 minute test for middle schoolers designed to promote the development and enhancement of problem solving skills."
 
-        initialized="${props.initialized}"
+        signedIn="${props.signedIn}"
         isRegistered="${props.registeredComps.includes('amc')}"
         on-register-comp="${() => store.dispatch(registerComp('amc'))}">
         </test-element>
@@ -293,7 +286,7 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
         information =  "The Florida Math Leauge is a state-wide exam.
                         It has three parts, each being 30 minutes long."
 
-        initialized="${props.initialized}"
+        signedIn="${props.signedIn}"
         isRegistered="${props.registeredComps.includes('fml')}"
         on-register-comp="${() => store.dispatch(registerComp('fml'))}">
         </test-element>
@@ -306,15 +299,15 @@ class MaoCompetitions extends connect(store)(PageViewElement) {
   static get properties() { return {
     // This is the data from the store.
     registeredComps :   Array,
-    initialized     :   Boolean,
+    signedIn        :   Boolean,
 
     nationalRegistered  : Boolean,
     statesRegistered    : Boolean
   }}
 
   _stateChanged(state) {
-    this.initialized      = state.firebase.initialized;
-    this.registeredComps  = state.firebase.registeredComps;
+    this.signedIn         = state.firebaseAuth      .signedIn;
+    this.registeredComps  = state.firebaseFirestore .registeredComps;
     //console.log(this.registeredComps);
   }