Skip to content

Add Join Us page with new navbar and footer #59

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
samanthaxwang wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Join Us page with new navbar and footer #59

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
43 changes: 6 additions & 37 deletions frontend/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
<BrowserRouter>
<ScrollToTop />
<Container maxWidth={false} style={{ margin: 0, padding: 0 }}>
<NavBar />
<Routes>
<Route path="/" element={<Home />} />
<Route path="/about" element={<About />} />
<Route path="/events" element={<Events />} />
<Route path="/opportunities" element={<Opportunities />} />
<Route path="/membership" element={<Membership />} />
{ /* <Route path="/login" element={<Login />} /> */}
<Route path="/editprofile" element={<EditForm />} />
<Route path="/initiatives" element={<Initiatives />} />
<Route path="/opensource" element={<OpenSource />} />
<Route path="/sponsorships" element={<Sponsorships />} />
<Route path="/opensourcecommunity" element={<OpenSourceCommunity />} />
<Route path="/devcommunity" element={<DevCommunity />} />
<Route path="/innovatecommunity" element={<InovateCommunity />} />
</Routes>
<Footer />
</Container>
</BrowserRouter>
<Container maxWidth={false} style={{ margin: 0, padding: 0 }}>
<NavBar />
<JoinUs />
<Footer />
</Container>
);
}

Expand Down
102 changes: 27 additions & 75 deletions frontend/src/components/Footer/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
<Box
sx={{
backgroundColor: '#1F3A7E',
padding: { xs: '0.5rem 2.5rem 1.25rem', md: '1.25rem 2.5rem 1.25rem' },
backgroundColor: '#1a1e2e',
padding: { xs: '2rem 1.5rem 1.5rem', md: '2.5rem 3rem 2rem' },
color: 'white',
}}
>
{/* Desktop Layout */}
{/* Top row: logo left, social icons right */}
<Box
sx={{
display: { xs: 'none', md: 'flex' },
display: 'flex',
alignItems: 'center',
justifyContent: 'space-between',
mb: 3,
}}
>
{/* Logo */}
{/* CSES Logo */}
<Box sx={{ display: 'flex', alignItems: 'center' }}>
<Box
component="img"
src={csesLogo}
alt="logo"
alt="CSES Logo"
sx={{
height: '3.75rem', // 60px equivalent
maxWidth: '100%',
mr: 1.25, // 10px
height: { xs: '40px', md: '55px' },
objectFit: 'contain',
}}
/>
</Box>

{/* Center Contact Info */}
<Typography sx={{ fontSize: '1.125rem', fontStyle: 'italic' }}>
For all inquiries, contact{' '}
<Link href="mailto:cses@ucsd.edu" color="inherit">
cses@ucsd.edu
</Link>
.
</Typography>

{/* Social Icons */}
<Box sx={{ display: 'flex', gap: 2 }}>
{links.map(({ logo, link }, idx) => (
{socialLinks.map(({ logo, link, alt }) => (
<Link
key={idx}
key={alt}
href={link}
target="_blank"
rel="noopener noreferrer"
sx={{
display: 'inline-block',
display: 'inline-flex',
alignItems: 'center',
justifyContent: 'center',
'& img': {
width: '2rem', // 32px
height: '2rem',
width: { xs: '28px', md: '32px' },
height: { xs: '28px', md: '32px' },
objectFit: 'contain',
filter: 'brightness(0) invert(1)',
},
}}
>
<img src={logo} alt="social" />
<img src={logo} alt={alt} />
</Link>
))}
</Box>
</Box>

{/* Mobile Layout */}
<Box
{/* Copyright */}
<Typography
sx={{
display: { xs: 'flex', md: 'none' },
alignItems: 'center',
justifyContent: 'space-between',
flexWrap: 'nowrap',
pt: 2,
textAlign: 'center',
fontSize: { xs: '0.75rem', md: '0.875rem' },
color: 'rgba(255, 255, 255, 0.7)',
}}
>
{/* Logo */}
<Box sx={{ display: 'flex', alignItems: 'center' }}>
<Box
component="img"
src={csesLogo}
alt="logo"
sx={{
height: '3.125rem', // 50px equivalent
maxWidth: '100%',
mr: 1.25, // 10px
objectFit: 'contain',
}}
/>
</Box>

{/* Social Icons */}
<Box sx={{ display: 'flex', gap: 1 }}>
{links.map(({ logo, link }, idx) => (
<Link
key={idx}
href={link}
target="_blank"
rel="noopener noreferrer"
sx={{
display: 'inline-block',
'& img': {
width: '1.75rem', // 28px
height: '1.75rem',
objectFit: 'contain',
},
}}
>
<img src={logo} alt="social" />
</Link>
))}
</Box>
</Box>
&copy; 2026 UC San Diego Computer Science and Engineering Society. All rights reserved.
</Typography>
</Box>
);
};
Expand Down
Loading