From 9116d049f7f39797ceeaa4f19660249611035de1 Mon Sep 17 00:00:00 2001
From: Joe Chen <jiajuncjoe@gmail.com>
Date: Wed, 29 Jan 2025 14:30:48 +0800
Subject: [PATCH 1/3] Miigrate eth page to Shadcn

---
 src/pages/eth.tsx | 185 ++++++++++++++++------------------------------
 1 file changed, 62 insertions(+), 123 deletions(-)

diff --git a/src/pages/eth.tsx b/src/pages/eth.tsx
index 9a71d8da556..38c3cdcc01c 100644
--- a/src/pages/eth.tsx
+++ b/src/pages/eth.tsx
@@ -1,38 +1,30 @@
 import { GetStaticProps } from "next"
 import { useTranslation } from "next-i18next"
 import { serverSideTranslations } from "next-i18next/serverSideTranslations"
-import type { ComponentProps } from "react"
-import {
-  Box,
-  Flex,
-  type FlexProps,
-  Heading,
-  type HeadingProps,
-  ListItem,
-  UnorderedList,
-} from "@chakra-ui/react"
+import type { ComponentProps, HTMLAttributes } from "react"
 
 import type { BasePageProps, ChildOnlyProp, Lang } from "@/lib/types"
 
 import ActionCard from "@/components/ActionCard"
-import ButtonLink from "@/components/Buttons/ButtonLink"
 import CalloutBanner from "@/components/CalloutBanner"
 import Card from "@/components/Card"
 import CardList from "@/components/CardList"
 import EthPriceCard from "@/components/EthPriceCard"
 import EthVideo from "@/components/EthVideo"
 import FeedbackCard from "@/components/FeedbackCard"
+import Heading from "@/components/Heading"
 import HorizontalCard from "@/components/HorizontalCard"
-import { Image } from "@/components/Image"
+import { TwImage } from "@/components/Image"
 import InfoBanner from "@/components/InfoBanner"
-import InlineLink from "@/components/Link"
 import MainArticle from "@/components/MainArticle"
-import OldHeading from "@/components/OldHeading"
-import Text from "@/components/OldText"
 import PageMetadata from "@/components/PageMetadata"
 import { StandaloneQuizWidget } from "@/components/Quiz/QuizWidget"
 import Translation from "@/components/Translation"
+import { ButtonLink } from "@/components/ui/buttons/Button"
 import { Divider } from "@/components/ui/divider"
+import { Flex, VStack } from "@/components/ui/flex"
+import InlineLink from "@/components/ui/Link"
+import { ListItem, UnorderedList } from "@/components/ui/list"
 
 import { cn } from "@/lib/utils/cn"
 import { existsNamespace } from "@/lib/utils/existsNamespace"
