3 files changed, 14 insertions, 28 deletions

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 9bfe340..0c4569a 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -11,7 +11,6 @@
         "@testing-library/jest-dom": "^5.16.5",
         "@testing-library/react": "^13.4.0",
         "@testing-library/user-event": "^13.5.0",
-        "js-cookie": "^3.0.5",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-scripts": "5.0.1",
@@ -11531,14 +11530,6 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/js-cookie": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz",
-      "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==",
-      "engines": {
-        "node": ">=14"
-      }
-    },
     "node_modules/js-sdsl": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz",
@@ -25466,11 +25457,6 @@
         }
       }
     },
-    "js-cookie": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz",
-      "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw=="
-    },
     "js-sdsl": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 72e2117..123a434 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -6,7 +6,6 @@
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
-    "js-cookie": "^3.0.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-scripts": "5.0.1",
diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js
index 8dea383..7bff5f0 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,22 +13,21 @@ function login() {
     window.location.href="https://lp.ardapektezol.com/api/v1/login"
 }
 function logout() {
-    Cookies.remove('token')
+    setIsLoggedIn(false)
+    setProfile(null)
     setToken(null)
-    window.location.href="/"
+    fetch(`/api/v1/token`,{'method':'DELETE'})
+    .then(r=>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);
-      console.log(d);
-    })
+    .then(d => setToken(d.data.token))
     }, []);
 
-const [profile, setProfile] = React.useState();
+const [profile, setProfile] = React.useState(null);
 React.useEffect(() => {
     fetch(`/api/v1/profile`,{
         headers: {
@@ -37,22 +35,25 @@ React.useEffect(() => {
             Authorization: token
         }})
     .then(r => r.json())
-    .then(d => {setProfile(d);console.log(d)})
+    .then(d => setProfile(d.data))
     }, [token]);
 
+React.useEffect(() => {
+    if(profile!==null){setIsLoggedIn(true)}
+    }, [profile]);
 
 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>