Skip to content

Commit a5c36ca

Browse files
wackerowwackerow
authored
Merge pull request #205 from ethereum/update-7.24.4
Update 7.24.4
2 parents 1d59140 + 3450927 commit a5c36ca

File tree

5 files changed

+103
-19
lines changed

5 files changed

+103
-19
lines changed

‎public/heroes/garden.jpg

842 KB
Loading

‎public/heroes/guides-hub-hero.jpg

847 KB
Loading

‎src/components/CommunityEvents/index.tsx

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ const CommunityEvents = ({ events }: CommunityEventsProps) => {
8787
const { t } = useTranslation("page-index")
8888
const { pastEventData, upcomingEventData } = events
8989

90+
const reversedUpcomingEventData = upcomingEventData.slice().reverse()
91+
const reversedPastEventData = pastEventData.slice().reverse()
92+
9093
return (
9194
<Flex
9295
w="full"
@@ -100,14 +103,12 @@ const CommunityEvents = ({ events }: CommunityEventsProps) => {
100103
<Center w={{ base: "100%", lg: "40%" }}>
101104
<Box pe={8} ps={{ base: 8, lg: 0 }}>
102105
<OldHeading>
103-
{t("page-index:community-events-content-heading")}
106+
{t("page-index:community-events-content-heading")}
104107
</OldHeading>
105108
<Text>
106109
<Translation id="page-index:community-events-content-1" />
107110
</Text>
108-
<Text>
109-
{t("page-index:community-events-content-2")}
110-
</Text>
111+
<Text>{t("page-index:community-events-content-2")}</Text>
111112
</Box>
112113
</Center>
113114
<Flex
@@ -123,21 +124,24 @@ const CommunityEvents = ({ events }: CommunityEventsProps) => {
123124
flexDir="column"
124125
>
125126
<Flex direction="column" h="full" gap={8}>
126-
{upcomingEventData.length ? (
127+
{reversedUpcomingEventData.length ? (
127128
<Box flex={1}>
128129
<Text fontSize="3xl" fontWeight="bold" lineHeight={1.4}>
129-
{upcomingEventData[0].title}
130+
{reversedUpcomingEventData[0].title}
130131
</Text>
131132
<Text m={0} fontSize="xl">
132-
{renderEventDateTime(upcomingEventData[0].date, locale!)}
133+
{renderEventDateTime(
134+
reversedUpcomingEventData[0].date,
135+
locale!
136+
)}
133137
</Text>
134138
<Text color="body.medium" fontSize="md">
135139
({Intl.DateTimeFormat().resolvedOptions().timeZone})
136140
</Text>
137141
</Box>
138142
) : (
139143
<Text fontSize="3xl" fontWeight="bold" mb={8}>
140-
{t("page-index:community-events-no-events-planned")}
144+
{t("page-index:community-events-no-events-planned")}
141145
</Text>
142146
)}
143147
<Flex flexDirection="column" gap={2}>
@@ -149,9 +153,9 @@ const CommunityEvents = ({ events }: CommunityEventsProps) => {
149153
<Icon as={FaDiscord} fontSize={25} />
150154
Join Discord
151155
</ButtonLink>
152-
{upcomingEventData[0] && (
156+
{reversedUpcomingEventData[0] && (
153157
<InlineLink
154-
to={upcomingEventData[0].calendarLink}
158+
to={reversedUpcomingEventData[0].calendarLink}
155159
onClick={() => matomoEvent("Add to calendar")}
156160
fontWeight={700}
157161
>
@@ -168,11 +172,11 @@ const CommunityEvents = ({ events }: CommunityEventsProps) => {
168172
flexDir="column"
169173
>
170174
<Text fontSize="lg" fontWeight="bold" mb={2}>
171-
{t("page-index:community-events-upcoming-calls")}
175+
{t("page-index:community-events-upcoming-calls")}
172176
</Text>
173177
<Divider mb={4} />
174-
{upcomingEventData.slice(1).length ? (
175-
upcomingEventData.slice(1).map((item, idx) => {
178+
{reversedUpcomingEventData.slice(1).length ? (
179+
reversedUpcomingEventData.slice(1).map((item, idx) => {
176180
return (
177181
<Event
178182
key={idx}
@@ -184,22 +188,22 @@ const CommunityEvents = ({ events }: CommunityEventsProps) => {
184188
})
185189
) : (
186190
<Text mx="auto">
187-
{t("page-index:community-events-no-upcoming-calls")}
191+
{t("page-index:community-events-no-upcoming-calls")}
188192
</Text>
189193
)}
190194
<Text fontSize="lg" fontWeight="bold" mb={2} mt={4}>
191-
{t("page-index:community-events-previous-calls")}
195+
{t("page-index:community-events-previous-calls")}
192196
</Text>
193197
<Divider mb={4} />
194-
{pastEventData.length ? (
195-
pastEventData.map((item, idx) => {
198+
{reversedPastEventData.length ? (
199+
reversedPastEventData.map((item, idx) => {
196200
return (
197201
<Event key={idx} event={item} language={locale!} type="past" />
198202
)
199203
})
200204
) : (
201205
<Text mx="auto">
202-
{t("page-index:community-events-there-are-no-past-calls")}
206+
{t("page-index:community-events-there-are-no-past-calls")}
203207
</Text>
204208
)}
205209
</Flex>

‎src/intl/en/page-assets.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,13 @@
4949
"page-assets-page-assets-transparent-background": "Transparent background",
5050
"page-assets-robot": "Robot wallet",
5151
"page-assets-sharding": "Sharding",
52-
"page-assets-hackathon": "Hackathon"
52+
"page-assets-hackathon": "Hackathon",
53+
"page-assets-learn-hero-name": "Futuristic university",
54+
"page-assets-community-hero-name": "Community gathering",
55+
"page-assets-quizzes-hero-name": "Infinite playground",
56+
"page-assets-developers-hero-name": "Building the future",
57+
"page-assets-garden-name": "Garden of Ethereum",
58+
"page-assets-roadmap-hero-name": "Road(s) to the future",
59+
"page-assets-layer-2-hero-name": "Constructing Ethereum",
60+
"page-assets-guides-hero-name": "Ethereum lab"
5361
}

‎src/pages/assets.tsx

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,14 @@ import eth from "@/public/eth.png"
6464
import finance from "@/public/finance_transparent.png"
6565
import future from "@/public/future_transparent.png"
6666
import hackathon from "@/public/hackathon_transparent.png"
67+
import communityHero from "@/public/heroes/community-hero.png"
68+
import developersHero from "@/public/heroes/developers-hub-hero.jpg"
69+
import garden from "@/public/heroes/garden.jpg"
70+
import guidesHero from "@/public/heroes/guides-hub-hero.jpg"
71+
import layer2Hero from "@/public/heroes/layer-2-hub-hero.jpg"
72+
import learnHero from "@/public/heroes/learn-hub-hero.png"
73+
import quizzesHub from "@/public/heroes/quizzes-hub-hero.png"
74+
import roadmapHero from "@/public/heroes/roadmap-hub-hero.jpg"
6775
import hero from "@/public/home/hero.png"
6876
import heroPanda from "@/public/home/hero-panda.png"
6977
import mergePanda from "@/public/home/merge-panda.png"
@@ -175,6 +183,70 @@ const AssetsPage = () => {
175183
artistUrl="https://liamcobb.com/"
176184
/>
177185
</Row>
186+
<Row>
187+
<AssetDownload
188+
title={t("page-assets-learn-hero-name")}
189+
alt={t("page-assets-learn-hero-name")}
190+
image={learnHero}
191+
artistName="Liam Cobb"
192+
artistUrl="https://liamcobb.com/"
193+
/>
194+
<AssetDownload
195+
title={t("page-assets-community-hero-name")}
196+
alt={t("page-assets-community-hero-name")}
197+
image={communityHero}
198+
artistName="Liam Cobb"
199+
artistUrl="https://liamcobb.com/"
200+
/>
201+
</Row>
202+
<Row>
203+
<AssetDownload
204+
title={t("page-assets-quizzes-hero-name")}
205+
alt={t("page-assets-quizzes-hero-name")}
206+
image={quizzesHub}
207+
artistName="Liam Cobb"
208+
artistUrl="https://liamcobb.com/"
209+
/>
210+
<AssetDownload
211+
title={t("page-assets-developers-hero-name")}
212+
alt={t("page-assets-developers-hero-name")}
213+
image={developersHero}
214+
artistName="Liam Cobb"
215+
artistUrl="https://liamcobb.com/"
216+
/>
217+
</Row>
218+
<Row>
219+
<AssetDownload
220+
title={t("page-assets-garden-name")}
221+
alt={t("page-assets-garden-name")}
222+
image={garden}
223+
artistName="Liam Cobb"
224+
artistUrl="https://liamcobb.com/"
225+
/>
226+
<AssetDownload
227+
title={t("page-assets-roadmap-hero-name")}
228+
alt={t("page-assets-roadmap-hero-name")}
229+
image={roadmapHero}
230+
artistName="Liam Cobb"
231+
artistUrl="https://liamcobb.com/"
232+
/>
233+
</Row>
234+
<Row>
235+
<AssetDownload
236+
title={t("page-assets-layer-2-hero-name")}
237+
alt={t("page-assets-layer-2-hero-name")}
238+
image={layer2Hero}
239+
artistName="Liam Cobb"
240+
artistUrl="https://liamcobb.com/"
241+
/>
242+
<AssetDownload
243+
title={t("page-assets-guides-hero-name")}
244+
alt={t("page-assets-guides-hero-name")}
245+
image={guidesHero}
246+
artistName="Liam Cobb"
247+
artistUrl="https://liamcobb.com/"
248+
/>
249+
</Row>
178250
<Row>
179251
<AssetDownload
180252
title={t("page-assets-doge")}

0 commit comments

Comments
 (0)