Skip to content

Commit ed96e51

Browse files
authored
Merge pull request #13569 from TylerAPfledderer/feat/learn-page-shadcn
[ShadCN] refactor(pages/learn): migrate to ShadCN
2 parents c8f1555 + 03add81 commit ed96e51

22 files changed

+577
-751
lines changed

src/components/Buttons/Button.stories.tsx

Lines changed: 0 additions & 136 deletions
This file was deleted.

src/components/Buttons/ButtonTwoLines/ButtonTwoLines.stories.tsx

Lines changed: 0 additions & 34 deletions
This file was deleted.

src/components/FeedbackWidget/FixedDot.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import { forwardRef } from "react"
22
import { useTranslation } from "next-i18next"
33
import type { ButtonHTMLAttributes } from "react"
44

5+
import { Button } from "@/components/ui/buttons/Button"
6+
57
import { cn } from "@/lib/utils/cn"
68

79
import { FeedbackGlyphIcon } from "../icons"
810

9-
import { Button } from "@/../tailwind/ui/buttons/Button"
10-
1111
type FixedDotProps = ButtonHTMLAttributes<HTMLButtonElement> & {
1212
isExpanded: boolean
1313
offsetBottom?: boolean

src/components/FeedbackWidget/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { useTranslation } from "next-i18next"
22
import { MdClose } from "react-icons/md"
33

4+
import { Button } from "@/components/ui/buttons/Button"
5+
46
import {
57
Popover,
68
PopoverClose,
@@ -11,8 +13,6 @@ import {
1113
import FixedDot from "./FixedDot"
1214
import { useFeedbackWidget } from "./useFeedbackWidget"
1315

14-
import { Button } from "@/../tailwind/ui/buttons/Button"
15-
1616
const FeedbackWidget = () => {
1717
const { t } = useTranslation("common")
1818
const {

src/components/Footer.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ import Translation from "@/components/Translation"
99
import { cn } from "@/lib/utils/cn"
1010
import { scrollIntoView } from "@/lib/utils/scrollIntoView"
1111

12-
import { Button } from "../../tailwind/ui/buttons/Button"
13-
import { BaseLink } from "../../tailwind/ui/Link"
14-
12+
import { Button } from "./ui/buttons/Button"
13+
import { BaseLink } from "./ui/Link"
1514
import { List, ListItem } from "./ui/list"
1615

1716
const socialLinks = [

src/components/Nav/Menu/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { cn } from "@/lib/utils/cn"
1313

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

16-
import { Button } from "../../../../tailwind/ui/buttons/Button"
16+
import { Button } from "../../ui/buttons/Button"
1717
import type { NavSections } from "../types"
1818

1919
import { useNavMenu } from "./useNavMenu"

src/components/Nav/Mobile/FooterButton.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import { forwardRef } from "react"
22
import type { IconType } from "react-icons"
33

4-
import {
5-
Button,
6-
type ButtonProps,
7-
} from "../../../../tailwind/ui/buttons/Button"
4+
import { Button, type ButtonProps } from "../../ui/buttons/Button"
85

96
type FooterButtonProps = ButtonProps & {
107
icon: IconType

src/components/Nav/Mobile/HamburgerButton.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ import { cn } from "@/lib/utils/cn"
66

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

9-
import {
10-
Button,
11-
type ButtonProps,
12-
} from "../../../../tailwind/ui/buttons/Button"
9+
import { Button, type ButtonProps } from "../../ui/buttons/Button"
1310

1411
const hamburgerSvg =
1512
"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"

src/components/Nav/Mobile/LvlAccordion.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import { cn } from "@/lib/utils/cn"
66
import { trackCustomEvent } from "@/lib/utils/matomo"
77
import { cleanPath } from "@/lib/utils/url"
88

9-
import { Button } from "../../../../tailwind/ui/buttons/Button"
10-
import { BaseLink } from "../../../../tailwind/ui/Link"
9+
import { Button } from "../../ui/buttons/Button"
10+
import { BaseLink } from "../../ui/Link"
1111
import type { Level, NavItem, NavSectionKey } from "../types"
1212

1313
import ExpandIcon from "./ExpandIcon"

src/components/Nav/Mobile/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
SheetTrigger,
77
} from "@/components/ui/sheet"
88

9-
import { ButtonProps } from "../../../../tailwind/ui/buttons/Button"
9+
import { ButtonProps } from "../../ui/buttons/Button"
1010
import type { NavSections } from "../types"
1111

1212
import HamburgerButton from "./HamburgerButton"

0 commit comments

Comments
 (0)