From 108815151b9ca1ee220c6ea5edec289a1051eaa5 Mon Sep 17 00:00:00 2001
From: Nidboj132 <lol2s@vp.plm>
Date: Sat, 6 May 2023 18:58:49 +0200
Subject: login

---
 frontend/src/components/login.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'frontend/src/components/login.js')

diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js
index 8dea383..fc63760 100644
--- a/frontend/src/components/login.js
+++ b/frontend/src/components/login.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { Link } from "react-router-dom";
-import Cookies from 'js-cookie';
 
 import "./login.css";
 import img1 from "../imgs/login.png"
@@ -14,8 +13,8 @@ function login() {
     window.location.href="https://lp.ardapektezol.com/api/v1/login"
 }
 function logout() {
-    Cookies.remove('token')
     setToken(null)
+    fetch(`/api/v1/token`,{'method':'DELETE'})
     window.location.href="/"
 }
 const [token, setToken] = React.useState(null);
@@ -25,7 +24,6 @@ React.useEffect(() => {
     .then(r => r.json())
     .then(d => {
       setToken(d.data.token);
-      console.log(d);
     })
     }, []);
 
@@ -37,7 +35,7 @@ React.useEffect(() => {
             Authorization: token
         }})
     .then(r => r.json())
-    .then(d => {setProfile(d);console.log(d)})
+    .then(d => setProfile(d.data))
     }, [token]);
 
 
@@ -46,13 +44,13 @@ return (
     {isLoggedIn ? (
     <Link to="/profile" tabIndex={-1} className='login'>
         <button>
-            <img src={img2} alt="" />
-            <span>Username</span>
+            <img src={profile.avatar_link} alt="" />
+            <span>{profile.user_name}</span>
         </button>
         <button onClick={logout}><img src={img3} alt="" /><span></span></button>
     </Link>
     ) : (
-    <Link className='login'>
+    <Link tabIndex={-1} className='login'>
         <button onClick={login}>
             <img src={img2} alt="" />
             <span><img src={img1} alt="Sign in through Steam" /></span>
-- 
cgit v1.2.3


From f4939cd30d474701547098906224c604ff72a9a0 Mon Sep 17 00:00:00 2001
From: Nidboj132 <lol2s@vp.plm>
Date: Sat, 6 May 2023 19:03:34 +0200
Subject: login

---
 frontend/src/components/login.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'frontend/src/components/login.js')

diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js
index fc63760..4960abc 100644
--- a/frontend/src/components/login.js
+++ b/frontend/src/components/login.js
@@ -14,16 +14,18 @@ function login() {
 }
 function logout() {
     setToken(null)
+    setIsLoggedIn(false)
     fetch(`/api/v1/token`,{'method':'DELETE'})
     window.location.href="/"
 }
 const [token, setToken] = React.useState(null);
-const isLoggedIn = token !== null;
+const [isLoggedIn, setIsLoggedIn] = React.useState(false);
 React.useEffect(() => {
     fetch(`/api/v1/token`)
     .then(r => r.json())
     .then(d => {
       setToken(d.data.token);
+      setIsLoggedIn(true)
     })
     }, []);
 
-- 
cgit v1.2.3


From 8538622108a88e7f6bd2c084f50fd022d24fbe57 Mon Sep 17 00:00:00 2001
From: Nidboj132 <lol2s@vp.plm>
Date: Sat, 6 May 2023 19:05:54 +0200
Subject: login

---
 frontend/src/components/login.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'frontend/src/components/login.js')

diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js
index 4960abc..5512444 100644
--- a/frontend/src/components/login.js
+++ b/frontend/src/components/login.js
@@ -38,6 +38,7 @@ React.useEffect(() => {
         }})
     .then(r => r.json())
     .then(d => setProfile(d.data))
+    console.log(profile)
     }, [token]);
 
 
