a

hu8813 · Apr 24, 2024 · 80efa90 · 80efa90
1 parent 95d4b93
commit 80efa90
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/srcs/frontend/js/Profile.js b/srcs/frontend/js/Profile.js
@@ -336,7 +336,8 @@ async function deleteProfile() {
 async function fetchAndDisplayProfile() {
     const errorMessageElement = document.getElementById('errorMessage');
     csrfToken = await getCSRFCookie();
-
+    updateNavigation() ;
+    translate(currentLanguage);
     try {
         const profileData = await fetchProfileData();
         const user = profileData.user_info || {};
@@ -345,6 +346,13 @@ async function fetchAndDisplayProfile() {
         const email = user.email || 'Not available';
         const score = user.score || 0;
         const csrfTokenNew = user.csrfToken || csrfToken;
+        let isLoggedIn2;
+        if (localStorage.getItem('isLoggedIn') === 'true') {
+            if (typeof isLoggedIn === 'undefined')
+                isLoggedIn2 = true;
+            else if (isLoggedIn === false)
+                isLoggedIn2 = true;
+        }
         if (csrfTokenNew)
             setCSRFCookie(csrfTokenNew);
 

diff --git a/srcs/frontend/js/router.js b/srcs/frontend/js/router.js
@@ -484,7 +484,7 @@ function updateNavigation() {
 
 
 
-  const menuItems = isLoggedIn ?
+  const menuItems = isLoggedIn || localStorage.getItem('isLoggedIn') === 'true' ?
     ['Play!', 'Chat', 'Leaderboard', 'Profile', 'Logout'] :
     ['Home', 'Login'];
 

diff --git a/srcs/frontend/return.html b/srcs/frontend/return.html
@@ -81,7 +81,7 @@
       const userNickname = userData.userNickname || userData.nickname;
       localStorage.setItem("isLoggedIn", true);
       localStorage.setItem("userNickname", userNickname );
-
+      //let isLoggedIn = true;
       setTimeout(() => {
         window.location.href = "/#profile";
     }, 2000);