diff --git a/web/src/components/events/EventItem.tsx b/web/src/components/events/EventItem.tsx index 79a344e..e6f4879 100644 --- a/web/src/components/events/EventItem.tsx +++ b/web/src/components/events/EventItem.tsx @@ -16,7 +16,7 @@ export const EventItem = ({ size, }: { event: SingularEvent | EventFragment; - mode: "list" | "calendar"; + mode: "list" | "calendar" | "singular"; size?: "small" | "medium" | "large"; }) => { const nextOccurrence = getClosestOccurrence(event); @@ -55,6 +55,13 @@ export const EventItem = ({ )}
)} + {mode === "singular" && + "occurrence" in event && + event.occurrence?.start && ( ++ {formatDate(event.occurrence?.start, commonDateTimeFormat)} +
+ )} {mode === "calendar" && "occurrence" in event && event.occurrence?.start && ( diff --git a/web/src/components/events/UpcomingEvents.tsx b/web/src/components/events/UpcomingEvents.tsx index be2fc27..489097c 100644 --- a/web/src/components/events/UpcomingEvents.tsx +++ b/web/src/components/events/UpcomingEvents.tsx @@ -1,9 +1,12 @@ import { EventFragment } from "@/gql/graphql"; import { EventItem } from "./EventItem"; +import { sortSingularEvents, getSingularEvents } from "@/lib/event"; import styles from "./upcomingEvents.module.scss"; import Link from "next/link"; export const UpcomingEvents = ({ events }: { events: EventFragment[] }) => { + const upcomingSingularEvents = sortSingularEvents(getSingularEvents(events)); + return (