@@ -46,8 +47,10 @@ return (
     {isLoggedIn ? (
     <Link to="/profile" tabIndex={-1} className='login'>
         <button>
-            <img src={profile.avatar_link} alt="" />
-            <span>{profile.user_name}</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>
-- 
cgit v1.2.3


From 75be62bdb95951cd0a0b374cb4347ec0c8b92eff Mon Sep 17 00:00:00 2001
From: Nidboj132 <lol2s@vp.plm>
Date: Sat, 6 May 2023 19:16:26 +0200
Subject: login

---
 frontend/src/components/login.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'frontend/src/components/login.js')

diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js
index 5512444..70fddba 100644
--- a/frontend/src/components/login.js
+++ b/frontend/src/components/login.js
@@ -13,7 +13,6 @@ function login() {
     window.location.href="https://lp.ardapektezol.com/api/v1/login"
 }
 function logout() {
-    setToken(null)
     setIsLoggedIn(false)
     fetch(`/api/v1/token`,{'method':'DELETE'})
     window.location.href="/"
@@ -26,6 +25,7 @@ React.useEffect(() => {
     .then(d => {
       setToken(d.data.token);
       setIsLoggedIn(true)
+      console.log(d)
     })
     }, []);
 
-- 
cgit v1.2.3


From 2668c7bc83640ca478c8913de84c7d1759cecb25 Mon Sep 17 00:00:00 2001
From: Nidboj132 <lol2s@vp.plm>
Date: Sat, 6 May 2023 19:21:28 +0200
Subject: login

---
 frontend/src/components/login.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'frontend/src/components/login.js')

diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js
index 70fddba..9495aab 100644
--- a/frontend/src/components/login.js
+++ b/frontend/src/components/login.js
@@ -13,8 +13,8 @@ function login() {
     window.location.href="https://lp.ardapektezol.com/api/v1/login"
 }
 function logout() {
-    setIsLoggedIn(false)
     fetch(`/api/v1/token`,{'method':'DELETE'})
+    setIsLoggedIn(false)
     window.location.href="/"
 }
 const [token, setToken] = React.useState(null);
@@ -37,9 +37,9 @@ React.useEffect(() => {
             Authorization: token
         }})
     .then(r => r.json())
-    .then(d => setProfile(d.data))
+    .then(d => {setProfile(d.data);console.log(d)})
     console.log(profile)
-    }, [token]);
+    }, [isLoggedIn]);
 
 
 return (
-- 
cgit v1.2.3


From f604ee40ecb17702f7b854a696de8ea7011c0b96 Mon Sep 17 00:00:00 2001
From: Nidboj132 <lol2s@vp.plm>
Date: Sat, 6 May 2023 19:25:39 +0200
Subject: login

---
 frontend/src/components/login.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'frontend/src/components/login.js')

diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js
index 9495aab..ddff010 100644
--- a/frontend/src/components/login.js
+++ b/frontend/src/components/login.js
@@ -25,7 +25,6 @@ React.useEffect(() => {
     .then(d => {
       setToken(d.data.token);
       setIsLoggedIn(true)
-      console.log(d)
     })
     }, []);
 
@@ -38,7 +37,7 @@ React.useEffect(() => {
         }})
     .then(r => r.json())
     .then(d => {setProfile(d.data);console.log(d)})
-    console.log(profile)
+    console.log("profile:",profile)
     }, [isLoggedIn]);
 
 
-- 
cgit v1.2.3


From a96a40412f2eab3127e4dca6206411f1f0d64a79 Mon Sep 17 00:00:00 2001
From: Nidboj132 <lol2s@vp.plm>
Date: Sat, 6 May 2023 19:34:16 +0200
Subject: login

---
 frontend/src/components/login.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'frontend/src/components/login.js')

diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js
index ddff010..c0dd8c4 100644
--- a/frontend/src/components/login.js
+++ b/frontend/src/components/login.js
@@ -28,7 +28,7 @@ React.useEffect(() => {
     })
     }, []);
 
