Merge branch 'main' into issue-143-allow_playable_game_width_and_height_to_be_null

laurenpudz · laurenpudz · commit fd4393902772 · 2026-03-03T16:47:39.000+08:00
diff --git a/client/src/components/ui/EventDateDisplay.tsx b/client/src/components/ui/EventDateDisplay.tsx
@@ -32,20 +32,31 @@ 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.  */
 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
@@ -11,10 +11,11 @@ type ApiEvent = {
   date: string;
   startTime: string | null;
   location: string;
-  cover_image: string | null;
+  coverImage: string | null;
+  workshopLink: string;
 };
 
-type UiEvent = Omit<ApiEvent, "cover_image"> & {
+type UiEvent = Omit<ApiEvent, "coverImage"> & {
   coverImage: string;
 };
 
@@ -32,7 +33,7 @@ function normalizeEventId(
 function transformApiEventToUiEvent(data: ApiEvent): UiEvent {
   return {
     ...data,
-    coverImage: data.cover_image ?? "/game_dev_club_logo.svg",
+    coverImage: data.coverImage ?? "/game_dev_club_logo.svg",
   };
 }
 
diff --git a/client/src/hooks/useEvents.ts b/client/src/hooks/useEvents.ts
@@ -10,17 +10,19 @@ type ApiEvent = {
   publicationDate: string;
   date: string;
   location: string;
-  cover_image: string | null;
+  coverImage: string | null;
+  workshopLink: string;
 };
 
-export type UiEvent = Omit<ApiEvent, "cover_image"> & {
+export type UiEvent = Omit<ApiEvent, "coverImage"> & {
   coverImage: string;
+  workshopLink: string;
 };
 
 function transformApiEventToUiEvent(data: ApiEvent): UiEvent {
   return {
     ...data,
-    coverImage: data.cover_image ?? "/game_dev_club_logo.svg",
+    coverImage: data.coverImage ?? "/game_dev_club_logo.svg",
   };
 }
 
diff --git a/client/src/pages/events/[id].tsx b/client/src/pages/events/[id].tsx
@@ -58,10 +58,25 @@ 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 font-firaCode">
+              <span className="font-medium text-primary">Workshop link:</span>{" "}
+              <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/client/src/pages/games/[id].tsx b/client/src/pages/games/[id].tsx
@@ -1,10 +1,12 @@
 import Image from "next/image";
+import Link from "next/link";
 import { useRouter } from "next/router";
 import React from "react";
 import { SocialIcon } from "react-social-icons";
 
 import { GameEmbed } from "@/components/ui/GameEmbed";
 import { ItchEmbed } from "@/components/ui/ItchEmbed";
+import { useEvent } from "@/hooks/useEvent";
 import { useGame } from "@/hooks/useGames";
 
 export default function IndividualGamePage() {
@@ -17,6 +19,9 @@ export default function IndividualGamePage() {
     error,
     isError,
   } = useGame(router.isReady ? id : undefined);
+  const { data: eventData } = useEvent(
+    game?.event ? String(game.event) : undefined,
+  );
 
   if (isPending) {
     return (
@@ -55,6 +60,8 @@ export default function IndividualGamePage() {
   const gamePlayableID = game.itchGamePlayableID;
   const gameWidth = game.itchGameWidth;
   const gameHeight = game.itchGameHeight;
+  const eventID = game.event;
+  const eventName = eventData?.name || "";
 
   const completionLabels: Record<number, string> = {
     1: "WIP",
@@ -65,8 +72,6 @@ export default function IndividualGamePage() {
 
   const devStage = completionLabels[game.completion] ?? "Stage Unknown";
 
-  // TODO ADD EVENT
-  const event = "Game Jam November 2025";
   // TODO ADD ARTIMAGES
   const artImages: { src: string; alt: string }[] = [];
   // const artImages = [
@@ -130,12 +135,12 @@ export default function IndividualGamePage() {
                           key={c.member_id}
                           className="flex items-center gap-x-2"
                         >
-                          <a
+                          <Link
                             href={`/members/${c.member_id}`}
                             className="text-primary hover:underline"
                           >
                             {c.name}
-                          </a>
+                          </Link>
                           {Array.isArray(c.social_media) &&
                             c.social_media.map((sm) => (
                               <SocialIcon
@@ -157,24 +162,39 @@ export default function IndividualGamePage() {
                   </td>
                   <td className="py-1 text-right sm:py-2">{devStage}</td>
                 </tr>
-                <tr className="border-b-2 border-gray-300">
-                  <td className="py-1 pr-2 text-muted-foreground sm:py-2">
-                    Host Site
-                  </td>
-                  <td className="py-1 text-right sm:py-2">
-                    <a
-                      href={game.hostURL}
-                      className="text-primary underline hover:underline"
-                    >
-                      {game.hostURL}
-                    </a>
-                  </td>
-                </tr>
+                {game.hostURL && (
+                  <tr className="border-b-2 border-gray-300">
+                    <td className="py-1 pr-2 text-muted-foreground sm:py-2">
+                      Host Site
+                    </td>
+                    <td className="py-1 text-right sm:py-2">
+                      <a
+                        href={game.hostURL}
+                        className="text-primary underline hover:underline"
+                      >
+                        {game.hostURL}
+                      </a>
+                    </td>
+                  </tr>
+                )}
                 <tr>
                   <td className="py-1 pr-2 text-muted-foreground sm:py-2">
                     Event
                   </td>
-                  <td className="py-1 text-right sm:py-2">{event}</td>
+                  <td className="py-1 text-right sm:py-2">
+                    {eventID && eventName ? (
+                      <Link
+                        href={`/events/${eventID}`}
+                        className="text-primary hover:underline"
+                      >
+                        {eventName}
+                      </Link>
+                    ) : (
+                      <span className="text-muted-foreground">
+                        No past/upcoming event
+                      </span>
+                    )}
+                  </td>
                 </tr>
               </tbody>
             </table>
diff --git a/server/game_dev/migrations/0028_alter_game_hosturl.py b/server/game_dev/migrations/0028_alter_game_hosturl.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.15 on 2026-02-28 14:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('game_dev', '0027_remove_game_itchgameembedid_game_itchgameplayableid'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='game',
+            name='hostURL',
+            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
@@ -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
@@ -18,8 +18,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)
+    workshopLink = models.URLField(max_length=2083, blank=True)
 
     def __str__(self):
         return self.name
@@ -54,7 +55,7 @@ class CompletionStatus(models.IntegerChoices):
         null=False,
     )
     active = models.BooleanField(default=True, null=False)
-    hostURL = models.URLField(max_length=2083)
+    hostURL = models.URLField(max_length=2083, blank=True)
     itchEmbedID = models.PositiveIntegerField(
         default=None,
         null=True,
diff --git a/server/game_dev/serializers.py b/server/game_dev/serializers.py
@@ -11,8 +11,9 @@ class Meta:
             "date",
             "description",
             "publicationDate",
-            "cover_image",
+            "coverImage",
             "location",
+            "workshopLink",
         ]
 
 
diff --git a/server/game_dev/tests.py b/server/game_dev/tests.py
@@ -44,8 +44,9 @@ def setUp(self):
             date=self.event_datetime,
             description="Yayayyayayay!",
             publicationDate=self.pub_date,
-            cover_image=image_file,
+            coverImage=image_file,
             location="Ezone",
+            workshopLink="https://example.com/workshop",
         )
 
     def test_publication_date_is_date(self):
@@ -57,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))
@@ -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.workshopLink, "https://example.com/workshop")
+
 
 class CommitteeModelTest(TestCase):
     def setUp(self):
diff --git a/server/game_dev/views.py b/server/game_dev/views.py
@@ -37,6 +37,9 @@ def get_queryset(self):
         qs = Event.objects.all()
         type_param = self.request.query_params.get("type")
         now = timezone.now()
+        nowdate = now.date()
+        # Only show published events
+        qs = qs.filter(publicationDate__lte=nowdate)
 
         # Default to upcoming when type is missing/empty
         if not type_param:
@@ -60,7 +63,16 @@ class EventDetailAPIView(generics.RetrieveAPIView):
     lookup_url_kwarg = "id"
 
     def get_queryset(self):
-        return Event.objects.filter(id=self.kwargs["id"])
+        now = timezone.now().date()
+        return Event.objects.filter(id=self.kwargs["id"], publicationDate__lte=now)
+
+    def get_object(self):
+        queryset = self.get_queryset()
+        try:
+            return queryset.get()
+        except Event.DoesNotExist:
+            from rest_framework.exceptions import NotFound
+            raise NotFound(detail="The event is not yet published by admin or does not exist.")
 
 
 class GameshowcaseAPIView(APIView):

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,9 @@ class Meta:`
`11`	`11`	`"date",`
`12`	`12`	`"description",`
`13`	`13`	`"publicationDate",`
`14`		`- "cover_image",`
	`14`	`+ "coverImage",`
`15`	`15`	`"location",`
	`16`	`+ "workshopLink",`
`16`	`17`	`]`
`17`	`18`
`18`	`19`