From 22d871851eb59694cd925c7a0b2f94f0a555f1d2 Mon Sep 17 00:00:00 2001
From: Max Hunt <mh2817@ic.ac.uk>
Date: Fri, 15 May 2020 21:02:43 +0100
Subject: [PATCH] Update

---
 functions/views/add-item.ejs    |  2 +-
 functions/views/edit-item.ejs   |  2 +-
 functions/views/js/fdb.js       | 24 ++++++++++++++++--------
 functions/views/my-products.ejs |  1 +
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/functions/views/add-item.ejs b/functions/views/add-item.ejs
index 8577031..b91a3b1 100644
--- a/functions/views/add-item.ejs
+++ b/functions/views/add-item.ejs
@@ -51,7 +51,7 @@
 			<div class="space"></div>
 
 			<div class="user-auth-message" id="uAuthMsg" style="display: block;"><p>Please log in to continue</p></div>
-
+			<div id="api-response" class="error-message" style="display: none;"></div>
 			<div class="new-product-field" id="authField" style="display: none;">
 				<p>Add product</p>
 				<div class="npf-short">
diff --git a/functions/views/edit-item.ejs b/functions/views/edit-item.ejs
index 6ef0025..2604481 100644
--- a/functions/views/edit-item.ejs
+++ b/functions/views/edit-item.ejs
@@ -50,7 +50,7 @@
 
 			<div class="space"></div>
 			<div id="productID" style="display: none;" product_id="<%= key%>"></div>
-
+			<div id="api-response" class="error-message" style="display: none;"></div>
 			<div class="new-product-field">
 				<p>Edit product</p>
 				<div class="npf-short">
diff --git a/functions/views/js/fdb.js b/functions/views/js/fdb.js
index 8f4630f..0210e17 100644
--- a/functions/views/js/fdb.js
+++ b/functions/views/js/fdb.js
@@ -43,13 +43,17 @@ async function productSubmitEventHandler(){
 					window.location.replace('home?itemAdded=true')
 				})
 				.catch(e=>{
-					console.log(e)
 					submitBtn.innerHTML = "Error..."
+					submitBtn.setAttribute('style', 'color:red;')
+					document.getElementById("api-response").innerHTML = "Error: " + e
+					document.getElementById("api-response").setAttribute("style", "display: block")
 				})
 			}
 			else {
 				submitBtn.innerHTML = "Error..."
-				console.log(result.error)
+				submitBtn.setAttribute('style', 'color:red;')
+				document.getElementById("api-response").innerHTML = "Error: " + result.error
+				document.getElementById("api-response").setAttribute("style", "display: block")
 			}
 		})
 	})
@@ -85,8 +89,10 @@ function productUpdateEventHandler() {
 					submitBtn.disabled = false
 				}
 				else {
-					console.log(result.error)
 					submitBtn.innerHTML = "Error..."
+					submitBtn.setAttribute('style', 'color:red;')
+					document.getElementById("api-response").innerHTML = "Error: " + result.error
+					document.getElementById("api-response").setAttribute("style", "display: block")
 				}
 			})
 		})
@@ -280,8 +286,10 @@ function addShippingAddress(){
 				document.getElementById("shippingaddressinput").placeholder = "Success!"
 			}
 			else {
+				document.getElementById("api-response").innerHTML = "Error: " + result.error
+				document.getElementById("api-response").setAttribute("style", "display: block")
 				document.getElementById("shippingaddressinput").value = ""
-				document.getElementById("shippingaddressinput").placeholder = "FAIL, " + esult.error
+				document.getElementById("shippingaddressinput").placeholder = "ERROR!"
 			}
 		})
 	})
@@ -387,15 +395,15 @@ try {
 		}
 	})
 }
-catch(error) {console.log(error)}
+catch(error) {}
 
 try {
-	let searchField = document.getElementById("u-address")
-	searchField.addEventListener("keyup", function(event) {
+	let regAddressField = document.getElementById("u-address")
+	regAddressField.addEventListener("keyup", function(event) {
 	if (event.keyCode === 13) {
 		event.preventDefault()
 		document.getElementById("u-r-btn").click()
 		}
 	})
 }
-catch(error) {console.log(error)}
\ No newline at end of file
+catch(error) {}
\ No newline at end of file
diff --git a/functions/views/my-products.ejs b/functions/views/my-products.ejs
index c96a2b9..db79582 100644
--- a/functions/views/my-products.ejs
+++ b/functions/views/my-products.ejs
@@ -1,5 +1,6 @@
 <%- include("partials/header") %>
 
+			<div id="api-response" class="error-message" style="display: none;"></div>
 			<div class="ship-adress">
 				<button id="shippingaddressbutton" style="display: block" onclick={showShipField()}>Edit Your Shipping Address</button>
 				<input style="display: none" type="text" placeholder="Type address, enter to submit" id="shippingaddressinput">