@@ -46,34 +38,25 @@ import defi from "@/public/images/finance_transparent.png"
 import ethereum from "@/public/images/what-is-ethereum.png"
 
 const Page = (props: ChildOnlyProp) => (
-  <Flex
-    as={MainArticle}
-    direction="column"
-    align="center"
-    w="full"
-    my={0}
-    mx="auto"
+  <MainArticle
+    className="mx-auto my-0 flex w-full flex-col items-center"
     {...props}
   />
 )
 
 const Content = (props: ChildOnlyProp) => (
-  <Box w="full" px={8} py={4} {...props} />
+  <div className="w-full px-8 py-4" {...props} />
 )
 
 const GrayContainer = (props: ChildOnlyProp) => (
-  <Box
-    width="full"
-    py={16}
-    mt={8}
-    background="grayBackground"
-    boxShadow="inset 0px 1px 0px var(--eth-colors-tableItemBoxShadow)"
+  <div
+    className="mt-8 w-full border-t bg-background-highlight py-16 shadow-table-item-box"
     {...props}
   />
 )
 
 const Intro = (props: ChildOnlyProp) => (
-  <Box maxW="608px" mb={{ base: 12, sm: 16 }} {...props} />
+  <div className="mb-12 max-w-[608px] sm:mb-16" {...props} />
 )
 
 const StyledCard = (props: ComponentProps<typeof Card>) => (
@@ -88,13 +71,7 @@ const StyledCard = (props: ComponentProps<typeof Card>) => (
 )
 
 const Slogan = (props: ChildOnlyProp) => (
-  <Text
-    textStyle="normal"
-    fontWeight="normal"
-    fontSize="2rem"
-    lineHeight={1.4}
-    {...props}
-  />
+  <h3 className="mb-6 leading-xs" {...props} />
 )
 
 const Title = (props: ChildOnlyProp) => (
@@ -112,104 +89,79 @@ const Title = (props: ChildOnlyProp) => (
 )
 
 const Subtitle = (props: ChildOnlyProp) => (
-  <Text fontSize="xl" lineHeight={1.4} color="text200" {...props} />
+  <Text className="leading-xs text-body-medium" {...props} />
+)
+
+const Text = ({ className, ...props }: HTMLAttributes<HTMLHeadingElement>) => (
+  <p className={cn("mb-6", className)} {...props} />
 )
 
-export const TwoColumnContent = (props: FlexProps) => (
+export const TwoColumnContent = ({
+  className,
+  ...props
+}: HTMLAttributes<HTMLHeadingElement>) => (
   <Flex
-    w="full"
-    direction={{ base: "column", lg: "row" }}
-    justify="space-between"
-    p={8}
-    mb={12}
+    className={cn(
+      "mb-12 w-full flex-col justify-between p-8 lg:flex-row",
+      className
+    )}
     {...props}
   />
 )
 
 export const LeftColumn = (props: ChildOnlyProp) => (
-  <Box
-    flex="0 0 50%"
-    maxW={{ base: "full", lg: "75%" }}
-    me={{ lg: 16 }}
+  <div
+    className="max-w-full flex-none basis-1/2 lg:me-16 lg:max-w-[75%]"
     {...props}
   />
 )
 
 export const RightColumn = (props: ChildOnlyProp) => (
   <Flex
-    flex="0 1 50%"
-    direction="column"
-    justify="center"
-    maxW={{ base: "full", lg: "75%" }}
-    mt={{ base: 12, lg: 0 }}
+    className="mt-12 max-w-full flex-shrink flex-grow-0 basis-1/2 flex-col justify-center lg:mt-0 lg:max-w-[75%]"
     {...props}
   />
 )
 
 const SubtitleTwo = (props: ChildOnlyProp) => (
-  <Text fontSize="xl" lineHeight={1.4} color="text300" mb={8} {...props} />
+  <Text className="mb-8 leading-xs text-body-menu-medium" {...props} />
 )
 
 const HeroContainer = (props: ChildOnlyProp) => (
   <Flex
-    align="center"
-    justify="space-between"
-    direction={{ base: "column-reverse", md: "row" }}
+    className="flex-col-reverse items-center justify-between md:flex-row"
     {...props}
   />
 )
 
 const Hero = (props: ChildOnlyProp) => (
-  <Box
-    flex="1 1 100%"
-    maxW="800px"
-    bgSize="cover"
-    bgRepeat="no-repeat"
-    ms={{ base: 0, md: 8 }}
+  <div
+    className="ms-0 max-w-[800px] flex-1 basis-full bg-cover bg-no-repeat md:ms-8"
     {...props}
   />
 )
 
 const Header = (props: ChildOnlyProp) => (
-  <Box
-    as="header"
-    flex="1 1 50%"
-    minW="300px"
-    mt={{ base: 6, md: 32 }}
-    {...props}
-  />
+  <div className="mt-6 min-w-[300px] flex-1 basis-1/2 md:mt-32" {...props} />
 )
 
-const H2 = (prop: HeadingProps) => (
-  <OldHeading
-    fontSize={{ base: "2xl", md: "2rem" }}
-    lineHeight={1.4}
-    mt={0}
-    {...prop}
-  />
+const H2 = (props: ChildOnlyProp) => (
+  <h2 className="mb-8 mt-0 leading-xs" {...props} />
 )
 
-const H3 = (props: HeadingProps) => (
-  <OldHeading
-    as="h3"
-    fontSize={{ base: "xl", md: "2xl" }}
-    lineHeight={1.4}
-    {...props}
-  />
+const H3 = (props: ChildOnlyProp) => (
+  <h3 className="mb-8 mt-10 leading-xs" {...props} />
 )
 
-const H4 = (props: HeadingProps) => (
-  <OldHeading
-    as="h4"
-    fontSize={{ base: "md", md: "xl" }}
-    fontWeight={600}
-    lineHeight={1.4}
-    {...props}
-  />
+const H4 = (props: ChildOnlyProp) => (
+  <h4 className="my-8 leading-xs" {...props} />
 )
 
-const CardContainer = (props: FlexProps) => (
-  <Flex wrap="wrap" mx={-4} {...props} />
+const CardContainer = ({
+  className,
+  ...props
+}: HTMLAttributes<HTMLHeadingElement>) => (
+  <Flex className={cn("-mx-4 flex-wrap", className)} {...props} />
 )
 
 const TokenCard = (props: ComponentProps<typeof HorizontalCard>) => (
@@ -220,24 +172,11 @@ const TokenCard = (props: ComponentProps<typeof HorizontalCard>) => (
   />
 )
 const TextDivider = () => (
-  <Box
-    w="10%"
-    h="1px"
-    bg="searchResultBackground"
-    my={8}
-    alignSelf={{ lg: "flex-start" }}
-  />
+  <div className="my-8 w-[10%] bg-search-background lg:items-start" />
 )
 
 const CentralColumn = (props: ChildOnlyProp) => (
-  <Flex
-    direction="column"
-    align="center"
-    maxW="960px"
-    my={16}
-    mx="auto"
-    {...props}
-  />
+  <VStack className="mx-auto my-16 max-w-[960px]" {...props} />
 )
 
 const CentralActionCard = (props: ComponentProps<typeof ActionCard>) => (
@@ -379,7 +318,7 @@ const EthPage = () => {
             </ButtonLink>
           </Header>
           <Hero>
-            <Image
+            <TwImage
               src={eth}
               // TODO: adjust value when the old theme breakpoints are removed (src/theme.ts)
               sizes="(max-width: 768px) 100vw, 800px"
@@ -394,7 +333,7 @@ const EthPage = () => {
           <Intro>
             <Text>{t("page-eth-description")} </Text>
           </Intro>
-          <CardContainer mb={8}>
+          <CardContainer className="mb-8">
             {benefits.map((benefits, idx) => (
               <StyledCard
                 key={idx}
@@ -405,7 +344,7 @@ const EthPage = () => {
             ))}
           </CardContainer>
           <InfoBanner emoji=":wave:" shouldCenter>
-            <Text as="b">{t("page-eth-buy-some")}</Text>{" "}
+            <b>{t("page-eth-buy-some")}</b>{" "}
             <Translation id="page-eth:page-eth-buy-some-desc" />{" "}
             <InlineLink href="/what-is-ethereum/">
               {t("page-eth-more-on-ethereum-link")}
@@ -419,13 +358,13 @@ const EthPage = () => {
           <H2>{t("page-eth-whats-unique")}</H2>
           <Text>{t("page-eth-whats-unique-desc")}</Text>
           <EthVideo />
-          <Box>
+          <div>
             <H4>{t("page-eth-fuels")}</H4>
             <Text>{t("page-eth-fuels-desc")}</Text>
             <Text>{t("page-eth-fuels-desc-2")}</Text>
             <Text>
               <Translation id="page-eth:page-eth-fuels-desc-3" />{" "}
-              <Text as="strong">{t("page-eth-powers-ethereum")}</Text>
+              <b>{t("page-eth-powers-ethereum")}</b>
               {t("page-eth-period")}
             </Text>
             <Text>
@@ -434,7 +373,7 @@ const EthPage = () => {
                 {t("page-eth-fuels-more-staking")}
               </InlineLink>
             </Text>
-          </Box>
+          </div>
           <CentralActionCard
             href="/what-is-ethereum/"
             title={t("page-eth-whats-ethereum")}
@@ -442,7 +381,7 @@ const EthPage = () => {
             image={ethereum}
           />
           <TextDivider />
-          <Box>
+          <div>
             <H4>{t("page-eth-underpins")}</H4>
             <Text>
               <Translation id="page-eth:page-eth-underpins-desc" />
@@ -457,9 +396,9 @@ const EthPage = () => {
             <InfoBanner isWarning>
               <Translation id="page-eth:page-eth-weth" />
             </InfoBanner>
-          </Box>
+          </div>
           <TextDivider />
-          <Box>
+          <div>
             <H4>{t("page-eth-uses")}</H4>
             <Text>{t("page-eth-uses-desc")}</Text>
             <Text>{t("page-eth-uses-desc-2")} </Text>
@@ -489,7 +428,7 @@ const EthPage = () => {
                 – {t("page-eth-uses-desc-6")}
               </ListItem>
             </UnorderedList>
-          </Box>
+          </div>
           <Divider />
         </CentralColumn>
         <CalloutBanner
@@ -500,11 +439,11 @@ const EthPage = () => {
           alt={t("page-eth-cat-img-alt")}
           imageWidth={300}
         >
-          <Box>
+          <div>
             <ButtonLink href="/get-eth/">
               {t("page-eth-get-eth-btn")}
             </ButtonLink>
-          </Box>
+          </div>
         </CalloutBanner>
       </Content>
 
@@ -521,12 +460,12 @@ const EthPage = () => {
           <CardList items={cardListContent} />
         </RightColumn>
       </TwoColumnContent>
-      <TwoColumnContent id="tokens" align="flex-start">
+      <TwoColumnContent className="items-start" id="tokens">
         <LeftColumn>
           <H3>{t("page-eth-not-only-crypto")}</H3>
           <Text>{t("page-eth-not-only-crypto-desc")} </Text>
           <Text>{t("page-eth-not-only-crypto-desc-2")}</Text>
-          <H4 fontWeight="normal">{t("page-eth-more-on-tokens")}</H4>
+          <H4>{t("page-eth-more-on-tokens")}</H4>
           <CardList items={tokenLinks} />
         </LeftColumn>
         <RightColumn>

From 6c8e1b942fd6f0487322bf6d1f8a0b5573a7bf8f Mon Sep 17 00:00:00 2001
From: Pablo <pettinarip@gmail.com>
Date: Wed, 29 Jan 2025 16:23:42 +0100
Subject: [PATCH 2/3] adjust card bg color and title component

---
 src/pages/eth.tsx | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/pages/eth.tsx b/src/pages/eth.tsx
index 38c3cdcc01c..156387ddcb6 100644
--- a/src/pages/eth.tsx
+++ b/src/pages/eth.tsx
@@ -12,7 +12,6 @@ import CardList from "@/components/CardList"
 import EthPriceCard from "@/components/EthPriceCard"
 import EthVideo from "@/components/EthVideo"
 import FeedbackCard from "@/components/FeedbackCard"
-import Heading from "@/components/Heading"
 import HorizontalCard from "@/components/HorizontalCard"
 import { TwImage } from "@/components/Image"
 import InfoBanner from "@/components/InfoBanner"
@@ -66,6 +65,7 @@ const StyledCard = (props: ComponentProps<typeof Card>) => (
     flex="1 0 30%"
     minW="280px"
     maxW={{ base: "full", md: "46%", lg: "31%" }}
+    bg="background.base"
     {...props}
   />
 )
@@ -75,21 +75,14 @@ const Slogan = (props: ChildOnlyProp) => (
 )
 
 const Title = (props: ChildOnlyProp) => (
-  <Heading
-    as="h1"
-    fontSize="sm"
-    lineHeight={1.4}
-    letterSpacing="0.04em"
-    fontWeight="500"
-    mb={4}
-    textTransform="uppercase"
-    color="textTableOfContents"
+  <h1
+    className="mb-4 mt-0 text-md font-normal uppercase !leading-xs"
     {...props}
   />
 )
 
 const Subtitle = (props: ChildOnlyProp) => (
-  <Text className="leading-xs text-body-medium" {...props} />
+  <Text className="mb-0 leading-xs text-body-medium" {...props} />
 )
 
 const Text = ({ className, ...props }: HTMLAttributes<HTMLHeadingElement>) => (

From 10b09f01a8b13176a4419a286ef237dce8ba7a8d Mon Sep 17 00:00:00 2001
From: Pablo <pettinarip@gmail.com>
Date: Thu, 30 Jan 2025 14:12:52 +0100
Subject: [PATCH 3/3] update card bg

---
 src/pages/eth.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/eth.tsx b/src/pages/eth.tsx
index 7b970efc8f0..7a132a61422 100644
--- a/src/pages/eth.tsx
+++ b/src/pages/eth.tsx
@@ -60,7 +60,7 @@ const Intro = (props: ChildOnlyProp) => (
 
 const StyledCard = (props: ComponentProps<typeof Card>) => (
   <Card
-    className="m-4 min-w-[280px] max-w-full flex-[1_0_30%] p-6 md:max-w-[46%] lg:max-w-[31%]"
+    className="m-4 min-w-[280px] max-w-full flex-[1_0_30%] bg-background p-6 md:max-w-[46%] lg:max-w-[31%]"
     {...props}
   />
 )