Skip to content

Commit 374ce42

Browse files
authored
Merge branch 'dev' into hub-hero-flickering
2 parents 167ce55 + e1b24fe commit 374ce42

File tree

1 file changed

+20
-16
lines changed

1 file changed

+20
-16
lines changed

src/lib/api/calendarEvents.ts

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,26 @@ export async function fetchCommunityEvents(): Promise<CommunityEventsReturnType>
2222
const pastEvents = await pastEventsReq.json()
2323
const pastEventsReqData: ReqCommunityEvent[] = pastEvents.items
2424

25-
const pastEventData = pastEventsReqData.map((event) => {
26-
return {
27-
date: event.start.dateTime,
28-
title: event.summary,
29-
calendarLink: event.htmlLink,
30-
pastEventLink: event.location,
31-
}
32-
})
33-
const upcomingEventData = futureEventsReqData.map((event) => {
34-
return {
35-
date: event.start.dateTime,
36-
title: event.summary,
37-
calendarLink: event.htmlLink,
38-
pastEventLink: event.location,
39-
}
40-
})
25+
const pastEventData = pastEventsReqData
26+
.filter((event) => event.start)
27+
.map((event) => {
28+
return {
29+
date: event.start.dateTime,
30+
title: event.summary,
31+
calendarLink: event.htmlLink,
32+
pastEventLink: event.location,
33+
}
34+
})
35+
const upcomingEventData = futureEventsReqData
36+
.filter((event) => event.start)
37+
.map((event) => {
38+
return {
39+
date: event.start.dateTime,
40+
title: event.summary,
41+
calendarLink: event.htmlLink,
42+
pastEventLink: event.location,
43+
}
44+
})
4145

4246
return {
4347
pastEventData,

0 commit comments

Comments
 (0)