From cd99c9be47d9e5eb307ea366e59c836256501f03 Mon Sep 17 00:00:00 2001 From: mshalom27 Date: Sun, 10 Aug 2025 19:47:27 +0530 Subject: [PATCH 1/2] style : Glass navbar on scrolling and achievement page fix --- src/App.jsx | 2 +- src/components/Achievements.jsx | 6 ++--- src/components/Footer.jsx | 10 +++---- src/components/Navbar.jsx | 47 +++++++++++++++++++++++++++------ src/main.jsx | 2 +- 5 files changed, 49 insertions(+), 18 deletions(-) diff --git a/src/App.jsx b/src/App.jsx index de85312..41aef08 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -1,6 +1,6 @@ import Footer from "./components/Footer.jsx"; import Navbar from "./components/Navbar.jsx"; -import { Outlet } from "react-router"; +import { Outlet } from "react-router-dom"; const App = () => { return ( diff --git a/src/components/Achievements.jsx b/src/components/Achievements.jsx index 53f76cd..48b1aff 100644 --- a/src/components/Achievements.jsx +++ b/src/components/Achievements.jsx @@ -1,11 +1,11 @@ -import { useNavigate } from "react-router"; +import { useNavigate } from "react-router-dom"; import achievementsData from "../config/achievement"; export default function Achievements() { const navigate = useNavigate(); return ( -
+

Our Achievements @@ -20,7 +20,7 @@ export default function Achievements() {

diff --git a/src/components/Footer.jsx b/src/components/Footer.jsx index 5c7e7b1..5658527 100644 --- a/src/components/Footer.jsx +++ b/src/components/Footer.jsx @@ -75,27 +75,27 @@ const Footer = ({

Quick Links

  • - + About us
  • - + Team
  • - + Events
  • - + Achievements
  • - + Gallery
  • diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx index 8bc4172..d769e6a 100644 --- a/src/components/Navbar.jsx +++ b/src/components/Navbar.jsx @@ -1,12 +1,27 @@ import { siteConfig } from "../config/navbarHero"; import Button from "./shared/Button"; -import { useState } from "react"; +import { useState, useEffect } from "react"; export default function Navbar() { const [mobileMenuOpen, setMobileMenuOpen] = useState(false); + const [scrolled, setScrolled] = useState(false); + + useEffect(() => { + const handleScroll = () => { + setScrolled(window.scrollY > 50); + }; + window.addEventListener("scroll", handleScroll); + + return () => window.removeEventListener("scroll", handleScroll); + }, []); + return ( -
    +
    - -
    @@ -50,7 +74,6 @@ export default function Navbar() { fill="none" stroke="currentColor" viewBox="0 0 24 24" - xmlns="http://www.w3.org/2000/svg" > {mobileMenuOpen ? (
    - -
    diff --git a/src/main.jsx b/src/main.jsx index bca00c0..4aac412 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -1,7 +1,7 @@ import { StrictMode } from "react"; import { createRoot } from "react-dom/client"; import "./index.css"; -import { BrowserRouter, Route, Routes } from "react-router"; +import { BrowserRouter, Route, Routes } from "react-router-dom"; import App from "./App.jsx"; import Test from "./components/Test.jsx"; import Home from "./pages/landing-page/Home.jsx"; From c778a3e2bf34ac3427f02af182044075b8bbee3d Mon Sep 17 00:00:00 2001 From: mshalom27 Date: Sun, 10 Aug 2025 20:10:59 +0530 Subject: [PATCH 2/2] achievement page --- src/components/Achievements.jsx | 2 +- src/components/Navbar.jsx | 115 ++++++++++++++++---------------- 2 files changed, 58 insertions(+), 59 deletions(-) diff --git a/src/components/Achievements.jsx b/src/components/Achievements.jsx index 48b1aff..6f5a1a1 100644 --- a/src/components/Achievements.jsx +++ b/src/components/Achievements.jsx @@ -5,7 +5,7 @@ export default function Achievements() { const navigate = useNavigate(); return ( -
    +

    Our Achievements diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx index d769e6a..adf542e 100644 --- a/src/components/Navbar.jsx +++ b/src/components/Navbar.jsx @@ -75,79 +75,78 @@ export default function Navbar() { stroke="currentColor" viewBox="0 0 24 24" > - {mobileMenuOpen ? ( - - ) : ( + {!mobileMenuOpen ? ( - )} + ) : null}

    - {mobileMenuOpen && ( -
    - - - + + + -
    - + {item.name} + + ))} + - -
    +
    + + +
    - )} +
    ); }