Skip to content

Commit cd99c9b

Browse files
committed
style : Glass navbar on scrolling and achievement page fix
1 parent 5e2f990 commit cd99c9b

5 files changed

Lines changed: 49 additions & 18 deletions

File tree

src/App.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Footer from "./components/Footer.jsx";
22
import Navbar from "./components/Navbar.jsx";
3-
import { Outlet } from "react-router";
3+
import { Outlet } from "react-router-dom";
44

55
const App = () => {
66
return (

src/components/Achievements.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { useNavigate } from "react-router";
1+
import { useNavigate } from "react-router-dom";
22
import achievementsData from "../config/achievement";
33

44
export default function Achievements() {
55
const navigate = useNavigate();
66

77
return (
8-
<div className="px-4 md:px-12 py-8 max-w-screen-xl mx-auto">
8+
<div className="px-4 pt-[64px] md:px-12 py-8 max-w-screen-xl mx-auto">
99
<div className="md:mb-48 mb-12">
1010
<h2 className="text-3xl font-bold text-blue-900 mb-4">
1111
Our Achievements
@@ -20,7 +20,7 @@ export default function Achievements() {
2020
</p>
2121
<button
2222
className="bg-white text-blue-800 border border-blue-800 px-4 py-2 rounded hover:bg-blue-50 md:mb-12"
23-
onClick={() => navigate("/achievementpage")}
23+
onClick={() => navigate("/achievements")}
2424
>
2525
View All Achievements &gt;
2626
</button>

src/components/Footer.jsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,27 +75,27 @@ const Footer = ({
7575
<h3 className="text-lg font-semibold">Quick Links</h3>
7676
<ul className="mt-2 space-y-1 text-sm">
7777
<li>
78-
<Link to="/playground/about" className="hover:underline">
78+
<Link to="/about" className="hover:underline">
7979
About us
8080
</Link>
8181
</li>
8282
<li>
83-
<Link to="/playground/team" className="hover:underline">
83+
<Link to="/team" className="hover:underline">
8484
Team
8585
</Link>
8686
</li>
8787
<li>
88-
<Link to="/playground/events" className="hover:underline">
88+
<Link to="/events" className="hover:underline">
8989
Events
9090
</Link>
9191
</li>
9292
<li>
93-
<Link to="/playground/achievements" className="hover:underline">
93+
<Link to="/achievements" className="hover:underline">
9494
Achievements
9595
</Link>
9696
</li>
9797
<li>
98-
<Link to="/playground/gallery" className="hover:underline">
98+
<Link to="/gallery" className="hover:underline">
9999
Gallery
100100
</Link>
101101
</li>

src/components/Navbar.jsx

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,27 @@
11
import { siteConfig } from "../config/navbarHero";
22
import Button from "./shared/Button";
3-
import { useState } from "react";
3+
import { useState, useEffect } from "react";
44

55
export default function Navbar() {
66
const [mobileMenuOpen, setMobileMenuOpen] = useState(false);
77

8+
const [scrolled, setScrolled] = useState(false);
9+
10+
useEffect(() => {
11+
const handleScroll = () => {
12+
setScrolled(window.scrollY > 50);
13+
};
14+
window.addEventListener("scroll", handleScroll);
15+
16+
return () => window.removeEventListener("scroll", handleScroll);
17+
}, []);
18+
819
return (
9-
<header className="bg-white w-full px-0 min-[1100px]:sticky fixed top-0 left-0 z-50 ">
20+
<header
21+
className={`w-full px-0 min-[1100px]:sticky fixed top-0 left-0 z-50 transition-all duration-300 ${
22+
scrolled ? "bg-white/80 backdrop-blur-md shadow-md" : "bg-transparent"
23+
}`}
24+
>
1025
<div className="max-w-[1920px] w-screen mx-auto px-4 sm:px-6 md:px-8 lg:px-10 py-3 flex items-center text-black font-['Helvetica'] font-normal text-[20px] leading-[100%] tracking-[-0.015em]">
1126
<div className="flex items-center space-x-3 min-[900px]:space-x-6 flex-shrink-0">
1227
<img
@@ -32,10 +47,19 @@ export default function Navbar() {
3247
</nav>
3348

3449
<div className="hidden min-[1100px]:flex items-center space-x-4 text-sm flex-shrink-0 ml-auto ">
35-
<Button className="border border-black bg-white text-black px-3 py-1.5 text-sm transition duration-300 ease-in-out hover:bg-[rgba(55,115,236,1)] hover:text-white hover:border-none">
50+
<Button
51+
backgroundColor="white"
52+
textColor="black"
53+
className="border border-black px-3 py-1.5 text-sm transition duration-300 ease-in-out hover:bg-[rgba(55,115,236,1)] hover:text-white hover:border-none"
54+
>
3655
Join Us
3756
</Button>
38-
<Button className="bg-[rgba(6,25,70,1)] text-white px-3 py-1.5 text-sm transition duration-300 ease-in-out hover:bg-white hover:text-[rgba(6,25,70,1)]">
57+
58+
<Button
59+
backgroundColor="rgba(6,25,70,1)"
60+
textColor="white"
61+
className="px-3 py-1.5 text-sm transition duration-300 ease-in-out hover:bg-white hover:text-[rgba(6,25,70,1)]"
62+
>
3963
Contact Us
4064
</Button>
4165
</div>
@@ -50,7 +74,6 @@ export default function Navbar() {
5074
fill="none"
5175
stroke="currentColor"
5276
viewBox="0 0 24 24"
53-
xmlns="http://www.w3.org/2000/svg"
5477
>
5578
{mobileMenuOpen ? (
5679
<path
@@ -83,7 +106,6 @@ export default function Navbar() {
83106
fill="none"
84107
stroke="currentColor"
85108
viewBox="0 0 24 24"
86-
xmlns="http://www.w3.org/2000/svg"
87109
>
88110
<path
89111
strokeLinecap="round"
@@ -108,10 +130,19 @@ export default function Navbar() {
108130
</nav>
109131

110132
<div className="mt-8 flex flex-col space-y-4 pt-6 w-full">
111-
<Button className="w-full border border-white bg-transparent text-white px-4 py-3 text-center text-base transition duration-300 hover:bg-white hover:text-[rgba(6,25,70,1)]">
133+
<Button
134+
backgroundColor="transparent"
135+
textColor="white"
136+
className="w-full border border-white px-4 py-3 text-center text-base transition duration-300 hover:bg-white hover:text-[rgba(6,25,70,1)]"
137+
>
112138
Join Us
113139
</Button>
114-
<Button className="w-full bg-white text-[rgba(6,25,70,1)] px-4 py-3 text-center text-base transition duration-300 hover:bg-blue-100">
140+
141+
<Button
142+
backgroundColor="white"
143+
textColor="rgba(6,25,70,1)"
144+
className="w-full px-4 py-3 text-center text-base transition duration-300 hover:bg-blue-100"
145+
>
115146
Contact Us
116147
</Button>
117148
</div>

src/main.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { StrictMode } from "react";
22
import { createRoot } from "react-dom/client";
33
import "./index.css";
4-
import { BrowserRouter, Route, Routes } from "react-router";
4+
import { BrowserRouter, Route, Routes } from "react-router-dom";
55
import App from "./App.jsx";
66
import Test from "./components/Test.jsx";
77
import Home from "./pages/landing-page/Home.jsx";

0 commit comments

Comments
 (0)