Skip to content

Commit 7ead043

Browse files
committed
Updating for AWAP 2025
1 parent 8d53c93 commit 7ead043

21 files changed

+1395
-1183
lines changed

AWAP-2025-Logo.png

87.9 KB
Loading

package-lock.json

+1,326-1,109
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/favicon-old.ico

2.74 KB
Binary file not shown.

public/favicon-too-small.ico

15 KB
Binary file not shown.

public/favicon.ico

12.3 KB
Binary file not shown.
46.7 KB
Loading
46 KB
Loading

public/index.html

+22-19
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,28 @@
2424

2525

2626
<!-- HTML Meta Tags -->
27-
<title>AWAP 2024 - Home</title>
28-
<meta name="description" content="ACM@CMU presents Debris Defense - protect your space balloon base from incoming space debris with your algorithms to win!">
29-
30-
<!-- Facebook Meta Tags -->
31-
<meta property="og:url" content="https://imgur.com/a/uCUNei5">
32-
<meta property="og:type" content="website">
33-
<meta property="og:title" content="AWAP 2024 - Home">
34-
<meta property="og:description" content="ACM@CMU presents Debris Defense - protect your space balloon base from incoming space debris with your algorithms to win!">
35-
<meta property="og:image" content="https://i.imgur.com/iYc4uxo.jpg?fb">
36-
37-
<!-- Twitter Meta Tags -->
38-
<meta name="twitter:card" content="summary_large_image">
39-
<meta property="twitter:domain" content="imgur.com">
40-
<meta property="twitter:url" content="https://imgur.com/a/uCUNei5">
41-
<meta name="twitter:title" content="AWAP 2024 - Home">
42-
<meta name="twitter:description" content="ACM@CMU presents Debris Defense - protect your space balloon base from incoming space debris with your algorithms to win!">
43-
<meta name="twitter:image" content="https://i.imgur.com/iYc4uxo.jpg?fb">
44-
45-
<!-- Meta Tags Generated via https://www.opengraph.xyz -->
27+
<title>AWAP 2025 - Home</title>
28+
<meta name="description"
29+
content="ACM@CMU presents Raid CMU Legends - expand your kingdom and control the strongest armys with your algorithm to win!">
30+
31+
<!-- Facebook Meta Tags -->
32+
<meta property="og:url" content="https://imgur.com/a/uCUNei5">
33+
<meta property="og:type" content="website">
34+
<meta property="og:title" content="AWAP 2024 - Home">
35+
<meta property="og:description"
36+
content="ACM@CMU presents Raid CMU Legends - expand your kingdom and control the strongest armys with your algorithm to win!">
37+
<meta property="og:image" content="https://i.imgur.com/iYc4uxo.jpg?fb">
38+
39+
<!-- Twitter Meta Tags -->
40+
<meta name="twitter:card" content="summary_large_image">
41+
<meta property="twitter:domain" content="imgur.com">
42+
<meta property="twitter:url" content="https://imgur.com/a/uCUNei5">
43+
<meta name="twitter:title" content="AWAP 2025 - Home">
44+
<meta name="twitter:description"
45+
content="ACM@CMU presents Raid CMU Legends - expand your kingdom and control the strongest armys with your algorithm to win!">
46+
<meta name="twitter:image" content="https://i.imgur.com/iYc4uxo.jpg?fb">
47+
48+
<!-- Meta Tags Generated via https://www.opengraph.xyz -->
4649

4750
</head>
4851

src/AWAP-2025-Logo.png

87.9 KB
Loading

