fix navbar and hero on homepage
This commit is contained in:
parent
7eec9b4821
commit
1f43a1bad8
4 changed files with 333 additions and 32 deletions
|
|
@ -1,12 +1,32 @@
|
|||
import React, { useState, useEffect } from "react";
|
||||
import React, { useState, useEffect, useRef } from "react";
|
||||
import "../scss/styles.scss";
|
||||
import "../scss/components/_navbar.scss";
|
||||
import { Link } from "react-router-dom";
|
||||
import { Link, useNavigate } from "react-router-dom";
|
||||
|
||||
const Navbar = () => {
|
||||
const [glitchEffect, setGlitchEffect] = useState(false);
|
||||
const [activeLink, setActiveLink] = useState("/");
|
||||
const [user, setUser] = useState(null);
|
||||
const [menuOpen, setMenuOpen] = useState(false);
|
||||
const menuRef = useRef(null);
|
||||
const navigate = useNavigate();
|
||||
|
||||
const handleLogout = () => {
|
||||
// Implement client-side logout without calling the backend
|
||||
// This clears the user state in the frontend
|
||||
setUser(null);
|
||||
|
||||
// Clear any authentication cookies if they exist
|
||||
document.cookie.split(";").forEach((cookie) => {
|
||||
const [name] = cookie.trim().split("=");
|
||||
document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;`;
|
||||
});
|
||||
|
||||
// Redirect to home page
|
||||
navigate("/");
|
||||
|
||||
console.log("Logged out successfully");
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
// Set active link based on current path
|
||||
|
|
@ -17,6 +37,19 @@ const Navbar = () => {
|
|||
setGlitchEffect(true);
|
||||
setTimeout(() => setGlitchEffect(false), 200);
|
||||
}, 3000);
|
||||
|
||||
// Close menu when clicking outside
|
||||
const handleClickOutside = (event) => {
|
||||
if (
|
||||
menuRef.current &&
|
||||
!menuRef.current.contains(event.target) &&
|
||||
menuOpen
|
||||
) {
|
||||
setMenuOpen(false);
|
||||
}
|
||||
};
|
||||
|
||||
document.addEventListener("mousedown", handleClickOutside);
|
||||
async function fetchUser() {
|
||||
const res = await fetch("http://localhost:8080/auth/current_user", {
|
||||
credentials: "include", // very important
|
||||
|
|
@ -24,8 +57,9 @@ const Navbar = () => {
|
|||
if (res.ok) {
|
||||
console.log("User response:", res);
|
||||
const user = await res.json();
|
||||
console.log("User:", user);
|
||||
console.log("User display name:", user.displayName);
|
||||
//checking user response
|
||||
// console.log("User:", user);
|
||||
// console.log("User display name:", user.displayName);
|
||||
|
||||
setUser(user);
|
||||
} else {
|
||||
|
|
@ -34,11 +68,22 @@ const Navbar = () => {
|
|||
}
|
||||
fetchUser();
|
||||
|
||||
return () => clearInterval(glitchInterval);
|
||||
return () => {
|
||||
clearInterval(glitchInterval);
|
||||
document.removeEventListener("mousedown", handleClickOutside);
|
||||
};
|
||||
}, []);
|
||||
|
||||
const toggleMenu = () => {
|
||||
setMenuOpen(!menuOpen);
|
||||
};
|
||||
|
||||
return (
|
||||
<nav className={`navbar ${glitchEffect ? "navbar--glitch" : ""}`}>
|
||||
<nav
|
||||
className={`navbar ${glitchEffect ? "navbar--glitch" : ""} ${
|
||||
menuOpen ? "navbar--menu-open" : ""
|
||||
}`}
|
||||
>
|
||||
<div className="navbar__logo">
|
||||
<div className="navbar__logo-scanner"></div>
|
||||
<span className="navbar__logo-text">
|
||||
|
|
@ -46,6 +91,18 @@ const Navbar = () => {
|
|||
</span>
|
||||
</div>
|
||||
|
||||
<div className="navbar__hamburger" onClick={toggleMenu}>
|
||||
<div
|
||||
className={`navbar__hamburger-line ${menuOpen ? "active" : ""}`}
|
||||
></div>
|
||||
<div
|
||||
className={`navbar__hamburger-line ${menuOpen ? "active" : ""}`}
|
||||
></div>
|
||||
<div
|
||||
className={`navbar__hamburger-line ${menuOpen ? "active" : ""}`}
|
||||
></div>
|
||||
</div>
|
||||
|
||||
{user && (
|
||||
<div className="navbar__greeting">
|
||||
<span className="navbar__greeting-text">WELCOME</span>
|
||||
|
|
@ -53,7 +110,10 @@ const Navbar = () => {
|
|||
</div>
|
||||
)}
|
||||
|
||||
<ul className="navbar__links">
|
||||
<ul
|
||||
className={`navbar__links ${menuOpen ? "navbar__links--open" : ""}`}
|
||||
ref={menuRef}
|
||||
>
|
||||
<li>
|
||||
<Link
|
||||
to="/"
|
||||
|
|
@ -105,16 +165,31 @@ const Navbar = () => {
|
|||
</Link>
|
||||
</li>
|
||||
<li>
|
||||
<Link
|
||||
to="/login"
|
||||
className={`navbar__link ${
|
||||
activeLink === "/login" ? "navbar__link--active" : ""
|
||||
}`}
|
||||
>
|
||||
<span className="navbar__link-icon">🔒</span>
|
||||
<span className="navbar__link-text">LOGIN</span>
|
||||
<span className="navbar__link-hover"></span>
|
||||
</Link>
|
||||
{user ? (
|
||||
<a
|
||||
href="#"
|
||||
onClick={(e) => {
|
||||
e.preventDefault();
|
||||
handleLogout();
|
||||
}}
|
||||
className={`navbar__link`}
|
||||
>
|
||||
<span className="navbar__link-icon">🔓</span>
|
||||
<span className="navbar__link-text">LOGOUT</span>
|
||||
<span className="navbar__link-hover"></span>
|
||||
</a>
|
||||
) : (
|
||||
<Link
|
||||
to="/login"
|
||||
className={`navbar__link ${
|
||||
activeLink === "/login" ? "navbar__link--active" : ""
|
||||
}`}
|
||||
>
|
||||
<span className="navbar__link-icon">🔒</span>
|
||||
<span className="navbar__link-text">LOGIN</span>
|
||||
<span className="navbar__link-hover"></span>
|
||||
</Link>
|
||||
)}
|
||||
</li>
|
||||
</ul>
|
||||
</nav>
|
||||
|
|
@ -123,3 +198,20 @@ const Navbar = () => {
|
|||
|
||||
export default Navbar;
|
||||
//{user ? user.displayName : "NOTEBOOK"}
|
||||
|
||||
//server side logout (was not working properly, so implemented client side logout)
|
||||
// const handleLogout = async () => {
|
||||
// try {
|
||||
// const res = await fetch("http://localhost:8080/auth/logout", {
|
||||
// method: "GET",
|
||||
// credentials: "include",
|
||||
// });
|
||||
|
||||
// if (res.ok) {
|
||||
// setUser(null);
|
||||
// } else {
|
||||
// console.error("Logout failed");
|
||||
// }
|
||||
// } catch (error) {
|
||||
// console.error("Error during logout:", error);
|
||||
// }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue