From 872fe52783de5a056c2a99d6bb29a1f8e2fa9522 Mon Sep 17 00:00:00 2001
From: MaximeOLIVA <maxime.oliva@etu.univ-cotedazur.fr>
Date: Tue, 14 Feb 2023 15:13:45 +0100
Subject: [PATCH] modif client
---
Twidder (Lab3)/database.db | Bin 36864 -> 36864 bytes
Twidder (Lab3)/static/client.js | 52 ++++++++++++++------------------
2 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/Twidder (Lab3)/database.db b/Twidder (Lab3)/database.db
index 8e9c99512952eb7006ed8459068fbfa3beb3d0e1..04197a099e1fd549403b38a56a27cfeaf99a0d36 100644
GIT binary patch
delta 604
zcmZozz|^pSX@Zmxqa*_Z11AFm0}BHK0}}%SgXBaVBPm8n2EA}EUY<1!Y}^41JW+h%
z{0Di9`9!z_Ha6biQfOl5W*3*0Wo%9?NleN~^>qync64_QhS408&+z!lE9mMvr{<Jq
zDioGxDioz2UY?&>qL7oSkegauoS2?ES&~;xMgc`pYF=4>W-3@sVrI@{dtRH#Q9MB`
zeEtl_CpI2tZj|GkT*o_~k!!LXp9K#a{~HDl1_lO(rgZkrQG6MUj2x2>^J~a6GcZ8J
zL2@w6%fP_E$iIt$f7fQggbn-w7K|K{qN4JW>XNyM6`8rIC8@<FxrsTcIhlFc`30GI
z>BZ%#DXDq6i4_j%xrv!Mddc~@hDOFFre-h`K{OZG)W;0`k2eb@T;-n_z#=HXtj>v|
zYoepDBqKD4LC!_NP;J~?Aonrwe_`O?w^=Y@JHMxydSQiAzFSdZuBpF!v43*1d%97i
zr*DQ=SgBurQemb+YFSB{A&NyH2f;ANVPNB64r6B%1S_8W#$IAGOTv48c~+QO5Dl`P
zmEVGa|2+RH{#O22ev8eD3TpgJ%B+(OqvY8@p`*q!xgbKFk$JLUv;u2MYN|35TuPY{
O#AE@f+We)SM*sktH<Wk)
literal 36864
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
diff --git a/Twidder (Lab3)/static/client.js b/Twidder (Lab3)/static/client.js
index 25cee84..810de42 100644
--- a/Twidder (Lab3)/static/client.js
+++ b/Twidder (Lab3)/static/client.js
@@ -82,7 +82,7 @@ function changePassword(formData) {
document.getElementById("pwderror").innerHTML = "Password too short. Must be 6 characters at leats."
} else if (req.status == 400){
document.getElementById("pwderror").innerHTML = "Missing information"
- }
+ }
}
}
}
@@ -184,7 +184,7 @@ function signOut() {
let messageDiv = document.getElementById("error");
let req = new XMLHttpRequest();
- req.open("POST", "/users/sign_out", true);
+ req.open("PUT", "/users/sign_out", true);
req.setRequestHeader("Content-type", "application/json;charset=UTF-8");
req.setRequestHeader("token", localStorage.getItem("token"));
req.send(null);
@@ -268,16 +268,6 @@ function openTab(tabName) {
var i, tabcontent, tablinks;
localStorage.setItem("tab", tabName);
- if(tabName != "browsePage") {
- var xhttp = new XMLHttpRequest();
- xhttp.open("GET", "/account/get/message/" + localStorage.getItem("browsed_email"), true);
- xhttp.setRequestHeader("token", localStorage.getItem("token"));
- xhttp.send();
- if (xhttp.readyState == 4 && xhttp.status != 204){
- localStorage.removeItem("browsed_email");
- }
- }
-
// Get all elements with class="tabcontent" and hide them
tabcontent = document.getElementsByClassName("tabcontent");
for (i = 0; i < tabcontent.length; i++) {
@@ -292,7 +282,7 @@ function openTab(tabName) {
if(tabName == "homePage") {
display_wall_info(localStorage.getItem("email_username"), "HP");
- } else if (tabName == "browsePage") {
+ } else if (tabName == "browsePage" && localStorage.getItem("browsed_email") != null) {
display_wall_info(localStorage.getItem("browsed_email"), "BP");
}
@@ -308,26 +298,27 @@ function display_wall_info(email, tab) {
let data_user;
get_user_info(email, tab, function(data){
data_user = data;
- if(data_user.success) {
- if(tab == "BP") {
+ if(data_user != null) {
+ if(data_user.success) {
+ if(tab == "BP") {
+ browsecontent = document.getElementsByClassName("browsecontent");
+ for (i = 0; i < browsecontent.length; i++) {
+ document.getElementById("browse_error").style.display = "none";
+ browsecontent[i].style.display = "block";
+ }
+ }
+ fills_data(tab, data_user);
+ display_wall(email, tab);
+ } else {
browsecontent = document.getElementsByClassName("browsecontent");
for (i = 0; i < browsecontent.length; i++) {
- document.getElementById("browse_error").style.display = "none";
- browsecontent[i].style.display = "block";
+ browsecontent[i].style.display = "none";
+ }
+ if (localStorage.getItem("browsed_email") != null){
+ document.getElementById("browse_error").style.display = "block";
+ document.getElementById("browse_error").innerHTML = data_user.message;
}
}
- fills_data(tab, data_user);
- display_wall(email, tab);
- } else {
- browsecontent = document.getElementsByClassName("browsecontent");
- for (i = 0; i < browsecontent.length; i++) {
- browsecontent[i].style.display = "none";
- }
- if (localStorage.getItem("browsed_email") != null){
- document.getElementById("browse_error").style.display = "block";
- document.getElementById("browse_error").innerHTML = data_user.message;
- }
-
}
});
}
@@ -335,7 +326,8 @@ function display_wall_info(email, tab) {
function get_user_info(email, tab, callback) {
//call the server if data aren't already stored
- if((tab == "BP") && (localStorage.getItem("browsed_email") != email || data_user_browse == null)) {
+ if((tab == "BP") && (localStorage.getItem("browsed_email") != email || data_user_browse == null)
+ && (localStorage.getItem("browsed_email") != null)) {
let req = new XMLHttpRequest();
req.open("GET", "/account/get/data/" + email, true);
req.setRequestHeader("token", localStorage.getItem("token"));
--
GitLab