Skip to content
Snippets Groups Projects
Commit 330ef33a authored by Johan Thörnblom's avatar Johan Thörnblom
Browse files

added static/ in 3 places in the client.html fileeee

parent 2b57fdc7
No related branches found
No related tags found
No related merge requests found
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<link href="static/client.css" type="text/css" rel="stylesheet"> <link href="static/client.css" type="text/css" rel="stylesheet">
<script src="static/client.js"></script> <script src="static/client.js"></script>
<script src="static/serverstub.js"></script> <script src="static/serverstub.js"></script>
<!-- <script src="server.py"></script> --> <script src="server.py"></script>
<script type="text/view" id="welcomeview"> <script type="text/view" id="welcomeview">
<div id="repeat_pass"></div> <div id="repeat_pass"></div>
......
...@@ -45,6 +45,8 @@ function setUserDetails(who) { ...@@ -45,6 +45,8 @@ function setUserDetails(who) {
if (token != null && token != "" ){ if (token != null && token != "" ){
let userTable = document.getElementById(who + "UserInfo"); let userTable = document.getElementById(who + "UserInfo");
let email = localStorage.getItem(who + "Email"); let email = localStorage.getItem(who + "Email");
// Todo
//let userDataArray = serverstub.getUserDataByEmail(token, email); //let userDataArray = serverstub.getUserDataByEmail(token, email);
let userDataArray = server.get_user_data_by_email(email); let userDataArray = server.get_user_data_by_email(email);
...@@ -82,6 +84,8 @@ function sign_up() { ...@@ -82,6 +84,8 @@ function sign_up() {
else if (user.password != user.repeat_password) else if (user.password != user.repeat_password)
errorMess.innerHTML = "Passwords does not match"; errorMess.innerHTML = "Passwords does not match";
else { else {
// Todo
// Submission to "server" // Submission to "server"
let signUpObj = serverstub.signUp(user); let signUpObj = serverstub.signUp(user);
// Set message to user // Set message to user
...@@ -101,6 +105,7 @@ function sign_in() { ...@@ -101,6 +105,7 @@ function sign_in() {
errorMess.innerHTML = "Password's length is too short"; errorMess.innerHTML = "Password's length is too short";
else { else {
//Todo
// Sending sign_in request to "server" // Sending sign_in request to "server"
let signInObj = serverstub.signIn(email, password); let signInObj = serverstub.signIn(email, password);
...@@ -123,6 +128,8 @@ function sign_in() { ...@@ -123,6 +128,8 @@ function sign_in() {
function sign_out(){ function sign_out(){
let token = localStorage.getItem("currentUser"); let token = localStorage.getItem("currentUser");
// Todo
let logOutObj = serverstub.signOut(token); let logOutObj = serverstub.signOut(token);
if (logOutObj["success"]) { if (logOutObj["success"]) {
...@@ -181,6 +188,8 @@ function change_password(ourEvent){ ...@@ -181,6 +188,8 @@ function change_password(ourEvent){
error_text.innerHTML = "New password and confirm password does not match"; error_text.innerHTML = "New password and confirm password does not match";
} }
else { else {
// Todo
// Success // Success
let message = serverstub.changePassword(token, old_pass, new_pass); let message = serverstub.changePassword(token, old_pass, new_pass);
...@@ -202,6 +211,7 @@ function updateWall(who){ ...@@ -202,6 +211,7 @@ function updateWall(who){
let token = localStorage.getItem("currentUser"); let token = localStorage.getItem("currentUser");
let email = localStorage.getItem(who + "Email"); let email = localStorage.getItem(who + "Email");
// Todo
// Send user's message to the server // Send user's message to the server
serverstub.postMessage(token, messageToWall, email); serverstub.postMessage(token, messageToWall, email);
...@@ -214,6 +224,8 @@ function reloadWall(who) { ...@@ -214,6 +224,8 @@ function reloadWall(who) {
// "who" could be either home or browse, this way know which wall to load to // "who" could be either home or browse, this way know which wall to load to
let token = localStorage.getItem("currentUser"); let token = localStorage.getItem("currentUser");
let email = localStorage.getItem(who + "Email"); let email = localStorage.getItem(who + "Email");
// Todo
let currentWall = serverstub.getUserMessagesByEmail(token, email); let currentWall = serverstub.getUserMessagesByEmail(token, email);
// Fromating the text before putting to wall // Fromating the text before putting to wall
...@@ -230,6 +242,8 @@ function searchAnotherUser(event){ ...@@ -230,6 +242,8 @@ function searchAnotherUser(event){
let token = localStorage.getItem("currentUser"); let token = localStorage.getItem("currentUser");
let email = event.target["searchInput"].value; let email = event.target["searchInput"].value;
let error = document.getElementById("searchMessage"); let error = document.getElementById("searchMessage");
// Todo
let user_obj = serverstub.getUserMessagesByEmail(token, email); let user_obj = serverstub.getUserMessagesByEmail(token, email);
error.innerHTML = user_obj["message"]; error.innerHTML = user_obj["message"];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment