From 7e1f6d8b73b43570f7803dd24b39a1c348e4b36a Mon Sep 17 00:00:00 2001 From: John Schmidt Date: Thu, 26 Mar 2026 20:35:49 -0500 Subject: [PATCH] feat: update layout, footer, and navbar components; enhance scrolling behavior and link structure --- Application/app/data.ts | 2 +- Application/app/layout.tsx | 15 +++++++++++---- Application/app/page.tsx | 6 +++--- Application/components/footer.tsx | 8 ++++---- Application/components/navbar.tsx | 7 ++++++- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/Application/app/data.ts b/Application/app/data.ts index 81910d7..f324d41 100644 --- a/Application/app/data.ts +++ b/Application/app/data.ts @@ -12,7 +12,7 @@ export const clubFeatures = [ ], }, { - title: "Open Office Hours", + title: "Open Office Hours (Every Sunday)", bgColor: "blue.600", items: [ "Online learning can feel isolating--it's easy to think you're on your own", diff --git a/Application/app/layout.tsx b/Application/app/layout.tsx index abcc307..42e0316 100644 --- a/Application/app/layout.tsx +++ b/Application/app/layout.tsx @@ -1,3 +1,5 @@ +"use client"; + import type { Metadata } from "next"; import { Geist, Geist_Mono } from "next/font/google"; import "./globals.css"; @@ -5,6 +7,8 @@ import { Provider } from "@/components/ui/provider"; import Navbar from "@/components/navbar"; import Footer from "@/components/footer"; import { Box, Flex } from "@chakra-ui/react/"; +import { useEffect } from "react"; +import { usePathname } from "next/navigation"; const geistSans = Geist({ @@ -17,14 +21,17 @@ const geistMono = Geist_Mono({ subsets: ["latin"], }); -export const metadata: Metadata = { - title: "Coding United Club", - description: "Coding United Club for SNHU", -}; + export default function RootLayout({ children,}: Readonly<{ children: React.ReactNode;}>) { + const pathname = usePathname(); + + useEffect(() => { + window.scrollTo(0, 0); + }, [pathname]); + return ( diff --git a/Application/app/page.tsx b/Application/app/page.tsx index 44e3f6b..4536612 100644 --- a/Application/app/page.tsx +++ b/Application/app/page.tsx @@ -23,7 +23,7 @@ export default function Home() { return ( <> {HomePage.getTitle()} -
+
{/* */}
- + @@ -51,7 +51,7 @@ export default function Home() { - + diff --git a/Application/components/footer.tsx b/Application/components/footer.tsx index 6ac6dbc..2e9b73b 100644 --- a/Application/components/footer.tsx +++ b/Application/components/footer.tsx @@ -32,10 +32,10 @@ const Footer = () => { gap={{ base: 4, md: 8}} alignItems="center"> - Home - About Us - FAQ - Contact + Home + About Us + FAQ + Contact diff --git a/Application/components/navbar.tsx b/Application/components/navbar.tsx index 754c02a..3c4d651 100644 --- a/Application/components/navbar.tsx +++ b/Application/components/navbar.tsx @@ -35,7 +35,9 @@ export default function Navbar() { zIndex="docked" > - Coding United + + Coding United + {/* Desktop Links */} @@ -64,6 +66,9 @@ export default function Navbar() { onClick={() => setIsOpen(!isOpen)} variant="outline" aria-label="Toggle Menu" + color="white" + _hover={{ bg: "whiteAlpha.200" }} + borderColor="whiteAlpha.400" > {isOpen ? : }