From f62421b8c52484917a8242701c2538cdcb945f4f Mon Sep 17 00:00:00 2001 From: Mark Fullbrook Date: Tue, 12 Nov 2024 07:28:44 +0000 Subject: [PATCH] wip --- app/page.tsx | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/app/page.tsx b/app/page.tsx index aef50b0..41b106c 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -18,8 +18,8 @@ const galindo = Galindo({ type DayStatus = { date: string isOpen: boolean - opensAt: string | null - closesAt: string | null + opensAt?: string + closesAt?: string } // type TrailData = { @@ -70,12 +70,18 @@ const StatusIcon = ({ isOpen, className, size = "large" }: { isOpen: boolean; cl } const OpeningTimes = ({ isOpen, opensAt, closesAt }: { isOpen: boolean; opensAt?: string; closesAt?: string }) => { - if (!isOpen && opensAt && closesAt) { - return {opensAt} - {closesAt} - } else if (!isOpen && opensAt) { - return Opens at {opensAt} + let children = [] + if (!isOpen) { + if (opensAt && closesAt) { + children.push(Closes at {opensAt}) + children.push(Opens at {closesAt}) + } else if (opensAt) { + children.push(Opens at {opensAt}) + } else if (closesAt) { + children.push(Closes at {closesAt}) + } } - return null + return
{children}
} export default function Page() { @@ -90,8 +96,8 @@ export default function Page() { const weekData = sortedDates.map(date => ({ date, isOpen: trailData.data[date].isOpen, - opensAt: trailData.data[date].conditions?.opensAt ?? null, - closesAt: trailData.data[date].conditions?.closesAt ?? null + opensAt: trailData.data[date].conditions?.opensAt ?? undefined, + closesAt: trailData.data[date].conditions?.closesAt ?? undefined })) setWeekStatus(weekData) @@ -157,10 +163,12 @@ export default function Page() { > - {getDayLabel(day.date, index + 2)} + { + console.log(day) + }}>{getDayLabel(day.date, index + 2)} -
+