diff --git a/Frontend/src/components/Navbar.jsx b/Frontend/src/components/Navbar.jsx index 0094da0..6cf12aa 100644 --- a/Frontend/src/components/Navbar.jsx +++ b/Frontend/src/components/Navbar.jsx @@ -1,5 +1,5 @@ import { useEffect, useMemo, useState } from "react"; -import { Link, useNavigate } from "react-router-dom"; +import { Link, useNavigate, useLocation } from "react-router-dom"; import { useSelector } from "react-redux"; import { Menu, X } from "lucide-react"; import ThemeToggle from "./ThemeToggle"; @@ -64,27 +64,33 @@ export default function Navbar({ }) { const { token } = useSelector((state) => state.auth); const navigate = useNavigate(); + const location = useLocation(); + const [mobileMenuOpen, setMobileMenuOpen] = useState(false); const [scrollY, setScrollY] = useState(0); + const styles = NAV_TONES[tone] || NAV_TONES.light; const links = useMemo(() => buildLinks(isLanding), [isLanding]); useEffect(() => { - if (variant !== "simple") { - return undefined; - } + if (variant !== "simple") return; const handleScroll = () => setScrollY(window.scrollY); window.addEventListener("scroll", handleScroll); return () => window.removeEventListener("scroll", handleScroll); }, [variant]); - const closeMobileMenu = () => { - setMobileMenuOpen(false); - }; + const closeMobileMenu = () => setMobileMenuOpen(false); const handleSectionClick = (event, sectionId) => { - if (onSectionClick) { - onSectionClick(event, sectionId); + if (onSectionClick) onSectionClick(event, sectionId); + closeMobileMenu(); + }; + + const handleHomeClick = () => { + if (location.pathname === "/") { + window.scrollTo({ top: 0, behavior: "smooth" }); + } else { + navigate("/"); } closeMobileMenu(); }; @@ -92,10 +98,11 @@ export default function Navbar({ if (variant === "simple") { return ( ); -} +} \ No newline at end of file diff --git a/Frontend/src/pages/AboutUs.jsx b/Frontend/src/pages/AboutUs.jsx index 4365a33..88f4d05 100644 --- a/Frontend/src/pages/AboutUs.jsx +++ b/Frontend/src/pages/AboutUs.jsx @@ -2,6 +2,7 @@ import React, { useEffect, useRef } from "react"; import { Link, useNavigate } from "react-router-dom"; import React, { useEffect, useRef, useState } from "react"; import { useNavigate } from "react-router-dom"; +import { useNavigate, Link } from "react-router-dom"; import { useSelector } from "react-redux"; import { motion, useInView, useAnimation } from "framer-motion"; import { @@ -22,7 +23,6 @@ import { Lightbulb, Star, } from "lucide-react"; -import { useState } from "react"; import Navbar from "../components/Navbar"; import Lenis from "@studio-freight/lenis"; @@ -190,7 +190,8 @@ export default function AboutUs() { return (
- + + {/* Hero Section */}
+ {/* Hero Section */}