diff --git a/frontend/app/aboutus/page.tsx b/frontend/app/aboutus/page.tsx new file mode 100644 index 0000000..e5afc82 --- /dev/null +++ b/frontend/app/aboutus/page.tsx @@ -0,0 +1,17 @@ +import Navbar from '@/components/global/Navbar'; +import AboutSection from '@/components/AboutSection'; +import ExecutiveSection from '@/components/ExecutiveSection'; +import Footer from '@/components/global/Footer'; + +export default function AboutUsPage() { + return ( +
+
+ + + +
+
+ ); +} diff --git a/frontend/app/dev-preview/page.tsx b/frontend/app/dev-preview/page.tsx deleted file mode 100644 index 8aaac86..0000000 --- a/frontend/app/dev-preview/page.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import AboutSection from "@/components/AboutSection"; -import ExecutiveSection from "@/components/ExecutiveSection"; -import FlipCard from "@/components/FlipCard"; -import Navbar from "@/components/Navbar"; -import Footer from "@/components/Footer"; - -export default function DevPreview() { - return ( -
- -
- -
- -
- -
- - - - -
- ); -} \ No newline at end of file diff --git a/frontend/app/events/page.tsx b/frontend/app/events/page.tsx index a3b9bcd..ef9e0ab 100644 --- a/frontend/app/events/page.tsx +++ b/frontend/app/events/page.tsx @@ -1,4 +1,4 @@ -import EventCard from "./EventCard"; +import EventCard from "@/components/EventCard"; export default function EventsPage() { diff --git a/frontend/app/favicon.ico b/frontend/app/favicon.ico deleted file mode 100644 index 718d6fe..0000000 Binary files a/frontend/app/favicon.ico and /dev/null differ diff --git a/frontend/app/globals.css b/frontend/app/globals.css index a2dc41e..5c5bca0 100644 --- a/frontend/app/globals.css +++ b/frontend/app/globals.css @@ -23,4 +23,7 @@ body { background: var(--background); color: var(--foreground); font-family: Arial, Helvetica, sans-serif; + margin: 0; + padding: 0; + height: 100%; } diff --git a/frontend/app/layout.tsx b/frontend/app/layout.tsx index f85bfba..8714b8c 100644 --- a/frontend/app/layout.tsx +++ b/frontend/app/layout.tsx @@ -20,7 +20,7 @@ export default function RootLayout({ return ( {children} diff --git a/frontend/components/AboutSection.jsx b/frontend/components/AboutSection.jsx index f2ffa01..255bec7 100644 --- a/frontend/components/AboutSection.jsx +++ b/frontend/components/AboutSection.jsx @@ -1,4 +1,4 @@ -import SectionHeader from "./SectionHeader"; +import SectionHeader from "./global/SectionHeader"; export default function AboutSection(){ return ( @@ -7,11 +7,11 @@ export default function AboutSection(){ About WiCSM -

+

WiCSM (Women in Computer Science, Statistics, and Mathematics) at UTSC was founded on a simple belief: when women in STEM feel supported and seen, they achieve beyond what they imagined.

-

+

Our goal is to build that support system:
one mentorship moment, one conversation, and one connection at a time.

diff --git a/frontend/app/events/EventCard.css b/frontend/components/EventCard.css similarity index 100% rename from frontend/app/events/EventCard.css rename to frontend/components/EventCard.css diff --git a/frontend/app/events/EventCard.tsx b/frontend/components/EventCard.tsx similarity index 100% rename from frontend/app/events/EventCard.tsx rename to frontend/components/EventCard.tsx diff --git a/frontend/components/ExecutiveSection.jsx b/frontend/components/ExecutiveSection.jsx index 97a3c6e..d167e11 100644 --- a/frontend/components/ExecutiveSection.jsx +++ b/frontend/components/ExecutiveSection.jsx @@ -1,5 +1,5 @@ import FlipCard from "./FlipCard"; -import SectionHeader from "./SectionHeader"; +import SectionHeader from "./global/SectionHeader"; const execTeamData = [ { @@ -173,7 +173,7 @@ export default function ExecutiveSection() { Executive Team -

+

Meet the amazing people at WiCSM!

@@ -189,7 +189,7 @@ export default function ExecutiveSection() { return (
-

+

{team.title}

diff --git a/frontend/components/Navbar.jsx b/frontend/components/Navbar.jsx deleted file mode 100644 index b240d32..0000000 --- a/frontend/components/Navbar.jsx +++ /dev/null @@ -1,22 +0,0 @@ -import Image from "next/image"; -import Link from "next/link"; - -export default function Navbar() { - return ( - - ) -} \ No newline at end of file diff --git a/frontend/components/Footer.jsx b/frontend/components/global/Footer.jsx similarity index 56% rename from frontend/components/Footer.jsx rename to frontend/components/global/Footer.jsx index 39caaaa..16f4b4b 100644 --- a/frontend/components/Footer.jsx +++ b/frontend/components/global/Footer.jsx @@ -1,10 +1,18 @@ 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 ( -