From d16d481d86b23d5ed738e555321a5d69c63cd3ef Mon Sep 17 00:00:00 2001 From: Barni Date: Wed, 22 Oct 2025 15:15:20 +0200 Subject: [PATCH] =?UTF-8?q?Navbar,landing,=20meg=20a=20t=C3=B6bbi=20fronte?= =?UTF-8?q?nd=20jav=C3=ADt=C3=A1s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Landingpage/LandingPage.jsx | 3 +- .../src/components/Navbar/Navbar.jsx | 115 ++++++++---------- .../src/pages/Landing/Landingpage.jsx | 6 +- 3 files changed, 58 insertions(+), 66 deletions(-) diff --git a/SerpentRace_Frontend/src/components/Landingpage/LandingPage.jsx b/SerpentRace_Frontend/src/components/Landingpage/LandingPage.jsx index 39e9408b..f3be5e7e 100644 --- a/SerpentRace_Frontend/src/components/Landingpage/LandingPage.jsx +++ b/SerpentRace_Frontend/src/components/Landingpage/LandingPage.jsx @@ -8,7 +8,7 @@ import { motion } from "framer-motion" import { isAuthenticated } from "../../hooks/useRequireAuth" // <-- added import import { useNavigate } from "react-router-dom" // <-- NEW -const LandingPage = ({ onNavigateToPlay, onNavigateToAuth }) => { +const LandingPage = ({ onNavigateToPlay, onNavigateToAuth, onNavigateToGame }) => { const auth = isAuthenticated() // <-- check without redirect const navigate = useNavigate() // <-- NEW @@ -65,6 +65,7 @@ const LandingPage = ({ onNavigateToPlay, onNavigateToAuth }) => { <> + ) : ( navigate("/home")} width="w-60" /> diff --git a/SerpentRace_Frontend/src/components/Navbar/Navbar.jsx b/SerpentRace_Frontend/src/components/Navbar/Navbar.jsx index c5f266b4..979be9de 100644 --- a/SerpentRace_Frontend/src/components/Navbar/Navbar.jsx +++ b/SerpentRace_Frontend/src/components/Navbar/Navbar.jsx @@ -9,14 +9,12 @@ const navLinkClassPlay = const Navbar = () => { const [menuOpen, setMenuOpen] = useState(false) const navigate = useNavigate() - // Check if authLevel and username exist in localStorage const isLoggedIn = Boolean(localStorage.getItem("authLevel") && localStorage.getItem("username")) - // Logout function: töröljük az adatokat és navigálunk a /login-ra (SPA, nincs reload) const handleLogout = () => { localStorage.removeItem("authLevel") localStorage.removeItem("username") - navigate("/login") + navigate("/") } return ( @@ -32,46 +30,40 @@ const Navbar = () => { SerpentRace + {/* Desktop Menu */}
{isLoggedIn ? ( <> - - Home - - - Decks - - - Stats - + Játék + Paklik + Statisztikák ) : ( - - Home - + Főoldal )} - - About - - - Contact - + Rólunk + Kontakt {!isLoggedIn && ( - - Play - + <> + Játék + + Bejelentkezés / Regisztráció + + )} {isLoggedIn && ( )}
+ {/* Mobile Hamburger */}
+ {/* Mobile Menu */} {menuOpen && (
{isLoggedIn ? ( - - Home - + Home ) : ( - - Home - + Főoldal )} - - Leaderboard - - - About - - - Contact - + Leaderboard + Rólunk + Kontakt {!isLoggedIn && ( -
- +
+ - Játék - -
+ Bejelentkezés / Regisztráció + + )} {isLoggedIn && (
diff --git a/SerpentRace_Frontend/src/pages/Landing/Landingpage.jsx b/SerpentRace_Frontend/src/pages/Landing/Landingpage.jsx index 50758c40..8ae5df29 100644 --- a/SerpentRace_Frontend/src/pages/Landing/Landingpage.jsx +++ b/SerpentRace_Frontend/src/pages/Landing/Landingpage.jsx @@ -19,6 +19,10 @@ export default function LandingPageMain() { navigate("/register"); }; + const handleNavigateToGame = () => { + navigate("/home"); + }; + return (
@@ -28,7 +32,7 @@ export default function LandingPageMain() {
- +