Skip to content

Commit 4051a0b

Browse files
authored
Merge pull request #14693 from JoeChenJ/Migrate_acknowledgements_to_shadcn
Shadcn Migrate: Migrate acknowledgements page to Shadcn
2 parents 3eec1dd + 2a61bb6 commit 4051a0b

File tree

1 file changed

+49
-78
lines changed

1 file changed

+49
-78
lines changed

src/pages/contributing/translation-program/acknowledgements.tsx

+49-78
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,23 @@
1+
import { BaseHTMLAttributes } from "react"
12
import { useRouter } from "next/router"
23
import { GetStaticProps } from "next/types"
34
import { useTranslation } from "next-i18next"
45
import { serverSideTranslations } from "next-i18next/serverSideTranslations"
5-
import {
6-
Box,
7-
BoxProps,
8-
Flex,
9-
HeadingProps,
10-
List,
11-
ListItem,
12-
useColorModeValue,
13-
} from "@chakra-ui/react"
146

157
import { BasePageProps, Lang } from "@/lib/types"
168

179
import ActionCard from "@/components/ActionCard"
1810
import Breadcrumbs from "@/components/Breadcrumbs"
1911
import FeedbackCard from "@/components/FeedbackCard"
20-
import { Image } from "@/components/Image"
21-
import InlineLink from "@/components/Link"
12+
import { TwImage } from "@/components/Image"
2213
import MainArticle from "@/components/MainArticle"
23-
import OldHeading from "@/components/OldHeading"
24-
import Text from "@/components/OldText"
2514
import PageMetadata from "@/components/PageMetadata"
2615
import TranslationLeaderboard from "@/components/TranslationLeaderboard"
16+
import { Flex } from "@/components/ui/flex"
17+
import InlineLink from "@/components/ui/Link"
18+
import { ListItem, OrderedList } from "@/components/ui/list"
2719

20+
import { cn } from "@/lib/utils/cn"
2821
import { existsNamespace } from "@/lib/utils/existsNamespace"
2922
import { getLastDeployDate } from "@/lib/utils/getLastDeployDate"
3023
import { getLocaleTimestamp } from "@/lib/utils/time"
@@ -34,17 +27,31 @@ import allTimeData from "../../../data/translation-reports/alltime/alltime-data.
3427
import monthData from "../../../data/translation-reports/month/month-data.json"
3528
import quarterData from "../../../data/translation-reports/quarter/quarter-data.json"
3629

30+
import useColorModeValue from "@/hooks/useColorModeValue"
3731
import darkThemeCertificateImg from "@/public/images/certificates/dark-certificate.png"
3832
import lightThemeCertificateImg from "@/public/images/certificates/light-certificate.png"
3933
import dogeComputerImg from "@/public/images/doge-computer.png"
4034
import whatIsEthereumImg from "@/public/images/what-is-ethereum.png"
4135

