Skip to content
Open
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
98 changes: 58 additions & 40 deletions public/data/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ export const stats: StatProps[] = [
statName: "Members",
subtitle: "And Alumni",
},
{
stat: "1",
statName: "DeCal",
},
];

export const aboutPageIconCards: IconCardProps[] = [
Expand Down Expand Up @@ -90,7 +86,7 @@ export const aboutPageInfoSection: InfoSectionProps[] = [
excursions, parties, and of course we have a retreat each semester. The
best place to get to know your PCS pals!`,
img: "/images/retreat.jpeg",
additionalInfo: "Two to three per month",

},
{
title: "Projects",
Expand All @@ -102,11 +98,10 @@ export const aboutPageInfoSection: InfoSectionProps[] = [
},
{
title: "Workshops",
children: `We host a few workshops each month focusing on improving our members'
children: `We host a few workshops each semester focusing on improving our members'
skill sets, including resumé and career workshops, data science, web
development, and much more!`,
img: "/images/workshop.jpg",
additionalInfo: "One to two per month",
},
];

Expand Down Expand Up @@ -164,39 +159,62 @@ export const projects: ProjectCardProps[] = [

//TODO: timezone fuckery
export const recruitmentSteps: RecruitmentStepProps[] = [
{
name: "Tabling",
start: new Date("2026-08-26"),
end: new Date("2026-09-04"),
description: "We'll be tabling on Sproul! Come say hi."
},
{
name: "Coffee Chats",
start: new Date("2026-09-01"),
end: new Date("2026-09-04"),
description: "Talk to a board member and learn more about the club!"
},
{
name: "Infosession",
start: new Date("2026-09-02"),
end: new Date("2026-09-02"),
description: "Learn more about the club - date/time not yet finalised"
},
{
name: "Applications Due!",
start: new Date("2026-08-26"),
end: new Date("2026-09-04"),
description: "Applications close 11:59 PM 09/04!"
}
// {
// name: "Tabling",
// start: new Date("2025-01-21"),
// end: new Date("2024-02-02"),
// description: "We'll be tabling on Sproul! Come say hi.",
// },
// {
// name: "Coffee Chats",
// start: new Date("2025-01-21"),
// end: new Date("2025-02-04"),
// description: "Chat with a board member and learn more about the club!",
// },

{
name: "Tabling",
start: new Date("2025-01-21"),
end: new Date("2024-02-02"),
description: "We'll be tabling on Sproul! Come say hi.",
},
{
name: "Coffee Chats",
start: new Date("2025-01-21"),
end: new Date("2025-02-04"),
description: "Chat with a board member and learn more about the club!",
},

{
name: "Infosession 1 (Virtual), 8 - 9 PM",
start: new Date("2025-01-27"),
end: new Date("2025-01-27"),
description: "Ia Ia Cthulhu Ftaghn?",
link: "https://berkeley.zoom.us/j/8079345982?omn=93103234887"
},
// {
// name: "Infosession 1 (Virtual), 8 - 9 PM",
// start: new Date("2025-01-27"),
// end: new Date("2025-01-27"),
// description: "Ia Ia Cthulhu Ftaghn?",
// link: "https://berkeley.zoom.us/j/8079345982?omn=93103234887"
// },

{
name: "Ethical Tec Infosession 2, 8 - 9 PM, Dwinelle 205",
start: new Date("2024-01-30"),
end: new Date("2025-01-30"),
description: "Ia Ia Cthulhu Ftaghn?",
},
{
name: "Applications Due",
start: new Date("2025-02-04"),
end: new Date("2025-02-04"),
description: "At the end of things, where the dry dust bleeds",
link: "https://docs.google.com/forms/d/1Q3BHxsN1qs0IkklM_2ZXa5rC731xPE1oFq7MOmTQWFo/edit#question=1588624652&field=621321900"
},
// {
// name: "Ethical Tec Infosession 2, 8 - 9 PM, Dwinelle 205",
// start: new Date("2024-01-30"),
// end: new Date("2025-01-30"),
// description: "Ia Ia Cthulhu Ftaghn?",
// },
// {
// name: "Applications Due",
// start: new Date("2025-02-04"),
// end: new Date("2025-02-04"),
// description: "At the end of things, where the dry dust bleeds",
// link: "https://docs.google.com/forms/d/1Q3BHxsN1qs0IkklM_2ZXa5rC731xPE1oFq7MOmTQWFo/edit#question=1588624652&field=621321900"
// },
];
Binary file removed public/images/dss_circle_photo.jpg
Binary file not shown.
Binary file modified public/images/group_photo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 3 additions & 9 deletions src/pages/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ const Home = () => {
};

const heroImage = (
<Box sx={heroImageStyles}>
<Box sx={{ ...defaultOverlayStyles, borderRadius: 5 }}>
<Box sx={{...heroImageStyles, paddingTop:"20%"}}>
<Box sx={{ ...defaultOverlayStyles, borderRadius: 5}}>
<Typography variant="h1" component="div">
{overlayTitle}
</Typography>
Expand Down Expand Up @@ -130,13 +130,7 @@ const Home = () => {
{whoWeAreParagraph}
</Typography>
</Box>
<Box sx={{ flex: 1 }}>
<Box
component="img"
src={dssCirclePhoto}
sx={{ maxWidth: "80%", borderRadius: 5 }}
/>
</Box>

</Box>
);

Expand Down
87 changes: 5 additions & 82 deletions src/pages/JoinUs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,83 +57,7 @@ const JoinUs = () => {
/>
);

const cardAndApplication = (
<Box
sx={{
display: "flex",
flexDirection: "column",
gap: "1rem",
px: {
md: "20%",
xs: "7%",
},
width: "100%",
pt: "20vh",
pb: "8vh",
justifyContent: "center",
alignItems: "center",
}}
>
<Box
sx={{
display: "flex",
flexDirection: "row",
justifyContent: "center",
alignItems: "stretch",
width: {
md: "60%",
xs: "100%",
},
gap: "0.5rem",
}}
>
<Button
href="https://docs.google.com/forms/d/e/1FAIpQLScDgbV_URB9l5nT1bhFb0pK2t_eQzFHctjdHRC5RpgRgP66FQ/viewform?usp=sharing"
target="_blank"
sx={{
flex: 1,
width: "100%",
backgroundColor: theme.palette.secondary.main,
color: "white",
"&:hover": {
color: "black",
},
py: "0.5rem",
}}
>
Application
</Button>
<Button
href="https://pcs-spring2025.carrd.co/"
target="_blank"
sx={{
flex: 1,
width: "100%",
backgroundColor: theme.palette.secondary.main,
color: "white",
"&:hover": {
color: "black",
},
py: "0.5rem",
}}
>
Recruitment Card
</Button>
</Box>
<Box
component="img"
src={recruitmentTimeline}
sx={{
width: {
md: "60%",
xs: "100%",
},
aspectRatio: 2 / 3,
}}
/>
</Box>
);


const purpleCard = (text: string) => (
<Card id={text} sx={purpleCardStyle}>
<Typography variant="h6" sx={bold}>
Expand All @@ -157,6 +81,7 @@ const JoinUs = () => {
justifyContent: "center",
alignItems: "center",
gap: "2rem",
paddingTop:"10%"
}}
>
<Box
Expand Down Expand Up @@ -262,7 +187,7 @@ const JoinUs = () => {
<Typography>
Note: While we are a majority undergrad club, our community and
conversations are enriched by our non-traditional, transfer, and
graduate level members.
graduate level members and we welcome them to apply.
</Typography>
</Stack>
</Box>
Expand All @@ -272,11 +197,10 @@ const JoinUs = () => {
<Typography variant="h6">How Do I Join?</Typography>
<Typography>
The recruitment process may change slightly between cycles but generally
consists of three stages:
consists of two stages:
<ol>
<li>Brief application</li>
<li>Brief written application.</li>
<li>Short, in-person interview.</li>
<li>Social Round</li>
</ol>
Applicants who advance past these steps are invited to join the club.
</Typography>
Expand Down Expand Up @@ -410,7 +334,6 @@ const JoinUs = () => {
}}
>
<Navbar />
{cardAndApplication}
{overview}
{generalMember}
{partnerClub}
Expand Down