www
/
www-new
12
3
Fork 5
Code Issues 58 Pull Requests 42 Projects Releases Wiki Activity

Add endDate to events #446

Merged
snedadah merged 23 commits from events-end-time into main 2022-05-25 20:58:14 -04:00
Conversation 0 Commits 23 Files Changed 548 +14 -3
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1cf4b4ed5e - Show all commits

17
lib/events.ts
View File

@ -133,7 +133,12 @@ export async function getUpcomingEvents(): Promise<Event[]> {
).flat();
return events
.filter((ev) => new Date(ev.metadata.startDate).getTime() >= Date.now())
.filter(
(ev) =>
// use endDate if possible, else use startDate
new Date(ev.metadata.endDate ?? ev.metadata.startDate).getTime() >=
Date.now()
)
.sort((a, b) => {
return (
new Date(a.metadata.startDate).getTime() -
@ -179,12 +184,18 @@ export async function getEventsPageProps({
const pastEvents = events
.filter(
(event) => new Date(event.metadata.startDate).getTime() < currentDate
(event) =>
// fallback to startDate if endDate is not set
new Date(event.metadata.endDate ?? event.metadata.startDate).getTime() <
currentDate
)
.reverse();
const futureEvents = events.filter(
(event) => new Date(event.metadata.startDate).getTime() >= currentDate
// We display events that are currently going on as upcoming so they still show up homepage and other pages on the top
(event) =>
new Date(event.metadata.endDate ?? event.metadata.startDate).getTime() >=
currentDate
);
const current = getCurrentTerm();