Update Event.ts and EventCollection.ts

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>
   )
 }

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> {

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

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({

src/types/event/event.type.ts

@@ -24,4 +24,5 @@ export interface BodyProps {
   qr_code: string | undefined
   startDate: Date
   departments: string[]
+  description: string
 }