Skip to content

Commit 513dd92

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents a93093c + 9aeb0e3 commit 513dd92

File tree

1 file changed

+28
-16
lines changed

1 file changed

+28
-16
lines changed

src/components/TimeTable/TimeTableEvents.ts

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ const workshops = [
1212
description: "Learn the basics of how to use Git for project submission, and find cool team members to hack with!",
1313
},
1414
{
15-
name: "From Prototype to Product",
16-
color: "var(--terminal-blue)",
15+
name: "Chess Tournament",
16+
color: "var(--terminal-red)",
1717
start: {
1818
hour: 11,
1919
minute: 0,
2020
},
2121
column: 3,
22-
duration: 45,
23-
images : undefined,
24-
description: "Want to learn about potential pathways post secondary? Join us for a chat with Christopher Anand (Associate Professor at McMaster) and Christopher Venantius (Angel Investor at GTAN & Entrepreneurship Coach at McMaster). They'll share insights on turning ideas into reality—whether in research or startups. Bring your business ideas, be ready for hands-on activities, and to talk about innovation!",
22+
duration: 30,
23+
images: undefined,
24+
description: "May the best chess player win",
2525
},
2626
{
2727
name: "Fireside Chat w/ Nicholas Tao",
@@ -35,6 +35,18 @@ const workshops = [
3535
images : undefined,
3636
description: "IRL podcast ahh... A unique opportunity to meet Nicholas Tao - known for having 150k+ subs on his Youtube channel and regularly receiving millions of views on his videos - he’s a UW CS student who’s had 7+ internships.",
3737
},
38+
{
39+
name: "ICP Workshop",
40+
color: "var(--terminal-red)",
41+
start: {
42+
hour: 13,
43+
minute: 30,
44+
},
45+
column: 4,
46+
duration: 30,
47+
images : undefined,
48+
description: "Solve a series of programming challenges in one line of python code. Be the first to finish and win bubble tea.",
49+
},
3850
{
3951
name: "How to be a normal human being (a guide to sunshine, sleep, showers and socializing)",
4052
color: "var(--terminal-blue)",
@@ -114,7 +126,7 @@ const funEvents = [
114126
name: "Mario Kart Tournament",
115127
color: "var(--terminal-red)",
116128
start: {
117-
hour: 10,
129+
hour: 11,
118130
minute: 45,
119131
},
120132
column: 5,
@@ -123,23 +135,23 @@ const funEvents = [
123135
description: "May the best mario karter win – prize: bubble tea",
124136
},
125137
{
126-
name: "Chess Tournament",
127-
color: "var(--terminal-red)",
138+
name: "From Prototype to Product",
139+
color: "var(--terminal-blue)",
128140
start: {
129-
hour: 10,
130-
minute: 45,
141+
hour: 11,
142+
minute: 0,
131143
},
132144
column: 4,
133-
duration: 30,
145+
duration: 45,
134146
images : undefined,
135-
description: "May the best mario karter win – prize: bubble tea",
147+
description: "Want to learn about potential pathways post secondary? Join us for a chat with Christopher Anand (Associate Professor at McMaster) and Christopher Venantius (Angel Investor at GTAN & Entrepreneurship Coach at McMaster). They'll share insights on turning ideas into reality—whether in research or startups. Bring your business ideas, be ready for hands-on activities, and to talk about innovation!",
136148
},
137149
{
138150
name: "Python One Liners Contest (15 minutes)",
139151
color: "var(--terminal-red)",
140152
start: {
141-
hour: 11,
142-
minute: 30,
153+
hour: 14,
154+
minute: 45,
143155
},
144156
column: 4,
145157
duration: 15,
@@ -159,7 +171,7 @@ const funEvents = [
159171
description: "May the best geoguessr win – prize: bubble tea",
160172
},
161173
{
162-
name: "Arch + Hyperland Install + Rice Session",
174+
name: "Arch + Hyprland Install + Rice Session",
163175
color: "var(--terminal-red)",
164176
start: {
165177
hour: 14,
@@ -317,7 +329,7 @@ const importantEvents = [
317329
images : undefined,
318330
description: "Closing ceremony for Eureka! Winners will be announced here.",
319331
},
320-
332+
321333
]
322334

323335
export const timeTableData = {

0 commit comments

Comments
 (0)