Skip to content

Commit 0428026

Browse files
authored
Merge pull request #42 from CapituloJaverianoACM/feature/league-page-structure
Add: league page structure and dynamic main-navbar. The fix to the cu…
2 parents 1bb344a + e5af74c commit 0428026

File tree

7 files changed

+59
-11
lines changed

7 files changed

+59
-11
lines changed

src/app/league/page.tsx

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
'use client';
2+
3+
import { HeroUIProvider } from "@heroui/react";
4+
import MainNavbar from '@/components/shared/main-navbar';
5+
import { Hero } from "@/components/league/sections/hero";
6+
import { Rules } from "@/components/league/sections/rules";
7+
import { UpcomingEvents } from "@/components/league/sections/upcoming-events";
8+
import { Podium } from "@/components/league/sections/podium";
9+
10+
const navLinks = [
11+
{ key: "home", label: "Home", href: "/" },
12+
{ key: "rules", label: "Rules", href: "#rules" },
13+
{ key: "upcoming-events", label: "Upcoming Events", href: "#upcoming-events" },
14+
{ key: "podium", label: "Podium", href: "#podium" },
15+
];
16+
17+
export default function LeagueHomePage() {
18+
return (
19+
<HeroUIProvider>
20+
<MainNavbar navLinks={navLinks} />
21+
<Hero />
22+
<Rules />
23+
<UpcomingEvents />
24+
<Podium />
25+
</HeroUIProvider>
26+
);
27+
}

src/app/page.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,21 @@ import { Activities } from "@/components/home/sections/activities";
55
import { Hero } from "@/components/home/sections/hero";
66
import { Members } from "@/components/home/sections/members";
77
import { HeroUIProvider } from "@heroui/react";
8-
import MainNavbar from '@/components/home/main-navbar';
8+
import MainNavbar from '@/components/shared/main-navbar';
99
import { CursorWrapper } from "@/components/home/ui/CursorWrapper";
1010

11+
const navLinks = [
12+
{ key: "home", label: "Home", href: "#home" },
13+
{ key: "about us", label: "About Us", href: "#about-us" },
14+
{ key: "members", label: "Members", href: "#members" },
15+
{ key: "league", label: "League", href: "/league" },
16+
];
17+
1118
export default function HomePage() {
1219
return (
1320
<HeroUIProvider>
1421
<CursorWrapper>
15-
<MainNavbar />
22+
<MainNavbar navLinks={navLinks} />
1623
<Hero />
1724
<AboutUs />
1825
<Members />
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export function Hero() {
2+
return (<></>);
3+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export function Podium() {
2+
return (<></>);
3+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export function Rules() {
2+
return (<></>);
3+
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export function UpcomingEvents() {
2+
return (<></>);
3+
}
Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,17 @@ import { IconMoon, IconSun } from "@tabler/icons-react";
44
import Link from "next/link";
55
import React, { useState } from "react";
66

7-
export default function MainNavbar() {
7+
type NavLink = {
8+
key: string;
9+
label: string;
10+
href: string;
11+
};
12+
13+
interface MainNavbarProps {
14+
navLinks: NavLink[];
15+
}
16+
17+
export default function MainNavbar({ navLinks }: MainNavbarProps) {
818
const [activeLink, setActiveLink] = useState("home");
919
const [isMobileMenuOpen, setIsMobileMenuOpen] = useState(false);
1020

@@ -38,14 +48,6 @@ export default function MainNavbar() {
3848
}
3949
};
4050

41-
// Nav links
42-
const navLinks = [
43-
{ key: "home", label: "Home", href: "#home" },
44-
{ key: "about us", label: "About Us", href: "#about-us" },
45-
{ key: "members", label: "Members", href: "#members" },
46-
{ key: "activities", label: "Activities", href: "#activities" },
47-
];
48-
4951
return (
5052
<nav className="fixed top-0 left-0 right-0 z-50 px-6 py-4 ">
5153
<div className="max-w-7xl mx-auto">

0 commit comments

Comments
 (0)