login

1 files changed, 11 insertions, 9 deletions

diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js
index 7ddb706..6cb196b 100644
--- a/frontend/src/components/login.js
+++ b/frontend/src/components/login.js
@@ -14,6 +14,7 @@ function login() {
 }
 function logout() {
     fetch(`/api/v1/token`,{'method':'DELETE'})
+    setToken(null)
     setIsLoggedIn(false)
     window.location.href="/"
 }
@@ -22,10 +23,7 @@ const [isLoggedIn, setIsLoggedIn] = React.useState(false);
 React.useEffect(() => {
     fetch(`/api/v1/token`)
     .then(r => r.json())
-    .then(d => {
-      setToken(d.data.token);
-      setIsLoggedIn(true)
-    })
+    .then(d => setToken(d.data.token))
     }, []);
 
 const [profile, setProfile] = React.useState(undefined);
@@ -36,7 +34,11 @@ React.useEffect(() => {
             Authorization: token
         }})
     .then(r => r.json())
-    .then(d => {setProfile(d.data);console.log(d,profile)})
+    .then(d => {
+        setProfile(d.data);
+        setIsLoggedIn(true)
+        console.log(d,profile)
+    })
     }, [token]);
 
 
@@ -45,10 +47,10 @@ return (
     {isLoggedIn ? (
     <Link to="/profile" tabIndex={-1} className='login'>
         <button>
-            {/* <img src={profile.avatar_link} alt="" /> */}
-            <img src={img2} alt="" />
-            {/* <span>{profile.user_name}</span> */}
-            <span>Username</span>
+            <img src={profile.avatar_link} alt="" />
+            {/* <img src={img2} alt="" /> */}
+            <span>{profile.user_name}</span>
+            {/* <span>Username</span> */}
         </button>
         <button onClick={logout}><img src={img3} alt="" /><span></span></button>
     </Link>