Skip to content

Cleanup frontend and update routing #69

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

Open
Rose-sys-collan wants to merge 3 commits into
base: legacy
Choose a base branch
from
Open

Cleanup frontend and update routing #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f2112a
Add about us page layout and update navbar/footer
Rose-sys-collan Jan 6, 2026
f1f101b
Fix layout issues
Rose-sys-collan Jan 17, 2026
a95c33e
Cleanup structure and update page routing
Rose-sys-collan Jan 17, 2026
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
17 changes: 17 additions & 0 deletions frontend/app/aboutus/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
<div className="min-h-screen bg-[linear-gradient(180deg,#F7F3FB_15%,#B1B0F2_49%,#F9F6FF_83%)] pt-14">
<main className="min-h-screen">
<Navbar />
<AboutSection />
<ExecutiveSection />
<Footer />
</main>
</div>
);
}
26 changes: 0 additions & 26 deletions frontend/app/dev-preview/page.tsx
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion frontend/app/events/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import EventCard from "./EventCard";
import EventCard from "@/components/EventCard";


export default function EventsPage() {
Expand Down
Binary file removed frontend/app/favicon.ico
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions frontend/app/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,7 @@ body {
background: var(--background);
color: var(--foreground);
font-family: Arial, Helvetica, sans-serif;
margin: 0;
padding: 0;
height: 100%;
}
2 changes: 1 addition & 1 deletion frontend/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default function RootLayout({
return (
<html lang="en">
<body
className={`${dmSans.className} antialiased`}
className={`${dmSans.className} antialiased min-h-screen m-0 p-0 overflow-x-hidden overscroll-none`}
>
{children}
</body>
Expand Down
6 changes: 3 additions & 3 deletions frontend/components/AboutSection.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import SectionHeader from "./SectionHeader";
import SectionHeader from "./global/SectionHeader";

export default function AboutSection(){
return (
Expand All @@ -7,11 +7,11 @@ export default function AboutSection(){
About WiCSM
</SectionHeader>

<p className="max-w-8xl mx-auto text-5xl font-bold mb-12 [line-height:1.3] [color:#513c97]">
<p className="max-w-8xl mx-auto text-5xl sm:text-3xl md:text-4xl lg:text-5xl font-bold mb-12 leading-[1.3] [color:#513c97]">
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.
</p>

<p className="max-w-8xl mx-auto text-4xl font-bold leading-relaxed [color:#815dbb]">
<p className="max-w-8xl mx-auto text-4xl sm:text-2xl md:text-3xl lg:text-4xl font-bold leading-relaxed [color:#815dbb]">
Our goal is to build that support system:<br/>
one mentorship moment, one conversation, and one connection at a time.
</p>
Expand Down
0 frontend/app/events/EventCard.css → frontend/components/EventCard.css
View file
Open in desktop
File renamed without changes.
0 frontend/app/events/EventCard.tsx → frontend/components/EventCard.tsx
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions frontend/components/ExecutiveSection.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import FlipCard from "./FlipCard";
import SectionHeader from "./SectionHeader";
import SectionHeader from "./global/SectionHeader";

const execTeamData = [
{
Expand Down Expand Up @@ -173,7 +173,7 @@ export default function ExecutiveSection() {
Executive Team
</SectionHeader>

<p className="max-w-2xl mx-auto text-4xl font-bold mb-20 [color:#513c97]">
<p className="max-w-2xl mx-auto text-4xl sm:text-2xl md:text-3xl lg:text-4xl font-bold mb-20 [color:#513c97]">
Meet the amazing people at WiCSM!
</p>

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

return (
<div key={team.title} className="mb-20 flex flex-col items-center">
<h3 className="text-5xl font-bold mb-12 [color:#513c97]">
<h3 className="text-5xl sm:text-3xl md:text-4xl lg:text-5xl font-bold mb-12 [color:#513c97]">
{team.title}
</h3>

Expand Down
22 changes: 0 additions & 22 deletions frontend/components/Navbar.jsx
View file
Open in desktop

This file was deleted.

45 changes: 28 additions & 17 deletions frontend/components/Footer.jsx → frontend/components/global/Footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
<footer className="h-[490px] bg-[linear-gradient(to_bottom,_#F9F6FF33_0%,_#F9F6FF33_10%,_#9BCEEE_35%,_#9BCEEE_45%,_#A9A7EB_75%,_#A9A7EB_100%)]">
<footer className="bg-[linear-gradient(to_bottom,_#F9F6FF33_0%,_#F9F6FF33_10%,_#9BCEEE_35%,_#9BCEEE_45%,_#A9A7EB_75%,_#A9A7EB_100%)]">

<div className="px-10 py-30">
<div className="px-10 pt-32 pb-16">
<div className="flex items-center justify-between">
<div className="flex items-center gap-3">
<Image
Expand All @@ -25,10 +33,10 @@ export default function Footer() {
</div>

<div className="grid grid-cols-2 gap-x-10 gap-y-4 text-3xl font-semibold text-white pr-40">
<a href="#" className="hover:underline">QUICKLINK 1 </a>
<a href="#" className="hover:underline">QUICKLINK 2 </a>
<a href="#" className="hover:underline">QUICKLINK 3 </a>
<a href="#" className="hover:underline">QUICKLINK 4 </a>
<a href="/aboutus" className="hover:underline">About Us </a>
<a href="/events" className="hover:underline">Events </a>
<a href="#" className="hover:underline">Join Us </a>
<a href="#" className="hover:underline">Contact </a>
</div>
</div>

Expand All @@ -40,22 +48,25 @@ export default function Footer() {
</p>

<div className="flex gap-4 pr-10 pb-1">
<a href="#" className="w-12 h-12 bg-white hover:bg-gray-200 transition-colors"></a>
<a href="#" className="w-12 h-12 bg-white hover:bg-gray-200 transition-colors"></a>
<a href="#" className="w-12 h-12 bg-white hover:bg-gray-200 transition-colors"></a>
<a href="#" className="w-12 h-12 bg-white hover:bg-gray-200 transition-colors"></a>
{socials.map(({ name, href, icon: Icon }) => (
<Link
key={name}
href={href}
aria-label={name}
target="_blank"
rel="noopener noreferrer"
className="rounded-md p-2 hover:opacity-80 focus:ring-2 focus:ring-[#54528F]"
>
<Icon className="text-4xl text-white" />
</Link>
))}


</div>
</div>


</div>







</footer>
)
}
24 changes: 24 additions & 0 deletions frontend/components/global/Navbar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import Image from "next/image";
import Link from "next/link";

export default function Navbar() {
return (
<nav className="border-3 border-[#54528F] rounded-3xl flex items-center py-2 px-7 max-w-5xl mx-auto">
<Image
src="/wicsm_logo_transparent_1.png"
alt="WiCSM Logo"
width={40}
height={40}
className="shrink-0"
/>
<div className="flex-1 flex justify-center">
<div className="flex gap-20 font-bold [color:#54528F] text-xl">
<Link href="/">HOME</Link>
<Link href="/aboutus">ABOUT</Link>
<Link href="/events">EVENTS</Link>
<Link href="/contact">CONTACT</Link>
</div>
</div>
</nav>
)
}
2 changes: 1 addition & 1 deletion frontend/components/SectionHeader.jsx → frontend/components/global/SectionHeader.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export default function SectionHeader({children }) {
return (
<h2 className="text-7xl font-black mb-8 [color:#513c97]">
<h2 className="text-7xl sm:text-5xl md:text-6xl lg:text-7xl font-black mb-8 [color:#513c97]">
{children}
</h2>
);
Expand Down
24 changes: 23 additions & 1 deletion frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"lucide-react": "^0.554.0",
"next": "16.0.3",
"react": "19.2.0",
"react-dom": "19.2.0"
"react-dom": "19.2.0",
"react-icons": "^5.5.0"
},
"devDependencies": {
"@tailwindcss/postcss": "^4",
Expand Down
1 change: 0 additions & 1 deletion frontend/public/file.svg
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion frontend/public/globe.svg
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion frontend/public/next.svg
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion frontend/public/vercel.svg
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion frontend/public/window.svg
View file
Open in desktop

This file was deleted.