diff --git a/Lab_4/Twidder/database.db b/Lab_4/Twidder/database.db
index d01e75e274924c6bb2d355fbb0a27f1808ed17ec..b77a861fe582d500b26c331020471bf2bd5e073a 100644
Binary files a/Lab_4/Twidder/database.db and b/Lab_4/Twidder/database.db differ
diff --git a/Lab_4/Twidder/static/client.html b/Lab_4/Twidder/static/client.html
index 5a4b803aa420527024c4fbb8c17a484b064b44c7..96e8db5c229501e7218cf38f0ca2fe71453937b2 100644
--- a/Lab_4/Twidder/static/client.html
+++ b/Lab_4/Twidder/static/client.html
@@ -171,7 +171,9 @@
</head>
<body>
- <div id="windowDiv"></div>
+ <div id="windowDiv">
+
+ </div>
</body>
</html>
diff --git a/Lab_4/Twidder/static/client.js b/Lab_4/Twidder/static/client.js
index d422cd01f9e94907b00ff83c8ca5f6545e8d3ec9..a26ecfd7db9b9565e339e3f20f32f466cd9daa4a 100644
--- a/Lab_4/Twidder/static/client.js
+++ b/Lab_4/Twidder/static/client.js
@@ -23,8 +23,8 @@ function dropHome(event) {
let data = event.dataTransfer.getData("text/plain");
// Replaces parts of the string. "g" gör att alla accurences av substringen byts ut
- let tmp = data.replace(/<br>/g, "\n");
- newStr = tmp.replace(/ /g, '');
+ let newStr = data.replace(/<br>/g, "\n");
+ // newStr = tmp.replace(/ /g, '');
document.getElementById("homeTextarea").innerHTML = newStr;
}
@@ -33,8 +33,8 @@ function dropBrowse(event) {
let data = event.dataTransfer.getData("text/plain");
// Replaces parts of the string. "g" gör att alla accurences av substringen byts ut
- let tmp = data.replace(/<br>/g, "\n");
- newStr = tmp.replace(/ /g, '');
+ let newStr = data.replace(/<br>/g, "\n");
+ // newStr = tmp.replace(/ /g, '');
document.getElementById("browseTextarea").innerHTML = newStr;
}
@@ -98,7 +98,7 @@ signInRequest.onreadystatechange = function() {
let errorMessage = document.getElementById("error");
if (this.status == 204) {
- let token = this.getResponseHeader("Authorization")
+ let token = this.getResponseHeader("Authorization");
localStorage.setItem("currentUser", token);
connectWithSocket();
}
@@ -121,13 +121,13 @@ signInRequest.onreadystatechange = function() {
var signOutRequest = new XMLHttpRequest();
signOutRequest.onreadystatechange = function() {
if (this.readyState == 4) {
- if (this.status == 204) {
-
- // Reset token in the localStorage
- localStorage.setItem("currentUser", "");
- localStorage.setItem("homeEmail", "");
- localStorage.setItem("browseEmail", "");
+ // Reset token in the localStorage
+ localStorage.setItem("currentUser", "");
+ localStorage.setItem("homeEmail", "");
+ localStorage.setItem("browseEmail", "");
+
+ if (this.status == 204) {
// Changes the view to welcome view
displayView();
}
@@ -179,13 +179,13 @@ ChangePassRequest.onreadystatechange = function () {
errorMessage.innerHTML = "Error 400: Old password is incorrect or Old/New password has wrong format"
}
else if (this.status == 401) {
- errorMessage.innerHTML = "Error 401: You are not logged in"
+ errorMessage.innerHTML = "Error 401: You are not logged in";
}
else if (this.status == 500) {
errorMessage.innerHTML = "Error 500: Error at server side";
}
else {
- errorMessage.innerHTML = "Unknown error"
+ errorMessage.innerHTML = "Unknown error";
}
errorMessage.style.display = "block";
}
@@ -425,7 +425,7 @@ function setUserDetails(who) {
// Send request to server about receiving the info
dataByTokenRequest.open("GET", url + "getDataByToken", true);
dataByTokenRequest.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
- dataByTokenRequest.setRequestHeader("Authorization", token)
+ dataByTokenRequest.setRequestHeader("Authorization", token);
dataByTokenRequest.send();
}
@@ -434,7 +434,7 @@ function setUserDetails(who) {
// Send request to server about receiving the info
dataByEmailRequest.open("GET", url + "getDataByEmail/" + email, true);
dataByEmailRequest.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
- dataByEmailRequest.setRequestHeader("Authorization", token)
+ dataByEmailRequest.setRequestHeader("Authorization", token);
dataByEmailRequest.send();
}
}
@@ -499,7 +499,7 @@ function sign_out(){
// Sending sign_out request to "server"
signOutRequest.open("POST", url + "sign_out", true);
signOutRequest.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
- signOutRequest.setRequestHeader("Authorization", token)
+ signOutRequest.setRequestHeader("Authorization", token);
signOutRequest.send();
return false;
@@ -557,7 +557,7 @@ function change_password(ourEvent){
else {
ChangePassRequest.open("PUT", url + "change_password", true);
ChangePassRequest.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
- ChangePassRequest.setRequestHeader("Authorization", token)
+ ChangePassRequest.setRequestHeader("Authorization", token);
ChangePassRequest.send(JSON.stringify({old_password:old_pass, new_password:new_pass}));
}
return false;
@@ -579,7 +579,7 @@ function updateWall(who){
// Send user's message to the server
postMessageRequest.open("POST", url + "post", true);
postMessageRequest.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
- postMessageRequest.setRequestHeader("Authorization", token)
+ postMessageRequest.setRequestHeader("Authorization", token);
postMessageRequest.send(JSON.stringify({ email: email, message: messageToWall }));
errorMessage.innerHTML = "";
@@ -604,7 +604,7 @@ function reloadWall(who) {
// Send request to server about receiving the info
messagesByTokenRequest.open("GET", url + "getUserMessageByToken", true);
messagesByTokenRequest.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
- messagesByTokenRequest.setRequestHeader("Authorization", token)
+ messagesByTokenRequest.setRequestHeader("Authorization", token);
messagesByTokenRequest.send();
}
@@ -613,7 +613,7 @@ function reloadWall(who) {
// Send request to server about receiving the info
messagesByEmailRequest.open("GET", url + "getMessagesByEmail/" + email, true);
messagesByEmailRequest.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
- messagesByEmailRequest.setRequestHeader("Authorization", token)
+ messagesByEmailRequest.setRequestHeader("Authorization", token);
messagesByEmailRequest.send();
}