From 9ae801fea95026dd90fb8b32b88ea8b7b047cdd4 Mon Sep 17 00:00:00 2001
From: IbrahimKo95 <ibrahkonate95@gmail.com>
Date: Fri, 8 Dec 2023 01:57:36 +0100
Subject: [PATCH] fix username problem

---
 webapp/src/components/navbarre/home/index.jsx |  9 +++++----
 webapp/src/index.js                           | 14 +++-----------
 webapp/src/lib/logout.js                      |  7 ++++---
 webapp/src/pages/home/index.jsx               |  4 ++--
 webapp/src/pages/login/index.jsx              |  9 +++------
 webapp/src/pages/register/index.jsx           |  8 +++-----
 6 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/webapp/src/components/navbarre/home/index.jsx b/webapp/src/components/navbarre/home/index.jsx
index eb2395d..ed683da 100644
--- a/webapp/src/components/navbarre/home/index.jsx
+++ b/webapp/src/components/navbarre/home/index.jsx
@@ -2,17 +2,18 @@ import NavListHome from "./navlist";
 import list from "../list";
 import LoginButton from "../login-button";
 import logout from "../../../lib/logout";
+import {useEffect} from "react";
 
-function NavbarreHome({auth, setAuth}) {
+function NavbarreHome() {
     return(
         <nav className="fixed top-0 left-0 h-16 w-full px-4 flex flex-row justify-between items-center text-center">
             <div className="h-12 w-12 bg-red-500">
             </div>
             <NavListHome list={list}/>
-            {auth !== null ? (
+            {localStorage.getItem('token') !== null ? (
                 <div>
-                    <a onClick={() => logout({setAuth})}>logout</a>
-                    <p>{auth.username}</p>
+                    <a onClick={() => logout()}>logout</a>
+                    <p>{localStorage.getItem('username')}</p>
                 </div>
             ) : (
                 <LoginButton/>
diff --git a/webapp/src/index.js b/webapp/src/index.js
index 9583648..9760ecb 100644
--- a/webapp/src/index.js
+++ b/webapp/src/index.js
@@ -9,21 +9,13 @@ import Register from "./pages/register";
 
 const root = ReactDOM.createRoot(document.getElementById('root'));
 function App() {
-    const savedToken = localStorage.getItem('auth');
-    const [auth, setAuth] = useState(savedToken ? savedToken : null)
-    useEffect(() => {
-        if(savedToken !== auth){
-            localStorage.setItem('auth', auth);
-        }
-    }, [auth]);
-
     return (
         <React.StrictMode>
             <BrowserRouter>
                 <Routes>
-                    <Route path="/" element={<Home auth={auth} setAuth={setAuth}/>}/>
-                    <Route path="/login" element={<Login setAuth={setAuth} />}/>
-                    <Route path="/register" element={<Register setAuth={setAuth} />}/>
+                    <Route path="/" element={<Home/>}/>
+                    <Route path="/login" element={<Login  />}/>
+                    <Route path="/register" element={<Register  />}/>
                     <Route path="/game" element={<Game />}/>
                 </Routes>
             </BrowserRouter>
diff --git a/webapp/src/lib/logout.js b/webapp/src/lib/logout.js
index e31fd96..10ea051 100644
--- a/webapp/src/lib/logout.js
+++ b/webapp/src/lib/logout.js
@@ -1,6 +1,7 @@
-function logout({setAuth}) {
-    setAuth(null);
-    localStorage.removeItem('auth');
+function logout() {
+    localStorage.removeItem('token');
+    localStorage.removeItem('username');
+    window.location.reload();
 }
 
 export default logout
\ No newline at end of file
diff --git a/webapp/src/pages/home/index.jsx b/webapp/src/pages/home/index.jsx
index c4f547b..9542e34 100644
--- a/webapp/src/pages/home/index.jsx
+++ b/webapp/src/pages/home/index.jsx
@@ -2,10 +2,10 @@ import NavbarreHome from "../../components/navbarre/home";
 import HomeHero from "../../components/content/home/hero";
 import Footer from "../../components/content/home/footer";
 
-function Home({auth, setAuth}) {
+function Home() {
     return (
         <div className="h-screen w-screen flex flex-col justify-center items-center">
-            <NavbarreHome auth={auth} setAuth={setAuth}/>
+            <NavbarreHome/>
             <HomeHero />
             <Footer />
         </div>
diff --git a/webapp/src/pages/login/index.jsx b/webapp/src/pages/login/index.jsx
index fb2c621..37b4a2e 100644
--- a/webapp/src/pages/login/index.jsx
+++ b/webapp/src/pages/login/index.jsx
@@ -1,18 +1,15 @@
 import {Link, redirect, useNavigate} from "react-router-dom";
 import {useState} from "react";
 import {get, post} from '../../modules/fetcher';
-function Login({setAuth}) {
+function Login() {
     const navigate = useNavigate();
     const loginUser = async (e) => {
         e.preventDefault()
         post('https://saucisson.justw.tf/api/users/login', {username, password}, '')
             .then(async res => {
                 if (res.status === 200) {
-                    console.log(res.JSON.message)
-                    setAuth({
-                        'token': res.JSON.token,
-                        'username': username
-                    })
+                    localStorage.setItem('username', username)
+                    localStorage.setItem('token', res.JSON.token)
                     navigate('/')
                 } else {
                     setError(res.message)
diff --git a/webapp/src/pages/register/index.jsx b/webapp/src/pages/register/index.jsx
index a20f3fb..62ca71b 100644
--- a/webapp/src/pages/register/index.jsx
+++ b/webapp/src/pages/register/index.jsx
@@ -3,7 +3,7 @@ import {post} from "../../modules/fetcher";
 import {useState} from "react";
 
 
-function Register({setAuth}) {
+function Register() {
     const navigate = useNavigate();
     const registerUser = async (e) => {
         e.preventDefault()
@@ -11,10 +11,8 @@ function Register({setAuth}) {
             post('https://saucisson.justw.tf/api/users/register', {username, password}, '')
                 .then(async res => {
                     if (res.status === 200) {
-                        setAuth({
-                            'token': res.JSON.token,
-                            'username': username
-                        })
+                        localStorage.setItem('username', username)
+                        localStorage.setItem('token', res.JSON.token)
                         navigate('/')
                     } else {
                         setError(res.message)