From 0cf61a8456c6d889920e29398c96154f5c6e17f7 Mon Sep 17 00:00:00 2001
From: Max Hunt <mh2817@ic.ac.uk>
Date: Fri, 8 May 2020 11:46:02 +0100
Subject: [PATCH] Update

---
 functions/views/js/fAuth.js | 10 +++++++++-
 functions/views/js/fdb.js   | 20 +++++++++++++++-----
 functions/views/product.ejs |  2 +-
 server.js                   | 12 +++++++++++-
 4 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/functions/views/js/fAuth.js b/functions/views/js/fAuth.js
index f52c8c1..06ef4f7 100644
--- a/functions/views/js/fAuth.js
+++ b/functions/views/js/fAuth.js
@@ -10,6 +10,11 @@ function checkAuth(){
 				var keys = Object.keys(vals)
 				uData = vals[keys[0]]
 				document.getElementById('uname-dom').innerHTML = "Hello, " + uData.fName
+
+				if (!uData.address) {
+					document.getElementsByClassName("notifications")[0].innerHTML = "🔔 | Update shipping address"
+					document.getElementsByClassName("notifications")[0].setAttribute("style", "color: red;")
+				}
 			})
 
 			document.getElementById('uname-field').setAttribute("style", "display: block;")
@@ -70,7 +75,10 @@ function checkNewUser(credential){
 			}
 			let itemRef = database.ref('/users')
 			itemRef.push(uData)
-			.then(function(){console.log("Added "+credential.displayName+" to user database")})
+			.then(function(){
+				console.log("Added "+credential.displayName+" to user database")
+				window.location.replace('home')
+			})
 			.catch(function(error){console.log(error)})
 		}
 	})
diff --git a/functions/views/js/fdb.js b/functions/views/js/fdb.js
index 17005f1..9db9080 100644
--- a/functions/views/js/fdb.js
+++ b/functions/views/js/fdb.js
@@ -298,15 +298,25 @@ function addShippingAddress(){
 		userKey = keys[0]
 		userRef = database.ref("/users/"+userKey)
 		userRef.update({address:document.getElementById('shippingaddressinput').value})
-		.then(document.getElementById("shippingaddressinput").value = "Success!")
+		.then(function(){
+			document.getElementById("shippingaddressinput").value = ""
+			document.getElementById("shippingaddressinput").placeholder = "Success!"
+		})
 		.catch(e => {console.log(e)})
 	})
 }
 
 var addressField = document.getElementById("shippingaddressinput")
 addressField.addEventListener("keyup", function(event) {
-  if (event.keyCode === 13) {
-   event.preventDefault()
-   addShippingAddress()
-  }
+	if (event.keyCode === 13) {
+	event.preventDefault()
+	if (addressField.value == "Success!" || addressField.value == ""){
+		addressField.value = ""
+		addressField.blur()
+	}
+	else {
+			addShippingAddress()
+			addressField.blur()
+		}
+	}
 });
\ No newline at end of file
diff --git a/functions/views/product.ejs b/functions/views/product.ejs
index 990b309..3219c0b 100644
--- a/functions/views/product.ejs
+++ b/functions/views/product.ejs
@@ -65,7 +65,7 @@
 					<div class="product-page-img"><img class="dyn-img" src="media/noimage.png" title="<%= item.img %>"></div>
 					<div class="product-page-info">			
 						<h2><%= item.name %> </h2>
-						<p>Seller <%= item.owner %></p>
+						<p>Seller: <%= seller %></p>
 						<p>Location: <%= item.location %></p>
 						<p>In stock: <%= item.stock %></p>
 						<p>Price: £<%= item.price %></p>
diff --git a/server.js b/server.js
index 7f65ae3..32437f5 100644
--- a/server.js
+++ b/server.js
@@ -154,7 +154,17 @@ app.get('/product', function(request, responce){
 		dbRef.once('value', function(snapshot){
 			data = snapshot.val()
 			if (data){
-				responce.render('product.ejs', {item:data, key:request.query.productid})
+				sellerID = data.owner
+				let sellerName = "John Doe (error)"
+				let usersRef = database.ref("/users")
+				usersRef.orderByChild("UID").equalTo(sellerID).once('value', function(snapshot){
+					vals = snapshot.val()
+					var keys = Object.keys(vals)
+					uData = vals[keys[0]]
+					sellerName = uData.fName + " " + uData.lName
+					responce.render('product.ejs', {item:data, key:request.query.productid, seller:sellerName})
+				})
+				.catch(e => {console.log(e)})
 			}
 			else {
 				responce.render('404.ejs')