From 330ef33a04a0273bc0b5ba2727ece672b20f4131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Th=C3=B6rnblom?= <johan.thornblom@hotmail.com>
Date: Fri, 4 Mar 2022 17:18:59 +0100
Subject: [PATCH] added static/ in 3 places in the client.html fileeee
---
Lab_3/Twidder/static/client.html | 2 +-
Lab_3/Twidder/static/client.js | 14 ++++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/Lab_3/Twidder/static/client.html b/Lab_3/Twidder/static/client.html
index 8ebd769..4c4df13 100644
--- a/Lab_3/Twidder/static/client.html
+++ b/Lab_3/Twidder/static/client.html
@@ -6,7 +6,7 @@
<link href="static/client.css" type="text/css" rel="stylesheet">
<script src="static/client.js"></script>
<script src="static/serverstub.js"></script>
- <!-- <script src="server.py"></script> -->
+ <script src="server.py"></script>
<script type="text/view" id="welcomeview">
<div id="repeat_pass"></div>
diff --git a/Lab_3/Twidder/static/client.js b/Lab_3/Twidder/static/client.js
index 89588f9..99540d2 100644
--- a/Lab_3/Twidder/static/client.js
+++ b/Lab_3/Twidder/static/client.js
@@ -45,6 +45,8 @@ function setUserDetails(who) {
if (token != null && token != "" ){
let userTable = document.getElementById(who + "UserInfo");
let email = localStorage.getItem(who + "Email");
+
+ // Todo
//let userDataArray = serverstub.getUserDataByEmail(token, email);
let userDataArray = server.get_user_data_by_email(email);
@@ -82,6 +84,8 @@ function sign_up() {
else if (user.password != user.repeat_password)
errorMess.innerHTML = "Passwords does not match";
else {
+
+ // Todo
// Submission to "server"
let signUpObj = serverstub.signUp(user);
// Set message to user
@@ -101,6 +105,7 @@ function sign_in() {
errorMess.innerHTML = "Password's length is too short";
else {
+ //Todo
// Sending sign_in request to "server"
let signInObj = serverstub.signIn(email, password);
@@ -123,6 +128,8 @@ function sign_in() {
function sign_out(){
let token = localStorage.getItem("currentUser");
+
+ // Todo
let logOutObj = serverstub.signOut(token);
if (logOutObj["success"]) {
@@ -181,6 +188,8 @@ function change_password(ourEvent){
error_text.innerHTML = "New password and confirm password does not match";
}
else {
+
+ // Todo
// Success
let message = serverstub.changePassword(token, old_pass, new_pass);
@@ -202,6 +211,7 @@ function updateWall(who){
let token = localStorage.getItem("currentUser");
let email = localStorage.getItem(who + "Email");
+ // Todo
// Send user's message to the server
serverstub.postMessage(token, messageToWall, email);
@@ -214,6 +224,8 @@ function reloadWall(who) {
// "who" could be either home or browse, this way know which wall to load to
let token = localStorage.getItem("currentUser");
let email = localStorage.getItem(who + "Email");
+
+ // Todo
let currentWall = serverstub.getUserMessagesByEmail(token, email);
// Fromating the text before putting to wall
@@ -230,6 +242,8 @@ function searchAnotherUser(event){
let token = localStorage.getItem("currentUser");
let email = event.target["searchInput"].value;
let error = document.getElementById("searchMessage");
+
+ // Todo
let user_obj = serverstub.getUserMessagesByEmail(token, email);
error.innerHTML = user_obj["message"];
--
GitLab