Merge branch 'main' of github.com:OliverGreen27/TDDD97-Webprog

client.html

@@ -79,8 +79,24 @@
 
 			<!-- Tab content -->
 			<div id="Home" class="tabcontent">
-				<h3>Home</h3>
-				<p>Welcome to your homepage.</p>
+				<h3 id=home-username>Home</h3>
+
+				<div class="user-data-elements">
+					<div class="data-field">	
+						<label for="home-gender"></label>
+						<p id=home-gender></p>
+					</div>
+
+					<div class="data-field">	
+						<label for="home-location"></label>
+						<p id=home-location></p>
+					</div>
+
+					<div class="data-field">	
+						<label for="home-email"></label>
+						<p id=home-email></p>
+					</div>
+				</div>
 			</div>
 
 			<div id="Browse" class="tabcontent">

client.js

@@ -89,7 +89,6 @@ loadProfileView = function() {
 		event.preventDefault();
 		if (inputValidation("changepassform")) {
 			var message = serverstub.changePassword(localStorage.getItem("logintoken"), changepassform["oldpassword"].value, changepassform["password"].value);
-			console.log(message.message);
 			changepassform["oldpassword"].value = "";
 			changepassform["password"].value = "";
 			changepassform["password2"].value = "";
@@ -105,13 +104,12 @@ loadProfileView = function() {
 
 	document.getElementById("logoutbutton").addEventListener("click", function(event) {
 		var message = serverstub.signOut(localStorage.getItem("logintoken"));
-		console.log(message);
 		if(!message.success) {
 			document.getElementById("message1").innerText = message.message;
 		} else {
 			localStorage.removeItem("logintoken");
-			loadWelcomeView();
 		}
+		loadWelcomeView();
 	})
 
     var userData = serverstub.getUserDataByToken(localStorage.getItem('logintoken')).data