Skip to content
Snippets Groups Projects
Commit 0e8217f2 authored by MaximeOLIVA's avatar MaximeOLIVA
Browse files

fix part 1 ok

parent 96eb6ff0
No related branches found
No related tags found
No related merge requests found
No preview for this file type
......@@ -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>
......
......@@ -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") {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment