Skip to content

Commit 8365cb4

Browse files
nkurellinkurelli
committed
2024 updates
1 parent 8239d04 commit 8365cb4

22 files changed

+196
-148
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# HackCMU 2023 Event Website
1+
# HackCMU 2024 Event Website
22
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). Ensure git and npm are installed on your computer.
33
The deployed website can be found here: https://www.acmatcmu.com/hackcmu/
44

‎public/index.html

+5-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@
2424
work correctly both with client-side routing and a non-root public URL.
2525
Learn how to configure a non-root public URL by running `npm run build`.
2626
-->
27-
<title>HackCMU 2023</title>
27+
<link rel="preconnect" href="https://fonts.googleapis.com">
28+
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
29+
<link href="https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100..900;1,100..900&display=swap" rel="stylesheet">
30+
31+
<title>HackCMU 2024</title>
2832
</head>
2933
<body>
3034
<noscript>You need to enable JavaScript to run this app.</noscript>

‎public/manifest.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"short_name": "HackCMU 2023",
3-
"name": "HackCMU 2023",
2+
"short_name": "HackCMU 2024",
3+
"name": "HackCMU 2024",
44
"icons": [
55
{
66
"src": "favicon.ico",

‎src/App.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
--row-title-text-size: 1.2em;
1111
--row-content-color: white;
1212
--row-content-text-size: 1.2em;
13-
font-family: "Roboto Mono", monospace;
13+
font-family: "Montserrat", monospace;
1414
font-weight: 400;
1515
}
1616

‎src/App.js

-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ function App() {
1515
<Homepage/>
1616
<Schedule/>
1717
<FaqPage/>
18-
<Prizes/>
19-
<Team/>
2018
<Sponsors/>
2119
</div>
2220
);

‎src/components/FaqPage.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ const FaqPage = () => {
1010
},
1111
{
1212
title: "Q: What is this year's theme?",
13-
content: `This year's theme is "Space"!`,
13+
content: `This year's theme is "Cyberpunk"!`,
1414
},
1515
{
1616
title: "Q: When will project categories be released?",
17-
content: `At the latest, project categories and sponsors will be released during our opening ceremony on Friday, September 15th. Please don't start or work on your project submissions before then, though considering ideas is acceptable. `,
17+
content: `At the latest, project categories and sponsors will be released during our opening ceremony on Friday, September 13th. Please don't start or work on your project submissions before then, though considering ideas is acceptable. `,
1818
},
1919
{
2020
title: "Q: What if I'm an undergrad / graduate / doctoral student?",
2121
content: `All current CMU students are welcome! And we'll even have alumni and professors around to mentor. But please confirm eligibility for a challenge before submitting. We're happy to share that our industry partners are excited to meet students at all levels of academia!`,
2222
},
2323
{
2424
title: "Q: Where will HackCMU be held?",
25-
content: `HackCMU will mostly place in Tepper Simmons, but there are also designated hacking areas in Gates!`,
25+
content: `HackCMU will mostly place in Rashid Auditorium, but there are also designated hacking areas in Gates!`,
2626
},
2727
{
2828
title: "Q: How much does this cost?",

‎src/components/Homepage.js

+14-18
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
11
import '../styles/Homepage.css'
22
import hero from '../images/hero.png'
3+
import cyberpunk from '../images/2024cyberpunk.png'
4+
35
const Homepage = () => {
46
return (
57
<div className="home-page">
6-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fullPage.js/4.0.20/fullpage.css"
7-
integrity="sha512-wCVOuVtxsXqrQK7tj9j4BvyfITQmpp7UE7mVilD7aieGLYFEIAa5UKTP1RapOf6dxQ9JIKAneakcyykWG4r4Ow=="
8-
crossorigin="anonymous" referrerpolicy="no-referrer" />
8+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fullPage.js/4.0.20/fullpage.css"
9+
integrity="sha512-wCVOuVtxsXqrQK7tj9j4BvyfITQmpp7UE7mVilD7aieGLYFEIAa5UKTP1RapOf6dxQ9JIKAneakcyykWG4r4Ow=="
10+
crossorigin="anonymous" referrerpolicy="no-referrer" />
911

1012
<div className="home-page-content">
11-
<div class="section" id="home">
12-
<div id="star-container">
13-
<div id='stars'></div>
14-
<div id='stars2'></div>
15-
<div id='stars2a'></div>
16-
</div>
13+
<div className="section" id="home">
14+
{/* Section content here */}
1715
</div>
18-
<img class="home-page-logo-pic" src={hero} alt="hero" width="30%" />
19-
16+
<img className="home-page-logo-pic" src={cyberpunk} alt="hero" />
2017

2118
<div className="home-page-sign-up-links">
22-
<a href="https://cmu.ca1.qualtrics.com/jfe/form/SV_2nrluKEiu0VOgLA?">
19+
<a href="https://docs.google.com/forms/d/e/1FAIpQLSevS-JRXkp0jOwKZIhcYjlWa4HFXfzoSBbqc7lxhJ4o0WPKeQ/viewform?usp=send_form">
2320
<div className="sign-up-button" id="participant-button">
24-
<p className='sign-up-text'> Sign up as participant </p>
21+
<p className='sign-up-text'>REGISTER</p>
2522
</div>
2623
</a>
2724
{/* <a href="https://docs.google.com/forms/d/e/1FAIpQLScply9xc9dBY4Nqe4Sx8vLzkcKPFS8G3DqzRQ1CARIszV6sLw/viewformIvY25MYoZCe_gnEyYbWbCpebXs7MgHIKA/viewform">
@@ -31,12 +28,11 @@ const Homepage = () => {
3128
</a> */}
3229
</div>
3330
</div>
31+
<script src="https://cdnjs.cloudflare.com/ajax/libs/fullPage.js/4.0.20/fullpage.min.js"
32+
integrity="sha512-LGiXf+jHGTHcIybSsOWO3I/in+OObCkcEsWIZ7IyhzfD6RzD5qDUw2CK+JveuI7zTSEcDG//bIOvOpAJW2BWsg=="
33+
crossorigin="anonymous" referrerpolicy="no-referrer"></script>
3434
</div>
3535
);
3636
}
3737

38-
<script src="https://cdnjs.cloudflare.com/ajax/libs/fullPage.js/4.0.20/fullpage.min.js"
39-
integrity="sha512-LGiXf+jHGTHcIybSsOWO3I/in+OObCkcEsWIZ7IyhzfD6RzD5qDUw2CK+JveuI7zTSEcDG//bIOvOpAJW2BWsg=="
40-
crossorigin="anonymous" referrerpolicy="no-referrer"></script>
41-
42-
export default Homepage;
38+
export default Homepage;

‎src/components/Navbar.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import "../styles/Navbar.css";
22
import React, { useState } from "react";
33
import { Link } from "react-scroll";
44
import { slide as Menu } from "react-burger-menu";
5+
import logo from "../images/logo.png";
56

67
const Navbar = () => {
78
const [menuOpen, setMenuOpen] = useState(false);
@@ -30,7 +31,7 @@ const Navbar = () => {
3031
<span>2</span>
3132
<span>0</span>
3233
<span>2</span>
33-
<span>3</span>
34+
<span>4</span>
3435
</div>
3536
{/* <img className='navbar-logo' src="../../hackcmu-logo-black-short.png"></img> */}
3637
</Link>
@@ -63,7 +64,7 @@ const Navbar = () => {
6364
<div className="link">Sponsors</div>
6465
</Link>
6566
<a
66-
id="mlh-trust-badge"
67+
id="acm-website"
6768
style={{
6869
display: "block",
6970
maxWidth: "100px",
@@ -74,12 +75,12 @@ const Navbar = () => {
7475
width: "10%",
7576
zIndex: 10000,
7677
}}
77-
href="https://mlh.io/na?utm_source=na-hackathon&utm_medium=TrustBadge&utm_campaign=2024-season&utm_content=white"
78+
href="acmatcmu.com"
7879
target="_blank"
7980
>
8081
<img
81-
src="https://s3.amazonaws.com/logged-assets/trust-badge/2024/mlh-trust-badge-2024-white.svg"
82-
alt="Major League Hacking 2024 Hackathon Season"
82+
src={logo}
83+
alt="ACM@CMU Website"
8384
style={{ width: "100%" }}
8485
/>
8586
</a>

‎src/components/Schedule.js

+14-55
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ const fridaySchedule = () => {
99
<p>5:30 - 6:00 PM</p>
1010
</div>
1111
<div class="col">
12-
<p>Check-in / Team Match A</p>
13-
<p class="details">Tepper 1101</p>
12+
<p>Check-in</p>
13+
<p class="details">Rashid Auditorium (GHC 4401)</p>
1414
<p class="details">Check in with organizers and find team members</p>
1515
</div>
1616
</div>
@@ -20,8 +20,8 @@ const fridaySchedule = () => {
2020
</div>
2121
<div class="col">
2222
<p>Opening Ceremony</p>
23-
<p class="details">Tepper 1101</p>
24-
<p class="details">Join us for the opening ceremony of HackCMU 2023!</p>
23+
<p class="details">Rashid Auditorium (GHC 4401)</p>
24+
<p class="details">Join us for the opening ceremony of HackCMU 2024!</p>
2525
</div>
2626
</div>
2727
<div class="schedule-event foods">
@@ -30,7 +30,7 @@ const fridaySchedule = () => {
3030
</div>
3131
<div class="col">
3232
<p>Dinner & Sponsor Fair</p>
33-
<p class="details">Tepper 1101</p>
33+
<p class="details">Rashid Auditorium (GHC 4401)</p>
3434
<p class="details">Meet our amazing event sponsors!</p>
3535
</div>
3636
</div>
@@ -39,24 +39,7 @@ const fridaySchedule = () => {
3939
<p>9:00 - 9:30 PM</p>
4040
</div>
4141
<div class="col">
42-
<p>Team Matching B / Cup Stacking (MLH)</p>
43-
</div>
44-
</div>
45-
<div class="schedule-event workshop">
46-
<div class="col">
47-
<p>9:30 - 10:00 PM</p>
48-
</div>
49-
<div class="col">
50-
<p>Orbital Edge Computing | Machine Learning (GDSC)</p>
51-
<p class="details">Interested in learning TensorFlow? Come <a href="https://gdsc.community.dev/events/details/developer-student-clubs-carnegie-mellon-university-presents-gdsc-presents-machine-learning-in-tensorflow-a-hackcmu-workshop/" class="custom-link">attend our workshop</a> with GDSC!</p>
52-
</div>
53-
</div>
54-
<div class="schedule-event workshop">
55-
<div class="col">
56-
<p>10:00 - 10:30 PM</p>
57-
</div>
58-
<div class="col">
59-
<p>Meet the ACM@CMU Organizing Team (free boba!) | Capture the Flag (picoCTF)</p>
42+
<p>Meet the ACM@CMU Organizing Team</p>
6043
</div>
6144
</div>
6245
<div class="schedule-event foods">
@@ -65,7 +48,7 @@ const fridaySchedule = () => {
6548
</div>
6649
<div class="col">
6750
<p>Midnight Snack</p>
68-
<p class="details">Scavengar Hunt!</p>
51+
<p class="details">Scavenger Hunt!</p>
6952
</div>
7053
</div>
7154
</div>
@@ -81,34 +64,10 @@ const saturdaySchedule = () => {
8164
</div>
8265
<div class="col">
8366
<p>Breakfast</p>
84-
<p class="details">Tepper 1101</p>
67+
<p class="details">Rashid Auditorium (GHC 4401)</p>
8568
<p class="details">Get breakfast after a long night of hacking!</p>
8669
</div>
8770
</div>
88-
<div class="schedule-event foods">
89-
<div class="col">
90-
<p>10:00 - 10:30 AM</p>
91-
</div>
92-
<div class="col">
93-
<p>The Trade Desk Info Session</p>
94-
</div>
95-
</div>
96-
<div class="schedule-event foods">
97-
<div class="col">
98-
<p>10:30 - 11:00 AM</p>
99-
</div>
100-
<div class="col">
101-
<p>Sandia National Labs Info Session</p>
102-
</div>
103-
</div>
104-
<div class="schedule-event workshop">
105-
<div class="col">
106-
<p>10:00 - 11:30 PM</p>
107-
</div>
108-
<div class="col">
109-
<p>Sponsor Workshops</p>
110-
</div>
111-
</div>
11271
<div class="schedule-event foods">
11372
<div class="col">
11473
<p>12:00 - 1:00 PM</p>
@@ -119,7 +78,7 @@ const saturdaySchedule = () => {
11978
</div>
12079
<div class="schedule-event main-event2">
12180
<div class="col">
122-
<p>1:00 PM</p>
81+
<p>3:00 PM</p>
12382
</div>
12483
<div class="col">
12584
<p>Project Submission Deadline</p>
@@ -129,23 +88,23 @@ const saturdaySchedule = () => {
12988
</div>
13089
<div class="schedule-event main-event2">
13190
<div class="col">
132-
<p>2:00 - 2:30 PM</p>
91+
<p>4:00 - 4:30 PM</p>
13392
</div>
13493
<div class="col">
13594
<p>Judging</p>
13695
</div>
13796
</div>
13897
<div class="schedule-event main-event2">
13998
<div class="col">
140-
<p>3:00 - 4:00 PM</p>
99+
<p>4:30 - 5:00 PM</p>
141100
</div>
142101
<div class="col">
143102
<p>Expo</p>
144103
</div>
145104
</div>
146105
<div class="schedule-event main-event2">
147106
<div class="col">
148-
<p>4:00 - 5:00 PM</p>
107+
<p>5:00 - 6:00 PM</p>
149108
</div>
150109
<div class="col">
151110
<p>Closing Ceremony</p>
@@ -192,14 +151,14 @@ const Schedule = () => {
192151
</div>
193152
<div class="schedule-days">
194153
<button class="schedule-day-button" id="friday" onClick={showFriday}>
195-
<span class="schedule-header-word">FRIDAY 9/15</span>
154+
<span class="schedule-header-word">FRIDAY 9/13</span>
196155
</button>
197156
<button
198157
class="schedule-day-button"
199158
id="saturday"
200159
onClick={showSaturday}
201160
>
202-
<span class="schedule-header-word">SATURDAY 9/16</span>
161+
<span class="schedule-header-word">SATURDAY 9/14</span>
203162
</button>
204163
</div>
205164
<div class="schedule" id="schedule">

‎src/components/Sponsors.js

+3-9
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import ford from "../images/sponsors/Ford_logo_flat.svg.png";
77
import deshaw from "../images/sponsors/2298205.png";
88
import bnymellon from "../images/sponsors/bny_mellon_logo.jpeg";
99
import sig from "../images/sponsors/SIG_Logo.png";
10-
import hrt from "../images/sponsors/hrt-logo.webp";
10+
import hrt from "../images/sponsors/hrtlogo.png";
1111
import lockheed from "../images/sponsors/lockheed-martin-logo.png";
1212
import stripe from "../images/sponsors/stripe-logo.png";
13-
import scm from "../images/sponsors/scm-logo.jpeg";
13+
import scm from "../images/sponsors/scmlogo.svg";
1414
import gsa from "../images/sponsors/gsa-logo.png";
1515

1616
const Sponsors = () => {
@@ -72,20 +72,14 @@ const Sponsors = () => {
7272
<a href="https://www.sandia.gov/">
7373
<img src={sandia} alt="sponsors" />
7474
</a>
75-
</div>
76-
</div>
77-
<br></br>
78-
<br></br>
79-
<div className="sponsors-container" id="bronze-sponsors-container">
80-
<div className="sponsors-level">OTHER</div>
81-
<div className="sponsors sponsors-silver">
8275
<a href="">
8376
<img src={gsa} alt="sponsors" />
8477
</a>
8578
<a href="https://www.scm-lp.com">
8679
<img src={scm} alt="sponsors" />
8780
</a>
8881
</div>
82+
8983
</div>
9084
<br></br>
9185
<br></br>

‎src/images/2024cyberpunk.png

11 MB
Loading

‎src/images/logo.png

12.5 KB
Loading

‎public/hrt-logo-clipart.png renamed to ‎src/images/sponsors/hrt-logo-clipart.png

File renamed without changes.

‎src/images/sponsors/hrtlogo.png

29.8 KB
Loading

‎src/images/sponsors/scmlogo.svg

+42
Loading

0 commit comments

Comments
 (0)