diff options
| -rw-r--r-- | src/actions/app.js | 9 | ||||
| -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/components/mao-forums.js | 1 | ||||
| -rw-r--r-- | src/components/mao-tutoring.js | 5 | ||||
| -rw-r--r-- | src/firebase.js | 4 | ||||
| -rw-r--r-- | src/reducers/firebaseStorage.js | 25 |
8 files changed, 26 insertions, 36 deletions
diff --git a/src/actions/app.js b/src/actions/app.js index 422c52d..ef3f18e 100644 --- a/src/actions/app.js +++ b/src/actions/app.js @@ -29,7 +29,7 @@ export const navigate = (path) => (dispatch) => { import { snapshotForums } from './firebaseFirestore.js'; var hasSubscribedPosts = false; -const loadPage = (page) => (dispatch, getState) => { +const loadPage = (page) => (dispatch) => { switch(page) { case 'home': import('../components/mao-home.js'); @@ -57,12 +57,7 @@ const loadPage = (page) => (dispatch, getState) => { break; case 'admin': - if(getState().firebaseAdmin.isAdmin) { - import('../components/mao-admin.js'); - } else { - page = 'view404'; - import('../components/my-view404.js'); - } + import('../components/mao-admin.js'); break; default: diff --git a/src/actions/firebaseAdmin.js b/src/actions/firebaseAdmin.js index 5ca0d17..c322f64 100644 --- a/src/actions/firebaseAdmin.js +++ b/src/actions/firebaseAdmin.js @@ -1,4 +1,4 @@ -import { firestore, storage } from '../firebase.js'; +import { firestore, fireStorage } 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 storageRef = storage.ref().child(_path); - storageRef.delete().then(() => { + var fireStorageRef = fireStorage.ref().child(_path); + fireStorageRef.delete().then(() => { }); }); } diff --git a/src/actions/firebaseFirestore.js b/src/actions/firebaseFirestore.js index a95e0c8..7e65eec 100644 --- a/src/actions/firebaseFirestore.js +++ b/src/actions/firebaseFirestore.js @@ -1,4 +1,4 @@ -import { firestore, storage } from '../firebase.js'; +import { firestore, fireStorage } 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 storageRef = storage.ref().child(_path); - storageRef.getDownloadURL().then((url) => { + var fireStorageRef = fireStorage.ref().child(_path); + fireStorageRef.getDownloadURL().then((url) => { docRef.add({ time: _time, trainee: _trainee, diff --git a/src/actions/firebaseStorage.js b/src/actions/firebaseStorage.js index af114f1..6828344 100644 --- a/src/actions/firebaseStorage.js +++ b/src/actions/firebaseStorage.js @@ -1,12 +1,12 @@ -import { storage } from '../firebase.js'; +import { fireStorage } from '../firebase.js'; export const UPDATE_PICTURE = 'UPDATE_PICTURE'; export const uploadPicture = (file, uploader) => (dispatch, getState) => { if(file) { - var storageRef = storage.ref('requests/' + getState().firebaseAuth.uid + '/' + file.name); + var fireStorageRef = fireStorage.ref('requests/' + getState().firebaseAuth.uid + '/' + file.name); - var task = storageRef.put(file); + var task = fireStorageRef.put(file); task.on('state_changed', function(snapshot) { var percentage = (snapshot.bytesTransferred / diff --git a/src/components/mao-forums.js b/src/components/mao-forums.js index daa4532..745c620 100644 --- a/src/components/mao-forums.js +++ b/src/components/mao-forums.js @@ -28,7 +28,6 @@ import '@polymer/paper-input/paper-textarea.js'; import '@polymer/paper-card/paper-card.js'; import '@polymer/paper-dropdown-menu/paper-dropdown-menu.js'; import '@polymer/paper-item/paper-item.js'; -import '@polymer/paper-slider/paper-slider.js'; import '@polymer/paper-button/paper-button.js'; // Import other customElements diff --git a/src/components/mao-tutoring.js b/src/components/mao-tutoring.js index a18cc2c..77454e5 100644 --- a/src/components/mao-tutoring.js +++ b/src/components/mao-tutoring.js @@ -16,8 +16,8 @@ import { connect } from 'pwa-helpers/connect-mixin.js'; import { store } from '../store.js'; //These are the actions needed by this element. -import { requestHours } from '../actions/firebaseFirestore.js'; -import { uploadPicture} from '../actions/firebaseStorage.js' +import { requestHours } from '../actions/firebaseFirestore.js'; +import { uploadPicture } from '../actions/firebaseStorage.js' // These are the }shared styles needed by this element. import { SharedStyles } from './shared-styles.js'; @@ -33,7 +33,6 @@ import '@polymer/paper-card/paper-card.js'; import '@polymer/paper-item/paper-item.js'; import '@polymer/paper-item/paper-icon-item.js'; import '@polymer/paper-icon-button/paper-icon-button.js'; -import '@polymer/paper-slider/paper-slider.js'; import '@polymer/paper-button/paper-button.js'; // Import other customElements diff --git a/src/firebase.js b/src/firebase.js index 995e96f..901ef5d 100644 --- a/src/firebase.js +++ b/src/firebase.js @@ -14,9 +14,9 @@ firebase.initializeApp(config); export const auth = firebase.auth(); //set settings and export firestore -export const firestore = firebase.firestore(); +export var firestore = firebase.firestore(); const settings = {timestampsInSnapshots: true}; firestore.settings(settings); //export storage -export const storage = firebase.storage();
\ No newline at end of file +export var fireStorage = firebase.storage();
\ No newline at end of file diff --git a/src/reducers/firebaseStorage.js b/src/reducers/firebaseStorage.js index 8ec702e..0c3921a 100644 --- a/src/reducers/firebaseStorage.js +++ b/src/reducers/firebaseStorage.js @@ -8,22 +8,19 @@ Code distributed by Google as part of the polymer project is also subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt */ -import { - UPDATE_PICTURE -} -from '../actions/firebaseStorage.js'; +import { UPDATE_PICTURE } from '../actions/firebaseStorage.js'; - const firebaseStorage = (state = {pictureName: "", uploaded: false}, action) => { - switch (action.type) { - case UPDATE_PICTURE: - return { - pictureName: action.name, - uploaded: action.uploaded - }; - break; +const firebaseStorage = (state = {pictureName: "", uploaded: false}, action) => { + switch (action.type) { + case UPDATE_PICTURE: + return { + pictureName: action.name, + uploaded: action.uploaded + }; + break; - default: - return state; + default: + return state; } }; |