Skip to content

feat: update layout, footer, and navbar components; enhance scrolling… #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JohnSchmidtN merged 1 commit into from
Mar 27, 2026
Merged

feat: update layout, footer, and navbar components; enhance scrolling… #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Application/app/data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
15 changes: 11 additions & 4 deletions Application/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
"use client";

import type { Metadata } from "next";
import { Geist, Geist_Mono } from "next/font/google";
import "./globals.css";
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({
Expand All @@ -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 (
<html lang="en" suppressHydrationWarning>
<body className={`${geistSans.variable} ${geistMono.variable} antialiased`}>
Expand Down
6 changes: 3 additions & 3 deletions Application/app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export default function Home() {
return (
<>
<title>{HomePage.getTitle()}</title>
<section className="relative h-[70vh] overflow-hidden">
<section className="relative h-[40vh] md:h-[70vh] overflow-hidden">
<div className="relative w-full h-full group">
{/* <!-- Background Image --> */}
<img
Expand All @@ -34,7 +34,7 @@ export default function Home() {

</div>
</section>
<Container maxW="container.md" py={20} textAlign="center" bg="bg">
<Container maxW="container.md" py={{ base: 10, md: 20 }} textAlign="center" bg="bg">
<VStack gap={10} align="stretch">
<Box>
<Heading as="h1" size="2xl" fontWeight="bold" letterSpacing="tight" color="fg">
Expand All @@ -51,7 +51,7 @@ export default function Home() {
</Text>
</VStack>
</Container>
<Container maxW="container.md" py={20} textAlign="center" bg="bg">
<Container maxW="container.md" py={{ base: 10, md: 20 }} textAlign="center" bg="bg">
<VStack gap={10} align="stretch">
<Box>
<Heading as="h1" size="2xl" fontWeight="bold" letterSpacing="tight" color="fg">
Expand Down
8 changes: 4 additions & 4 deletions Application/components/footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ const Footer = () => {
gap={{ base: 4, md: 8}}
alignItems="center">

<Link href="/" className="hover:text-blue-400 transition-colors">Home</Link>
<Link href="/about" className="hover:text-blue-400 transition-colors">About Us</Link>
<Link href="/faq" className="hover:text-blue-400 transition-colors">FAQ</Link>
<Link href="/contact" className="hover:text-blue-400 transition-colors">Contact</Link>
<Link href="/" scroll={true} className="hover:text-blue-400 transition-colors">Home</Link>
<Link href="/about" scroll={true} className="hover:text-blue-400 transition-colors">About Us</Link>
<Link href="/faq" scroll={true} className="hover:text-blue-400 transition-colors">FAQ</Link>
<Link href="/contact" scroll={true} className="hover:text-blue-400 transition-colors">Contact</Link>
</Stack>
</Flex>
</Box>
Expand Down
7 changes: 6 additions & 1 deletion Application/components/navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ export default function Navbar() {
zIndex="docked"
>
<Flex h={16} px={8} alignItems="center" justifyContent="space-between">
<Text fontSize="xl" fontWeight="bold">Coding United</Text>
<Link href="/">
<Text fontSize="xl" fontWeight="bold">Coding United</Text>
</Link>

<HStack gap={4}>
{/* Desktop Links */}
Expand Down Expand Up @@ -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 ? <HiX /> : <HiMenu />}
</IconButton>
Expand Down
Loading