Skip to content

feat: Update shadcn ui 4 #691

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.

Sign up for GitHub

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

Draft
aXenDeveloper wants to merge 1 commit into
base: canary
Choose a base branch
from
Draft

feat: Update shadcn ui 4 #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions apps/api/src/locales/@vitnode/core/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
{
"core": {
"global": {
"close": "Close",
"confirm": "Confirm",
"previous": "Previous",
"next": "Next",
"current_page": "Current page",
"go_to_page": "Go to page",
"remove": "Remove",
"editor": {
"undo": "Undo",
"redo": "Redo",
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/components.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://ui.shadcn.com/schema.json",
"style": "base-nova",
"style": "radix-vega",
"rsc": true,
"tsx": true,
"tailwind": {
Expand Down
26 changes: 13 additions & 13 deletions apps/docs/content/docs/dev/email/components/button.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ description: A button or link component for emails.

## Preview

import { ImgDocs } from '@/components/fumadocs/img';
import buttonPreviewImg from './button-preview.png';
import { ImgDocs } from "@/components/fumadocs/img";
import buttonPreviewImg from "./button-preview.png";

<ImgDocs src={buttonPreviewImg} alt="Buttons Preview" />

## Usage

```ts
import { EmailButton } from '@vitnode/core/emails/ui/button';
import { EmailButton } from "@vitnode/core/emails/ui/button";
```

```tsx
Expand All @@ -22,24 +22,24 @@ import { EmailButton } from '@vitnode/core/emails/ui/button';

## Props

import { TypeTable } from 'fumadocs-ui/components/type-table';
import { TypeTable } from "fumadocs-ui/components/type-table";

<TypeTable
type={{
variant: {
description: 'The variant of the button.',
type: 'default | secondary | outline | ghost | link | destructive | destructiveGhost',
default: 'default',
description: "The variant of the button.",
type: "default | secondary | outline | ghost | link | destructive | destructiveGhost",
default: "default",
},
size: {
description: 'The size of the button.',
type: 'default | sm | lg',
default: 'default',
description: "The size of the button.",
type: "default | sm | lg",
default: "default",
},
href: {
description: 'The URL the button links to.',
type: 'string',
default: '',
description: "The URL the button links to.",
type: "string",
default: "",
},
}}
/>
18 changes: 9 additions & 9 deletions apps/docs/content/docs/ui/button.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ description: A button component for triggering actions in your application.
## Usage

```ts
import { Home } from 'lucide-react';
import { Button } from '@vitnode/core/components/ui/button';
import { Home } from "lucide-react";
import { Button } from "@vitnode/core/components/ui/button";
```

```tsx
Expand All @@ -23,19 +23,19 @@ import { Button } from '@vitnode/core/components/ui/button';

## Props

import { TypeTable } from 'fumadocs-ui/components/type-table';
import { TypeTable } from "fumadocs-ui/components/type-table";

<TypeTable
type={{
variant: {
description: 'The variant of the button.',
type: 'default | secondary | outline | ghost | link | destructive| destructiveGhost',
default: 'default',
description: "The variant of the button.",
type: "default | secondary | outline | ghost | link | destructive",
default: "default",
},
size: {
description: 'The size of the button.',
type: 'default | sm | lg | icon',
default: 'default',
description: "The size of the button.",
type: "default | sm | lg | icon",
default: "default",
},
}}
/>
1 change: 1 addition & 0 deletions apps/docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"react-dom": "^19.2.5",
"react-hook-form": "^7.74.0",
"react-use": "^17.6.0",
"shadcn": "^4.7.0",
"sonner": "^2.0.7"
},
"devDependencies": {
Expand Down
84 changes: 43 additions & 41 deletions apps/docs/src/app/global.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
@import "tailwindcss";
@import "fumadocs-ui/css/shadcn.css";
@import "fumadocs-ui/css/neutral.css";
@import "fumadocs-ui/css/preset.css";
@import "@vitnode/core/styles/tiptap.css";
@import "shadcn/tailwind.css";

@import "tw-animate-css";

Expand All @@ -11,75 +12,76 @@

:root:not(.dark) {
--background: oklch(1 0 0);
--foreground: oklch(0.141 0.005 285.823);
--foreground: oklch(0.145 0 0);
--card: oklch(1 0 0);
--card-foreground: oklch(0.141 0.005 285.823);
--card-foreground: oklch(0.145 0 0);
--popover: oklch(1 0 0);
--popover-foreground: oklch(0.141 0.005 285.823);
--primary: oklch(0.488 0.243 264.376);
--primary-foreground: oklch(0.97 0.014 254.604);
--popover-foreground: oklch(0.145 0 0);
--primary: oklch(0.51 0.16 262.61);
--primary-foreground: oklch(0.985 0 0);
--secondary: oklch(0.967 0.001 286.375);
--secondary-foreground: oklch(0.21 0.006 285.885);
--muted: oklch(0.967 0.001 286.375);
--muted-foreground: oklch(0.552 0.016 285.938);
--accent: oklch(0.967 0.001 286.375);
--accent-foreground: oklch(0.21 0.006 285.885);
--muted: oklch(0.97 0 0);
--muted-foreground: oklch(0.556 0 0);
--accent: oklch(0.97 0 0);
--accent-foreground: oklch(0.205 0 0);
--destructive: oklch(0.577 0.245 27.325);
--border: oklch(0.92 0.004 286.32);
--input: oklch(0.92 0.004 286.32);
--ring: oklch(0.705 0.015 286.067);
--chart-1: oklch(0.871 0.006 286.286);
--chart-2: oklch(0.552 0.016 285.938);
--chart-3: oklch(0.442 0.017 285.786);
--chart-4: oklch(0.37 0.013 285.805);
--chart-5: oklch(0.274 0.006 286.033);
--radius: 0.625rem;
--warn: oklch(0.54 0.12 82.58);
--border: oklch(0.922 0 0);
--input: oklch(0.922 0 0);
--ring: oklch(0.708 0 0);
--chart-1: oklch(0.87 0 0);
--chart-2: oklch(0.556 0 0);
--chart-3: oklch(0.439 0 0);
--chart-4: oklch(0.371 0 0);
--chart-5: oklch(0.269 0 0);
--sidebar: oklch(0.985 0 0);
--sidebar-foreground: oklch(0.141 0.005 285.823);
--sidebar-foreground: oklch(0.145 0 0);
--sidebar-primary: oklch(0.546 0.245 262.881);
--sidebar-primary-foreground: oklch(0.97 0.014 254.604);
--sidebar-accent: oklch(0.967 0.001 286.375);
--sidebar-accent-foreground: oklch(0.21 0.006 285.885);
--sidebar-border: oklch(0.92 0.004 286.32);
--sidebar-ring: oklch(0.705 0.015 286.067);
--sidebar-accent: oklch(0.97 0 0);
--sidebar-accent-foreground: oklch(0.205 0 0);
--sidebar-border: oklch(0.922 0 0);
--sidebar-ring: oklch(0.708 0 0);

--dev-color: oklch(0.6 0.18 50);
--ui-color: oklch(0.65 0.18 170);
--guides-color: oklch(0.45 0.16 262.61);
}

.dark {
--background: oklch(0.141 0.005 285.823);
--background: oklch(0.145 0 0);
--foreground: oklch(0.985 0 0);
--card: oklch(0.21 0.006 285.885);
--card: oklch(0.205 0 0);
--card-foreground: oklch(0.985 0 0);
--popover: oklch(0.21 0.006 285.885);
--popover: oklch(0.205 0 0);
--popover-foreground: oklch(0.985 0 0);
--primary: oklch(0.424 0.199 265.638);
--primary-foreground: oklch(0.97 0.014 254.604);
--primary: oklch(0.6 0.18 262.65);
--primary-foreground: oklch(0.98 0 0);
--secondary: oklch(0.274 0.006 286.033);
--secondary-foreground: oklch(0.985 0 0);
--muted: oklch(0.274 0.006 286.033);
--muted-foreground: oklch(0.705 0.015 286.067);
--accent: oklch(0.274 0.006 286.033);
--muted: oklch(0.269 0 0);
--muted-foreground: oklch(0.708 0 0);
--accent: oklch(0.269 0 0);
--accent-foreground: oklch(0.985 0 0);
--destructive: oklch(0.704 0.191 22.216);
--warn: oklch(0.76 0.18 81.84);
--border: oklch(1 0 0 / 10%);
--input: oklch(1 0 0 / 15%);
--ring: oklch(0.552 0.016 285.938);
--chart-1: oklch(0.871 0.006 286.286);
--chart-2: oklch(0.552 0.016 285.938);
--chart-3: oklch(0.442 0.017 285.786);
--chart-4: oklch(0.37 0.013 285.805);
--chart-5: oklch(0.274 0.006 286.033);
--sidebar: oklch(0.21 0.006 285.885);
--ring: oklch(0.556 0 0);
--chart-1: oklch(0.87 0 0);
--chart-2: oklch(0.556 0 0);
--chart-3: oklch(0.439 0 0);
--chart-4: oklch(0.371 0 0);
--chart-5: oklch(0.269 0 0);
--sidebar: oklch(0.205 0 0);
--sidebar-foreground: oklch(0.985 0 0);
--sidebar-primary: oklch(0.623 0.214 259.815);
--sidebar-primary-foreground: oklch(0.97 0.014 254.604);
--sidebar-accent: oklch(0.274 0.006 286.033);
--sidebar-accent: oklch(0.269 0 0);
--sidebar-accent-foreground: oklch(0.985 0 0);
--sidebar-border: oklch(1 0 0 / 10%);
--sidebar-ring: oklch(0.552 0.016 285.938);
--sidebar-ring: oklch(0.556 0 0);

--dev-color: oklch(0.75 0.18 50);
--ui-color: oklch(0.7 0.18 170);
Expand Down
2 changes: 1 addition & 1 deletion apps/docs/src/examples/button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default function ButtonExample() {
aria-label="Delete"
isLoading={isLoading}
size="icon"
variant="destructiveGhost"
variant="destructive"
>
<Trash2 />
</Button>
Expand Down
7 changes: 7 additions & 0 deletions apps/docs/src/locales/@vitnode/core/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
{
"core": {
"global": {
"close": "Close",
"confirm": "Confirm",
"previous": "Previous",
"next": "Next",
"current_page": "Current page",
"go_to_page": "Go to page",
"remove": "Remove",
"editor": {
"undo": "Undo",
"redo": "Redo",
Expand Down
Loading
Loading