aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/actions/firebaseAdmin.js6
-rw-r--r--src/actions/firebaseFirestore.js6
-rw-r--r--src/actions/firebaseStorage.js6
-rw-r--r--src/firebase.js2
-rw-r--r--src/reducers/firebaseStorage.js6
5 files changed, 13 insertions, 13 deletions
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..1ccf583 100644
--- a/src/actions/firebaseStorage.js
+++ b/src/actions/firebaseStorage.js
@@ -1,12 +1,12 @@
-import { storage } from '../firebase.js';
+import { firefireStorage } 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/firebase.js b/src/firebase.js
index 995e96f..c3417d3 100644
--- a/src/firebase.js
+++ b/src/firebase.js
@@ -19,4 +19,4 @@ const settings = {timestampsInSnapshots: true};
firestore.settings(settings);
//export storage
-export const storage = firebase.storage(); \ No newline at end of file
+export const fireStorage = firebase.storage(); \ No newline at end of file
diff --git a/src/reducers/firebaseStorage.js b/src/reducers/firebaseStorage.js
index 599d220..8c0249d 100644
--- a/src/reducers/firebaseStorage.js
+++ b/src/reducers/firebaseStorage.js
@@ -10,12 +10,12 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
import {
UPDATE_PICTURE
- }
- from '../actions/firebaseStorage.js';
+}
+from '../actions/firebaseStorage.js';
const firebaseStorage = (state = {pictureName: "", uploaded: false}, action) => {
switch (action.type) {
- case 'UPDATE_PICTURE':
+ case UPDATE_PICTURE:
return {
pictureName: action.name,
uploaded: action.uploaded