Changeset 07f4e8b for frontend/src/Components/Layout/Navbar/Navigation.js

Timestamp:

01/24/24 17:42:28 (5 months ago)

Author:

darsov2 <62809499+darsov2@…>

Branches:

master

Children:

0f5aa27

Parents:

5528b99

Message:

prefinal fixes

File:

• frontend/src/Components/Layout/Navbar/Navigation.js (modified) (7 diffs)

frontend/src/Components/Layout/Navbar/Navigation.js

@@ -7 +7 @@
 import useGet from "../../Hooks/useGet";
 import axios from "../../../axios.js";
-<<<<<<< HEAD
 import {useAuth} from "../../Context/AuthContext";
 import ImageUpload from "../../ImageUpload/ImageUpload";
-=======
->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl)
 //import logo from 'assets/images/logo.png';
 //src="https://upload.wikimedia.org/wikipedia/commons/0/08/Vergina_Sun_-_Golden_Larnax.png"
@@ -17 +14 @@
 function Navigation(props) {
   const navigator = useNavigate();
-<<<<<<< HEAD
   const Auth = useAuth();
   const isLoggedIn = Auth.userIsAuthenticated();
@@ -26 +22 @@
   const handleShow = () => setShow(true);
 
-=======
-
-  const { data, setData, isLoading, getData } = useGet("/username");
-  
->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl)
   return (
     <>
@@ -40 +31 @@
       >
         <Container>
-          <Navbar.Brand href="#home">
+          <Navbar.Brand href="/home">
             <span className="ikona">
               <Image
@@ -66 +57 @@
                 <Button onClick={handleShow}></Button>
               </Nav.Link>
-              {!isLoading && !data && (
+              {!isLoggedIn && (
                 <Button
                   className="m-2"
@@ -78 +69 @@
                 </Button>
               )}
-              {!isLoading && data && (
+              {isLoggedIn && (
                 <>
                   <Nav.Link className="m-2" href="/profile">
-                    {data}
+                    {Auth.getUser().username}
                   </Nav.Link>
                   <Button
@@ -90 +81 @@
                       await axios.get("/logout")
                       .then((res) => {
-                        console.log(res)
+                        console.log(res);
+                        Auth.userLogout();
                       })
                       .catch((err) => {