From 0e8217f24525342bdae14fd1f31165f1015fbecd Mon Sep 17 00:00:00 2001
From: MaximeOLIVA <maxime.oliva@etu.univ-cotedazur.fr>
Date: Wed, 15 Feb 2023 18:43:57 +0100
Subject: [PATCH] fix part 1 ok
---
Twidder (Lab3)/database.db | Bin 36864 -> 36864 bytes
Twidder (Lab3)/static/client.html | 4 ++--
Twidder (Lab3)/static/client.js | 27 +++++++++++++++++++++------
3 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/Twidder (Lab3)/database.db b/Twidder (Lab3)/database.db
index d10537741a5704a2a2e1c0e53069f4e22c3d9885..38b322ef7f4eab821a6ddbd0fc7e31da1d27a2a7 100644
GIT binary patch
delta 578
zcmZozz|^pSX@WFk{X`jO#`=v3OYGSg_`fjl@7pY>u$^DcOugLK*|@aat0XAEASJ56
z)TGip#V9GfwAj<oDBUQt($OW=C~)#~e_4pO$D0)m?(j1TZhjumBap1lfCP9M7#P&K
zf*APE^RMD><&WjJ;OFOi&Ub)sHeVTEAfFZ=8}CEjJ-pL-i+TNcHF;Ti9`fwvnaNYe
z6U3v(!^!=SdoTA)?h<Z)Zf$Nhu18$^xn^-ya0P8_{KLtvqRz^ot}Z@#W4#nlYEf!Y
zs)8CwfFC5loT#ii`C`2?yP^t6Ob{f-nVPDk4B`occ&w?Zsme-|FV@R*gET8CqRJ?M
zWY|(cisZotDapYVa3y6GDapdQtVvl#YBH1K>(v>hAxfp-a$IR?X-bj^Zc193q6CNw
zaZyT|k~oM5b`e)vdb*Mr5;rYPNfg0NPDxf0fpfvm7lt^pD78pg2*iZ=L=d4UB_&N+
zVDiO!MV69OWqyznw$#+3B4s`h6QY_Iu9_<~HC2@d#FYdE5JyTH2r6@f)UtuXNSO=7
K+&sN5QxE`eX`z$=
delta 145
zcmZozz|^pSX@WGP>qHr6M%RrAOYGSg`S&sK@7pY>u!UdKgpoN^J=rt4ve=-?*(J~?
zIl$Sds-oDWBqXHDC_Er4Kh&Tyqqrp0WAbx<+085pfA}{geCF5WVn71C3=9lhd}R#$
p=lNIhxAMpGTk!MqJ?A^XH=D0)v!Fl}ACofI<iKi$%`@sU1OYewDDwaS
diff --git a/Twidder (Lab3)/static/client.html b/Twidder (Lab3)/static/client.html
index a868b20..6ef54ed 100644
--- a/Twidder (Lab3)/static/client.html
+++ b/Twidder (Lab3)/static/client.html
@@ -74,7 +74,7 @@
<textarea id="BP_Message" name="story" rows="7" cols="55" placeholder="Write something here"></textarea>
<div><button id="BP_post_message" onclick="message_management('BP');">Post message</button></div>
</div>
- <button id="BP_Reload_wall" class="browsecontent" onclick="display_wall(localStorage.getItem('browsed_email'), 'BP');">Reload wall</button>
+ <button id="BP_Reload_wall" class="browsecontent" onclick="display_wall(localStorage.getItem('reloadBrowsed'), 'BP');">Reload wall</button>
<div id="BP_Wall_all">
<div id="BP_wall" class="browsecontent"></div>
</div>
@@ -94,7 +94,7 @@
<div><button id="post_message" onclick="message_management('HP');">Post message</button></div>
</div>
<div id = "Wall">
- <button id="HP_Reload_wall" onclick="display_wall(localStorage.getItem('email_username'), 'HP');">Reload wall</button>
+ <button id="HP_Reload_wall" onclick="display_wall(localStorage.getItem('reloadHome'), 'HP');">Reload wall</button>
</div>
<div id="HP_Wall_all">
<div id="HP_wall" class="browsecontent"></div>
diff --git a/Twidder (Lab3)/static/client.js b/Twidder (Lab3)/static/client.js
index 514383b..72aefab 100644
--- a/Twidder (Lab3)/static/client.js
+++ b/Twidder (Lab3)/static/client.js
@@ -4,11 +4,16 @@ let data_user_home = null;
window.onload = function() {
if(localStorage.getItem("token") != null) {
displayProfilView();
+
if(localStorage.getItem("browse_success") == "true") {
localStorage.setItem("browsed_email", localStorage.getItem("reloadBrowsed"));
} else {
localStorage.removeItem("browsed_email");
}
+
+ localStorage.setItem("refreshToken", "1");
+ localStorage.setItem("refreshToken2", "2");
+ localStorage.setItem("email_username", localStorage.getItem("reloadHome"));
openTab(localStorage.getItem("tab"));
} else {
displayWelcomeView();
@@ -161,6 +166,7 @@ function signIn(formData) {
let token = resp.token;
localStorage.setItem("token", token);
localStorage.setItem("email_username", user.email);
+ localStorage.setItem("reloadHome", user.email);
displayProfilView();
openTab('homePage');
} else if(req.status == 409){
@@ -202,6 +208,11 @@ function signOut() {
localStorage.removeItem("token");
localStorage.removeItem("browsed_email");
localStorage.removeItem("email_username");
+ localStorage.removeItem("refreshToken");
+ localStorage.removeItem("refreshToken2");
+ localStorage.removeItem("reloadHome");
+ localStorage.removeItem("reloadBrowsed");
+ localStorage.removeItem("browse_success");
document.getElementById("displayprofil").innerHTML = "";
document.getElementById("displaywelcome").innerHTML = document.getElementById("welcomeview").innerHTML;
document.body.style.backgroundColor = "#0F98B7";
@@ -226,10 +237,10 @@ function message_management(tab){
switch(tab) {
case "HP":
- email = localStorage.getItem("email_username");
+ email = localStorage.getItem("reloadHome");
break;
default:
- email = localStorage.getItem("browsed_email");
+ email = localStorage.getItem("reloadBrowsed");
}
if(message.length > 0) {
@@ -274,10 +285,15 @@ function openTab(tabName) {
var i, tabcontent, tablinks;
localStorage.setItem("tab", tabName);
- if(tabName != "browsePage") {
+ if(tabName != "browsePage" && localStorage.getItem("refreshToken") != "1") {
localStorage.removeItem("browsed_email");
}
+ if(tabName != "homePage" && localStorage.getItem("refreshToken2") != "2") {
+ localStorage.removeItem("email_username");
+ }
+
+
// Get all elements with class="tabcontent" and hide them
tabcontent = document.getElementsByClassName("tabcontent");
for (i = 0; i < tabcontent.length; i++) {
@@ -292,12 +308,12 @@ function openTab(tabName) {
if(tabName == "homePage" && localStorage.getItem("email_username") != null) {
display_wall_info(localStorage.getItem("email_username"), "HP");
+ localStorage.removeItem("refreshToken2");
} else if (tabName == "browsePage" && localStorage.getItem("browsed_email") != null) {
display_wall_info(localStorage.getItem("browsed_email"), "BP");
+ localStorage.removeItem("refreshToken");
}
- console.log(data_user_home);
-
document.getElementById("browse_error").style.display = "none";
document.getElementById(tabName).style.display = "block";
document.getElementById("tab_" + tabName).className += " active";
@@ -310,7 +326,6 @@ function display_wall_info(email, tab) {
let data_user;
get_user_info(email, tab, function(data){
data_user = data;
- console.log(data_user);
if(data_user != null) {
if(data_user.success) {
if(tab == "BP") {
--
GitLab