Skip to content

Commit 50cb780

Browse files
thecodingtreethecodingtree
committed
Upgrade to NextJs 15
1 parent be9cf2c commit 50cb780

15 files changed

+348
-286
lines changed

‎app/globals.css

+49-34
Original file line numberDiff line numberDiff line change
@@ -5,64 +5,79 @@
55
@layer base {
66
:root {
77
--background: 0 0% 100%;
8-
--foreground: 222.2 84% 4.9%;
8+
--foreground: 240 10% 3.9%;
99

1010
--card: 0 0% 100%;
11-
--card-foreground: 222.2 84% 4.9%;
11+
--card-foreground: 240 10% 3.9%;
1212

1313
--popover: 0 0% 100%;
14-
--popover-foreground: 222.2 84% 4.9%;
14+
--popover-foreground: 240 10% 3.9%;
1515

16-
--primary: 222.2 47.4% 11.2%;
17-
--primary-foreground: 210 40% 98%;
16+
--primary: 240 5.9% 10%;
17+
--primary-foreground: 0 0% 98%;
1818

19-
--secondary: 210 40% 96.1%;
20-
--secondary-foreground: 222.2 47.4% 11.2%;
19+
--secondary: 240 4.8% 95.9%;
20+
--secondary-foreground: 240 5.9% 10%;
2121

22-
--muted: 210 40% 96.1%;
23-
--muted-foreground: 215.4 16.3% 46.9%;
22+
--muted: 240 4.8% 95.9%;
23+
--muted-foreground: 240 3.8% 46.1%;
2424

25-
--accent: 210 40% 96.1%;
26-
--accent-foreground: 222.2 47.4% 11.2%;
25+
--accent: 240 4.8% 95.9%;
26+
--accent-foreground: 240 5.9% 10%;
2727

2828
--destructive: 0 84.2% 60.2%;
29-
--destructive-foreground: 210 40% 98%;
29+
--destructive-foreground: 0 0% 98%;
3030

31-
--border: 214.3 31.8% 91.4%;
32-
--input: 214.3 31.8% 91.4%;
33-
--ring: 222.2 84% 4.9%;
31+
--border: 240 5.9% 90%;
32+
--input: 240 5.9% 90%;
33+
--ring: 240 10% 3.9%;
3434

3535
--radius: 0.5rem;
36+
37+
--chart-1: 12 76% 61%;
38+
39+
--chart-2: 173 58% 39%;
40+
41+
--chart-3: 197 37% 24%;
42+
43+
--chart-4: 43 74% 66%;
44+
45+
--chart-5: 27 87% 67%;
3646
}
3747

3848
.dark {
39-
--background: 222.2 84% 4.9%;
40-
--foreground: 210 40% 98%;
49+
--background: 240 10% 3.9%;
50+
--foreground: 0 0% 98%;
4151

42-
--card: 222.2 84% 4.9%;
43-
--card-foreground: 210 40% 98%;
52+
--card: 240 10% 3.9%;
53+
--card-foreground: 0 0% 98%;
4454

45-
--popover: 222.2 84% 4.9%;
46-
--popover-foreground: 210 40% 98%;
55+
--popover: 240 10% 3.9%;
56+
--popover-foreground: 0 0% 98%;
4757

48-
--primary: 210 40% 98%;
49-
--primary-foreground: 222.2 47.4% 11.2%;
58+
--primary: 0 0% 98%;
59+
--primary-foreground: 240 5.9% 10%;
5060

51-
--secondary: 217.2 32.6% 17.5%;
52-
--secondary-foreground: 210 40% 98%;
61+
--secondary: 240 3.7% 15.9%;
62+
--secondary-foreground: 0 0% 98%;
5363

54-
--muted: 217.2 32.6% 17.5%;
55-
--muted-foreground: 215 20.2% 65.1%;
64+
--muted: 240 3.7% 15.9%;
65+
--muted-foreground: 240 5% 64.9%;
5666

57-
--accent: 217.2 32.6% 17.5%;
58-
--accent-foreground: 210 40% 98%;
67+
--accent: 240 3.7% 15.9%;
68+
--accent-foreground: 0 0% 98%;
5969

6070
--destructive: 0 62.8% 30.6%;
61-
--destructive-foreground: 210 40% 98%;
62-
63-
--border: 217.2 32.6% 17.5%;
64-
--input: 217.2 32.6% 17.5%;
65-
--ring: 212.7 26.8% 83.9%;
71+
--destructive-foreground: 0 0% 98%;
72+
73+
--border: 240 3.7% 15.9%;
74+
--input: 240 3.7% 15.9%;
75+
--ring: 240 4.9% 83.9%;
76+
--chart-1: 220 70% 50%;
77+
--chart-2: 160 60% 45%;
78+
--chart-3: 30 80% 55%;
79+
--chart-4: 280 65% 60%;
80+
--chart-5: 340 75% 55%;
6681
}
6782
}
6883

‎app/layout.tsx

+4-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ export const fontSans = FontSans({
2626
variable: '--font-sans',
2727
});
2828

