diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 38db3e28..f0a24f0a 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -12,6 +12,7 @@ "@emailjs/browser": "^3.12.1", "@emotion/react": "^11.14.0", "@emotion/styled": "^11.14.1", + "@mui/base": "^5.0.0-beta.5", "@mui/icons-material": "^5.18.0", "@mui/material": "^5.18.0", "@mui/system": "^5.13.6", @@ -3200,7 +3201,8 @@ "version": "5.0.0-beta.5", "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.5.tgz", "integrity": "sha512-vy3TWLQYdGNecTaufR4wDNQFV2WEg6wRPi6BVbx6q1vP3K1mbxIn1+XOqOzfYBXjFHvMx0gZAo2TgWbaqfgvAA==", - "peer": true, + "deprecated": "This package has been replaced by @base-ui-components/react", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.22.5", "@emotion/is-prop-valid": "^1.2.1", @@ -6399,7 +6401,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==", - "peer": true, "engines": { "node": ">=6" } @@ -23363,7 +23364,6 @@ "version": "5.0.0-beta.5", "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.5.tgz", "integrity": "sha512-vy3TWLQYdGNecTaufR4wDNQFV2WEg6wRPi6BVbx6q1vP3K1mbxIn1+XOqOzfYBXjFHvMx0gZAo2TgWbaqfgvAA==", - "peer": true, "requires": { "@babel/runtime": "^7.22.5", "@emotion/is-prop-valid": "^1.2.1", @@ -25451,8 +25451,7 @@ "clsx": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", - "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==", - "peer": true + "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==" }, "co": { "version": "4.6.0", diff --git a/frontend/package.json b/frontend/package.json index 332ac103..0db63c4d 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -7,6 +7,7 @@ "@emailjs/browser": "^3.12.1", "@emotion/react": "^11.14.0", "@emotion/styled": "^11.14.1", + "@mui/base": "^5.0.0-beta.5", "@mui/icons-material": "^5.18.0", "@mui/material": "^5.18.0", "@mui/system": "^5.13.6", diff --git a/frontend/public/SponsorshipPackage.pdf b/frontend/public/SponsorshipPackage.pdf new file mode 100644 index 00000000..f0fa0619 Binary files /dev/null and b/frontend/public/SponsorshipPackage.pdf differ diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 1c3084a8..6dd26a0d 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -28,7 +28,7 @@ function App() { } /> } /> } /> - } /> + {/* } /> */} } /> } /> } /> diff --git a/frontend/src/components/About/About.tsx b/frontend/src/components/About/About.tsx index 5cf914e3..1b994d2c 100644 --- a/frontend/src/components/About/About.tsx +++ b/frontend/src/components/About/About.tsx @@ -13,6 +13,8 @@ import HowtoJoin from './HowToJoin'; import MeetTheAlumni from './MeetTheAlumni'; import Typewriter from './TypeWriter'; import { motion } from 'framer-motion'; +import OurHistory from '../../images/aboutpage/ourhistory.png' +import OurFuture from '../../images/aboutpage/ourfuture.png' const PLACEHOLDER_GENERAL = 'https://placehold.co/200x200?text=Placeholder'; @@ -142,13 +144,27 @@ const About = () => { transition={{ type: 'spring', stiffness: 50, damping: 20, mass: 1, delay: 0.2 }} style={{ display: 'flex', justifyContent: 'center' }} > - {/* Placeholder image with gradient border */} + sx={{ + display: "inline-block", + borderRadius: "12px", + p: "3px", + background: "linear-gradient(45deg, #FFCE00, #00F0FF)", + }} + > + + @@ -204,13 +220,28 @@ const About = () => { transition={{ type: 'spring', stiffness: 50, damping: 20, mass: 1, delay: 0.2 }} style={{ display: 'flex', justifyContent: 'center' }} > - {/* Placeholder image with gradient border */} + + sx={{ + display: "inline-block", + borderRadius: "12px", + p: "3px", + background: "linear-gradient(45deg, #FFCE00, #00F0FF)", + }} + > + + diff --git a/frontend/src/components/About/HowToJoin.tsx b/frontend/src/components/About/HowToJoin.tsx index dd6544cc..54d08a43 100644 --- a/frontend/src/components/About/HowToJoin.tsx +++ b/frontend/src/components/About/HowToJoin.tsx @@ -38,21 +38,30 @@ const HowtoJoin = () => { > {/* Image */} - + + + + {/* Text */} { socials to be notified of when board applications open on a rolling basis. - navigate('/membership')} sx={{ @@ -99,7 +108,7 @@ const HowtoJoin = () => { }} > Become a member now! - + */} diff --git a/frontend/src/components/About/MeetTheAlumni.tsx b/frontend/src/components/About/MeetTheAlumni.tsx index e84703fd..84020f5a 100644 --- a/frontend/src/components/About/MeetTheAlumni.tsx +++ b/frontend/src/components/About/MeetTheAlumni.tsx @@ -5,6 +5,10 @@ import EmailIcon from "@mui/icons-material/Email"; import ChevronLeftIcon from "@mui/icons-material/ChevronLeft"; import ChevronRightIcon from "@mui/icons-material/ChevronRight"; import { gradientImgWrapper, gradientImg } from "./styles"; +import Rahul from '../../images/meettheteamImages/rahul.png'; +import Varun_Parekh from '../../images/meettheteamImages/Varun_Parekh.jpg'; +import Josue from '../../images/meettheteamImages/josue martinez.jpeg'; +import Maanasa from '../../images/meettheteamImages/maanasa prasad.png'; type Member = { name: string; @@ -22,11 +26,12 @@ type Props = { const PLACEHOLDER_PHOTO = "https://placehold.co/400x400?text=Photo"; const PAGE_SIZE = 8; -const DEFAULT_ALUMNI: Member[] = Array.from({ length: 12 }).map(() => ({ - name: "[name]", - company: "[company]", - photo: PLACEHOLDER_PHOTO, -})); +const DEFAULT_ALUMNI: Member[] = [ + { name: "Rahul Mistry", company: "Former President", photo: Rahul }, + { name: "Maanasa Prasad", company: "Former VP Events", photo: Maanasa }, + { name: "Varun Parekh", company: "Former Technical Workshop Director", photo: Varun_Parekh }, + { name: "Josue Martinez", company: "Former External Director - Alumni and Professor", photo: Josue }, +]; function Card({ m }: { m: Member }) { return ( diff --git a/frontend/src/components/About/MeetTheTeam.tsx b/frontend/src/components/About/MeetTheTeam.tsx index 63717080..3294572a 100644 --- a/frontend/src/components/About/MeetTheTeam.tsx +++ b/frontend/src/components/About/MeetTheTeam.tsx @@ -13,6 +13,36 @@ import EmailIcon from "@mui/icons-material/Email"; import ChevronLeftIcon from "@mui/icons-material/ChevronLeft"; import ChevronRightIcon from "@mui/icons-material/ChevronRight"; import { gradientImgWrapper, gradientImg } from "./styles"; +import Sithu from '../../images/meettheteamImages/sithu.jpg'; +import Yashil from '../../images/meettheteamImages/yashil vora.jpg'; +import Mishka from '../../images/meettheteamImages/mishka.jpeg'; +import Brian from '../../images/meettheteamImages/brian.jpg'; +import Jake from '../../images/meettheteamImages/jake villaseno.jpeg'; +import Angelina from '../../images/meettheteamImages/angelina yee.jpg'; +import Ganesh from '../../images/meettheteamImages/ganesh kumarappan.jpg'; +import Sardor from '../../images/meettheteamImages/sardor sobirov.jpg'; +import Shreya from '../../images/meettheteamImages/shreya gupta.jpg'; +import ShreyaN from '../../images/meettheteamImages/Shreya Nagunuri.png'; +import Kevin from '../../images/meettheteamImages/kevin kim.jpeg'; +import KevinW from '../../images/meettheteamImages/KevinWu.png'; +import Sofia from '../../images/meettheteamImages/sofia nguyen.png'; +import Michael from '../../images/meettheteamImages/michael he.png'; +import Pranav_Soma from '../../images/meettheteamImages/Pranav_Soma.jpeg'; +import Nikitha_Maderamitla from '../../images/meettheteamImages/Nikitha_Maderamitla.jpg'; +import Aryen_Singhal from '../../images/meettheteamImages/Aryen_Singhal.jpg'; +import Hillary_Chang from '../../images/meettheteamImages/Hillary_Chang.webp'; +import Aditya_Kakarla from '../../images/meettheteamImages/Aditya_Kakarla.jpg'; +import Chase_Peterson from '../../images/meettheteamImages/Chase_Peterson.jpg'; +import Tia_Irani from '../../images/meettheteamImages/Tia_Irani.jpeg'; +import Steven_Shi from '../../images/meettheteamImages/Steven_Shi.jpg'; +import Vinod_Vairavaraj from '../../images/meettheteamImages/Vinod_Vairavaraj.png'; +import Shree_Venkatesh from '../../images/meettheteamImages/Shree_Venkatesh.jpg'; +import Bhavik_Chandna from '../../images/meettheteamImages/Bhavik_Chandna.jpg'; +import Kevin_Sun from '../../images/meettheteamImages/Kevin_Sun.jpg'; +import Aryamun_Das from '../../images/meettheteamImages/Ryan_Das.jpeg'; +import Aditi_Bansal from '../../images/meettheteamImages/Aditi_Bansal.jpg'; +import Lucas_Hlaing from '../../images/meettheteamImages/Lucas_Hiaing.jpeg'; +import Yash_Ravipati from '../../images/meettheteamImages/Yash_Ravipati.jpg' type Division = "general" | "dev" | "open-source" | "innovate"; type Member = { @@ -26,24 +56,46 @@ type Member = { const PLACEHOLDER_PHOTO = "https://placehold.co/400x400?text=Photo"; -// Mock data (all placeholders). const TEAM: Member[] = [ - { name: "[name]", company: "[company]", division: "general" }, - { name: "[name]", company: "[company]", division: "general" }, - { name: "[name]", company: "[company]", division: "general" }, - { name: "[name]", company: "[company]", division: "general" }, - { name: "[name]", company: "[company]", division: "general" }, - { name: "[name]", company: "[company]", division: "general" }, - { name: "[name]", company: "[company]", division: "general" }, - { name: "[name]", company: "[company]", division: "general" }, - { name: "[name]", company: "[company]", division: "general" }, - { name: "[name]", company: "[company]", division: "dev" }, - { name: "[name]", company: "[company]", division: "dev" }, - { name: "[name]", company: "[company]", division: "dev" }, - { name: "[name]", company: "[company]", division: "open-source" }, - { name: "[name]", company: "[company]", division: "open-source" }, - { name: "[name]", company: "[company]", division: "innovate" }, - { name: "[name]", company: "[company]", division: "innovate" }, + // General + { name: "Pranav Soma", company: "President", division: "general", photo: Pranav_Soma }, + { name: "Michael He", company: "VP External", division: "general", photo: Michael }, + { name: "Sithu Soe", company: "VP Operations", division: "general", photo: Sithu }, + { name: "Lucas Hlaing", company: "Finance Director", division: "general", photo: Lucas_Hlaing }, + { name: "Angelina Yee", company: "Marketing Chair", division: "general", photo: Angelina }, + { name: "Hillary Chang", company: "Corporate Connections Director", division: "general", photo: Hillary_Chang }, + + // Dev + { name: "Shreya Gupta", company: "President", division: "dev", photo: Shreya }, + { name: "Steven Shi", company: "VP Products", division: "dev", photo: Steven_Shi }, + { name: "Jake Villasenor", company: "VP Design", division: "dev", photo: Jake }, + { name: "Sardor Sobirov", company: "Frontend Developer", division: "dev", photo: Sardor }, + { name: "Sithu Soe", company: "Frontend Developer", division: "dev", photo: Sithu }, + { name: "Kevin Wu", company: "Frontend Developer", division: "dev", photo: KevinW }, + { name: "Shreya Nagunuri", company: "Backend Developer", division: "dev", photo: ShreyaN }, + { name: "Brian Liu", company: "Backend Developer", division: "dev", photo: Brian }, + { name: "Ganesh Kumarappan", company: "Backend Developer", division: "dev", photo: Ganesh }, + + // Open Source + { name: "Yashil Vora", company: "President", division: "open-source", photo: Yashil }, + { name: "Mishka Jethwani", company: "VP Operations", division: "open-source", photo: Mishka }, + { name: "Yash Ravipati", company: "VP Tech", division: "open-source", photo: Yash_Ravipati }, + { name: "Aryen Singhal", company: "Engineering Manager", division: "open-source", photo: Aryen_Singhal }, + { name: "Chase Peterson", company: "Engineering Manager", division: "open-source", photo: Chase_Peterson }, + { name: "Shree Venkatesh", company: "Engineering Manager", division: "open-source", photo: Shree_Venkatesh }, + { name: "Kevin Sun", company: "Engineering Manager", division: "open-source", photo: Kevin_Sun }, + { name: "Kevin Kim", company: "Lead Software Engineer", division: "open-source", photo: Kevin }, + { name: "Sofia Nguyen", company: "UI/UX Designer", division: "open-source", photo: Sofia }, + { name: "Tia Irani", company: "UI/UX Designer", division: "open-source", photo: Tia_Irani }, + { name: "Aditi Bansal", company: "UI/UX Designer", division: "open-source", photo: Aditi_Bansal }, + { name: "Vinod Vairavaraj", company: "UI/UX Designer", division: "open-source", photo: Vinod_Vairavaraj }, + + // Innovate + { name: "Pranav Soma", company: "President", division: "innovate", photo: Pranav_Soma }, + { name: "Aryamun Das", company: "Founder", division: "innovate", photo: Aryamun_Das }, + { name: "Nikitha Maderamitla", company: "Internal Director", division: "innovate", photo: Nikitha_Maderamitla }, + { name: "Aditya Kakarla", company: "External Director", division: "innovate", photo: Aditya_Kakarla }, + { name: "Bhavik Chandna", company: "Project Lead", division: "innovate", photo: Bhavik_Chandna }, ]; const DIVISIONS: { label: string; value: Division }[] = [ diff --git a/frontend/src/components/Home/Home.tsx b/frontend/src/components/Home/Home.tsx index 59847461..ea26d5e8 100644 --- a/frontend/src/components/Home/Home.tsx +++ b/frontend/src/components/Home/Home.tsx @@ -1,6 +1,6 @@ import React, { useState, useEffect } from 'react'; import { useNavigate } from 'react-router-dom'; -import { Container, Box, Grid } from '@mui/material'; +import { Container, Box, Grid, Button as MuiButton } from '@mui/material'; import { homeStyles } from './styles'; import DevLogo from '../../images/DevLogo.png'; import InnovateLogo from '../../images/InnovateLogo.png'; @@ -8,10 +8,17 @@ import OpenSourceLogo from '../../images/OpenSourceLogo.png'; import HomeLogo from '../../images/HomeLogo.png'; import ASLogo from '../../images/AS.png'; import CSEDeptLogo from '../../images/csedeplogo.png'; -import Sithu from '../../images/aboutpage/sithu.jpg'; +import Sithu from '../../images/homepage/sithu.jpg'; import axios from 'axios'; import CountUp from 'react-countup'; import { motion } from "framer-motion"; +import jesusgonzalez from '../../images/homepage/jesusgonzalez.png'; +import shreevenkatesh from '../../images/homepage/shreevenkatesh.jpg'; +import pranavsoma from '../../images/homepage/pranavsoma.jpg'; +import nikithamaderamitla from '../../images/homepage/nikithaM.jpg'; +import westonzong from '../../images/homepage/westonzong.jpg'; +import vanditajain from '../../images/homepage/vanditajain.jpg'; + interface EventData { calendar_link: string; @@ -32,17 +39,56 @@ const Home = () => { const [totalUsers, setTotalUsers] = useState(0); const [currentPersonIndex, setCurrentPersonIndex] = useState(0); const [displayedFutureEvents, setDisplayedFutureEvents] = useState([]); + const [allFutureEvents, setAllFutureEvents] = useState([]); const [eventsToShow, setEventsToShow] = useState(4); + const [currentEventPage, setCurrentEventPage] = useState(0); const teamMembers = [ { - name: "Sithu Soe", + name: "Jesus Gonzalez", position: "Software Engineer Intern", + company: "Intuit", + photo: jesusgonzalez // placeholder for now + }, + { + name: "Shree Venkatesh", + position: "Software Development Engineer", + company: "Amazon Web Services", + photo: shreevenkatesh // placeholder for now + }, + { + name: "Pranav Soma", + position: "Associate Software Engineer", company: "ServiceNow", - classOf: "2026", - photo: Sithu + photo: pranavsoma // placeholder for now }, { + name: "Nikitha Maderamitla", + position: "Software Engineer", + company: "Curanostics", + photo: nikithamaderamitla // placeholder for now + }, + { + name: "Weston Zong", + position: "Software Engineer", + company: "Roblox", + photo: westonzong // placeholder for now + }, + { + name: "Vandita Jain", + position: "AL and ML Intern", + company: "Global Impact Assessment", + photo: vanditajain // placeholder for now + }, + + { + name: "Sithu Soe", + position: "Associate Software Engineer Intern", + company: "ServiceNow", + // classOf: "2026", + photo: Sithu + }, + /*{ name: "Michael Chen", position: "Full Stack Developer", company: "Microsoft", @@ -69,9 +115,10 @@ const Home = () => { company: "Meta", classOf: "2022", photo: null - } + }*/ ]; + const currentMember = teamMembers[currentPersonIndex]; const handlePrevPerson = () => { @@ -86,6 +133,20 @@ const Home = () => { ); }; + const handlePrevEvent = () => { + setCurrentEventPage((prev) => { + const maxPage = Math.max(0, Math.ceil(allFutureEvents.length / eventsToShow) - 1); + return prev > 0 ? prev - 1 : maxPage; + }); + }; + + const handleNextEvent = () => { + setCurrentEventPage((prev) => { + const maxPage = Math.max(0, Math.ceil(allFutureEvents.length / eventsToShow) - 1); + return prev < maxPage ? prev + 1 : 0; + }); + }; + useEffect(() => { axios .get(`${process.env.REACT_APP_BACKEND_URL}/api/v1/events`) @@ -131,14 +192,21 @@ const Home = () => { ); let mostRecentEvents = await response.json(); console.log('Events received:', mostRecentEvents); - setDisplayedFutureEvents(mostRecentEvents.slice(0, eventsToShow)); + setAllFutureEvents(mostRecentEvents); } catch (error) { console.error('Error fetching upcoming events:', error); } }; fetchRecentEvents(); - }, [eventsToShow]); + }, []); + + // Update displayed events when page or eventsToShow changes + useEffect(() => { + const startIndex = currentEventPage * eventsToShow; + const endIndex = startIndex + eventsToShow; + setDisplayedFutureEvents(allFutureEvents.slice(startIndex, endIndex)); + }, [allFutureEvents, currentEventPage, eventsToShow]); return (
@@ -209,16 +277,20 @@ const Home = () => { - navigate('/membership')}> - Become a member now! - + {/* navigate('/membership')} + sx={styles.ctaButton} + > + Become a member now! + */} {/* Events Section REDO THE WHOLE THING*/} {"{Events}"} - + {displayedFutureEvents.length > 0 ? ( @@ -243,13 +315,17 @@ const Home = () => { )} - + - navigate('/events')}> - See Events Page - + navigate('/events')} + sx={styles.ctaButton} + > + See Events Page + @@ -263,9 +339,13 @@ const Home = () => { - navigate('/about')}> - About us - + navigate('/about')} + sx={styles.ctaButton} + > + About us + @@ -291,7 +371,7 @@ const Home = () => { {currentMember.position} | {currentMember.company} - Class of {currentMember.classOf} + {/* {currentMember.classOf} */} {currentMember.name} @@ -305,9 +385,13 @@ const Home = () => { ))} - navigate('/about')}> - Meet the Team - + navigate('/about')} + sx={styles.ctaButton} + > + Meet the Team + {/* Current Sponsors */} diff --git a/frontend/src/components/Home/styles.ts b/frontend/src/components/Home/styles.ts index 2d9b0146..86f6956b 100644 --- a/frontend/src/components/Home/styles.ts +++ b/frontend/src/components/Home/styles.ts @@ -164,26 +164,31 @@ export const homeStyles = () => ({ /* ===== CTA Button ===== */ ctaButton: { - border: '2px solid #FF6B35', - borderRadius: '25px', - padding: '12px 24px', - display: 'inline-block', - background: '#020F5D', - cursor: 'pointer', - position: 'relative', - '&::before': { - content: '""', - position: 'absolute', - top: '-2px', - left: '-2px', - right: '-2px', - bottom: '-2px', - background: 'linear-gradient(45deg, #FF6B35, #00E5FF)', - borderRadius: '25px', - zIndex: '-1' - }, + borderRadius: '40px', + border: '2px solid transparent', + backgroundImage: + 'linear-gradient(#0b0b0b, #0b0b0b), linear-gradient(to right, #FFCE00, #00F0FF)', + backgroundOrigin: 'border-box', + backgroundClip: 'padding-box, border-box', + paddingX: '20px', + paddingY: '11px', + color: 'white', + fontSize: '20px', + textTransform: 'none', '&:hover': { - background: 'rgba(2, 15, 93, 0.9)' + backgroundImage: + 'linear-gradient(rgba(255,255,255,0.05), rgba(255,255,255,0.05)), linear-gradient(to right, #FFCE00, #00F0FF)', + color: 'black' + }, + '@media (max-width: 600px)': { + fontSize: '18px', + paddingX: '16px', + paddingY: '9px' + }, + '@media (min-width: 1200px)': { + fontSize: '22px', + paddingX: '24px', + paddingY: '13px' } }, diff --git a/frontend/src/components/NavBar/NavBar.tsx b/frontend/src/components/NavBar/NavBar.tsx index 1050f5d3..0438ec50 100644 --- a/frontend/src/components/NavBar/NavBar.tsx +++ b/frontend/src/components/NavBar/NavBar.tsx @@ -35,7 +35,7 @@ const NavBar = () => { const navItems = [ { text: 'About', link: '/about' }, { text: 'Events', link: '/events' }, - { text: 'Sponsors', link: '/sponsors' }, + { text: 'Sponsors', link: '/sponsorships' }, { text: 'Initiatives', link: '/initiatives' }, ]; @@ -83,7 +83,7 @@ const NavBar = () => { ))} {/* Gradient Join Us Button */} - {!isLoggedIn && location.pathname !== '/login' && ( + {/* {!isLoggedIn && location.pathname !== '/login' && ( navigate('/login')} sx={{ @@ -117,7 +117,7 @@ const NavBar = () => { - )} + )} */} {isLoggedIn && userData && ( @@ -170,7 +170,7 @@ const NavBar = () => { ))} - {!isLoggedIn && location.pathname !== '/login' && ( + {/* {!isLoggedIn && location.pathname !== '/login' && ( clickItem('/login')}> { } /> - )} + )} */}
diff --git a/frontend/src/components/Sponsorships/Sponsorships.css b/frontend/src/components/Sponsorships/Sponsorships.css index 4b933660..c77799cd 100644 --- a/frontend/src/components/Sponsorships/Sponsorships.css +++ b/frontend/src/components/Sponsorships/Sponsorships.css @@ -1,5 +1,5 @@ -html, body, #root { - height: 100%; +.sponsorships { + min-height: 100vh; margin: 0; background-color: #040f59; color: white; @@ -7,7 +7,7 @@ html, body, #root { text-align: center; } -.container { +.sponsorships-container { height: 100%; display: flex; flex-direction: column; @@ -20,18 +20,18 @@ html, body, #root { text-align: center; } -h1 { +.sponsorships h1 { font-size: 4.5rem; margin: 0; } -h2 { +.sponsorships h2 { font-size: 4.5rem; margin: 0; margin-bottom: 10px; } -p { +.sponsorships p { font-size: 2.25rem; line-height: 1.2; margin: 0; @@ -46,17 +46,17 @@ p { display: block; } -/* Accent colors for special words */ +/* Accent colors */ .blue { color: #64c3e3;} -.purple {color: #725df0;} +.purple { color: #725df0;} .teal { color: #5df0c4;} .yellow { color: #ebb111;} -a { +.sponsorships a { color: #e2b340; text-decoration: none; } -a:hover { +.sponsorships a:hover { color: #f7dc55; } @@ -73,25 +73,25 @@ a:hover { } @media (max-width: 650px){ - .container{ + .sponsorships-container { margin-top: 120px; } - h1 { + .sponsorships h1 { font-size: 3rem; padding: 0 5rem; margin-top: 10px; margin-bottom: 30px; } - h2 { + .sponsorships h2 { font-size: 3rem; padding: 0 5rem; margin-top: 30px; margin-bottom: 20px; } - p { + .sponsorships p { font-size: 1.1rem; line-height: 1.2; margin-bottom: 30px; @@ -102,7 +102,7 @@ a:hover { white-space: nowrap; } - .sponsorship-link{ + .sponsorship-link { display: inline; white-space: nowrap; } diff --git a/frontend/src/components/Sponsorships/Sponsorships.tsx b/frontend/src/components/Sponsorships/Sponsorships.tsx index e1fec6ac..8e6145e8 100644 --- a/frontend/src/components/Sponsorships/Sponsorships.tsx +++ b/frontend/src/components/Sponsorships/Sponsorships.tsx @@ -5,29 +5,31 @@ import picTwo from "../../images/AssociatedStudent.jpg"; export default function Sponsorships() { return ( -
-

Become a part of the Team

+
+
+

Become a part of the Team

-

- Join us in our mission to{" "} - build,{" "} - innovate, and{" "} - lead the future of{" "} - computer science. -

- -

- Check out our sponsorship package{" "} - - here. - -

- -

Thank You to our Current Partners

- -
- UCSD CSE Logo - Associated Students Logo +

+ Join us in our mission to{" "} + build,{" "} + innovate, and{" "} + lead the future of{" "} + computer science. +

+ +

+ Check out our sponsorship package{" "} + + here. + +

+ +

Thank You to our Current Partners

+ +
+ UCSD CSE Logo + Associated Students Logo +
); diff --git a/frontend/src/images/aboutpage/ourfuture.png b/frontend/src/images/aboutpage/ourfuture.png new file mode 100644 index 00000000..a37c14cf Binary files /dev/null and b/frontend/src/images/aboutpage/ourfuture.png differ diff --git a/frontend/src/images/aboutpage/ourhistory.png b/frontend/src/images/aboutpage/ourhistory.png new file mode 100644 index 00000000..81342685 Binary files /dev/null and b/frontend/src/images/aboutpage/ourhistory.png differ diff --git a/frontend/src/images/homepage/jesusgonzalez.png b/frontend/src/images/homepage/jesusgonzalez.png new file mode 100644 index 00000000..247cf25d Binary files /dev/null and b/frontend/src/images/homepage/jesusgonzalez.png differ diff --git a/frontend/src/images/homepage/nikithaM.jpg b/frontend/src/images/homepage/nikithaM.jpg new file mode 100644 index 00000000..ae0b99eb Binary files /dev/null and b/frontend/src/images/homepage/nikithaM.jpg differ diff --git a/frontend/src/images/homepage/pranavsoma.jpg b/frontend/src/images/homepage/pranavsoma.jpg new file mode 100644 index 00000000..16eec7bb Binary files /dev/null and b/frontend/src/images/homepage/pranavsoma.jpg differ diff --git a/frontend/src/images/homepage/shreevenkatesh.jpg b/frontend/src/images/homepage/shreevenkatesh.jpg new file mode 100644 index 00000000..3dfc8fd2 Binary files /dev/null and b/frontend/src/images/homepage/shreevenkatesh.jpg differ diff --git a/frontend/src/images/aboutpage/sithu.jpg b/frontend/src/images/homepage/sithu.jpg similarity index 100% rename from frontend/src/images/aboutpage/sithu.jpg rename to frontend/src/images/homepage/sithu.jpg diff --git a/frontend/src/images/homepage/vanditajain.jpg b/frontend/src/images/homepage/vanditajain.jpg new file mode 100644 index 00000000..db0d2f1b Binary files /dev/null and b/frontend/src/images/homepage/vanditajain.jpg differ diff --git a/frontend/src/images/homepage/westonzong.jpg b/frontend/src/images/homepage/westonzong.jpg new file mode 100644 index 00000000..5e81483d Binary files /dev/null and b/frontend/src/images/homepage/westonzong.jpg differ