diff --git a/client/src/pages/CreateEventsPage.tsx b/client/src/pages/CreateEventsPage.tsx index d7cea8c..a1b4c7e 100644 --- a/client/src/pages/CreateEventsPage.tsx +++ b/client/src/pages/CreateEventsPage.tsx @@ -31,7 +31,9 @@ const validationSchema = Yup.object({ "Only letters, numbers, commas, spaces, exclamation marks, quotations, and common symbols are allowed" ) .required("Description is required"), - date: Yup.date().required("Date is required"), + date: Yup.date() + .min(new Date(), "Date must be in the future") + .required("Date is required"), time: Yup.string().required("Time is required"), location: Yup.string().required("Location is required"), category: Yup.string().required("Category is required"), diff --git a/client/src/pages/EditEventsPage.tsx b/client/src/pages/EditEventsPage.tsx index 5d8b725..7090f83 100644 --- a/client/src/pages/EditEventsPage.tsx +++ b/client/src/pages/EditEventsPage.tsx @@ -32,7 +32,9 @@ const validationSchema = Yup.object({ "Only letters, numbers, commas, spaces, exclamation marks, quotations, and common symbols are allowed" ) .required("Description is required"), - date: Yup.date().required("Date is required"), + date: Yup.date() + .min(new Date(), "Date must be in the future") + .required("Date is required"), time: Yup.string().required("Time is required"), location: Yup.string().required("Location is required"), category: Yup.string().required("Category is required"), diff --git a/client/src/pages/EventsPage.tsx b/client/src/pages/EventsPage.tsx index 1360f29..a253a14 100644 --- a/client/src/pages/EventsPage.tsx +++ b/client/src/pages/EventsPage.tsx @@ -40,8 +40,13 @@ const EventsPage: React.FC = () => { `${config.serverAddress}/events` ); console.log("Fetched events data:", res.data); - setEvents(res.data); - setFilteredEvents(res.data); + + // Filter out past events + const now = new Date(); + const futureEvents = res.data.filter(event => new Date(event.date) > now); + + setEvents(futureEvents); + setFilteredEvents(futureEvents); // Extract unique categories and locations from events const uniqueCategories = Array.from(