Merge branch 'attempt-to-order-front-page'

WarwickStudentArtsFestival · Jun 9, 2024 · c33d5b7 · c33d5b7
2 parents eec0dc7 + b16ee02
commit c33d5b7
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/src/app/(home)/components/whats-on.tsx b/src/app/(home)/components/whats-on.tsx
@@ -3,7 +3,7 @@ import { getEvents } from '@/lib/events';
 import EventCard from '@/app/events/components/event-card';
 
 export default async function WhatsOn() {
-  const events = (await getEvents(true, 1)).slice(0, 6);
+  const events = (await getEvents(false, 1)).slice(0, 6);
 
   return (
     <section className="mb-8">
@@ -26,6 +26,7 @@ export default async function WhatsOn() {
         .
       </p>
 
+      <p className="font-bold mb-1">Coming up Next:</p>
       <div className="mx-4 mb-4 flex justify-center flex-wrap gap-4">
         {events.map((event) => (
           <EventCard

diff --git a/src/app/events/components/event-card.tsx b/src/app/events/components/event-card.tsx
@@ -17,6 +17,7 @@ export default function EventCard({
   spacingClasses?: string;
   pastEvent?: boolean;
 }) {
+  const currentTime = new Date().getTime();
   return (
     <a
       href={`/events/${event.slug}`}
@@ -27,7 +28,12 @@ export default function EventCard({
       >
         <div className="text-xs">
           {event.schedule_eventinstance.map((instance) => (
-            <p key={instance.id}>
+            <p
+              key={instance.id}
+              className={
+                instance.end.getTime() < currentTime ? 'line-through' : ''
+              }
+            >
               <time dateTime={instance.start.toISOString()}>
                 {formatShowDateTime(instance.start)}
               </time>{' '}

diff --git a/src/app/schedule/components/schedule-event-instance.tsx b/src/app/schedule/components/schedule-event-instance.tsx
@@ -18,7 +18,7 @@ export default function ScheduleEventInstance({
   return (
     <a
       href={`/events/${eventInstance.schedule_event.slug}`}
-      className={`block w-52 ${eventPage ? 'hover:scale-105' : 'mr-3'} ${eventInstance.start.getTime() - new Date().getTime() > 0 ? '' : 'opacity-50 line-through'}`}
+      className={`block w-52 ${eventPage ? 'hover:scale-105' : 'mr-3'} ${eventInstance.end.getTime() - new Date().getTime() > 0 ? '' : 'opacity-50 line-through'}`}
     >
       <article
         className={`group p-2 ${getEventColourClasses(eventInstance.schedule_event)} drop-shadow-md h-full relative`}

diff --git a/src/lib/events.ts b/src/lib/events.ts
@@ -87,7 +87,7 @@ export async function getEvents(
       schedule_eventinstance: {
         some: {
           published: true,
-          start: pastEvents
+          end: pastEvents
             ? pastEvents === 1
               ? { gte: new Date() }
               : { lte: new Date() }
@@ -102,6 +102,7 @@ export async function getEvents(
       schedule_eventinstance: {
         where: { published: true },
         include: { schedule_venue: true },
+        orderBy: { start: 'asc' },
       },
     },
   });
@@ -110,6 +111,20 @@ export async function getEvents(
       .map((val) => ({ val, sort: Math.random() }))
       .sort((a, b) => a.sort - b.sort)
       .map((val) => val.val);
+  } else {
+    const currentTime = new Date().getTime();
+    events = events
+      .map((val) => ({
+        val,
+        earliest:
+          (pastEvents !== 1 && false
+            ? val.schedule_eventinstance[0]?.start?.getTime()
+            : val.schedule_eventinstance
+                .filter((instance) => instance.end.getTime() >= currentTime)[0]
+                ?.start?.getTime()) || 0,
+      }))
+      .sort((a, b) => a.earliest - b.earliest)
+      .map((val) => val.val);
   }
 
   return events;