diff options
author | Michael Foiani <mfoiani2019@communiyschoolnaples.org> | 2018-08-13 23:13:56 -0400 |
---|---|---|
committer | Michael Foiani <mfoiani2019@communiyschoolnaples.org> | 2018-08-13 23:13:56 -0400 |
commit | fe125c5deb979d753d8b903ce6cdeb968e1c5f46 (patch) | |
tree | 079474a83ab36a1cd2566b0528362288dbbbeba9 /src | |
parent | b1d481ee51e39734a9f10b14d5bc907d17c2afd0 (diff) |
Attempting to fix issue with building and serving. I believe it was a semicolon I missed in the actions of the app.js.
Diffstat (limited to 'src')
-rw-r--r-- | src/actions/app.js | 2 | ||||
-rw-r--r-- | src/actions/firebaseAdmin.js | 6 | ||||
-rw-r--r-- | src/actions/firebaseFirestore.js | 6 | ||||
-rw-r--r-- | src/actions/firebaseStorage.js | 6 | ||||
-rw-r--r-- | src/firebase.js | 2 | ||||
-rw-r--r-- | src/reducers/firebaseStorage.js | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/actions/app.js b/src/actions/app.js index 9ae3184..422c52d 100644 --- a/src/actions/app.js +++ b/src/actions/app.js @@ -32,7 +32,7 @@ var hasSubscribedPosts = false; const loadPage = (page) => (dispatch, getState) => { switch(page) { case 'home': - import('../components/mao-home.js') + import('../components/mao-home.js'); break; case 'compete': diff --git a/src/actions/firebaseAdmin.js b/src/actions/firebaseAdmin.js index c322f64..5ca0d17 100644 --- a/src/actions/firebaseAdmin.js +++ b/src/actions/firebaseAdmin.js @@ -1,4 +1,4 @@ -import { firestore, fireStorage } from '../firebase.js'; +import { firestore, storage } from '../firebase.js'; export const UPDATE_ADMIN = 'UPDATE_ADMIN'; export const UPDATE_ADMIN_REQUESTS = 'UPDATE_ADMIN_REQUESTS'; @@ -76,8 +76,8 @@ export const adminRejectHours = (_id, _path) => (dispatch) => { export const adminDeleteRequest = (_id, _path) => (dispatch) => { var docRef = firestore.collection('requests').doc(_id); docRef.delete().then(() => { - var fireStorageRef = fireStorage.ref().child(_path); - fireStorageRef.delete().then(() => { + var storageRef = storage.ref().child(_path); + storageRef.delete().then(() => { }); }); } diff --git a/src/actions/firebaseFirestore.js b/src/actions/firebaseFirestore.js index 7e65eec..a95e0c8 100644 --- a/src/actions/firebaseFirestore.js +++ b/src/actions/firebaseFirestore.js @@ -1,4 +1,4 @@ -import { firestore, fireStorage } from '../firebase.js'; +import { firestore, storage } from '../firebase.js'; export const UPDATE_DIVISON = 'UPDATE_DIVISON'; export const UPDATE_HOURS = 'UPDATE_HOURS'; @@ -106,8 +106,8 @@ export const requestHours = (_time, _trainee, _location, _subject, _date, _pictu const _email = getState().firebaseAuth.userEmail; const _path = 'requests/' + _uid + '/' + _pictureName; - var fireStorageRef = fireStorage.ref().child(_path); - fireStorageRef.getDownloadURL().then((url) => { + var storageRef = storage.ref().child(_path); + storageRef.getDownloadURL().then((url) => { docRef.add({ time: _time, trainee: _trainee, diff --git a/src/actions/firebaseStorage.js b/src/actions/firebaseStorage.js index 1ccf583..af114f1 100644 --- a/src/actions/firebaseStorage.js +++ b/src/actions/firebaseStorage.js @@ -1,12 +1,12 @@ -import { firefireStorage } from '../firebase.js'; +import { storage } from '../firebase.js'; export const UPDATE_PICTURE = 'UPDATE_PICTURE'; export const uploadPicture = (file, uploader) => (dispatch, getState) => { if(file) { - var fireStorageRef = fireStorage.ref('requests/' + getState().firebaseAuth.uid + '/' + file.name); + var storageRef = storage.ref('requests/' + getState().firebaseAuth.uid + '/' + file.name); - var task = fireStorageRef.put(file); + var task = storageRef.put(file); task.on('state_changed', function(snapshot) { var percentage = (snapshot.bytesTransferred / diff --git a/src/firebase.js b/src/firebase.js index c3417d3..995e96f 100644 --- a/src/firebase.js +++ b/src/firebase.js @@ -19,4 +19,4 @@ const settings = {timestampsInSnapshots: true}; firestore.settings(settings); //export storage -export const fireStorage = firebase.storage();
\ No newline at end of file +export const storage = firebase.storage();
\ No newline at end of file diff --git a/src/reducers/firebaseStorage.js b/src/reducers/firebaseStorage.js index 8c0249d..8ec702e 100644 --- a/src/reducers/firebaseStorage.js +++ b/src/reducers/firebaseStorage.js @@ -19,7 +19,7 @@ from '../actions/firebaseStorage.js'; return { pictureName: action.name, uploaded: action.uploaded - } + }; break; default: |