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
38 changes: 19 additions & 19 deletions src/pages/Home.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Navbar } from "../components/layout";
import RecruitmentTimeline from "../components/RecruitmentTimeline";
// import RecruitmentTimeline from "../components/RecruitmentTimeline";
import {
Divider,
// Stack,
Expand Down Expand Up @@ -44,7 +44,7 @@ const Home = () => {
but we also have room individuals who explore non-technical projects relating to tech policy,
and even code tools to help inform others about government.`;

const recruitmentTimelineTitle = "Recruitment Timeline:";
// const recruitmentTimelineTitle = "Recruitment Timeline:";

/**
* Styles
Expand Down Expand Up @@ -89,20 +89,20 @@ const Home = () => {
gap: "2rem",
};

const recruitmentTimelineStyles: SxProps = {
...defaultFlexStyles,
flexDirection: {
md: "column",
xs: "column",
},
// width: "100%",
// overflowX: "hidden",
// justifyContent: "center",
alignItems: "start",
px: "3rem",
// py: "5rem",
gap: "2rem",
};
// const recruitmentTimelineStyles: SxProps = {
// ...defaultFlexStyles,
// flexDirection: {
// md: "column",
// xs: "column",
// },
// // width: "100%",
// // overflowX: "hidden",
// // justifyContent: "center",
// alignItems: "start",
// px: "3rem",
// // py: "5rem",
// gap: "2rem",
// };

const heroImage = (
<Box sx={heroImageStyles}>
Expand Down Expand Up @@ -158,12 +158,12 @@ const Home = () => {
</Box>
);

const recruitmentTimeline = (
/*const recruitmentTimeline = (
<Box sx={{ ...recruitmentTimelineStyles, p: 2 }}>
<Typography variant="h2">{recruitmentTimelineTitle}</Typography>
<RecruitmentTimeline />
</Box>
);
);*/

// const ourCommunity = (
// <Stack
Expand Down Expand Up @@ -256,7 +256,7 @@ const Home = () => {
{heroImage}
{clubStats}
{whoWeAre}
{recruitmentTimeline}
{/*recruitmentTimeline*/}
{/*ourCommunity*/}
{bragging}
<Footer />
Expand Down
12 changes: 8 additions & 4 deletions src/pages/JoinUs.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Link, Stack, Typography, Card, Box, Button } from "@mui/material";
import { Link, Stack, Typography, Card, Box } from "@mui/material";
import { Navbar, Footer } from "../components/layout";

import {
Expand All @@ -12,7 +12,7 @@ import partnerClubIcon from "/images/join_us_page/partnerClub.png";
import externalSponsorIcon from "/images/join_us_page/externalSponsor.png";
import partnerClubIcons from "/images/partnerClubIcons.png";
import partnerOrgIcons from "/images/partnerOrgIcons.png";
import recruitmentTimeline from "/images/recruitmentTimeline2.png";
// import recruitmentTimeline from "/images/recruitmentTimeline2.png";

const waysToJoin = ["General Member", "Partner Club", "External Sponsor"];

Expand Down Expand Up @@ -78,7 +78,11 @@ const JoinUs = () => {
alignItems: "center",
}}
>
<Box
<Typography variant="h3" sx={{lineHeight: 1.5}}>
Our recruitment cycle is over, please check back in January to join us
in the spring!
</Typography>
{/* <Box
component="img"
src={recruitmentTimeline}
sx={{
Expand Down Expand Up @@ -134,7 +138,7 @@ const JoinUs = () => {
>
Recruitment Card
</Button>
</Box>
</Box> */}
</Box>
);

Expand Down