diff --git a/.firebase/hosting.cHVibGlj.cache b/.firebase/hosting.cHVibGlj.cache index 5dd8f49..de76caf 100644 --- a/.firebase/hosting.cHVibGlj.cache +++ b/.firebase/hosting.cHVibGlj.cache @@ -1,3 +1,3 @@ +.DS_Store,1587684684410,7528a8673733d2deb795b0da1132f48af707587d79256490bba83b6db6abb3f1 404.html,1587671220032,05cbc6f94d7a69ce2e29646eab13be2c884e61ba93e3094df5028866876d18b3 _noindex.html,1587675225722,0027cec228eae5b4e981e1300268d79f4509fb29a7844e404bccb8d529ff69e1 -.DS_Store,1587684684410,7528a8673733d2deb795b0da1132f48af707587d79256490bba83b6db6abb3f1 diff --git a/functions/views/add-item.ejs b/functions/views/add-item.ejs index 8dcd42f..12da9f2 100644 --- a/functions/views/add-item.ejs +++ b/functions/views/add-item.ejs @@ -10,6 +10,8 @@ + + @@ -60,7 +62,7 @@
- +
diff --git a/functions/views/js/fdb.js b/functions/views/js/fdb.js index e66e51a..f97b1b5 100644 --- a/functions/views/js/fdb.js +++ b/functions/views/js/fdb.js @@ -1,3 +1,12 @@ +var permissionToLeavePage1 = false +var permissionToLeavePage2 = false + +function leavePage(){ + if (permissionToLeavePage1 && permissionToLeavePage2) { + window.location.replace('home?itemAdded=true') + } +} + function productSubmutEventHandler(){ data = { id: 1, @@ -42,7 +51,10 @@ function productSubmutEventHandler(){ var storageRef = firebase.storage().ref('/product-img/' + imgPath) updateDBImg(productKey, imgPath) - storageRef.put(image) + storageRef.put(image).then(function(){ + permissionToLeavePage2 = true + leavePage() + }) } function addItem(item){ @@ -59,7 +71,8 @@ function updateDBImg(key, value){ console.log("itemRef") console.log(itemRef) itemRef.update({img: value}).then(function(){ - window.location.replace('home?itemAdded=true') + permissionToLeavePage1 = true + leavePage() }) }