diff --git a/app/routes/events-team.tsx b/app/routes/events-team.tsx index cbd7ef4..8016976 100644 --- a/app/routes/events-team.tsx +++ b/app/routes/events-team.tsx @@ -31,57 +31,41 @@ export async function loader({ context }: { context: RequestContext }) { } export default function () { - const data = useLoaderData(); - const daysInThisMonth = new Date().setUTCDate(0); - const dayCards: ReactNode[] = []; + const data: { [k: string]: any }[] = useLoaderData(); + const eventCards: ReactNode[] = []; - for (let i = 0; i < daysInThisMonth; i++) { - const dayData: { [k: string]: any }[] = data.filter( - (row) => row.day === i + 1, - ); - - if (!dayData.length) continue; - - const fotd = dayData.find((d) => d.type === "fotd"); - const gamenight = dayData.find((d) => d.type === "gamenight"); - const qotd = dayData.find((d) => d.type === "qotd"); - - const dayCard = ( - - - - {new Date( - dayData[0].year, - dayData[0].month, - dayData[0].day, - ).toDateString()} - - + for (const event of data) { + eventCards.push( + - } spacing={4}> + } spacing="4"> - FACT OF THE DAY - {fotd ? "" : "Not"} Booked + Date + + {event.year}-{event.month}-{event.day} + - GAMENIGHT - {gamenight ? "" : "Not"} Booked + Event Type + + {event.type.toUpperCase()} + - QUESTION OF THE DAY - {qotd ? "" : "Not"} Booked + Host + + {event.created_by} + - + , ); - - dayCards.push(dayCard); } return ( - {dayCards} + {eventCards} ); }