diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 4a08aac5..8a38f5b9 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -1,47 +1,16 @@
import React from 'react';
-import { BrowserRouter, Routes, Route } from 'react-router-dom';
import { Container } from '@mui/material';
-import ScrollToTop from './utils/scrollToTop';
-import Home from './components/Home/Home';
import NavBar from './components/NavBar/NavBar';
+import JoinUs from './components/JoinUs/JoinUs';
import Footer from './components/Footer/Footer';
-import About from './components/About/About';
-import Events from './components/NewEvents/Events';
-import Opportunities from './components/Opportunities/Opportunities';
-import Membership from './components/Membership/Membership';
-import Login from './components/Login/Login';
-import EditForm from './components/Login/EditProfile';
-import Initiatives from './components/Initiatives/Initiatives';
-import OpenSource from './components/OpenSource/OpenSource';
-import Sponsorships from './components/Sponsorships/Sponsorships'; // added my mal and line 34
-import OpenSourceCommunity from './components/OpenSourceCommunity/OpenSourceCommunity';
-import DevCommunity from './components/Dev/DevCommunity'
-import InovateCommunity from './components/Inovate/InovateCommunity'
function App() {
return (
-
-
-
-
-
- } />
- } />
- } />
- } />
- } />
- { /* } /> */}
- } />
- } />
- } />
- } />
- } />
- } />
- } />
-
-
-
-
+
+
+
+
+
);
}
diff --git a/frontend/src/components/Footer/Footer.tsx b/frontend/src/components/Footer/Footer.tsx
index c652700d..5cb52840 100644
--- a/frontend/src/components/Footer/Footer.tsx
+++ b/frontend/src/components/Footer/Footer.tsx
@@ -1,129 +1,81 @@
import React from 'react';
import { Box, Typography, Link } from '@mui/material';
import InstagramIcon from '../../images/instagram-icon.svg';
-import FacebookIcon from '../../images/facebook-icon.svg';
import LinkedInIcon from '../../images/linkedin-icon.svg';
-import DiscordIcon from '../../images/discord-icon.svg';
import csesLogo from '../../images/footer-logo.png';
-const links = [
- { logo: InstagramIcon, link: 'https://www.instagram.com/cses_ucsd/' },
- { logo: DiscordIcon, link: 'https://discord.gg/UkdACyy2h8' },
- { logo: FacebookIcon, link: 'https://www.facebook.com/csesucsd' },
- { logo: LinkedInIcon, link: 'https://www.linkedin.com/in/csesucsd/' },
+const socialLinks = [
+ { logo: InstagramIcon, link: 'https://www.instagram.com/cses_ucsd/', alt: 'Instagram' },
+ { logo: LinkedInIcon, link: 'https://www.linkedin.com/in/csesucsd/', alt: 'LinkedIn' },
];
const Footer = () => {
return (
- {/* Desktop Layout */}
+ {/* Top row: logo left, social icons right */}
- {/* Logo */}
+ {/* CSES Logo */}
- {/* Center Contact Info */}
-
- For all inquiries, contact{' '}
-
- cses@ucsd.edu
-
- .
-
-
{/* Social Icons */}
- {links.map(({ logo, link }, idx) => (
+ {socialLinks.map(({ logo, link, alt }) => (
- 
+
))}
- {/* Mobile Layout */}
-
- {/* Logo */}
-
-
-
-
- {/* Social Icons */}
-
- {links.map(({ logo, link }, idx) => (
-
-
-
- ))}
-
-
+ © 2026 UC San Diego Computer Science and Engineering Society. All rights reserved.
+
);
};
diff --git a/frontend/src/components/JoinUs/JoinUs.tsx b/frontend/src/components/JoinUs/JoinUs.tsx
new file mode 100644
index 00000000..6a021268
--- /dev/null
+++ b/frontend/src/components/JoinUs/JoinUs.tsx
@@ -0,0 +1,214 @@
+import React from 'react';
+import { Box, Typography, Button } from '@mui/material';
+import ASLogo from '../../images/sponsors/AS_Logo.png';
+import CSEDeptLogo from '../../images/sponsors/CSEDept_Logo.png';
+import BasementLogo from '../../images/sponsors/Basement_Logo.jpeg';
+import EyePopAILogo from '../../images/sponsors/EyePopAI_Logo.png';
+import BSLLogo from '../../images/sponsors/BSL.png';
+import IGELogo from '../../images/sponsors/IGE_Logo.png';
+import LinuxLogo from '../../images/sponsors/Linux_Logo.png';
+import LovableLogo from '../../images/sponsors/Lovable_Logo.png';
+import OSPOLogo from '../../images/sponsors/OSPO_Logo.png';
+import PersonaLogo from '../../images/sponsors/Persona_Logo.png';
+import RobloxLogo from '../../images/sponsors/Roblox_Logo.png';
+
+const stats = [
+ { number: '455+', label: 'members' },
+ { number: '18+', label: 'annual\nevents' },
+ { number: '12+', label: 'annual\nprojects' },
+];
+
+const sponsors = [
+ { src: ASLogo, alt: 'Associated Students' },
+ { src: CSEDeptLogo, alt: 'CSE Department' },
+ { src: BSLLogo, alt: 'Big Strategy Lab' },
+ { src: RobloxLogo, alt: 'Roblox' },
+ { src: PersonaLogo, alt: 'Persona' },
+ { src: LovableLogo, alt: 'Lovable' },
+ { src: EyePopAILogo, alt: 'EyePop AI' },
+ { src: IGELogo, alt: 'IGE' },
+ { src: LinuxLogo, alt: 'Linux Foundation' },
+ { src: OSPOLogo, alt: 'OSPO' },
+ { src: BasementLogo, alt: 'Basement' },
+];
+
+const JoinUs = () => {
+ return (
+
+ {/* Heading */}
+
+ Join us.
+
+
+ {/* Subtext */}
+
+ Interested in joining our initiative? Apply below!
+
+
+ {/* Apply Button */}
+
+
+
+
+ {/* Organization tagline */}
+
+ We are UCSD's largest computing organization
+
+
+ {/* Stats */}
+
+ {stats.map((stat) => (
+
+
+ {stat.number}
+
+
+ {stat.label}
+
+
+ ))}
+
+
+ {/* Partners Section */}
+
+ Thank You to Our Current Partners
+
+
+ {/* Sponsor Logos Grid */}
+
+ {sponsors.map((sponsor) => (
+
+
+
+ ))}
+
+
+ );
+};
+
+export default JoinUs;
diff --git a/frontend/src/components/NavBar/NavBar.tsx b/frontend/src/components/NavBar/NavBar.tsx
index 0438ec50..02352b02 100644
--- a/frontend/src/components/NavBar/NavBar.tsx
+++ b/frontend/src/components/NavBar/NavBar.tsx
@@ -1,4 +1,4 @@
-import React, { useContext, useEffect, useState } from 'react';
+import React, { useState } from 'react';
import {
AppBar,
IconButton,
@@ -10,177 +10,124 @@ import {
Box,
Button,
Toolbar,
- Avatar,
} from '@mui/material';
import { Menu as MenuIcon, Close as CloseIcon } from '@mui/icons-material';
-import { Link, useNavigate, useLocation } from 'react-router-dom';
-import csesLogo from '../../images/CSES-logo.png';
-import MuiButton from '../Button/Button';
-import { navBarStyles } from './styles';
-import { AuthContext } from '../../context/AuthContext';
-import ProfileDropdown from './ProfileDropdown';
-import { User } from '../../utils/types';
-import axios from 'axios';
+import csesLogo from '../../images/cses-logo-white.png';
-const NavBar = () => {
- const location = useLocation();
- const styles = navBarStyles();
- const navigate = useNavigate();
+const navItems = [
+ { text: 'Home', link: '#' },
+ { text: 'Events', link: '#' },
+ { text: 'Communities', link: '#' },
+];
+const NavBar = () => {
const [isDrawerOpen, setIsDrawerOpen] = useState(false);
- const [userData, setUserData] = useState(null);
-
- const { user, isLoggedIn } = useContext(AuthContext);
-
- const navItems = [
- { text: 'About', link: '/about' },
- { text: 'Events', link: '/events' },
- { text: 'Sponsors', link: '/sponsorships' },
- { text: 'Initiatives', link: '/initiatives' },
- ];
-
- const clickItem = (link: string) => {
- setIsDrawerOpen(false);
- navigate(link);
- };
-
- useEffect(() => {
- const fetchUserData = async () => {
- try {
- if (isLoggedIn) {
- const response = await axios.get(
- `${process.env.REACT_APP_BACKEND_URL}/api/v1/users/${user.email}`,
- );
- setUserData(response.data);
- }
- } catch (error) {
- console.log('Error fetching user data: ', error);
- }
- };
-
- fetchUserData();
- }, [isLoggedIn, user.email, navigate]);
return (
-
-
-
+
+
+ {/* Logo + text */}
+
-
-
-
+
+ at UC San Diego
+
+
-
+ {/* Desktop Nav */}
+
{navItems.map(({ text, link }) => (
-
- ))}
-
- {/* Gradient Join Us Button */}
- {/* {!isLoggedIn && location.pathname !== '/login' && (
- navigate('/login')}
+
- )} */}
+ {text}
+
+ ))}
+
- {isLoggedIn && userData && (
-
- )}
-
+ {/* Mobile Menu Icon */}
- setIsDrawerOpen(!isDrawerOpen)} color="inherit">
- {!isDrawerOpen && }
+ setIsDrawerOpen(true)} color="inherit">
+
-
-
+ {/* Mobile Drawer */}
setIsDrawerOpen(false)}>
-
+
setIsDrawerOpen(false)}
>
-
+
-
{navItems.map(({ text, link }) => (
- clickItem(link)}>
+ setIsDrawerOpen(false)}>
+
{text}
}
/>
))}
-
- {/* {!isLoggedIn && location.pathname !== '/login' && (
- clickItem('/login')}>
-
- Join Us
-
- }
- />
-
- )} */}
+ setIsDrawerOpen(false)}>
+
+ Contact Us
+
+ }
+ />
+