src/App.css

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
.App {
22
/* variables to set colors, fonts, etc. */
3-
--background-color: #d08572;
4-
--main-color: #141d2e;
5-
--secondary-color: #87a1a6;
6-
--ternary-color: #284a8a;
7-
--text-color: #c6d2cd;
3+
--background-color: #cfad81;
4+
--main-color: #618054;
5+
--secondary-color: #227b3e;
6+
--ternary-color: #227b3e;
7+
--text-color: #227b3e;
88
--font-1: "Rubik";
99
--font-2: "Archivo Narrow";
1010
--font-3: "Karla";

src/components/About.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ const About = () => {
1616
<FAQButton
1717
key={2}
1818
question="Q: What is this year's game about?"
19-
answer="This year's theme is Debris Defense! Players will use optimize their towers and resources to protect their base against incoming space debris. The team with the best algorithm wins!"
19+
answer="This year's theme is Raid CMU Legends! Players will go head-to-head on a medieval battefield to grow their kingdoms and defeat their opponents. The team with the best algorithm wins!"
2020
/>
2121
<FAQButton
2222
key={3}
2323
question="Q: What if I don't have a team yet?"
24-
answer="No worries! We will have a team matching channel on Discord :)"
24+
answer="No worries! We will have a team matching channel on Discord :) Join at https://discord.gg/W2Aq6x7KYB"
2525
/>
2626
<FAQButton
2727
key={1}

src/components/EventDetails.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const fridaySchedule = () => {
66
<div>
77
<div class="schedule-event main-event2">
88
<div class="col">
9-
<p>5:00 - 6:00 PM</p>
9+
<p>11:00 AM - 12:00 PM</p>
1010
</div>
1111
<div class="col">
1212
<p>Check-in</p>
@@ -16,7 +16,7 @@ const fridaySchedule = () => {
1616
</div>
1717
<div class="schedule-event main-event2">
1818
<div class="col">
19-
<p>6:00 - 6:30 PM</p>
19+
<p>11:30 AM - 12:30 AM</p>
2020
</div>
2121
<div class="col">
2222
<p>Opening Ceremony</p>
@@ -26,7 +26,7 @@ const fridaySchedule = () => {
2626
</div>
2727
<div class="schedule-event foods">
2828
<div class="col">
29-
<p>7:00 - 8:00 PM</p>
29+
<p>5:00 - 6:00 PM</p>
3030
</div>
3131
<div class="col">
3232
<p>Dinner</p>

src/components/Home.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import "../styles/Home.css";
2-
import awap_logo from "../awap-logo.PNG";
2+
import awap_logo from "../AWAP-2025-Logo.png";
33

44
const Homepage = () => {
55
return (
@@ -13,14 +13,14 @@ const Homepage = () => {
1313
<div className="home-content">
1414
<img src={awap_logo} width="100%" alt="AWAP logo" />
1515
<div className="home-acm">ACM@CMU PRESENTS</div>
16-
<div className="home-awap">Algorithms with a Purpose 2024:</div>
17-
<div className="home-event-title">DEBRIS DEFENSE</div>
16+
<div className="home-awap">Algorithms with a Purpose 2025:</div>
17+
<div className="home-event-title">Raid CMU Legends</div>
1818

1919
<div className="home-register-button-wrapper">
2020
<div className="home-register-button">
2121
<a
2222
className="home-register-link"
23-
href="https://forms.gle/hF41DL4ARRwHJFjc9"
23+
href="https://forms.gle/jto6LmZQXNqaS9E97"
2424
target="_blank"
2525
>
2626
Register Here!

src/components/Navbar.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +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 awap_logo from "../awap-logo.PNG";
5+
import awap_logo from "../AWAP-2025-Logo.png";
66

77
const Navbar = () => {
88
const [menuOpen, setMenuOpen] = useState(false);

src/components/Past.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,12 @@ const Past = () => {
182182
<div className="past-info-box" id="past-info">
183183
{year2023()}
184184
</div>
185-
<section>
185+
{/* <section>
186186
<img className="rover" src={rover} alt="" />
187187
<div className="line">
188188
<hr />
189189
</div>
190-
</section>
190+
</section> */}
191191
</div>
192192
</div>
193193
);

src/components/Sponsors.js

+11-20
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import ford_logo from "../sponsors/ford.png";
1717
import bnymellon_logo from "../sponsors/bnymellon.jpeg";
1818
import deshaw_logo from "../sponsors/deshaw.png";
1919
import lockheed_logo from "../sponsors/lockheed.png";
20+
import jumptrading_logo from "../sponsors/jump_trading_logo.png"
2021

2122
const Sponsors = () => {
2223
return (
@@ -35,9 +36,9 @@ const Sponsors = () => {
3536
<a href="https://www.hudsonrivertrading.com">
3637
<img src={hrt_logo} alt="hrt" />
3738
</a>
38-
<a href="https://www.stripe.com">
39+
{/* <a href="https://www.stripe.com">
3940
<img src={stripe_logo} alt="stripe" />
40-
</a>
41+
</a> */}
4142
</div>
4243
</div>
4344
<div className="row" id="gold-sponsors-container">
@@ -46,39 +47,29 @@ const Sponsors = () => {
4647
<a href="https://www.ford.com">
4748
<img src={ford_logo} alt="ford" />
4849
</a>
49-
<a href="https://www.bnymellon.com/">
50-
<img src={bnymellon_logo} alt="ford" />
51-
</a>
52-
<a className="hrt-logo" href="https://www.deshaw.com/">
53-
<img src={deshaw_logo} alt="hudson river trading" />
50+
<a href="https://www.jumptrading.com/">
51+
<img src={jumptrading_logo} alt="jump trading" />
5452
</a>
55-
<a
56-
className="rounded-sponsor-img"
57-
href="https://www.bloomberg.com/"
58-
>
59-
<img src={bloomberg_logo} alt="bloomberg" />
53+
<a href="https://www.deshaw.com/">
54+
<img src={deshaw_logo} alt="de shaw" />
6055
</a>
6156
<a
6257
className="rounded-sponsor-img"
6358
href="https://www.janestreet.com/"
6459
>
6560
<img src={janestreet_logo} alt="jane street" />
6661
</a>
67-
<a href="https://sig.com/">
62+
{/* <a href="https://sig.com/">
6863
<img src={sig_logo} alt="sig" />
69-
</a>
70-
<a href="https://www.lockheedmartin.com/en-us">
71-
<img src={lockheed_logo} alt="lockheed" />
72-
</a>
73-
64+
</a> */}
7465
</div>
7566
</div>
7667
<div className="row" id="silver-sponsors-container">
7768
{/* <div className="col sponsors-level">Silver</div> */}
7869
<div className="col sponsors sponsors-silver">
79-
<a href="https://www.sandia.gov/">
70+
{/* <a href="https://www.sandia.gov/">
8071
<img src={sandia_logo} alt="sandia" />
81-
</a>
72+
</a> */}
8273

8374
</div>
8475
</div>

src/sponsors/jump_trading_logo.png

72.7 KB
Loading

src/sponsors/scm-logo.png

-3.86 KB
Loading

src/styles/About.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
}
2525

2626
.about .about-content p {
27-
color: rgb(171, 94, 78);
27+
color: var(--background-color);
2828
line-height: 200%;
2929
font-weight: bold;
3030
}
@@ -52,7 +52,7 @@
5252
}
5353

5454
.beginner-button:hover {
55-
background-color: rgba(218, 189, 157);
55+
background-color: #fcc7d8;
5656
}
5757

5858
.beginner-button:after {

src/styles/Home.css

+14-13
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,38 @@
1111
align-items: center;
1212
justify-content: center;
1313
}
14+
1415
.onee {
15-
width: 100%;
16+
width: 41%;
1617
height: 100%;
1718
display: flex;
1819
flex-direction: row;
19-
overflow-x: visible !important;
20-
background-image: url("../../public/home/spacehome.jpeg");
21-
background-size: 100% 100%;
20+
overflow-x: hidden !important;
21+
background-image: url("../../public/home/castles_landing_page_brown.jpg");
22+
background-size: auto 100%;
2223
background-repeat: no-repeat;
2324
flex-wrap: wrap;
2425
align-items: center;
2526
justify-content: center;
2627
}
2728
.twoo {
28-
width: 100%;
29+
width: 59%;
2930
height: 100vh;
3031
display: flex;
3132
flex-direction: row;
3233
overflow-x: visible !important;
3334
/* background-image: url("../../public/home/spacehome.jpeg"); */
34-
background-color: #141d2e;
35+
background-color: #7aa16a;
3536
background-size: 100% 100%;
3637
background-repeat: no-repeat;
3738
flex-wrap: wrap;
3839
align-items: center;
3940
justify-content: center;
4041
}
4142
.col {
43+
float: left;
4244
justify-content: center;
4345
align-items: center;
44-
width: 50%;
4546
}
4647

4748
.home-content {
@@ -81,10 +82,10 @@
8182
}
8283

8384
.home-register-button {
84-
color: var(--main-color);
85+
color: var(--secondary-color);
8586
font-family: var(--font-3);
8687
font-size: 1.5em;
87-
border: 2px solid var(--main-color);
88+
border: 2px solid var(--background-color);
8889
border-radius: 2vh;
8990
background: var(--background-color);
9091
margin: 0 0 40px 0;
@@ -93,20 +94,20 @@
9394
}
9495

9596
.home-register-button:hover {
96-
background-color: rgb(231, 228, 224);
97+
background-color: rgb(231, 224, 229);
9798
}
9899

99100
.home-register-link {
100101
text-decoration: none;
101-
color: var(--main-color);
102+
color: var(--secondary-color);
102103
}
103104

104105
.home-event-title {
105-
font-family: "Orbitron";
106+
font-family: "Georgia";
106107
font-size: 250%;
107108
margin: 0 0 40px 0;
108109
color: var(--secondary-color);
109-
font-weight: 800;
110+
font-weight: 600;
110111
}
111112

112113
.home p {

src/styles/Schedule.css

+3-3
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@
6666
}
6767

6868
.main-event2 {
69-
background-color: #3f5577;
69+
background-color: #694925;
7070
}
7171
.workshop {
72-
background-color: #0e0c51;
72+
background-color: #7e5e39;
7373
}
7474
.foods {
75-
background-color: #0d2a4c;
75+
background-color: #7e5e39;
7676
}
7777

7878
.schedule-day-button {

0 commit comments

Comments
 (0)