42-
const Content = (props: BoxProps) => (
43-
<Box as={MainArticle} py={4} px={10} w="full" {...props} />
36+
const Content = ({
37+
className,
38+
...props
39+
}: BaseHTMLAttributes<HTMLHeadingElement>) => (
40+
<MainArticle className={cn("w-full px-10 py-4", className)} {...props} />
4441
)
4542

46-
const ContentHeading = (props: HeadingProps) => (
47-
<OldHeading lineHeight={1.4} {...props} />
43+
const H2 = ({
44+
className,
45+
...props
46+
}: BaseHTMLAttributes<HTMLHeadingElement>) => (
47+
<h2 className={cn("mb-8 mt-12 leading-xs", className)} {...props} />
48+
)
49+
50+
const Text = ({
51+
className,
52+
...props
53+
}: BaseHTMLAttributes<HTMLHeadingElement>) => (
54+
<p className={cn("mb-6", className)} {...props} />
4855
)
4956

5057
export const getStaticProps = (async ({ locale }) => {
@@ -81,7 +88,7 @@ const TranslatorAcknowledgements = () => {
8188
)
8289

8390
return (
84-
<Flex direction="column" align="center" w="full">
91+
<Flex className="w-full flex-col items-center">
8592
<PageMetadata
8693
title={t(
8794
"page-contributing-translation-program-acknowledgements-meta-title"
@@ -93,26 +100,14 @@ const TranslatorAcknowledgements = () => {
93100

94101
<Content>
95102
<Breadcrumbs slug={router.asPath} className="mt-12" />
96-
<ContentHeading
97-
as="h1"
98-
fontSize={{ base: "2rem", sm: "2.5rem", md: "5xl" }}
99-
>
103+
<h1 className="my-8 leading-xs">
100104
{t(
101105
"page-contributing-translation-program-acknowledgements-acknowledgement-page-title"
102106
)}
103-
</ContentHeading>
104-
<Flex
105-
direction={{ base: "column", lg: "row" }}
106-
align={{ base: "flex-start", lg: "normal" }}
107-
w="full"
108-
ms={0}
109-
me={{ base: 0, lg: 8 }}
110-
>
107+
</h1>
108+
<Flex className="me-0 ms-0 w-full flex-col items-start lg:me-8 lg:flex-row">
111109
{/* LEFT COLUMN */}
112-
<Box
113-
m={{ base: "auto 0", lg: "0 2rem 0 0" }}
114-
w={{ base: "full", lg: "50%" }}
115-
>
110+
<div className="m-auto w-full lg:mb-0 lg:ml-0 lg:mr-8 lg:mt-0 lg:w-1/2">
116111
<Text>
117112
{t(
118113
"page-contributing-translation-program-acknowledgements-acknowledgement-page-1"
@@ -143,34 +138,26 @@ const TranslatorAcknowledgements = () => {
143138
{/* <p>
144139
<Translation id="page-contributing-translation-program-acknowledgements-acknowledgement-page-5" />
145140
</p> */}
146-
</Box>
141+
</div>
147142
{/* RIGHT COLUMN */}
148-
<Box
149-
m={{ base: "auto 0", lg: "0 0 0 2rem" }}
150-
w={{ base: "full", lg: "50%" }}
151-
>
152-
<Image
143+
<div className="m-auto w-full lg:mb-0 lg:ml-8 lg:mr-0 lg:mt-0 lg:w-1/2">
144+
<TwImage
145+
width={500}
153146
src={dogeComputerImg}
154-
w={500}
155147
alt={t(
156148
"page-contributing-translation-program-acknowledgements-hero-image-alt"
157149
)}
158150
/>
159-
</Box>
151+
</div>
160152
</Flex>
161153
</Content>
162154

163-
<Content maxW="800px">
164-
<ContentHeading
165-
as="h2"
166-
textAlign="center"
167-
fontSize={{ base: "2xl", md: "2rem" }}
168-
fontWeight={600}
169-
>
155+
<Content className="max-w-[800px]">
156+
<H2 className="text-center">
170157
{t(
171158
"page-contributing-translation-program-acknowledgements-translation-leaderboard-title"
172159
)}
173-
</ContentHeading>
160+
</H2>
174161
<TranslationLeaderboard
175162
monthData={monthData}
176163
quarterData={quarterData}
@@ -184,15 +171,11 @@ const TranslatorAcknowledgements = () => {
184171
</Content>
185172

186173
<Content>
187-
<ContentHeading
188-
as="h2"
189-
fontSize={{ base: "2xl", md: "2rem" }}
190-
fontWeight={600}
191-
>
174+
<H2>
192175
{t(
193176
"page-contributing-translation-program-acknowledgements-our-translators-title"
194177
)}
195-
</ContentHeading>
178+
</H2>
196179
<Text>
197180
{t(
198181
"page-contributing-translation-program-acknowledgements-our-translators-1"
@@ -213,15 +196,11 @@ const TranslatorAcknowledgements = () => {
213196
</Content>
214197

215198
<Content id="certificate">
216-
<ContentHeading
217-
as="h2"
218-
fontSize={{ base: "2xl", md: "2rem" }}
219-
fontWeight={600}
220-
>
199+
<H2>
221200
{t(
222201
"page-contributing-translation-program-acknowledgements-cert-title"
223202
)}
224-
</ContentHeading>
203+
</H2>
225204
<Text>
226205
{t("page-contributing-translation-program-acknowledgements-cert-1")}
227206
</Text>
@@ -231,21 +210,17 @@ const TranslatorAcknowledgements = () => {
231210
<Text>
232211
{t("page-contributing-translation-program-acknowledgements-cert-3")}
233212
</Text>
234-
<Flex justify="center">
235-
<Image src={themedCertificateImage} alt="translator certificate" />
213+
<Flex className="justify-center">
214+
<TwImage src={themedCertificateImage} alt="translator certificate" />
236215
</Flex>
237216
</Content>
238217

239218
<Content id="oats">
240-
<ContentHeading
241-
as="h2"
242-
fontSize={{ base: "2xl", md: "2rem" }}
243-
fontWeight={600}
244-
>
219+
<H2>
245220
{t(
246221
"page-contributing-translation-program-acknowledgements-oats-title"
247222
)}
248-
</ContentHeading>
223+
</H2>
249224
<Text>
250225
{t("page-contributing-translation-program-acknowledgements-1")}
251226
</Text>
@@ -255,17 +230,13 @@ const TranslatorAcknowledgements = () => {
255230
<Text>
256231
{t("page-contributing-translation-program-acknowledgements-3")}
257232
</Text>
258-
<ContentHeading
259-
as="h3"
260-
fontSize={{ base: "xl", md: "2xl" }}
261-
fontWeight={600}
262-
>
233+
<h3 className="mb-8 mt-10 leading-xs">
263234
{t(
264235
"page-contributing-translation-program-acknowledgements-how-to-claim-title"
265236
)}
266-
</ContentHeading>
237+
</h3>
267238

268-
<List as="ol" styleType="decimal">
239+
<OrderedList>
269240
<ListItem>
270241
{t(
271242
"page-contributing-translation-program-acknowledgements-how-to-claim-1"
@@ -291,7 +262,7 @@ const TranslatorAcknowledgements = () => {
291262
"page-contributing-translation-program-acknowledgements-how-to-claim-4"
292263
)}
293264
</ListItem>
294-
</List>
265+
</OrderedList>
295266
<Text>
296267
{t("page-contributing-translation-program-acknowledgements-4")}
297268
</Text>

0 commit comments

Comments
 (0)