diff --git a/views/add-item.ejs b/views/add-item.ejs index 77ce340..e2d0982 100644 --- a/views/add-item.ejs +++ b/views/add-item.ejs @@ -13,6 +13,7 @@ + @@ -59,7 +60,7 @@
- +
diff --git a/views/css/style.css b/views/css/style.css index 4ef6485..0479789 100644 --- a/views/css/style.css +++ b/views/css/style.css @@ -28,6 +28,7 @@ body { } main { + min-height: 79.7vh; /*padding-bottom: 200px;*/ } @@ -272,10 +273,12 @@ footer a { .product-container { width: 160px; + height: 100%; } .product-container img { width: 100%; + max-height: 90%; } .product-container p { @@ -283,6 +286,7 @@ footer a { color: #CA5555; font-size: 17px; } + .r {float: right;} .l {float: left;} @@ -370,6 +374,14 @@ footer a { border: 0.5px solid grey; } +#pImg { + position: relative; + border: none; + color: grey; + left: -10px; + top: 12px; +} + .new-product-field button { height: 40px; width: 100px; diff --git a/views/home.ejs b/views/home.ejs index 99dce09..b0221c0 100644 --- a/views/home.ejs +++ b/views/home.ejs @@ -13,9 +13,9 @@ + - @@ -65,13 +65,16 @@
+

Popular:

<% var keys = Object.keys(products) %> <% keys.forEach(function(key){ %>
- img + + img +

<%= products[key].name%>

£ <%= products[key].price%>

@@ -157,5 +160,6 @@
+ \ No newline at end of file diff --git a/views/js/fStore.js b/views/js/fStore.js new file mode 100644 index 0000000..3a8dd08 --- /dev/null +++ b/views/js/fStore.js @@ -0,0 +1,12 @@ +function updateImgs() { + const storage = firebase.storage() + const rootReference = storage.ref('/product-img') + + var images = document.getElementsByClassName('dyn-img') + // console.log(images) + Array.from(images).forEach((image) => { + var pathReference = rootReference.child(image.title) + pathReference.getDownloadURL().then(function(url) {image.src = url}) + }) +} +updateImgs(); \ No newline at end of file diff --git a/views/js/fdb.js b/views/js/fdb.js index 2f28b45..0ae357d 100644 --- a/views/js/fdb.js +++ b/views/js/fdb.js @@ -14,18 +14,22 @@ function productSubmutEventHandler(){ const nameField = document.getElementById('pName') const descField = document.getElementById('pDesc') - const imgField = document.getElementById('pImgUrl') const locField = document.getElementById('pLoc') const stockField = document.getElementById('pStock') const publicField = document.getElementById('pPublic') const priceField = document.getElementById('pPrice') + const imgBtn = document.getElementById('pImg') + var image = imgBtn.files[0] + var storageRef = firebase.storage().ref('/product-img/' + image.name) + storageRef.put(image) + var sessUid = firebase.auth().currentUser.uid data.id = 999 data.name = nameField.value data.desc = descField.value - data.img = imgField.value + data.img = image.name data.location = locField.value data.stock = stockField.value data.public = publicField.value @@ -33,7 +37,6 @@ function productSubmutEventHandler(){ data.owner = sessUid data.holder = sessUid - addItem(data) } @@ -48,4 +51,4 @@ function addItem(item){ .catch(function(error){ console.log(error) }) -} \ No newline at end of file +}