Added divison field to accounts. Will implement in the future.

3 files changed, 26 insertions, 7 deletions

diff --git a/src/actions/firebase.js b/src/actions/firebase.js
index 8e440eb..21757ae 100644
--- a/src/actions/firebase.js
+++ b/src/actions/firebase.js
@@ -9,13 +9,13 @@ export const ADMIN_LISTENER = 'ADMIN_LISTENER';
 export const IS_ADMIN       = 'IS_ADMIN';
 export const ADMIN_CONTROLS = 'ADMIN_CONTROLS';
 export const UPDATE_ADMIN   = 'UPDATE_ADMIN';
+export const SET_USER_DATA  = 'SET_USER_DATA';
 
 const auth = firebase.auth();
 
 export const createAccount = (_email, _password, divison) => (dispatch) => {
-  var authTrue  = false;
   firebase.auth().createUserWithEmailAndPassword(_email, _password).then(() => {
-    dispatch(signIn(_email, _password));
+    dispatch(signIn(_email, _password, divison));
   })
   .catch((error) => {
   // Handle Errors here.
@@ -23,7 +23,7 @@ export const createAccount = (_email, _password, divison) => (dispatch) => {
   });
 }
 
-export const signIn  = (_email, _password) => (dispatch) => {
+export const signIn  = (_email, _password, divison) => (dispatch) => {
   auth.signInWithEmailAndPassword(_email, _password).then(() => {
     var user  = auth.currentUser;
     /* User is signed in.
@@ -36,6 +36,10 @@ export const signIn  = (_email, _password) => (dispatch) => {
     var providerData = user.providerData;
     */
     dispatch(authSuccess(user));
+    if(divison) {
+      console.log(divison);
+      dispatch(setUserData(divison));
+    }
     dispatch(snapshotHours())
     dispatch(snapshotRegisteredCompetitions());
     //Admin controls
@@ -52,6 +56,17 @@ export const signIn  = (_email, _password) => (dispatch) => {
 
 }
 
+export const setUserData = (_divison) => (dispatch, getState) => {
+  const uid   = getState().firebase.uid;
+  var docRef  = firestore.collection('users').doc(uid);
+  docRef.set({
+    hours:    0,
+    divison: _divison
+  }).catch((error) => {
+    console.log(error);
+  })
+}
+
 export const adminListener = () => (dispatch, getState) => {
   document.onkeyup = function(e) {
     if(e.altKey && e.which == 65) {
diff --git a/src/components/mao-account.js b/src/components/mao-account.js
index 72eb8b8..7a654fd 100644
--- a/src/components/mao-account.js
+++ b/src/components/mao-account.js
@@ -131,6 +131,9 @@ class MaoAccount extends connect(store)(PageViewElement) {
 
           <paper-input type="password" label="password" id="createPasswordField">
           </paper-input>
+
+          <paper-input label="division" id="createDivisionField">
+          </paper-input>
         </div>
 
         <div class="card-actions">
@@ -169,7 +172,7 @@ class MaoAccount extends connect(store)(PageViewElement) {
                         + "@communityschoolnaples.org";
       const password  = passwordElement.value;
 
-      store.dispatch(signIn(email,password));
+      store.dispatch(signIn(email,password,null));
 
       emailElement.value    = "";
       passwordElement.value = "";
@@ -198,6 +201,7 @@ class MaoAccount extends connect(store)(PageViewElement) {
   makeAccount() {
     var emailElement     = this.shadowRoot.getElementById('createEmailField');
     var passwordElement  = this.shadowRoot.getElementById('createPasswordField');
+    var divisionElement  = this.shadowRoot.getElementById('createDivisionField');
 
     if( emailElement.value.includes('2019') ||
         emailElement.value.includes('2020')
@@ -206,14 +210,16 @@ class MaoAccount extends connect(store)(PageViewElement) {
       const email     = emailElement.value
                         + "@communityschoolnaples.org";
       const password  = passwordElement.value;
+      const division  = divisionElement.value;
 
-      store.dispatch(createAccount(email,password));
+      store.dispatch(createAccount(email,password,division));
     } else {
       alert('Please use a validated email.');
     }
 
     emailElement.value    = "";
     passwordElement.value = "";
+    divisionElement.value = "";
   }
 
 }
diff --git a/src/components/mao-tutoring.js b/src/components/mao-tutoring.js
index bca76c1..707f0be 100644
--- a/src/components/mao-tutoring.js
+++ b/src/components/mao-tutoring.js
@@ -164,7 +164,6 @@ class MaoTutoring extends connect(store)(PageViewElement) {
               <div class="approved-card">
                 <h3>Approved Hours</h3>
                 <div
-                hidden= "${props.hours===-1}"
                 class=  "circle"
                 style=  "background-color: #0f9d58;">${props.hours}</div>
               </div>
@@ -172,7 +171,6 @@ class MaoTutoring extends connect(store)(PageViewElement) {
               <div class="unapproved-card">
                 <h3>Requested Hours</h3>
                 <div
-                hidden= "${props.requestedHours===-1}"
                 class=  "circle"
                 style=  "background-color: #f4b400;">${props.requestedHours}</div>
               </div>