Skip to content

Commit 684bd6f

Browse files
Merge pull request #148 from umdevclub/feat/upcomingEvents
feat!:upcoming Events
2 parents 68f22b3 + 37f5192 commit 684bd6f

File tree

6 files changed

+208
-59
lines changed

6 files changed

+208
-59
lines changed

src/resources/data/events.ts

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ import examCram from "@/resources/images/events/ExamCram.jpg";
1010
import devchamps from "@/resources/images/events/devchamps.jpeg";
1111
import labtours from "@/resources/images/events/Labtours.jpg";
1212
import codingKickoff from "@/resources/images/events/Coding Kickoff.png";
13+
import codingKickoffUpcoming from "@/resources/images/events/CodingKickoffUpcoming.png";
14+
import devgames1 from "@/resources/images/events/devgames1.png";
15+
import devgames2 from "@/resources/images/events/devgames2.png";
1316

1417
export { TERMS_ORDER } from "./types";
1518

@@ -20,7 +23,7 @@ export const EVENTS: EventData[] = [
2023
description:
2124
"Each term kicks off with a general meeting where we update students on .devClub's vision, goals, and planned events.",
2225
term: ["Summer", "Fall", "Winter"],
23-
images: generalmeeting,
26+
image: generalmeeting,
2427
recurring: true,
2528
},
2629
{
@@ -29,7 +32,7 @@ export const EVENTS: EventData[] = [
2932
description:
3033
"Summer means a .devClub leisure trip: a chance to decompress after exams. We've gone to Gimli, Kenora, and, most recently, Pinawa.",
3134
term: ["Summer"],
32-
images: AWTY,
35+
image: AWTY,
3336
recurring: true,
3437
},
3538
{
@@ -38,55 +41,64 @@ export const EVENTS: EventData[] = [
3841
description:
3942
"Kickstart your coding journey with a hands-on workshop! Learn the basics, set up your environment, and explore tech career paths while meeting fellow students.",
4043
term: ["Fall"],
41-
images: codingKickoff,
44+
image: codingKickoff,
4245
recurring: true,
46+
date: "2025-09-18T17:00:00",
47+
location: "EITC E2-125",
48+
rsvp: "https://docs.google.com/forms/d/e/1FAIpQLSfSVtcqE3yz4dnmpBs7bLpXAj7nZ2VNsDoeZnFIO5IKo1hX7g/viewform",
49+
upcomingImage: codingKickoffUpcoming,
4350
},
4451
{
4552
id: "workshops",
4653
title: "Workshops",
4754
description:
4855
".devClub runs workshops every semester on all kinds of cool topics! We've played around with GitHub, built games in Unity, designed in Figma, hosted résumés online, and plenty more!",
4956
term: ["Fall", "Winter"],
50-
images: workshop,
57+
image: workshop,
5158
recurring: true,
5259
},
53-
5460
{
5561
id: "rendezvous",
5662
title: "renDEVous",
5763
description:
5864
"Every month we host renDEVous, a fun hangout where you can game, present cool projects, or just kick back with the squad.",
5965
term: ["Summer", "Fall", "Winter"],
60-
images: rendevouz,
66+
image: rendevouz,
6167
recurring: true,
6268
},
6369
{
6470
id: "devgames",
65-
title: ".devGames",
71+
title: "devGames",
6672
description:
67-
"Our new game development workshop series runs every month, offering students a chance to learn the fundamentals of game design and development step by step. ",
73+
"Our new game development workshop series runs every month, offering students a chance to learn the fundamentals of game design and development step by step.",
6874
term: ["Fall"],
69-
images: devgames,
75+
image: devgames,
7076
recurring: true,
77+
upcomingTitle: [".devGames Level 1", ".devGames Level 2"],
78+
upcomingDescription: [
79+
"Level 1: Learn the basics of game development in Unity. We will be building a simple 2D game from scratch.",
80+
"Level 2: Join us for this special workshop in collaboration with UBISOFT and CSSA to learn about the fundamentals of Game Design.",
81+
],
82+
upcomingImage: [devgames1, devgames2],
83+
date: ["2025-09-25T18:00:00", "2025-10-01T18:00:00"],
84+
location: ["EITC E2-110", "EITC E3-270"],
7185
},
72-
7386
{
7487
id: "exam-crams",
7588
title: "Exam Crams",
7689
description:
7790
"Need a boost before finals? Our Fall Exam Crams offer guided study support for first and second year courses so you can prep smarter, not harder.",
7891
term: ["Fall"],
79-
images: examCram,
92+
image: examCram,
8093
recurring: true,
8194
},
82-
8395
{
8496
id: "devhacks",
8597
title: ".devHacks",
8698
description:
8799
".devHacks is an annual hackathon hosted by .devClub for students to showcase their creativity and endurance over a period of 24 hours of fun filled development!",
88100
term: ["Winter"],
89-
images: devhacks,
101+
image: devhacks,
90102
path: "/devhacks",
91103
recurring: true,
92104
},
@@ -96,24 +108,23 @@ export const EVENTS: EventData[] = [
96108
description:
97109
"Take a peek inside CS labs, meet profs, and see cool research in action!",
98110
term: ["Fall"],
99-
images: labtours,
111+
image: labtours,
100112
},
101113
{
102114
id: "devchamps",
103-
title: ".devChamps ",
115+
title: ".devChamps",
104116
description:
105117
".devChamps is a two to three month project-based programming battle featuring a new challenge every season.",
106118
term: ["Fall", "Winter"],
107-
images: devchamps,
119+
image: devchamps,
108120
path: "/devchamps",
109121
},
110-
111122
{
112123
id: "battlesnake",
113124
title: "Battle Snake",
114125
description:
115126
"Code your own snake, outsmart your friends, and see who slithers to the top!",
116127
term: ["Fall"],
117-
images: battlesnake,
128+
image: battlesnake,
118129
},
119130
];

src/resources/data/types.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,15 @@ export interface EventData {
5454
title: string;
5555
term?: Term[];
5656
description: string;
57-
images: string;
57+
image: string;
5858
path?: string;
5959
recurring?: boolean;
60+
//use this for upcoming events in Events.ts, can be array or just string to setup multiple events of the same thing
61+
upcomingTitle?: string | string[];
62+
upcomingDescription?: string | string[];
63+
upcomingImage?: string | string[];
64+
date?: string | string[];
65+
location?: string | string[];
66+
rsvp?: string | string[];
6067
}
6168
export const TERMS_ORDER: Term[] = ["Summer", "Fall", "Winter"];
309 KB
Loading
441 KB
Loading
503 KB
Loading

0 commit comments

Comments
 (0)