-const [profile, setProfile] = React.useState();
+const [profile, setProfile] = React.useState(undefined);
 React.useEffect(() => {
     fetch(`/api/v1/profile`,{
         headers: {
@@ -38,7 +38,7 @@ React.useEffect(() => {
     .then(r => r.json())
     .then(d => {setProfile(d.data);console.log(d)})
     console.log("profile:",profile)
-    }, [isLoggedIn]);
+    }, [token,profile]);
 
 
 return (
-- 
cgit v1.2.3


From c11814533fd7d38cf13c891a29f8994640bfe49d Mon Sep 17 00:00:00 2001
From: Nidboj132 <lol2s@vp.plm>
Date: Sat, 6 May 2023 19:35:58 +0200
Subject: login

---
 frontend/src/components/login.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'frontend/src/components/login.js')

diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js
index c0dd8c4..0e3c9a8 100644
--- a/frontend/src/components/login.js
+++ b/frontend/src/components/login.js
@@ -38,7 +38,7 @@ React.useEffect(() => {
     .then(r => r.json())
     .then(d => {setProfile(d.data);console.log(d)})
     console.log("profile:",profile)
-    }, [token,profile]);
+    }, [token]);
 
 
 return (
-- 
cgit v1.2.3


From 298c14057aab3ddbc956d30e399052ab36df6b22 Mon Sep 17 00:00:00 2001
From: Nidboj132 <lol2s@vp.plm>
Date: Sat, 6 May 2023 19:54:38 +0200
Subject: login

---
 frontend/src/components/login.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'frontend/src/components/login.js')

diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js
index 0e3c9a8..7ddb706 100644
--- a/frontend/src/components/login.js
+++ b/frontend/src/components/login.js
@@ -36,8 +36,7 @@ React.useEffect(() => {
             Authorization: token
         }})
     .then(r => r.json())
-    .then(d => {setProfile(d.data);console.log(d)})
-    console.log("profile:",profile)
+    .then(d => {setProfile(d.data);console.log(d,profile)})
     }, [token]);
 
 
-- 
cgit v1.2.3


From 4451ed109b05679118b5410fba111b370d8956ed Mon Sep 17 00:00:00 2001
From: Nidboj132 <lol2s@vp.plm>
Date: Sat, 6 May 2023 19:58:27 +0200
Subject: login

---
 frontend/src/components/login.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'frontend/src/components/login.js')

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>
-- 
cgit v1.2.3


From 9ef16713f8da2802d550d9fb5bb183fda54e7208 Mon Sep 17 00:00:00 2001
From: Nidboj132 <lol2s@vp.plm>
Date: Sat, 6 May 2023 20:02:24 +0200
Subject: login

---
 frontend/src/components/login.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'frontend/src/components/login.js')

diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js
index 6cb196b..a4a3397 100644
--- a/frontend/src/components/login.js
+++ b/frontend/src/components/login.js
@@ -35,10 +35,13 @@ React.useEffect(() => {
         }})
     .then(r => r.json())
     .then(d => {
+        console.log("data:", d);
         setProfile(d.data);
-        setIsLoggedIn(true)
-        console.log(d,profile)
-    })
+        console.log("profile:", profile);
+      })
+      .catch(error => {
+        console.log("error:", error);
+      });
     }, [token]);
 
 
@@ -47,10 +50,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>
-- 
cgit v1.2.3


From d879940f923466a8ca72f7d0e078982ac95c0907 Mon Sep 17 00:00:00 2001
From: Nidboj132 <lol2s@vp.plm>
Date: Sat, 6 May 2023 20:10:36 +0200
Subject: login

---
 frontend/src/components/login.js | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'frontend/src/components/login.js')

diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js
index a4a3397..08c8114 100644
--- a/frontend/src/components/login.js
+++ b/frontend/src/components/login.js
@@ -35,6 +35,7 @@ React.useEffect(() => {
         }})
     .then(r => r.json())
     .then(d => {
+        
         console.log("data:", d);
         setProfile(d.data);
         console.log("profile:", profile);
@@ -44,6 +45,10 @@ React.useEffect(() => {
       });
     }, [token]);
 
