Skip to content

Commit f15b5d8

Browse files
authored
Merge branch 'dev' into fix-translated-images-link
2 parents a04b2d1 + 5427754 commit f15b5d8

File tree

2 files changed

+29
-33
lines changed

2 files changed

+29
-33
lines changed

src/components/Hero/HubHero/index.tsx

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
1-
import {
2-
Box,
3-
Heading,
4-
HStack,
5-
Stack,
6-
Text,
7-
useBreakpointValue,
8-
} from "@chakra-ui/react"
1+
import { Box, Heading, HStack, Stack, Text } from "@chakra-ui/react"
92

103
import type { CommonHeroProps } from "@/lib/types"
114

@@ -21,22 +14,21 @@ const HubHero = (props: CommonHeroProps) => {
2114
)
2215
}
2316

24-
const height = useBreakpointValue({
25-
base: "192px",
26-
md: "256px",
27-
lg: "320px",
28-
xl: "576px",
29-
"2xl": "672px",
30-
})
31-
3217
return (
3318
<Box position="relative">
3419
<Image
3520
src={heroImg}
3621
alt=""
3722
priority
3823
sizes="100vw"
39-
style={{ width: "100vw", objectFit: "cover", height }}
24+
style={{ width: "100vw", objectFit: "cover" }}
25+
h={{
26+
base: "192px",
27+
md: "256px",
28+
lg: "320px",
29+
xl: "576px",
30+
"2xl": "672px",
31+
}}
4032
/>
4133
<Stack
4234
spacing={{ base: "3", md: "4" }}

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)