refactor: put endTime inside date object

compsci-adl · Mar 18, 2024 · 5f452c1 · 5f452c1
1 parent 9f8b26e
commit 5f452c1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 15 deletions.
diff --git a/src/app/events/Events.tsx b/src/app/events/Events.tsx
@@ -71,16 +71,15 @@ export default function Events({ className }: { className?: string }) {
     // Convert event date and check if upcoming event
     const upcomingEvents = EVENTS.filter((event) => {
         const eventDate = new Date(
-            `${event.date.year} ${event.date.month} ${event.date.day} ${event.endTime}`
+            `${event.date.year} ${event.date.month} ${event.date.day} ${event.date.endTime}`
         );
-        console.log('event: ' + eventDate);
         return eventDate >= currentDate;
     });
 
     // Convert event date, check if past event and reverse events
     const pastEvents = EVENTS.filter((event) => {
         const eventDate = new Date(
-            `${event.date.year} ${event.date.month} ${event.date.day} ${event.endTime}`
+            `${event.date.year} ${event.date.month} ${event.date.day} ${event.date.endTime}`
         );
         return eventDate < currentDate;
     }).reverse();

diff --git a/src/data/events.ts b/src/data/events.ts
@@ -15,8 +15,7 @@ type Month =
     | 'DEC';
 export type Event = {
     title: string;
-    date: { year: number; month: Month; day: number };
-    endTime: string;
+    date: { year: number; month: Month; day: number; endTime: string };
     time: string;
     location: string;
     details: string;
@@ -26,8 +25,7 @@ export type Event = {
 export const EVENTS: Event[] = [
     {
         title: 'Meet and Greet',
-        date: { year: 2024, month: 'MAR', day: 1 },
-        endTime: '21:00',
+        date: { year: 2024, month: 'MAR', day: 1, endTime: '21:00' },
         time: '5:00pm - 9:00pm',
         location: 'Engineering and Maths EM105',
         details:
@@ -36,8 +34,7 @@ export const EVENTS: Event[] = [
     },
     {
         title: 'Insight Into Industry',
-        date: { year: 2024, month: 'MAR', day: 6 },
-        endTime: '21:00',
+        date: { year: 2024, month: 'MAR', day: 6, endTime: '21:00' },
         time: '6:00pm - 9:00pm',
         location: 'Ingkarni Wardli 715',
         details:
@@ -46,26 +43,23 @@ export const EVENTS: Event[] = [
     },
     {
         title: 'Quiz Night',
-        date: { year: 2024, month: 'MAR', day: 8 },
-        endTime: '21:00',
+        date: { year: 2024, month: 'MAR', day: 8, endTime: '21:00' },
         time: '6:00pm - 9:00pm',
         location: 'Ingkarni Wardli 218',
         details: 'Join us for a night of quizzical encounters! Free food and prizes to come!',
         image: 'quiz-night.jpg',
     },
     {
         title: 'Industry Night',
-        date: { year: 2024, month: 'APR', day: 2 },
-        endTime: '21:00',
+        date: { year: 2024, month: 'APR', day: 2, endTime: '21:00' },
         time: '6:00pm - 9:00pm',
         location: 'The National Wine Centre, Hickinbotham Hall',
         details: 'Connect with top companies and explore job opportunities in the tech industry!',
         image: 'industry-night.jpg',
     },
     {
         title: 'LaTeX Workshop',
-        date: { year: 2024, month: 'APR', day: 4 },
-        endTime: '19:00',
+        date: { year: 2024, month: 'APR', day: 4, endTime: '19:00' },
         time: '5:00pm - 7:00pm',
         location: 'Ingkarni Wardli 218',
         details: