diff --git a/assets/pasted-20260114-155921-75e1e840.jpg b/assets/pasted-20260114-155921-75e1e840.jpg new file mode 100644 index 0000000..f313584 Binary files /dev/null and b/assets/pasted-20260114-155921-75e1e840.jpg differ diff --git a/backend/src/routes/events.js b/backend/src/routes/events.js index df82854..156f24c 100644 --- a/backend/src/routes/events.js +++ b/backend/src/routes/events.js @@ -291,8 +291,16 @@ router.get('/', wrapAsync(async (req, res) => { const filetype = req.query.filetype const currentUser = req.currentUser; + + const { sort, ...otherFilters } = req.query; + let order = {}; + if (sort) { + const [field, direction] = sort.split(','); + order = { field, sort: direction }; + } + const payload = await EventsDBApi.findAll( - req.query, { currentUser } + { ...otherFilters, ...order }, { currentUser } ); if (filetype && filetype === 'csv') { const fields = ['id','name','description', diff --git a/frontend/public/assets/vm-shot-2026-01-14T15-59-17-801Z.jpg b/frontend/public/assets/vm-shot-2026-01-14T15-59-17-801Z.jpg new file mode 100644 index 0000000..f313584 Binary files /dev/null and b/frontend/public/assets/vm-shot-2026-01-14T15-59-17-801Z.jpg differ diff --git a/frontend/src/pages/dashboard.tsx b/frontend/src/pages/dashboard.tsx index 633fd8e..f0fef37 100644 --- a/frontend/src/pages/dashboard.tsx +++ b/frontend/src/pages/dashboard.tsx @@ -23,7 +23,7 @@ const Dashboard = () => { useEffect(() => { if(hasPermission(currentUser, 'READ_EVENTS')) { - dispatch(fetchEvents({ query: '?sort=createdAt,DESC&limit=5' })); + dispatch(fetchEvents({ query: '?sort=start_datetime,ASC&limit=5' })); } if(hasPermission(currentUser, 'READ_GUESTS')) { dispatch(fetchGuests({ query: '' })); @@ -31,7 +31,7 @@ const Dashboard = () => { }, [dispatch, currentUser]); const upcomingEvents = events.filter( - (event) => new Date(event.date) > new Date() + (event) => new Date(event.start_datetime) > new Date() ); return ( @@ -96,19 +96,17 @@ const Dashboard = () => { events.map((event) => ( {event.name} - - {new Date(event.date).toLocaleDateString()} - + {new Date(event.start_datetime).toLocaleDateString()} {event.location} - {new Date(event.date) < new Date() ? 'Past' : 'Upcoming'} + {new Date(event.start_datetime) < new Date() ? 'Past' : 'Upcoming'}