Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ShadCN] refactor(pages/learn): migrate to ShadCN #13569

Merged
merged 8 commits into from
Aug 13, 2024
136 changes: 0 additions & 136 deletions src/components/Buttons/Button.stories.tsx

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions src/components/FeedbackWidget/FixedDot.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import { forwardRef } from "react"
import { useTranslation } from "next-i18next"
import type { ButtonHTMLAttributes } from "react"

import { Button } from "@/components/ui/buttons/Button"

import { cn } from "@/lib/utils/cn"

import { FeedbackGlyphIcon } from "../icons"

import { Button } from "@/../tailwind/ui/buttons/Button"

type FixedDotProps = ButtonHTMLAttributes<HTMLButtonElement> & {
isExpanded: boolean
offsetBottom?: boolean
Expand Down
4 changes: 2 additions & 2 deletions src/components/FeedbackWidget/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { useTranslation } from "next-i18next"
import { MdClose } from "react-icons/md"

import { Button } from "@/components/ui/buttons/Button"

import {
Popover,
PopoverClose,
Expand All @@ -11,8 +13,6 @@ import {
import FixedDot from "./FixedDot"
import { useFeedbackWidget } from "./useFeedbackWidget"

import { Button } from "@/../tailwind/ui/buttons/Button"

const FeedbackWidget = () => {
const { t } = useTranslation("common")
const {
Expand Down
5 changes: 2 additions & 3 deletions src/components/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ import Translation from "@/components/Translation"
import { cn } from "@/lib/utils/cn"
import { scrollIntoView } from "@/lib/utils/scrollIntoView"

import { Button } from "../../tailwind/ui/buttons/Button"
import { BaseLink } from "../../tailwind/ui/Link"

import { Button } from "./ui/buttons/Button"
import { BaseLink } from "./ui/Link"
import { List, ListItem } from "./ui/list"

const socialLinks = [
Expand Down
2 changes: 1 addition & 1 deletion src/components/Nav/Menu/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { cn } from "@/lib/utils/cn"

import { MAIN_NAV_ID, SECTION_LABELS } from "@/lib/constants"

import { Button } from "../../../../tailwind/ui/buttons/Button"
import { Button } from "../../ui/buttons/Button"
import type { NavSections } from "../types"

import { useNavMenu } from "./useNavMenu"
Expand Down
5 changes: 1 addition & 4 deletions src/components/Nav/Mobile/FooterButton.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import { forwardRef } from "react"
import type { IconType } from "react-icons"

import {
Button,
type ButtonProps,
} from "../../../../tailwind/ui/buttons/Button"
import { Button, type ButtonProps } from "../../ui/buttons/Button"

type FooterButtonProps = ButtonProps & {
icon: IconType
Expand Down
5 changes: 1 addition & 4 deletions src/components/Nav/Mobile/HamburgerButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ import { cn } from "@/lib/utils/cn"

import { HAMBURGER_BUTTON_ID } from "@/lib/constants"

import {
Button,
type ButtonProps,
} from "../../../../tailwind/ui/buttons/Button"
import { Button, type ButtonProps } from "../../ui/buttons/Button"

const hamburgerSvg =
"M 2 13 l 10 0 l 0 0 l 10 0 M 4 19 l 8 0 M 12 19 l 8 0 M 2 25 l 10 0 l 0 0 l 10 0"
Expand Down
4 changes: 2 additions & 2 deletions src/components/Nav/Mobile/LvlAccordion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { cn } from "@/lib/utils/cn"
import { trackCustomEvent } from "@/lib/utils/matomo"
import { cleanPath } from "@/lib/utils/url"

import { Button } from "../../../../tailwind/ui/buttons/Button"
import { BaseLink } from "../../../../tailwind/ui/Link"
import { Button } from "../../ui/buttons/Button"
import { BaseLink } from "../../ui/Link"
import type { Level, NavItem, NavSectionKey } from "../types"

import ExpandIcon from "./ExpandIcon"
Expand Down
2 changes: 1 addition & 1 deletion src/components/Nav/Mobile/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
SheetTrigger,
} from "@/components/ui/sheet"

import { ButtonProps } from "../../../../tailwind/ui/buttons/Button"
import { ButtonProps } from "../../ui/buttons/Button"
import type { NavSections } from "../types"

import HamburgerButton from "./HamburgerButton"
Expand Down
2 changes: 1 addition & 1 deletion src/components/SkipLink.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useTranslation } from "next-i18next"

import { MAIN_CONTENT_ID } from "@/lib/constants"

import { BaseLink } from "../../tailwind/ui/Link"
import { BaseLink } from "./ui/Link"

export const SkipLink = () => {
const { t } = useTranslation()
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { MdChevronRight, MdExpandMore } from "react-icons/md"
import type { Meta, StoryObj } from "@storybook/react"

import { HStack, VStack } from "../../../src/components/ui/flex"
import { Button, type ButtonVariantProps } from "../buttons/Button"
import { HStack, VStack } from "../flex"

const meta = {
title: "Atoms / Form / ShadCn Buttons",
title: "Atoms / Form / Buttons",
component: Button,
args: {
children: "What is Ethereum?",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { Meta, StoryObj } from "@storybook/react/*"
import { ButtonLink as ButtonLinkComponent } from "../buttons/Button"

const meta = {
title: "Atoms / Form / ShadCn Buttons",
title: "Atoms / Form / Buttons",
component: ButtonLinkComponent,
} satisfies Meta<typeof ButtonLinkComponent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Meta, StoryObj } from "@storybook/react"
import ButtonTwoLinesComponent from "../buttons/ButtonTwoLines"

const meta = {
title: "Atoms / Form / ShadCn Buttons / ButtonTwoLines",
title: "Atoms / Form / Buttons / ButtonTwoLines",
component: ButtonTwoLinesComponent,
} satisfies Meta<typeof ButtonTwoLinesComponent>

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { IconType } from "react-icons/lib"

import { cn } from "@/lib/utils/cn"

import { Stack } from "../../../src/components/ui/flex"
import { Stack } from "../flex"

import {
Button,
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/sheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import * as SheetPrimitive from "@radix-ui/react-dialog"

import { cn } from "@/lib/utils/cn"

import { Button } from "../../../tailwind/ui/buttons/Button"
import { Button } from "./buttons/Button"

const Sheet = SheetPrimitive.Root

Expand Down
Loading
Loading