29-
export default function RootLayout({ children }: { children: any }) {
29+
export default async function RootLayout({ children }: { children: any }) {
30+
const headersList = await headers();
31+
3032
return (
3133
<html lang="en">
3234
<head>
@@ -42,7 +44,7 @@ export default function RootLayout({ children }: { children: any }) {
4244
fontSans.variable,
4345
)}
4446
>
45-
<TRPCProvider headers={headers()}>{children}</TRPCProvider>
47+
<TRPCProvider headers={headersList}>{children}</TRPCProvider>
4648
<Analytics />
4749
<Toaster position="bottom-center" closeButton />
4850
</body>

‎bun.lockb

9.94 KB
Binary file not shown.

‎components.json

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
{
22
"$schema": "https://ui.shadcn.com/schema.json",
3-
"style": "default",
3+
"style": "new-york",
44
"rsc": true,
55
"tsx": true,
66
"tailwind": {
77
"config": "tailwind.config.js",
8-
"css": "./app/global.css",
9-
"baseColor": "slate",
8+
"css": "app/globals.css",
9+
"baseColor": "zinc",
1010
"cssVariables": true,
1111
"prefix": ""
1212
},
1313
"aliases": {
1414
"components": "@/components",
15-
"utils": "@/libs/utils"
16-
}
17-
}
15+
"utils": "@/lib/utils",
16+
"ui": "@/components/ui",
17+
"lib": "@/lib",
18+
"hooks": "@/hooks"
19+
},
20+
"iconLibrary": "lucide"
21+
}

‎components/tables/AddRelationship.tsx

+5-7
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,11 @@ export function AddRelationship({
8787
/>
8888
</div>
8989
</CollapsibleContent>
90-
<CollapsibleTrigger>
91-
<Button
92-
onClick={handleAdd}
93-
disabled={toEntity === undefined || relationshipType === undefined}
94-
>
95-
Add Relationship
96-
</Button>
90+
<CollapsibleTrigger
91+
onClick={handleAdd}
92+
disabled={toEntity === undefined || relationshipType === undefined}
93+
>
94+
Add Relationship
9795
</CollapsibleTrigger>
9896
</Collapsible>
9997
);

‎components/ui/alert-dialog.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import * as React from "react"
44
import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog"
55

6-
import { cn } from "@/libs/utils"
6+
import { cn } from "@/lib/utils"
77
import { buttonVariants } from "@/components/ui/button"
88

99
const AlertDialog = AlertDialogPrimitive.Root
@@ -18,7 +18,7 @@ const AlertDialogOverlay = React.forwardRef<
1818
>(({ className, ...props }, ref) => (
1919
<AlertDialogPrimitive.Overlay
2020
className={cn(
21-
"fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
21+
"fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
2222
className
2323
)}
2424
{...props}

‎components/ui/button.tsx

+27-26
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,57 @@
1-
import * as React from 'react';
2-
import { Slot } from '@radix-ui/react-slot';
3-
import { cva, type VariantProps } from 'class-variance-authority';
1+
import * as React from "react"
2+
import { Slot } from "@radix-ui/react-slot"
3+
import { cva, type VariantProps } from "class-variance-authority"
44

5-
import { cn } from '@/libs/utils';
5+
import { cn } from "@/lib/utils"
66

77
const buttonVariants = cva(
8-
'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50',
8+
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0",
99
{
1010
variants: {
1111
variant: {
12-
default: 'bg-primary text-primary-foreground hover:bg-primary/90',
12+
default:
13+
"bg-primary text-primary-foreground shadow hover:bg-primary/90",
1314
destructive:
14-
'bg-destructive text-destructive-foreground hover:bg-destructive/90',
15+
"bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90",
1516
outline:
16-
'border border-input bg-background hover:bg-accent hover:text-accent-foreground',
17+
"border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground",
1718
secondary:
18-
'bg-secondary text-secondary-foreground hover:bg-secondary/80',
19-
ghost: 'hover:bg-accent hover:text-accent-foreground',
20-
link: 'text-primary underline-offset-4 hover:underline',
19+
"bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80",
20+
ghost: "hover:bg-accent hover:text-accent-foreground",
21+
link: "text-primary underline-offset-4 hover:underline",
2122
},
2223
size: {
23-
default: 'h-10 px-4 py-2',
24-
sm: 'h-9 rounded-md px-3',
25-
lg: 'h-11 rounded-md px-8',
26-
icon: 'h-10 w-10',
24+
default: "h-9 px-4 py-2",
25+
sm: "h-8 rounded-md px-3 text-xs",
26+
lg: "h-10 rounded-md px-8",
27+
icon: "h-9 w-9",
2728
},
2829
},
2930
defaultVariants: {
30-
variant: 'default',
31-
size: 'default',
31+
variant: "default",
32+
size: "default",
3233
},
33-
},
34-
);
34+
}
35+
)
3536

3637
export interface ButtonProps
3738
extends React.ButtonHTMLAttributes<HTMLButtonElement>,
3839
VariantProps<typeof buttonVariants> {
39-
asChild?: boolean;
40+
asChild?: boolean
4041
}
4142

4243
const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
4344
({ className, variant, size, asChild = false, ...props }, ref) => {
44-
const Comp = asChild ? Slot : 'button';
45+
const Comp = asChild ? Slot : "button"
4546
return (
4647
<Comp
4748
className={cn(buttonVariants({ variant, size, className }))}
4849
ref={ref}
4950
{...props}
5051
/>
51-
);
52-
},
53-
);
54-
Button.displayName = 'Button';
52+
)
53+
}
54+
)
55+
Button.displayName = "Button"
5556

56-
export { Button, buttonVariants };
57+
export { Button, buttonVariants }

0 commit comments

Comments
 (0)