From 19bb88c365754b1c2c1c59c59eddb4eb01634f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Th=C3=B6rnblom?= <johan.thornblom@hotmail.com> Date: Mon, 14 Mar 2022 12:15:03 +0100 Subject: [PATCH] refresh problem --- Lab_3/Twidder/server.py | 1 + Lab_3/Twidder/static/client.js | 36 +++++++++++++++++++++------------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/Lab_3/Twidder/server.py b/Lab_3/Twidder/server.py index e759f95..48c0636 100644 --- a/Lab_3/Twidder/server.py +++ b/Lab_3/Twidder/server.py @@ -100,6 +100,7 @@ def echo(socket): # Put socket in global dict so server knows my connection is open signedInUser[myEmail] = socket + print(signedInUser) socket.send(json.dumps({"action" : "signIn"})) diff --git a/Lab_3/Twidder/static/client.js b/Lab_3/Twidder/static/client.js index db7a5be..de96a87 100644 --- a/Lab_3/Twidder/static/client.js +++ b/Lab_3/Twidder/static/client.js @@ -14,11 +14,16 @@ function connectWithSocket() { let token = localStorage.getItem("currentUser"); // Changes the view to profile view and loads user info - document.getElementById("error").innerHTML = "You are signed in"; + // document.getElementById("error").innerHTML = "You are signed in"; displayView(); setUserDetails("home"); // Establish web socket + // if (socket.readyState !== WebSocket.CLOSED) { + // socket.close(); + // } + // socket.close(); + socket = new WebSocket('ws://' + document.domain + ':5000/myServer/api'); socket.onopen = function (event) { let myEmail = localStorage.getItem("homeEmail"); @@ -33,8 +38,9 @@ function connectWithSocket() { console.log("Nu fick jag svar"); switch (response["action"]) { case "signOut": + socket.close(); console.log(response); - + // hej // Reset token in the localStorage localStorage.setItem("currentUser", ""); localStorage.setItem("homeEmail", ""); @@ -351,9 +357,9 @@ displayView = function(){ window.onload = function () { // Delete when done - används för att hoppa tillbaka till rtt view under utveckling - localStorage.setItem("currentUser", ""); - localStorage.setItem("homeEmail", ""); - localStorage.setItem("browseEmail", ""); + // localStorage.setItem("currentUser", ""); + // localStorage.setItem("homeEmail", ""); + // localStorage.setItem("browseEmail", ""); // All key/value pairs stored in out localStorage // If first time? check this: @@ -364,21 +370,23 @@ window.onload = function () { if (localStorage.getItem("currentUser") == null) localStorage.setItem("currentUser", ""); - // Todo - problem - if (localStorage.getItem("currentUser") != "") - connectWithSocket(); - // Initialize div objects (global variables) welcomeDiv = document.getElementById("welcomeview"); profileDiv = document.getElementById("profileview"); windowDiv = document.getElementById("windowDiv"); + + if (localStorage.getItem("currentUser") != "") {//if logged in + connectWithSocket(); + } + else { + // Set correct view depending on if someone is signed in or not + displayView(); - // Set correct view depending on if someone is signed in or not - displayView(); + // Load user details to home page and browse page + // setUserDetails("home"); + // setUserDetails("browse"); + } - // Load user details to home page and browse page - setUserDetails("home"); - setUserDetails("browse"); }; // Function for setting user details, either for yourself or for some other user -- GitLab