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

refresh problem

parent 6ac1a6b4
No related branches found
No related tags found
No related merge requests found
......@@ -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"}))
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment