Skip to content

Commit 3eec1dd

Browse files
authored
Merge pull request #14676 from JoeChenJ/Shadcn/Tailwind_migration
Shadcn Migrate: contributing/translation-program/contributors.tsx
2 parents 7d35602 + e983e5e commit 3eec1dd

File tree

1 file changed

+27
-44
lines changed

1 file changed

+27
-44
lines changed

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

Lines changed: 27 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,20 @@
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-
ListItem,
11-
SimpleGrid,
12-
UnorderedList,
13-
} from "@chakra-ui/react"
146

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

179
import Breadcrumbs from "@/components/Breadcrumbs"
1810
import FeedbackCard from "@/components/FeedbackCard"
19-
import InlineLink from "@/components/Link"
2011
import MainArticle from "@/components/MainArticle"
21-
import OldHeading from "@/components/OldHeading"
22-
import Text from "@/components/OldText"
2312
import PageMetadata from "@/components/PageMetadata"
13+
import { Flex } from "@/components/ui/flex"
14+
import InlineLink from "@/components/ui/Link"
15+
import { List, ListItem } from "@/components/ui/list"
2416

17+
import { cn } from "@/lib/utils/cn"
2518
import { existsNamespace } from "@/lib/utils/existsNamespace"
2619
import { getLastDeployDate } from "@/lib/utils/getLastDeployDate"
2720
import { getLocaleTimestamp } from "@/lib/utils/time"
@@ -51,11 +44,15 @@ export const getStaticProps = (async ({ locale }) => {
5144
}
5245
}) satisfies GetStaticProps<BasePageProps>
5346

54-
const Content = (props: BoxProps) => (
55-
<Box as={MainArticle} py={4} px={10} w="full" {...props} />
47+
const Content = ({ ...props }: BaseHTMLAttributes<HTMLHeadingElement>) => (
48+
<MainArticle className="w-full px-10 py-4" {...props} />
5649
)
57-
const ContentHeading = (props: HeadingProps) => (
58-
<OldHeading lineHeight={1.4} {...props} />
50+
51+
const Text = ({
52+
className,
53+
...props
54+
}: BaseHTMLAttributes<HTMLHeadingElement>) => (
55+
<p className={cn("mb-6", className)} {...props} />
5956
)
6057

6158
const Contributors = () => {
@@ -69,7 +66,7 @@ const Contributors = () => {
6966
.filter((item) => item.length > 0)
7067

7168
return (
72-
<Flex direction="column" align="center" w="full">
69+
<Flex className="w-full flex-col items-center">
7370
<PageMetadata
7471
title={t(
7572
"page-contributing-translation-program-contributors-meta-title"
@@ -81,25 +78,15 @@ const Contributors = () => {
8178

8279
<Content>
8380
<Breadcrumbs slug={router.asPath} className="mt-12" />
84-
<ContentHeading
85-
as="h1"
86-
fontSize={{ base: "2.5rem", md: "5xl" }}
87-
fontWeight={700}
88-
>
81+
<h1 className="my-8 leading-xs">
8982
{t("page-contributing-translation-program-contributors-title")}
90-
</ContentHeading>
91-
<ContentHeading
92-
as="h4"
93-
fontSize={{ base: "md", md: "xl" }}
94-
fontWeight={500}
95-
>
96-
<Text as="strong">
97-
{t(
98-
"page-contributing-translation-program-contributors-number-of-contributors"
99-
)}{" "}
100-
{translators.length}
101-
</Text>
102-
</ContentHeading>
83+
</h1>
84+
<h4 className="my-8 leading-xs">
85+
{t(
86+
"page-contributing-translation-program-contributors-number-of-contributors"
87+
)}{" "}
88+
{translators.length}
89+
</h4>
10390
<Text>
10491
{t(
10592
"page-contributing-translation-program-contributors-our-translators-1"
@@ -122,24 +109,20 @@ const Contributors = () => {
122109
</InlineLink>
123110
.
124111
</Text>
125-
<ContentHeading
126-
as="h2"
127-
fontSize={{ base: "2xl", md: "2rem" }}
128-
fontWeight={600}
129-
>
112+
<h2 className="mb-8 mt-12 leading-xs">
130113
{t("page-contributing-translation-program-contributors-thank-you")}
131-
</ContentHeading>
132-
<SimpleGrid as={UnorderedList} columns={[1, 2, 3, 4, 6]} ms="1.45rem">
114+
</h2>
115+
<List className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-6">
133116
{translators
134117
.sort((user1, user2) =>
135118
user1.toLowerCase().localeCompare(user2.toLowerCase())
136119
)
137120
.map((user) => (
138-
<ListItem key={user} color="text300">
121+
<ListItem key={user} className="text-body-medium">
139122
{user}
140123
</ListItem>
141124
))}
142-
</SimpleGrid>
125+
</List>
143126
<Text>
144127
{t("common:page-languages-interested")}{" "}
145128
<InlineLink href="/contributing/translation-program/">

0 commit comments

Comments
 (0)