From d210cebfe14900ec4787ec7dc4282431996e2fa7 Mon Sep 17 00:00:00 2001
From: markgcera <>
Date: Sun, 29 Oct 2023 19:58:43 +0800
Subject: [PATCH 1/2] Update Event.ts and EventCollection.ts

---
 .../db/collections/admin/EventCollection.ts   | 21 ++++++++++--------
 src/server/db/models/Event.ts                 | 22 +++++++++++--------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/server/db/collections/admin/EventCollection.ts b/src/server/db/collections/admin/EventCollection.ts
index 60edbe1..edeffed 100644
--- a/src/server/db/collections/admin/EventCollection.ts
+++ b/src/server/db/collections/admin/EventCollection.ts
@@ -10,15 +10,18 @@ type User = {
 }
 
 export type Event = {
-  attendees: number
-  endDate: FirebaseFirestore.Timestamp | Date
-  hasStarted: boolean
-  id?: string
-  invitedAttendees: User[]
-  name: string
-  departments: string[]
-  isQrRequired: boolean
-  startDate: FirebaseFirestore.Timestamp | Date
+    id?: string
+    startDate: FirebaseFirestore.Timestamp | Date
+    endDate: FirebaseFirestore.Timestamp | Date
+    name: string
+    description: string
+    venue: string
+    departments: string[]
+    isExclusive: boolean  
+    hasStarted: boolean
+    attendees: number
+    invitedAttendees: User[]
+    secretCode: string   
 }
 
 class EventCollection extends BaseCollection<Event> {
diff --git a/src/server/db/models/Event.ts b/src/server/db/models/Event.ts
index 4c7f67e..54eae86 100644
--- a/src/server/db/models/Event.ts
+++ b/src/server/db/models/Event.ts
@@ -10,15 +10,19 @@ type User = {
 }
 
 export type Event = {
-  attendees: number
-  endDate: Timestamp | Date
-  hasStarted: boolean
-  id?: string
-  invitedAttendees: User[]
-  name: string
-  departments: string[]
-  isQrRequired: boolean
-  startDate: Timestamp | Date
+    id?: string
+    startDate: Timestamp | Date
+    endDate: Timestamp | Date
+    name: string
+    description: string
+    venue: string
+    departments: string[]
+    isExclusive: boolean  
+    hasStarted: boolean
+    attendees: number
+    invitedAttendees: User[]
+    secretCode: string   
+
 }
 
 export default User

From 598a6dee8674f4bd071a76a6439fe753b69683f2 Mon Sep 17 00:00:00 2001
From: markgcera <>
Date: Sun, 29 Oct 2023 21:04:47 +0800
Subject: [PATCH 2/2] Update eventModal class and minor UI changes

---
 src/components/calendar/EventModal.tsx   | 11 ++++-------
 src/server/trpc/router/event/getEvent.ts |  1 +
 src/types/event/event.type.ts            |  1 +
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/components/calendar/EventModal.tsx b/src/components/calendar/EventModal.tsx
index a57a2ba..e8ad37f 100644
--- a/src/components/calendar/EventModal.tsx
+++ b/src/components/calendar/EventModal.tsx
@@ -106,12 +106,11 @@ const Header: React.FC<{ data: BodyProps | null | undefined }> = ({ data }) => {
   }
   dayjs.extend(LocalizedFormat)
   const startDate = dayjs(data.startDate).format('lll')
-
   return (
     <Flex justify="space-between" py={8}>
       <Box float="left">{data.name}</Box>
       {/* <Box float="right">{data.startDate.toString()}</Box> */}
-      <Box float="right">{startDate}</Box>
+      <Box float="right">{`Starts: ` + startDate}</Box>
     </Flex>
   )
 }
@@ -122,16 +121,14 @@ const Body: React.FC<{ data: BodyProps | null | undefined }> = ({ data }) => {
   }
 
   dayjs.extend(LocalizedFormat)
-  const startDate = dayjs(data.startDate).format('lll')
   const endDate = dayjs(data.endDate).format('lll')
-
+  const description = data.description;
   return (
     <Flex direction="column">
       <Flex justify="space-between" py={4}>
-        <Box>{'Time: 1000 - 1200'}</Box>
-        <Box>{'Venue: LT69'}</Box>
+        <Box float="left">{`Event Description: ` + description}</Box>
+        <Box float="right">{`Ends: ` + endDate}</Box>
       </Flex>
-      <Box py={6}>{'Description: This is a very fun event.'}</Box>
     </Flex>
   )
 }
diff --git a/src/server/trpc/router/event/getEvent.ts b/src/server/trpc/router/event/getEvent.ts
index 9beb4ce..4a37f66 100644
--- a/src/server/trpc/router/event/getEvent.ts
+++ b/src/server/trpc/router/event/getEvent.ts
@@ -40,6 +40,7 @@ export const getEvent = protectedProcedure
         qr_code,
         departments: event.departments,
         startDate: (event.startDate as Timestamp).toDate(),
+        description: event.description
       }
     } catch (e) {
       throw new TRPCError({
diff --git a/src/types/event/event.type.ts b/src/types/event/event.type.ts
index 2f27562..97102df 100644
--- a/src/types/event/event.type.ts
+++ b/src/types/event/event.type.ts
@@ -24,4 +24,5 @@ export interface BodyProps {
   qr_code: string | undefined
   startDate: Date
   departments: string[]
+  description: string
 }