From 43a16a57cc74266b09ca7e7a2a2b302660791ccc Mon Sep 17 00:00:00 2001 From: Michael Fatemi Date: Tue, 13 Jul 2021 12:49:39 -0400 Subject: [PATCH] Make event carpools use real data --- src/components/Event/EventCarpools.tsx | 26 +++----------------------- src/components/types.ts | 8 ++++++++ 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/src/components/Event/EventCarpools.tsx b/src/components/Event/EventCarpools.tsx index 2309730..345f622 100644 --- a/src/components/Event/EventCarpools.tsx +++ b/src/components/Event/EventCarpools.tsx @@ -4,10 +4,10 @@ import { useCallback, useState } from 'react'; import { createCarpool } from '../api'; import { lightgrey } from '../colors'; import { useMe } from '../hooks'; -import { ICarpool, IEvent } from '../types'; +import { IEvent } from '../types'; import UIButton from '../UI/UIButton'; -function CarpoolRow({ carpool }: { carpool: ICarpool }) { +function CarpoolRow({ carpool }: { carpool: IEvent['carpools'][0] }) { const PADDING = '1rem'; return (
(null); const me = useMe()!; @@ -100,7 +80,7 @@ export default function Carpools({ event }: { event: IEvent }) { ? 'Created!' : 'Errored'} - {carpools.map((carpool) => ( + {event.carpools.map((carpool) => ( ))}
diff --git a/src/components/types.ts b/src/components/types.ts index 9cee24a..a6139d2 100644 --- a/src/components/types.ts +++ b/src/components/types.ts @@ -57,6 +57,14 @@ export type IEvent = { id: number; name: string; }; + carpools: { + id: number; + name: string; + members: { + id: number; + name: string; + }; + }[]; startTime: string; // Datestring duration: number; endTime: string | null; // Datestring