diff --git a/web/src/components/events/EventItem.tsx b/web/src/components/events/EventItem.tsx index befaace..3072c61 100644 --- a/web/src/components/events/EventItem.tsx +++ b/web/src/components/events/EventItem.tsx @@ -51,32 +51,39 @@ export const EventItem = ({ /> )} -
- {mode === "list" && nextOccurrence && ( -
- {groupedOccurrences.slice(0, DATE_PILLS_TO_SHOW).map((group) => ( - - {formatDateRange(group)} - - ))} - {groupedOccurrences.length > DATE_PILLS_TO_SHOW && ( - {`+${groupedOccurrences - .slice(DATE_PILLS_TO_SHOW) - .reduce((sum, group) => sum + group.length, 0)}`} - )} -
- )} - {(mode === "calendar" || mode === "singular-time-only") && +
+ {mode === "singular-time-only" && "occurrence" in event && event.occurrence?.start && ( -

- {formatDate(event.occurrence?.start, "'kl.' HH:mm")} +

+ {formatDate(event.occurrence?.start, "eeee dd.MM.")}

)} -
-

{event.title}

Evt. andre detaljer

+
+ {mode === "list" && nextOccurrence && ( +
+ {groupedOccurrences.slice(0, DATE_PILLS_TO_SHOW).map((group) => ( + + {formatDateRange(group)} + + ))} + {groupedOccurrences.length > DATE_PILLS_TO_SHOW && ( + {`+${groupedOccurrences + .slice(DATE_PILLS_TO_SHOW) + .reduce((sum, group) => sum + group.length, 0)}`} + )} +
+ )} + {(mode === "calendar" || mode === "singular-time-only") && + "occurrence" in event && + event.occurrence?.start && ( +

+ {formatDate(event.occurrence?.start, "'kl.' HH:mm")} +

+ )} +
Mer om arrangementet {event.title} diff --git a/web/src/components/events/UpcomingEvents.tsx b/web/src/components/events/UpcomingEvents.tsx index 38c79ff..a6a3a52 100644 --- a/web/src/components/events/UpcomingEvents.tsx +++ b/web/src/components/events/UpcomingEvents.tsx @@ -28,12 +28,12 @@ export const UpcomingEvents = ({ events }: { events: EventFragment[] }) => { const eventsThisDay = eventsByDate[day]; return (
-

+ {/*

{formatDate( parse(day, "yyyy-MM-dd", new Date()), "eeee dd.MM." )} -

+ */}