+React.useEffect(() => {
+    console.log("profile 2:", profile);
+    setIsLoggedIn(true)
+}, [profile]);
 
 return (
     <>
-- 
cgit v1.2.3


From 8a3107ed9fabbcb17fbe02985140121010067f84 Mon Sep 17 00:00:00 2001
From: Nidboj132 <lol2s@vp.plm>
Date: Sat, 6 May 2023 20:16:19 +0200
Subject: login

---
 frontend/src/components/login.js | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

(limited to 'frontend/src/components/login.js')

diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js
index 08c8114..db8cc4c 100644
--- a/frontend/src/components/login.js
+++ b/frontend/src/components/login.js
@@ -15,6 +15,7 @@ function login() {
 function logout() {
     fetch(`/api/v1/token`,{'method':'DELETE'})
     setToken(null)
+    setProfile(null)
     setIsLoggedIn(false)
     window.location.href="/"
 }
@@ -26,7 +27,7 @@ React.useEffect(() => {
     .then(d => setToken(d.data.token))
     }, []);
 
-const [profile, setProfile] = React.useState(undefined);
+const [profile, setProfile] = React.useState(null);
 React.useEffect(() => {
     fetch(`/api/v1/profile`,{
         headers: {
@@ -34,31 +35,20 @@ React.useEffect(() => {
             Authorization: token
         }})
     .then(r => r.json())
-    .then(d => {
-        
-        console.log("data:", d);
-        setProfile(d.data);
-        console.log("profile:", profile);
-      })
-      .catch(error => {
-        console.log("error:", error);
-      });
+    .then(d => setProfile(d.data))
     }, [token]);
 
 React.useEffect(() => {
-    console.log("profile 2:", profile);
-    setIsLoggedIn(true)
-}, [profile]);
+    if(profile!==null){setIsLoggedIn(true)}
+    }, [profile]);
 
 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="" />
+            <span>{profile.user_name}</span>
         </button>
         <button onClick={logout}><img src={img3} alt="" /><span></span></button>
     </Link>
-- 
cgit v1.2.3


From bb8d71a0de0de75e74478eeb63bc7901d966727c Mon Sep 17 00:00:00 2001
From: Nidboj132 <lol2s@vp.plm>
Date: Sat, 6 May 2023 21:15:52 +0200
Subject: login

---
 frontend/src/components/login.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'frontend/src/components/login.js')

diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js
index db8cc4c..0932c16 100644
--- a/frontend/src/components/login.js
+++ b/frontend/src/components/login.js
@@ -14,9 +14,9 @@ function login() {
 }
 function logout() {
     fetch(`/api/v1/token`,{'method':'DELETE'})
-    setToken(null)
-    setProfile(null)
     setIsLoggedIn(false)
+    setProfile(null)
+    setToken(null)
     window.location.href="/"
 }
 const [token, setToken] = React.useState(null);
-- 
cgit v1.2.3


From 6cbfe7e0e5983756bff320ee4e3176df2711ccb3 Mon Sep 17 00:00:00 2001
From: Nidboj132 <lol2s@vp.plm>
Date: Sat, 6 May 2023 21:21:39 +0200
Subject: login

---
 frontend/src/components/login.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'frontend/src/components/login.js')

diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js
index 0932c16..266c147 100644
--- a/frontend/src/components/login.js
+++ b/frontend/src/components/login.js
@@ -17,7 +17,7 @@ function logout() {
     setIsLoggedIn(false)
     setProfile(null)
     setToken(null)
-    window.location.href="/"
+    setTimeout(() => {window.location.href="/"}, 300);
 }
 const [token, setToken] = React.useState(null);
 const [isLoggedIn, setIsLoggedIn] = React.useState(false);
-- 
cgit v1.2.3


From ccbecd61cd27d02489345f2e844ff76284bad74e Mon Sep 17 00:00:00 2001
From: Nidboj132 <lol2s@vp.plm>
Date: Sat, 6 May 2023 21:22:55 +0200
Subject: login

---
 frontend/src/components/login.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'frontend/src/components/login.js')

diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js
index 266c147..7bff5f0 100644
--- a/frontend/src/components/login.js
+++ b/frontend/src/components/login.js
@@ -13,11 +13,11 @@ function login() {
     window.location.href="https://lp.ardapektezol.com/api/v1/login"
 }
 function logout() {
-    fetch(`/api/v1/token`,{'method':'DELETE'})
     setIsLoggedIn(false)
     setProfile(null)
     setToken(null)
-    setTimeout(() => {window.location.href="/"}, 300);
+    fetch(`/api/v1/token`,{'method':'DELETE'})
+    .then(r=>window.location.href="/")
 }
 const [token, setToken] = React.useState(null);
 const [isLoggedIn, setIsLoggedIn] = React.useState(false);
-- 
cgit v1.2.3