aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Foiani <mfoiani2019@communiyschoolnaples.org>2018-08-05 00:19:16 -0400
committerMichael Foiani <mfoiani2019@communiyschoolnaples.org>2018-08-05 00:19:16 -0400
commit767c464c51627559863eb6929744cc25fd4fb816 (patch)
tree391af6f5ed15baf4baf417203bb1c62f41a95e1e
parent959b2cbefde8284ae677f5e6f5ef79890cfe1aea (diff)
Made some other small imports and edits to allow the redux management to work correctly.
-rw-r--r--src/actions/app.js7
-rw-r--r--src/actions/firebaseAuth.js11
2 files changed, 13 insertions, 5 deletions
diff --git a/src/actions/app.js b/src/actions/app.js
index 849fadb..e0b95e3 100644
--- a/src/actions/app.js
+++ b/src/actions/app.js
@@ -26,16 +26,13 @@ export const navigate = (path) => (dispatch) => {
dispatch(updateDrawerState(false));
};
-import {snapshotForums} from './firebase.js';
+import { snapshotForums } from './firebaseFirestore.js';
var hasSubscribedPosts = false;
const loadPage = (page) => (dispatch) => {
switch(page) {
case 'home':
- import('../components/mao-home.js').then((module) => {
- // Put code in here that you want to run every time when
- // navigating to view1 after my-view1.js is loaded.
- });
+ import('../components/mao-home.js')
break;
case 'compete':
import('../components/mao-competitions.js');
diff --git a/src/actions/firebaseAuth.js b/src/actions/firebaseAuth.js
index ff49888..c80836c 100644
--- a/src/actions/firebaseAuth.js
+++ b/src/actions/firebaseAuth.js
@@ -45,6 +45,17 @@ export const createAccount = (_email, _password, divison) => (dispatch) => {
});
}
+import {
+ setUserData,
+ fetchDivison,
+ snapshotHours,
+ snapshotRegisteredCompetitions
+} from './firebaseFirestore.js';
+
+import {
+ adminListener
+} from './firebaseAdmin.js'
+
export const signIn = (_email, _password, divison) => (dispatch) => {
auth.signInWithEmailAndPassword(_email, _password).then(() => {
var user = auth.currentUser;