diff --git a/app/routes/events-team.tsx b/app/routes/events-team.tsx index 8045abe..bc9bb88 100644 --- a/app/routes/events-team.tsx +++ b/app/routes/events-team.tsx @@ -23,7 +23,7 @@ import { VStack, } from "@chakra-ui/react"; import { useLoaderData } from "@remix-run/react"; -import { type ReactNode, useState } from "react"; +import { useState } from "react"; export async function loader({ context }: { context: RequestContext }) { if (!context.data.current_user) @@ -83,7 +83,6 @@ export default function () { members: { id: string; name: string }[]; } = useLoaderData(); const [eventData, setEventData] = useState(events); - const eventCards: ReactNode[] = []; const { isOpen, onClose, onOpen } = useDisclosure(); const toast = useToast(); const [selectedEvent, setSelectedEvent] = useState(""); @@ -176,95 +175,6 @@ export default function () { setEventData(newEventData); } - for (const event of eventData) { - const eventCreatorName = members.find( - (member) => member.id === event.created_by, - )?.name; - - eventCards.push( - - - } spacing="4"> - - Date - - {event.year}-{event.month}-{event.day} - - - - Event Type - - {event.type.toUpperCase()} - - - - Event Details - - {event.details} - - - {event.type === "rotw" ? ( - - Riddle Answer - - {event.answer} - - - ) : null} - - Host - - {eventCreatorName - ? `${eventCreatorName} (${event.created_by})` - : event.created_by} - - - - - - - {can_approve && event.pending ? ( - <> - - - - ) : null} - {can_approve && - event.approved && - event.type === "gamenight" && - !event.reached_minimum_player_count ? ( - <> - - - ) : null} - - - Status:{" "} - {event.pending ? "Pending" : event.approved ? "Approved" : "Denied"} - - - , - ); - } - return ( @@ -295,7 +205,100 @@ export default function () { - {eventCards} + + {eventData.map((event) => { + const eventCreatorName = members.find( + (member) => member.id === event.created_by, + )?.name; + + return ( + + + } spacing="4"> + + Date + + {event.year}-{event.month}-{event.day} + + + + Event Type + + {event.type.toUpperCase()} + + + + Event Details + + {event.details} + + + {event.type === "rotw" ? ( + + Riddle Answer + + {event.answer} + + + ) : null} + + Host + + {eventCreatorName + ? `${eventCreatorName} (${event.created_by})` + : event.created_by} + + + + + + + {can_approve && event.pending ? ( + <> + + + + ) : null} + {can_approve && + event.approved && + event.type === "gamenight" && + !event.reached_minimum_player_count ? ( + <> + + + ) : null} + + + Status:{" "} + {event.pending + ? "Pending" + : event.approved + ? "Approved" + : "Denied"} + + + + ); + })} + Book an Event