Skip to content

Commit

Permalink
Jakob/extra issues (#402)
Browse files Browse the repository at this point in the history
* Updated X to XI

* Updated descriptions

* Missed one spot
  • Loading branch information
jakobreinwald authored Jan 29, 2024
1 parent 0ce1b6d commit 86dae17
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 27 deletions.
12 changes: 6 additions & 6 deletions src/components/HomePage/Banner.js
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ function Banner() {
<Typography component='h1' variant='h1' className={classes.text} style={{
fontWeight: 'bold'
}}>
HOTH <span className={classes.hothNumber}>X</span>
HOTH <span className={classes.hothNumber}>XI</span>
</Typography>

<NoSsr>
Expand All @@ -209,7 +209,7 @@ function Banner() {
</NoSsr>

<Typography variant='h5' className={classes.text} component='h3'
style={{ fontWeight: 500, marginTop: 10 }}><b>Location:</b> Carnesale Commons Palisades Room
style={{ fontWeight: 500, marginTop: 10 }}><b>Location:</b> The Hill, room TBD
</Typography>

<Box display='flex' alignItems='left' color='white'>
Expand All @@ -227,15 +227,15 @@ function Banner() {
<time dateTime={hothStart.toISOString()} hidden>
{month} {startDay}{endDayString}, 2022
</time>
<b>Date:</b> Sunday, March 5, 2023
<b>Date:</b> Saturday, March 2, 2024
</Typography>
</Tooltip>
</Box>

{Date.now() > applicationOpen.getTime() && Date.now() < applyDeadline.getTime() &&
<Button className={classes.apply} href={'https://forms.gle/N7VHpwUMSkGLhBdd6'} target='_blank'>
Apply Now
</Button>
<Button className={classes.apply} href={'https://forms.gle/N7VHpwUMSkGLhBdd6'} target='_blank'>
Apply Now
</Button>
}
</>
);
Expand Down
14 changes: 7 additions & 7 deletions src/components/HomePage/HothDescription.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const useStyles = makeStyles(theme => ({
const LeftGridItem = ({ children }) => <Grid item xs={12} sm={8} md={6}>{children}</Grid>;
const RightGridItem = ({ children }) => <Grid item sm={10} md={6}>{children}</Grid>;

const SideImage = ({ fluidImage }) => <Img fluid={fluidImage} width='100%' style={{ borderRadius: '14px' }}/>;
const SideImage = ({ fluidImage }) => <Img fluid={fluidImage} width='100%' style={{ borderRadius: '14px' }} />;

export default function HothDescription() {
const theme = useTheme();
Expand Down Expand Up @@ -106,18 +106,18 @@ export default function HothDescription() {
</hgroup>
<Grid container spacing={isSmall ? 3 : 8} alignItems='center' justify='center'>
<LeftGridItem>
<SideImage fluidImage={data.actionShot1.childImageSharp.fluid}/>
<SideImage fluidImage={data.actionShot1.childImageSharp.fluid} />
</LeftGridItem>
<RightGridItem>
<Typography variant='body1' style={{ paddingBottom: isSmall ? theme.spacing(2) : 0 }}>
Hack on the Hill (HOTH X) is a{' '}
Hack on the Hill (HOTH XI) is a{' '}
<strong>12-hour beginner-friendly</strong>
{' '}hackathon designed to be your first hackathon experience.
HOTH X will be in-person in Carnesale Commons Palisades Room. We hope to see you there!
HOTH XI will be in-person on the Hill with the specific room TBD. We hope to see you there!
</Typography>
</RightGridItem>
</Grid>
<Grid container spacing={ isSmall ? 3 : 8 } wrap='wrap-reverse' justify='center' alignItems='center'>
<Grid container spacing={isSmall ? 3 : 8} wrap='wrap-reverse' justify='center' alignItems='center'>
<LeftGridItem>
<Typography
variant='body1'
Expand All @@ -133,14 +133,14 @@ export default function HothDescription() {
<RightGridItem>
<SideImage fluidImage={data.actionShot2.childImageSharp.fluid} width='100%' style={{
borderRadius: '14px'
}}/>
}} />
</RightGridItem>
</Grid>
<Grid container spacing={isSmall ? 3 : 8} alignItems='center' justify='center'>
<LeftGridItem>
<SideImage fluidImage={data.hackBanner.childImageSharp.fluid} width='100%' style={{
borderRadius: '14px'
}}/>
}} />
</LeftGridItem>
<RightGridItem>
<Typography variant='body1' style={{ paddingBottom: isSmall ? theme.spacing(2) : 0 }}>
Expand Down
10 changes: 6 additions & 4 deletions src/components/PrizePage/Prizes.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export default function Prizes() {
<>
<Container maxWidth='md'>
<Typography align='center' gutterBottom>
Below are the total prize amounts for each category :)
Below are the total prize amounts for each prize track! :)
</Typography>
{/* <Typography align='center' gutterBottom>
Due to current restrictions with the CS Department we are unable
Expand All @@ -152,7 +152,7 @@ export default function Prizes() {
<Box className={classes.imageBox}>
<Img fluid={iconImageMap.get(prize.img)}
style={{ height: '70%', width: '70%' }}
objectFit = "contain"
objectFit="contain"
/>
</Box>
<Box className={classes.prizeCard}>
Expand All @@ -163,9 +163,11 @@ export default function Prizes() {
<Squiggle />
</Box>
<Box className={classes.prizeDescription}>
<Typography style={{ color: '#a1a1a1',
<Typography style={{
color: '#a1a1a1',
fontSize: '14px',
textTransform: 'uppercase' }}>
textTransform: 'uppercase'
}}>
prize
</Typography>
<Typography style={{ paddingLeft: '10px', paddingRight: '10px' }}>
Expand Down
9 changes: 1 addition & 8 deletions src/data/announcements.json
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
[
{
"id": 0,
"subject": "Thank you HOTH X participants!",
"body": "Congratulations everyone! And a big round of applause to all the winning teams!\r\n\r\nThanks to everyone who participated and helped make HOTH X a success! We\u2019re so glad to have had you all and we hope you\u2019ve enjoyed your experience! Give yourself a pat on the back and a well-deserved rest.\r\n\r\nWinning teams should expect to receive their prizes within the next 3 weeks. For anyone who missed the closing ceremony, here are the winning teams for all prize tracks:\r\n\r\n- Best Overall: QuakeAlert\r\n- Best Web: Sportify\r\n- Best Mobile: Allies\r\n- Best Game: Road Rager\r\n- Best in Intersectional Environmentalism: BruinThrift\r\n- Best Beginner: HandiWalk\r\n\r\nCongratulations again to everyone who participated! We will be reaching out to all the winners to send the Amazon Gift Card prizes!\r\n\r\nThank you everyone! Enjoy the rest of your week!",
"timestamp": "2023-03-06T21:39:55Z"
}
]
[]
4 changes: 2 additions & 2 deletions src/data/eventSchedule.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ const eventSchedule = [
duration: '',
location: '',
description: `Your amazing project should be done and submitted to
Devpost for judging. Also remember to submit the 'HOTH X Team Submission'
Devpost for judging. Also remember to submit the 'HOTH XI Team Submission'
Google form.`
}
]
Expand Down Expand Up @@ -181,7 +181,7 @@ const eventSchedule = [
duration: '',
location: '',
description: `So long, farewell, au revoir, auf Wiedersehen. The day is done,
and with it HOTH X. We hope you had as much fun as we did, and we hope to see
and with it HOTH XI. We hope you had as much fun as we did, and we hope to see
you again soon!!`
}
]
Expand Down

0 comments on commit 86dae17

Please sign in to comment.