Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 4 additions & 5 deletions frontend/package-lock.json

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

1 change: 1 addition & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Binary file added frontend/public/SponsorshipPackage.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function App() {
<Route path="/events" element={<Events />} />
<Route path="/opportunities" element={<Opportunities />} />
<Route path="/membership" element={<Membership />} />
<Route path="/login" element={<Login />} />
{/* <Route path="/login" element={<Login />} /> */}
<Route path="/editprofile" element={<EditForm />} />
<Route path="/initiatives" element={<Initiatives />} />
<Route path="/templatewebsite" element={<TemplateWebsite />} />
Expand Down
55 changes: 43 additions & 12 deletions frontend/src/components/About/About.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -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 */}
<Box
component="img"
src={PLACEHOLDER_GENERAL}
alt="placeholder"
sx={{ display: 'block', width: { xs: 260, sm: 340, md: 300 }, height: { xs: 260, sm: 340, md: 300 }, objectFit: 'cover'}}
/>
sx={{
display: "inline-block",
borderRadius: "12px",
p: "3px",
background: "linear-gradient(45deg, #FFCE00, #00F0FF)",
}}
>
<Box
component="img"
src={OurHistory}
alt="placeholder"
sx={{
display: "block",
width: { xs: 260, sm: 340, md: 300 },
height: { xs: 260, sm: 340, md: 300 },
objectFit: "cover",
borderRadius: "10px",
}}
/>
</Box>
</motion.div>
</Grid>

Expand Down Expand Up @@ -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 */}

<Box
component="img"
src={PLACEHOLDER_GENERAL}
alt="placeholder"
sx={{ display: 'block', width: { xs: 260, sm: 340, md: 320 }, height: { xs: 260, sm: 340, md: 320 }, objectFit: 'cover'}}
/>
sx={{
display: "inline-block",
borderRadius: "12px",
p: "3px",
background: "linear-gradient(45deg, #FFCE00, #00F0FF)",
}}
>
<Box
component="img"
src={OurFuture}
alt="placeholder"
sx={{
display: "block",
width: { xs: 260, sm: 340, md: 300 },
height: { xs: 260, sm: 340, md: 300 },
objectFit: "cover",
borderRadius: "10px",
}}
/>
</Box>
</motion.div>
</Grid>
</Grid>
Expand Down
39 changes: 24 additions & 15 deletions frontend/src/components/About/HowToJoin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,30 @@ const HowtoJoin = () => {
>
{/* Image */}
<Grid item xs={12} sm={6} md={4}>
<Box
component="img"
src={about3}
alt="How to Join"
sx={{
width: '100%',
maxWidth: '460px',
borderRadius: '8px',
border: '3px solid',
borderImage: 'linear-gradient(45deg, #FFCE00, #00F0FF) 1',
display: 'block',
}}
/>
<Box
sx={{
display: "inline-block",
borderRadius: "12px",
p: "3px",
background: "linear-gradient(45deg, #FFCE00, #00F0FF)",
width: "100%",
maxWidth: "460px",
}}
>
<Box
component="img"
src={about3}
alt="How to Join"
sx={{
width: "100%",
display: "block",
borderRadius: "10px",
}}
/>
</Box>
</Grid>


{/* Text */}
<Grid item xs={12} sm={6} md={8}>
<Typography
Expand All @@ -76,7 +85,7 @@ const HowtoJoin = () => {
socials to be notified of when board applications open on a rolling basis.
</Typography>
<Box sx={{ marginTop: '40px'}}>
<MuiButton
{/* <MuiButton
variant="outlined"
onClick={() => navigate('/membership')}
sx={{
Expand All @@ -99,7 +108,7 @@ const HowtoJoin = () => {
}}
>
Become a member now!
</MuiButton>
</MuiButton> */}
</Box>
</Grid>
</Grid>
Expand Down
15 changes: 10 additions & 5 deletions frontend/src/components/About/MeetTheAlumni.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 (
Expand Down
86 changes: 69 additions & 17 deletions frontend/src/components/About/MeetTheTeam.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand All @@ -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 }[] = [
Expand Down
Loading