merged main

uclaacm · Feb 5, 2024 · 31dd41b · 31dd41b
2 parents 330ef21 + 4111ca1
commit 31dd41b
Show file tree

Hide file tree

Showing 15 changed files with 128 additions and 150 deletions.
diff --git a/README.md b/README.md
@@ -15,30 +15,39 @@ There is also hardware available for hackers to check out and hack with.
 This website is developed with [Gatsby](https://www.gatsbyjs.org/) and
 [Material UI](https://material-ui.com/), and is a work-in-progress being
 developed by ACM Hack’s Dev Team: 
-- Alex Xia [(@khxia)](https://github.com/khxia)
 - Jakob Reinwald [(@jakobreinwald)](https://github.com/jakobreinwald)
-- Maggie Li [(@maggieelli)](https://github.com/maggieelli)
 - Katelyn Yu [(@katelynsyu)](https://github.com/katelynsyu)
-- Anakin Trotter [(@AnakinTrotter)](https://github.com/AnakinTrotter)
-- Nathan Zhang [(@nathanzzhang)](https://github.com/nathanzzhang)
+- Maggie Li [(@maggieelli)](https://github.com/maggieelli)
+- Aazel Tan [(@aazeltan)](https://github.com/aazeltan)
+- Hannah Kendall [(@hannahkendall04)](https://github.com/hannahkendall04)
+- James Wu [(@jamesmwu)](https://github.com/jamesmwu)
 - Jenna Wang [(@ariyin)](https://github.com/ariyin)
+- Kayla Hamakawa [(@kaylahama)](https://github.com/kaylahama)
+- Kaylin Chung [(@kaylin-chung)](https://github.com/kaylin-chung)
+- Lillian Gonick [(@lilliangonick)](https://github.com/lilliangonick)
+- Max Lee [(@maxywaxyy)](https://github.com/maxywaxyy)
+- Nathan Zhang [(@nathanzzhang)](https://github.com/nathanzzhang)
+- Samuel Perrott [(@sperrott22)](https://github.com/sperrott22)
 - Shiyu Ye [(@Monicaaawa)](https://github.com/Monicaaawa)
-- Brooke Jiang [(@jiangxuann)](https://github.com/jiangxuann)
-- Jonathan Si [(@jsi19)](https://github.com/jsi19)
-- Andy Lewis [(@datowq)](https://github.com/datowq)
-- Satyen Subramaniam [(@SubramaniamSatyen)](https://github.com/SubramaniamSatyen)
+- Sneha Agarwal [(@snehaagar2023)](https://github.com/snehaagar2023)
 
 Past contributors: 
-- Timothy Gu [(@TimothyGu)](https://github.com/TimothyGu/)
-- Jamie Liu [(@jamieliu386)](https://github.com/jamieliu386/)
-- Timothy Rediehs [(@Timthetic)](https://github.com/Timthetic)
-- Galen Wong [(@GalenWong)](https://github.com/GalenWong)
-- Miles Wu [(@milesswu)](https://github.com/milesswu)
+- Alex Xia [(@khxia)](https://github.com/khxia)
+- Anakin Trotter [(@AnakinTrotter)](https://github.com/AnakinTrotter)
+- Andy Lewis [(@datowq)](https://github.com/datowq)
+- Brooke Jiang [(@jiangxuann)](https://github.com/jiangxuann)
 - Chandra Suresh [(@curesh)](https://github.com/curesh)
+- Christina Tong [(@christinatong01)](https://github.com/christinatong01)
 - Eric Yang [(@eric8yang)](https://github.com/eric8yang)
+- Galen Wong [(@GalenWong)](https://github.com/GalenWong)
+- Jamie Liu [(@jamieliu386)](https://github.com/jamieliu386/)
 - Jody Lin [(@jodymlin)](https://github.com/jodymlin)
-- Christina Tong [(@christinatong01)](https://github.com/christinatong01)
+- Jonathan Si [(@jsi19)](https://github.com/jsi19)
+- Miles Wu [(@milesswu)](https://github.com/milesswu)
+- Satyen Subramaniam [(@SubramaniamSatyen)](https://github.com/SubramaniamSatyen)
 - Thomas McGall [(@tmag1)](https://github.com/tmag1)
+- Timothy Gu [(@TimothyGu)](https://github.com/TimothyGu/)
+- Timothy Rediehs [(@Timthetic)](https://github.com/Timthetic)
 
 ACM Hack is a subcomittee of [ACM @ UCLA](http://www.uclaacm.com/), the largest
 Computer Science student organization in Southern California. Check out [our

diff --git a/code-of-conduct.md b/code-of-conduct.md
@@ -63,7 +63,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-uclaacmhack@gmail.com.
+hack@uclaacm.com.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

diff --git a/gatsby-config.js b/gatsby-config.js
@@ -34,7 +34,7 @@ module.exports = {
 				background_color: '#fff',
 				theme_color: '#c960ff',
 				display: 'minimal-ui',
-				icon: 'src/images/hothX-logo.svg' // This path is relative to the root of the site.
+				icon: 'src/images/hothXI-logo.svg' // This path is relative to the root of the site.
 			}
 			/* eslint-enable camelcase */
 		},

diff --git a/src/components/HomePage/Banner.js b/src/components/HomePage/Banner.js
@@ -27,7 +27,7 @@ const monthFormatter = new Intl.DateTimeFormat('en-US', { month: 'short' });
 
 const useStyles = makeStyles(theme => ({
 	background: {
-		backgroundColor: '#11002E',
+		backgroundColor: '#010101',
 		height: 'auto',
 		[theme.breakpoints.down('sm')]: {
 			padding: '12px 2px'
@@ -39,7 +39,7 @@ const useStyles = makeStyles(theme => ({
 	},
 	info: {
 		position: 'absolute',
-		left: '0px',
+		right: '0px',
 		zIndex: 1,
 		maxWidth: '50%',
 		[theme.breakpoints.down('sm')]: {
@@ -84,7 +84,7 @@ const useStyles = makeStyles(theme => ({
 		flexDirection: 'row',
 		justifyContent: 'center',
 		alignItems: 'baseline',
-		alignSelf: 'flex-start',
+		alignSelf: 'flex-end',
 		paddingBottom: theme.spacing(2),
 		[theme.breakpoints.down('sm')]: {
 			alignSelf: 'center'
@@ -123,11 +123,12 @@ const useStyles = makeStyles(theme => ({
 	},
 	img: {
 		position: 'relative',
-		width: '110%'
+		width: '110%',
+		left: '-10%'
 	},
 	grid: {
-		justifyContent: 'flex-start',
-		alignItems: 'flex-start',
+		justifyContent: 'flex-end',
+		alignItems: 'flex-end',
 		[theme.breakpoints.down('sm')]: {
 			justifyContent: 'center',
 			alignItems: 'center'
@@ -141,7 +142,7 @@ function Banner() {
 	const smallScreen = useMediaQuery(theme.breakpoints.down('sm'));
 	const data = useStaticQuery(graphql`
     query {
-      placeholderImage: file(relativePath: { eq: "hothX-banner.png" }) {
+      placeholderImage: file(relativePath: { eq: "hothXI-banner.png" }) {
         childImageSharp {
           fluid(quality: 100) {
             ...GatsbyImageSharpFluid
@@ -198,7 +199,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>
@@ -209,7 +210,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'>
@@ -227,15 +228,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/4zSBeQh3cjRtqcg79'} target='_blank'>
-                        Apply Now
-                    </Button>
+					<Button className={classes.apply} href={'https://forms.gle/N7VHpwUMSkGLhBdd6'} target='_blank'>
+						Apply Now
+					</Button>
 				}
 			</>
 		);

diff --git a/src/components/HomePage/FAQSection.js b/src/components/HomePage/FAQSection.js
@@ -110,10 +110,10 @@ AccordionQA.propTypes = {
 };
 
 function FAQSection() {
-	const hothNum = 'X';
-	const appDeadline = 'Friday, February 24, 2023';
-	const hothDate = 'Sunday, March 5, 2023';
-	const hothLocation = 'Carnesale Commons Palisades Room';
+	const hothNum = 'XI';
+	const appDeadline = 'Monday, February 26, 2024';
+	const hothDate = 'Saturday, March 2, 2024';
+	const hothLocation = 'Hill';
 	const faqs = [
 		{
 			question: `What's a hackathon?`,
@@ -173,7 +173,7 @@ function FAQSection() {
 				<>
 					We would love to have you as a mentor to answer participants&apos; technical
 					questions and help them with their projects. If you are interested, send us an email
-					at <Link href='mailto:uclaacmhack@gmail.com'>uclaacmhack@gmail.com</Link> or dm us on
+					at <Link href='mailto:hack@uclaacm.com'>hack@uclaacm.com</Link> or dm us on
 					our <Link href='https://discord.gg/MStu2cnBV9'>discord server</Link>!
 				</>
 		},
@@ -189,7 +189,7 @@ function FAQSection() {
 			question: `I have some other questions.`,
 			answer:
 				<>
-					Send us an email at <Link href='mailto:uclaacmhack@gmail.com'>uclaacmhack@gmail.com</Link>!
+					Send us an email at <Link href='mailto:hack@uclaacm.com'>hack@uclaacm.com</Link>!
 				</>
 		}
 	];

diff --git a/src/components/HomePage/HothDescription.js b/src/components/HomePage/HothDescription.js
@@ -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();
@@ -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'
@@ -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 }}>

diff --git a/src/components/MenuBar/ButtonBar.js b/src/components/MenuBar/ButtonBar.js
@@ -83,7 +83,7 @@ function ButtonBar({ isMobile }) {
 			{
 				<BorderLink
 					disabled={Date.now() < applicationOpen.getTime() || Date.now() > applyDeadline.getTime()}
-					href={'https://forms.gle/4zSBeQh3cjRtqcg79'}
+					href={'https://forms.gle/VMhdCzMov8RvGUfP8'}
 					target='_blank'
 				>
 					Apply

diff --git a/src/components/MenuBar/MenuBar.js b/src/components/MenuBar/MenuBar.js
@@ -11,7 +11,7 @@ import Typography from '@material-ui/core/Typography';
 import { navigate } from 'gatsby';
 
 import ButtonBar from './ButtonBar';
-import { ReactComponent as HOTHLogo } from '../../images/hothX-logo.svg';
+import { ReactComponent as HOTHLogo } from '../../images/hothXI-logo.svg';
 
 const useStyles = makeStyles(theme => {
 	return {

diff --git a/src/components/PrizePage/Prizes.js b/src/components/PrizePage/Prizes.js
@@ -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
@@ -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}>
@@ -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' }}>

diff --git a/src/components/WorkshopPage/WorkshopPage.js b/src/components/WorkshopPage/WorkshopPage.js
@@ -6,11 +6,12 @@ import useTheme from '@material-ui/core/styles/useTheme';
 import useMediaQuery from '@material-ui/core/useMediaQuery';
 import Workshop from './Workshop.js';
 import { makeStyles } from '@material-ui/core/styles';
+import ComingSoon from '../ComingSoon/ComingSoon';
 // import { AnchorLink } from 'gatsby-plugin-anchor-links';
 // import { Button } from '@material-ui/core';
 // import StickyBox from 'react-sticky-box';
 // import Divider from '@mui/material/Divider';
-
+const workshopsAvailable = false;
 const useStyles = makeStyles(theme => ({
 	itemType: {
 		fontWeight: 'medium',
@@ -44,7 +45,6 @@ const useStyles = makeStyles(theme => ({
 	btn: {
 		fontWeight: 500,
 		marginRight: '30px'
-
 	},
 	anchor: {
 		textDecoration: 'none'
@@ -277,7 +277,10 @@ function WorkshopPage() {
 					<Typography variant='h4' component='h1' className={classes.title}>
 						Workshops
 					</Typography>
-					{workshopCards}
+					{!workshopsAvailable ?
+						<ComingSoon alignment='left' /> :
+						{ workshopCards }
+					}
 				</Container>
 			</div>
 		</React.Fragment>

diff --git a/src/components/constants.js b/src/components/constants.js
@@ -1,5 +1,5 @@
-export const hothStart = new Date('2023-03-05T08:00:00-08:00');
-export const hothEnd = new Date('2023-03-05T21:00:00-08:00');
-export const applyDeadline = new Date('2023-02-24T23:59:59-08:00');
-export const applicationOpen = new Date('2023-01-30T12:00:00-08:00');
-export const scheduleAvailableTime = new Date('2023-02-26T23:59:59-08:00');
+export const hothStart = new Date('2024-03-02T08:00:00-08:00');
+export const hothEnd = new Date('2024-03-02T23:00:00-08:00');
+export const applyDeadline = new Date('2024-02-26T23:59:59-08:00');
+export const applicationOpen = new Date('2024-01-29T08:00:00-08:00');
+export const scheduleAvailableTime = new Date('2024-02-26T08:00:00-08:00');