From f85a686b14eef7703f1b91a9bc559d7eacffb75f Mon Sep 17 00:00:00 2001 From: tylerapfledderer Date: Wed, 12 Feb 2025 19:10:33 -0500 Subject: [PATCH 1/2] feat(pages/roadmap/vision): migrate to Tailwind --- src/pages/roadmap/vision.tsx | 82 ++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 42 deletions(-) diff --git a/src/pages/roadmap/vision.tsx b/src/pages/roadmap/vision.tsx index 84af95eaf85..bda4b6a0ae7 100644 --- a/src/pages/roadmap/vision.tsx +++ b/src/pages/roadmap/vision.tsx @@ -2,17 +2,11 @@ import { GetStaticProps } from "next" import { useRouter } from "next/router" import { useTranslation } from "next-i18next" import { serverSideTranslations } from "next-i18next/serverSideTranslations" -import type { ComponentPropsWithRef } from "react" -import { - Box, - Flex, - type FlexProps, - Heading, - type HeadingProps, - List, - ListItem, - useToken, -} from "@chakra-ui/react" +import type { + ComponentProps, + ComponentPropsWithRef, + CSSProperties, +} from "react" import type { BasePageProps, ChildOnlyProp, Lang } from "@/lib/types" @@ -24,7 +18,6 @@ import FeedbackCard from "@/components/FeedbackCard" 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 PageHero, { type ContentType as PageHeroContent, @@ -32,59 +25,61 @@ import PageHero, { import PageMetadata from "@/components/PageMetadata" import Trilemma from "@/components/Trilemma" import { Divider } from "@/components/ui/divider" +import { Flex, type FlexProps, VStack } from "@/components/ui/flex" +import { List, ListItem } from "@/components/ui/list" +import { cn } from "@/lib/utils/cn" import { existsNamespace } from "@/lib/utils/existsNamespace" import { getLastDeployDate } from "@/lib/utils/getLastDeployDate" +import { screens } from "@/lib/utils/screen" import { getLocaleTimestamp } from "@/lib/utils/time" import { getRequiredNamespacesForPage } from "@/lib/utils/translations" import oldship from "@/public/images/upgrades/oldship.png" const Page = (props: ChildOnlyProp) => ( - + + + ) const PageContent = (props: ChildOnlyProp) => ( - + ) -const H2 = (props: HeadingProps) => ( - ) => ( +

) -const CenterH2 = (props: HeadingProps) =>

+const CenterH2 = (props: Omit, "className">) => ( +

+) -const H3 = (props: HeadingProps) => ( - , "className">) => ( +

) -const CardContainer = (props: FlexProps) => ( - +const CardContainer = ({ className, ...props }: FlexProps) => ( + ) const ProblemCardContainer = (props: ChildOnlyProp) => { - const containerMaxWidth = useToken("breakpoints", ["lg"]) - - return + return ( + + ) } const CentreCard = (props: ComponentPropsWithRef) => ( @@ -95,11 +90,14 @@ const CentreCard = (props: ComponentPropsWithRef) => ( ) const CentralContent = (props: ChildOnlyProp) => ( - +
) const TrilemmaContent = (props: ChildOnlyProp) => ( - +
) export const getStaticProps = (async ({ locale }) => { @@ -162,7 +160,7 @@ const VisionPage = () => { {t("page-roadmap-vision-upgrade-needs-desc")} {t("page-roadmap-vision-upgrade-needs-desc-2")} {t("page-roadmap-vision-upgrade-needs-desc-3")} - + {t("page-roadmap-vision-2022")} From a1a20fc363ecf67ffb44450d3087bc29fe5deecc Mon Sep 17 00:00:00 2001 From: Pablo Date: Thu, 13 Feb 2025 09:49:49 +0100 Subject: [PATCH 2/2] triggering new deploy