From 78c40c7e3df6d2b545b93c8065312e9fc449be70 Mon Sep 17 00:00:00 2001
From: saltyypringle <bookreader667@gmail.com>
Date: Sat, 21 Feb 2026 14:40:07 +0800
Subject: [PATCH 1/2] added workshop link to models and events

---
 client/src/hooks/useEvent.ts                     |  5 ++++-
 client/src/hooks/useEvents.ts                    |  5 ++++-
 client/src/pages/events/[id].tsx                 | 13 +++++++++++++
 .../migrations/0015_event_workshop_link.py       | 16 ++++++++++++++++
 server/game_dev/models.py                        |  1 +
 server/game_dev/serializers.py                   |  1 +
 server/game_dev/tests.py                         |  5 +++++
 7 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 server/game_dev/migrations/0015_event_workshop_link.py

diff --git a/client/src/hooks/useEvent.ts b/client/src/hooks/useEvent.ts
index 27794c6b..830b3b7d 100644
--- a/client/src/hooks/useEvent.ts
+++ b/client/src/hooks/useEvent.ts
@@ -12,10 +12,12 @@ type ApiEvent = {
   startTime: string | null;
   location: string;
   cover_image: string | null;
+  workshop_link: string;
 };
 
-type UiEvent = Omit<ApiEvent, "cover_image"> & {
+type UiEvent = Omit<ApiEvent, "cover_image" | "workshop_link"> & {
   coverImage: string;
+  workshopLink: string;
 };
 
 /**
@@ -33,6 +35,7 @@ function transformApiEventToUiEvent(data: ApiEvent): UiEvent {
   return {
     ...data,
     coverImage: data.cover_image ?? "/game_dev_club_logo.svg",
+    workshopLink: data.workshop_link,
   };
 }
 
diff --git a/client/src/hooks/useEvents.ts b/client/src/hooks/useEvents.ts
index 674d1a06..5d8922d2 100644
--- a/client/src/hooks/useEvents.ts
+++ b/client/src/hooks/useEvents.ts
@@ -12,16 +12,19 @@ type ApiEvent = {
   startTime: string | null;
   location: string;
   cover_image: string | null;
+  workshop_link: string;
 };
 
-export type UiEvent = Omit<ApiEvent, "cover_image"> & {
+export type UiEvent = Omit<ApiEvent, "cover_image" | "workshop_link"> & {
   coverImage: string;
+  workshopLink: string;
 };
 
 function transformApiEventToUiEvent(data: ApiEvent): UiEvent {
   return {
     ...data,
     coverImage: data.cover_image ?? "/game_dev_club_logo.svg",
+    workshopLink: data.workshop_link,
   };
 }
 
diff --git a/client/src/pages/events/[id].tsx b/client/src/pages/events/[id].tsx
index 8e8d8803..5f58a89a 100644
--- a/client/src/pages/events/[id].tsx
+++ b/client/src/pages/events/[id].tsx
@@ -75,6 +75,19 @@ export default function EventPage() {
           <p className="mt-4 max-w-lg text-base leading-relaxed">
             {event.description}
           </p>
+          {event.workshopLink && (
+            <p className="mt-4 text-base">
+              Workshop link:
+              <a
+                href={event.workshopLink}
+                target="_blank"
+                rel="noreferrer"
+                className="underline"
+              >
+                {event.workshopLink}
+              </a>
+            </p>
+          )}
         </div>
         <div className="lg:w-128 relative aspect-[4/3] w-full flex-shrink-0 overflow-hidden rounded-lg bg-gray-700 md:w-96">
           <Image
diff --git a/server/game_dev/migrations/0015_event_workshop_link.py b/server/game_dev/migrations/0015_event_workshop_link.py
new file mode 100644
index 00000000..9cff2762
--- /dev/null
+++ b/server/game_dev/migrations/0015_event_workshop_link.py
@@ -0,0 +1,16 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("game_dev", "0014_merge_20260214_1420"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="event",
+            name="workshop_link",
+            field=models.URLField(blank=True, max_length=2083),
+        ),
+    ]
diff --git a/server/game_dev/models.py b/server/game_dev/models.py
index d626275d..502b5cbb 100644
--- a/server/game_dev/models.py
+++ b/server/game_dev/models.py
@@ -19,6 +19,7 @@ class Event(models.Model):
     publicationDate = models.DateField()
     cover_image = models.ImageField(upload_to="events/", null=True)
     location = models.CharField(max_length=256)
+    workshop_link = models.URLField(max_length=2083, blank=True)
 
     def __str__(self):
         return self.name
diff --git a/server/game_dev/serializers.py b/server/game_dev/serializers.py
index c576aaa3..5907fab1 100644
--- a/server/game_dev/serializers.py
+++ b/server/game_dev/serializers.py
@@ -13,6 +13,7 @@ class Meta:
             "publicationDate",
             "cover_image",
             "location",
+            "workshop_link",
         ]
 
 
diff --git a/server/game_dev/tests.py b/server/game_dev/tests.py
index 96bdc434..984ed1b5 100644
--- a/server/game_dev/tests.py
+++ b/server/game_dev/tests.py
@@ -46,6 +46,7 @@ def setUp(self):
             publicationDate=self.pub_date,
             cover_image=image_file,
             location="Ezone",
+            workshop_link="https://example.com/workshop",
         )
 
     def test_publication_date_is_date(self):
@@ -73,6 +74,10 @@ def test_event_datetime_matches(self):
         event = Event.objects.get(pk=self.event.pk)
         self.assertEqual(event.date, self.event_datetime)
 
+    def test_workshop_link_matches(self):
+        event = Event.objects.get(pk=self.event.pk)
+        self.assertEqual(event.workshop_link, "https://example.com/workshop")
+
 
 class CommitteeModelTest(TestCase):
     def setUp(self):

From 479704b28e0669ee9b881d8f6502c10acaef5856 Mon Sep 17 00:00:00 2001
From: laurenpudz <lhpudney@gmail.com>
Date: Sun, 1 Mar 2026 14:10:13 +0800
Subject: [PATCH 2/2] camelcased coverImage and workshopLink, minor css
 frontend tweaks

---
 client/src/components/ui/EventDateDisplay.tsx | 25 +++++++++++++------
 client/src/hooks/useEvent.ts                  | 10 +++-----
 client/src/hooks/useEvents.ts                 |  9 +++----
 client/src/pages/events/[id].tsx              |  8 +++---
 .../migrations/0015_event_workshop_link.py    | 16 ------------
 ...e_cover_image_event_coverimage_and_more.py | 23 +++++++++++++++++
 server/game_dev/models.py                     |  4 +--
 server/game_dev/serializers.py                |  4 +--
 server/game_dev/tests.py                      | 10 ++++----
 9 files changed, 63 insertions(+), 46 deletions(-)
 delete mode 100644 server/game_dev/migrations/0015_event_workshop_link.py
 create mode 100644 server/game_dev/migrations/0029_rename_cover_image_event_coverimage_and_more.py

diff --git a/client/src/components/ui/EventDateDisplay.tsx b/client/src/components/ui/EventDateDisplay.tsx
index d7b97c89..c8172b8e 100644
--- a/client/src/components/ui/EventDateDisplay.tsx
+++ b/client/src/components/ui/EventDateDisplay.tsx
@@ -32,6 +32,20 @@ export function getEventDateParts(dateString: string): EventDateParts | null {
   }
 }
 
+const getOrdinal = (d: number) => {
+  if (d > 3 && d < 21) return `${d}th`;
+  switch (d % 10) {
+    case 1:
+      return `${d}st`;
+    case 2:
+      return `${d}nd`;
+    case 3:
+      return `${d}rd`;
+    default:
+      return `${d}th`;
+  }
+};
+
 type EventDateDisplayProps = { date: string };
 
 /** Renders event date as: weekday・ day month・ time.  */
@@ -39,13 +53,10 @@ export function EventDateDisplay({ date }: EventDateDisplayProps) {
   const parts = getEventDateParts(date);
   if (!parts) return null;
   return (
-    <div className="flex flex-wrap items-baseline gap-x-1">
-      <span className="whitespace-nowrap text-primary">
-        {parts.weekday}
-        {"・"}
-      </span>
-      <span className="whitespace-nowrap text-primary">
-        {parts.day} {parts.month}
+    <div className="flex flex-wrap items-baseline gap-x-1 font-firaCode">
+      <span className="whitespace-nowrap text-primary">{parts.weekday},</span>
+      <span className="whitespace-nowrap font-medium text-primary">
+        {getOrdinal(parseInt(parts.day))} {parts.month}
         {"・"}
       </span>
       <span className="text-secondary">{parts.time}</span>
diff --git a/client/src/hooks/useEvent.ts b/client/src/hooks/useEvent.ts
index 830b3b7d..f5cd607a 100644
--- a/client/src/hooks/useEvent.ts
+++ b/client/src/hooks/useEvent.ts
@@ -11,13 +11,12 @@ type ApiEvent = {
   date: string;
   startTime: string | null;
   location: string;
-  cover_image: string | null;
-  workshop_link: string;
+  coverImage: string | null;
+  workshopLink: string;
 };
 
-type UiEvent = Omit<ApiEvent, "cover_image" | "workshop_link"> & {
+type UiEvent = Omit<ApiEvent, "coverImage"> & {
   coverImage: string;
-  workshopLink: string;
 };
 
 /**
@@ -34,8 +33,7 @@ function normalizeEventId(
 function transformApiEventToUiEvent(data: ApiEvent): UiEvent {
   return {
     ...data,
-    coverImage: data.cover_image ?? "/game_dev_club_logo.svg",
-    workshopLink: data.workshop_link,
+    coverImage: data.coverImage ?? "/game_dev_club_logo.svg",
   };
 }
 
diff --git a/client/src/hooks/useEvents.ts b/client/src/hooks/useEvents.ts
index 18e674ee..f97cb7fd 100644
--- a/client/src/hooks/useEvents.ts
+++ b/client/src/hooks/useEvents.ts
@@ -10,11 +10,11 @@ type ApiEvent = {
   publicationDate: string;
   date: string;
   location: string;
-  cover_image: string | null;
-  workshop_link: string;
+  coverImage: string | null;
+  workshopLink: string;
 };
 
-export type UiEvent = Omit<ApiEvent, "cover_image" | "workshop_link"> & {
+export type UiEvent = Omit<ApiEvent, "coverImage"> & {
   coverImage: string;
   workshopLink: string;
 };
@@ -22,8 +22,7 @@ export type UiEvent = Omit<ApiEvent, "cover_image" | "workshop_link"> & {
 function transformApiEventToUiEvent(data: ApiEvent): UiEvent {
   return {
     ...data,
-    coverImage: data.cover_image ?? "/game_dev_club_logo.svg",
-    workshopLink: data.workshop_link,
+    coverImage: data.coverImage ?? "/game_dev_club_logo.svg",
   };
 }
 
diff --git a/client/src/pages/events/[id].tsx b/client/src/pages/events/[id].tsx
index 9374ff40..ec53f25a 100644
--- a/client/src/pages/events/[id].tsx
+++ b/client/src/pages/events/[id].tsx
@@ -58,13 +58,15 @@ export default function EventPage() {
           <p className="mt-6 text-lg">
             <EventDateDisplay date={event.date} />
           </p>
-          <div className="text-primary">{event.location} </div>
+          <div className="font-firaCode text-sm text-primary">
+            {event.location}{" "}
+          </div>
           <p className="mt-4 max-w-lg text-base leading-relaxed">
             {event.description}
           </p>
           {event.workshopLink && (
-            <p className="mt-4 text-base">
-              Workshop link:
+            <p className="mt-4 font-firaCode">
+              <span className="font-medium text-primary">Workshop link:</span>{" "}
               <a
                 href={event.workshopLink}
                 target="_blank"
diff --git a/server/game_dev/migrations/0015_event_workshop_link.py b/server/game_dev/migrations/0015_event_workshop_link.py
deleted file mode 100644
index 9cff2762..00000000
--- a/server/game_dev/migrations/0015_event_workshop_link.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("game_dev", "0014_merge_20260214_1420"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="event",
-            name="workshop_link",
-            field=models.URLField(blank=True, max_length=2083),
-        ),
-    ]
diff --git a/server/game_dev/migrations/0029_rename_cover_image_event_coverimage_and_more.py b/server/game_dev/migrations/0029_rename_cover_image_event_coverimage_and_more.py
new file mode 100644
index 00000000..a6deec1e
--- /dev/null
+++ b/server/game_dev/migrations/0029_rename_cover_image_event_coverimage_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.1.15 on 2026-03-01 05:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('game_dev', '0028_alter_game_hosturl'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='event',
+            old_name='cover_image',
+            new_name='coverImage',
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='workshopLink',
+            field=models.URLField(blank=True, max_length=2083),
+        ),
+    ]
diff --git a/server/game_dev/models.py b/server/game_dev/models.py
index 3f5d1a28..dece53c5 100644
--- a/server/game_dev/models.py
+++ b/server/game_dev/models.py
@@ -17,9 +17,9 @@ class Event(models.Model):
     date = models.DateTimeField()
     description = models.CharField(max_length=256, blank=True)
     publicationDate = models.DateField()
-    cover_image = models.ImageField(upload_to="events/", null=True)
+    coverImage = models.ImageField(upload_to="events/", null=True)
     location = models.CharField(max_length=256)
-    workshop_link = models.URLField(max_length=2083, blank=True)
+    workshopLink = models.URLField(max_length=2083, blank=True)
 
     def __str__(self):
         return self.name
diff --git a/server/game_dev/serializers.py b/server/game_dev/serializers.py
index 3bd37f26..97a9295e 100644
--- a/server/game_dev/serializers.py
+++ b/server/game_dev/serializers.py
@@ -11,9 +11,9 @@ class Meta:
             "date",
             "description",
             "publicationDate",
-            "cover_image",
+            "coverImage",
             "location",
-            "workshop_link",
+            "workshopLink",
         ]
 
 
diff --git a/server/game_dev/tests.py b/server/game_dev/tests.py
index 984ed1b5..9b30e70a 100644
--- a/server/game_dev/tests.py
+++ b/server/game_dev/tests.py
@@ -44,9 +44,9 @@ def setUp(self):
             date=self.event_datetime,
             description="Yayayyayayay!",
             publicationDate=self.pub_date,
-            cover_image=image_file,
+            coverImage=image_file,
             location="Ezone",
-            workshop_link="https://example.com/workshop",
+            workshopLink="https://example.com/workshop",
         )
 
     def test_publication_date_is_date(self):
@@ -58,10 +58,10 @@ def test_publication_date_matches(self):
         self.assertEqual(event.publicationDate, self.pub_date)
 
     def test_cover_image_not_empty(self):
-        self.assertIsNotNone(self.event.cover_image)
+        self.assertIsNotNone(self.event.coverImage)
 
     def test_cover_image_is_saved_in_correct_folder(self):
-        self.assertTrue(self.event.cover_image.name.startswith("events/"))
+        self.assertTrue(self.event.coverImage.name.startswith("events/"))
 
     def test_publication_date_not_empty(self):
         self.assertTrue(bool(self.event.publicationDate))
@@ -76,7 +76,7 @@ def test_event_datetime_matches(self):
 
     def test_workshop_link_matches(self):
         event = Event.objects.get(pk=self.event.pk)
-        self.assertEqual(event.workshop_link, "https://example.com/workshop")
+        self.assertEqual(event.workshopLink, "https://example.com/workshop")
 
 
 class CommitteeModelTest(TestCase):