From 3f2112a58ba7fa313a0e4972d5b50b52a3433be0 Mon Sep 17 00:00:00 2001 From: Rose Gu Date: Tue, 6 Jan 2026 16:48:56 -0500 Subject: [PATCH 1/3] Add about us page layout and update navbar/footer --- frontend/app/aboutus/page.tsx | 17 ++++++++++++++ frontend/components/Footer.jsx | 41 +++++++++++++++++++++------------- frontend/components/Navbar.jsx | 16 +++++++------ frontend/package-lock.json | 24 +++++++++++++++++++- frontend/package.json | 3 ++- 5 files changed, 77 insertions(+), 24 deletions(-) create mode 100644 frontend/app/aboutus/page.tsx diff --git a/frontend/app/aboutus/page.tsx b/frontend/app/aboutus/page.tsx new file mode 100644 index 0000000..68cee43 --- /dev/null +++ b/frontend/app/aboutus/page.tsx @@ -0,0 +1,17 @@ +import Navbar from '@/components/Navbar'; +import AboutSection from '@/components/AboutSection'; +import ExecutiveSection from '@/components/ExecutiveSection'; +import Footer from '@/components/Footer'; + +export default function AboutUsPage() { + return ( +
+
+ + + +
+
+
+ ); +} diff --git a/frontend/components/Footer.jsx b/frontend/components/Footer.jsx index 39caaaa..e1b7ad4 100644 --- a/frontend/components/Footer.jsx +++ b/frontend/components/Footer.jsx @@ -1,6 +1,14 @@ import Image from "next/image"; +import Link from "next/link"; +import { FaInstagram, FaDiscord, FaFacebook } from "react-icons/fa"; export default function Footer() { + const socials = [ + { name: "Instagram", href: "#", icon: FaInstagram }, + { name: "Discord", href: "#", icon: FaDiscord }, + { name: "Facebook", href: "#", icon: FaFacebook }, + ]; + return ( ) } \ No newline at end of file diff --git a/frontend/components/Navbar.jsx b/frontend/components/Navbar.jsx index b240d32..26f7dda 100644 --- a/frontend/components/Navbar.jsx +++ b/frontend/components/Navbar.jsx @@ -3,20 +3,22 @@ import Link from "next/link"; export default function Navbar() { return ( -