diff --git a/src/components/Event/Event.tsx b/src/components/Event/Event.tsx index f0b4011..b00e6c4 100644 --- a/src/components/Event/Event.tsx +++ b/src/components/Event/Event.tsx @@ -10,7 +10,9 @@ import EventDetails from './EventDetails'; import EventInterestForm from './EventInterestForm'; import EventPlaceholder from './EventPlaceholder'; -function GroupName({ group }: { group: IEvent['group'] }) { +type NotNull = T extends null ? never : T; + +function GroupName({ group }: { group: NotNull }) { return {group.name}; } @@ -56,6 +58,8 @@ export default function Event({
{name} + Created by {event.creator.name} +
{group && }
diff --git a/src/components/types.ts b/src/components/types.ts index 66d7cf0..c31ddfc 100644 --- a/src/components/types.ts +++ b/src/components/types.ts @@ -24,11 +24,6 @@ export type ICarpool = { longitude: number; placeId: string; }; - // driverId: number | null; - // driver: { - // id: number; - // name: string; - // }; creatorId: number; members: { id: number; @@ -72,6 +67,10 @@ export type IEvent = { group: { id: number; name: string; + } | null; + creator: { + id: number; + name: string; }; carpools: { id: number;