From 0a7f2c8d3c19067604056ce328cab0bf4ac99f37 Mon Sep 17 00:00:00 2001 From: Jonas Braathen Date: Thu, 23 May 2024 11:57:18 +0200 Subject: [PATCH] only show upcoming events from today or the future --- web/src/components/events/UpcomingEvents.tsx | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/web/src/components/events/UpcomingEvents.tsx b/web/src/components/events/UpcomingEvents.tsx index b2d6bd6..ee17c6d 100644 --- a/web/src/components/events/UpcomingEvents.tsx +++ b/web/src/components/events/UpcomingEvents.tsx @@ -1,11 +1,16 @@ import { EventFragment } from "@/gql/graphql"; -import { EventItem } from "./EventItem"; -import { sortSingularEvents, getSingularEvents } from "@/lib/event"; -import styles from "./upcomingEvents.module.scss"; +import { isTodayOrFuture } from "@/lib/date"; +import { getSingularEvents, sortSingularEvents } from "@/lib/event"; import Link from "next/link"; +import { EventItem } from "./EventItem"; +import styles from "./upcomingEvents.module.scss"; export const UpcomingEvents = ({ events }: { events: EventFragment[] }) => { - const upcomingSingularEvents = sortSingularEvents(getSingularEvents(events)); + const upcomingSingularEvents = sortSingularEvents( + getSingularEvents(events).filter((event) => + isTodayOrFuture(event.occurrence.start) + ) + ); return (