From 39e0d36a7f95ac86b8de7514a2cac6ec0b7cad7e Mon Sep 17 00:00:00 2001 From: WalkeU Date: Mon, 27 Oct 2025 18:55:54 +0100 Subject: [PATCH 1/4] navbar meg merge --- SerpentRace_Frontend/src/App.jsx | 4 +- .../src/components/Navbar/Navbar.jsx | 164 ++++++---- .../src/pages/About/About.jsx | 292 +++++++++++++++--- 3 files changed, 343 insertions(+), 117 deletions(-) diff --git a/SerpentRace_Frontend/src/App.jsx b/SerpentRace_Frontend/src/App.jsx index e82ae4ea..80aa0a79 100644 --- a/SerpentRace_Frontend/src/App.jsx +++ b/SerpentRace_Frontend/src/App.jsx @@ -19,8 +19,6 @@ import ProfileCard from "./components/Userdetails/Userdetails" import { ToastConfig } from "./components/Toastify/toastifyServices" // ✅ fontos: named import, nem default! import VerifyEmailPage from "./pages/Auth/VerifyEmailPage" - - function App() { const [isMobile, setIsMobile] = useState(false) @@ -66,7 +64,7 @@ function App() { } /> } /> } /> - } /> + {/* } /> */} } /> diff --git a/SerpentRace_Frontend/src/components/Navbar/Navbar.jsx b/SerpentRace_Frontend/src/components/Navbar/Navbar.jsx index 738bd17b..1bb4a2d0 100644 --- a/SerpentRace_Frontend/src/components/Navbar/Navbar.jsx +++ b/SerpentRace_Frontend/src/components/Navbar/Navbar.jsx @@ -1,18 +1,17 @@ import React, { useState } from "react" import Logo from "../../assets/pictures/Logo" import { Link } from "react-router-dom" -import HandleNavigate from "../../utils/HandleNavigate/HandleNavigate"// ✅ importáld a navigációs hookot +import HandleNavigate from "../../utils/HandleNavigate/HandleNavigate" // ✅ importáld a navigációs hookot +import { FaSignOutAlt, FaChartBar, FaUser, FaBars } from "react-icons/fa" -const navLinkClass = - "px-3 py-2 rounded-lg text-white transition-all duration-200 hover:bg-white/10" +const navLinkClass = "px-3 py-2 rounded-lg text-white transition-all duration-200 hover:bg-white/10" const navLinkClassPlay = "px-4 py-2 rounded-lg text-white bg-white/12 hover:bg-white/20 transition-all duration-200" const Navbar = () => { const [menuOpen, setMenuOpen] = useState(false) - const isLoggedIn = Boolean( - localStorage.getItem("authLevel") && localStorage.getItem("username") - ) + const [userMenuOpen, setUserMenuOpen] = useState(false) + const isLoggedIn = Boolean(localStorage.getItem("authLevel") && localStorage.getItem("username")) // ✅ Használjuk a HandleNavigate hookot const { goLanding, goAbout, goHome, goLogin, goContacts } = HandleNavigate() @@ -25,7 +24,14 @@ const Navbar = () => { return (