Skip to content

Commit 89ba3b3

Browse files
committed
some layout fixes
1 parent 3750876 commit 89ba3b3

File tree

11 files changed

+772
-67
lines changed

11 files changed

+772
-67
lines changed

frontend/components.json

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
11
{
2-
"$schema": "https://ui.shadcn.com/schema.json",
3-
"style": "new-york",
4-
"rsc": true,
5-
"tsx": true,
6-
"tailwind": {
7-
"config": "",
8-
"css": "src/app/globals.css",
9-
"baseColor": "stone",
10-
"cssVariables": true,
11-
"prefix": ""
12-
},
13-
"iconLibrary": "lucide",
14-
"aliases": {
15-
"components": "@/components",
16-
"utils": "@/lib/utils",
17-
"ui": "@/components/ui",
18-
"lib": "@/lib",
19-
"hooks": "@/hooks"
20-
}
2+
"$schema": "https://ui.shadcn.com/schema.json",
3+
"style": "new-york",
4+
"rsc": true,
5+
"tsx": true,
6+
"tailwind": {
7+
"config": "",
8+
"css": "src/app/globals.css",
9+
"baseColor": "stone",
10+
"cssVariables": true,
11+
"prefix": ""
12+
},
13+
"iconLibrary": "lucide",
14+
"aliases": {
15+
"components": "@/components",
16+
"utils": "@/lib/utils",
17+
"ui": "@/components/ui",
18+
"lib": "@/lib",
19+
"hooks": "@/hooks"
20+
},
21+
"registries": {
22+
"@tailark": "https://tailark.com/r/{name}.json"
23+
}
2124
}

frontend/next.config.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
import type { NextConfig } from "next";
22

33
const nextConfig: NextConfig = {
4-
/* config options here */
4+
/* config options here */
5+
images: {
6+
dangerouslyAllowSVG: true,
7+
remotePatterns: [
8+
{
9+
protocol: "https",
10+
hostname: "*",
11+
},
12+
],
13+
},
514
};
615

716
export default nextConfig;

frontend/package-lock.json

Lines changed: 105 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@
77
"build": "next build --turbopack",
88
"start": "next start",
99
"lint": "eslint",
10+
"lint:fix": "eslint --fix",
1011
"upgrade:tailwind": "npx @tailwindcss/upgrade@latest"
1112
},
1213
"dependencies": {
14+
"@radix-ui/react-slot": "^1.2.3",
1315
"@remixicon/react": "^4.6.0",
1416
"class-variance-authority": "^0.7.1",
1517
"clsx": "^2.1.1",
1618
"lucide-react": "^0.542.0",
19+
"motion": "^12.23.12",
1720
"next": "15.5.2",
1821
"next-themes": "^0.4.6",
1922
"react": "19.1.0",

frontend/src/app/(root)/layout.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import React from "react";
2+
3+
const Layout = ({ children }: Readonly<{ children: React.ReactNode }>) => {
4+
return <main>{children}</main>;
5+
};
6+
7+
export default Layout;

frontend/src/app/globals.css

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -44,72 +44,72 @@
4444
}
4545

4646
:root {
47-
--radius: 0.65rem;
47+
--radius: 0.625rem;
4848
--background: oklch(1 0 0);
49-
--foreground: oklch(0.141 0.005 285.823);
49+
--foreground: oklch(0.147 0.004 49.25);
5050
--card: oklch(1 0 0);
51-
--card-foreground: oklch(0.141 0.005 285.823);
51+
--card-foreground: oklch(0.147 0.004 49.25);
5252
--popover: oklch(1 0 0);
53-
--popover-foreground: oklch(0.141 0.005 285.823);
54-
--primary: oklch(0.795 0.184 86.047);
55-
--primary-foreground: oklch(0.421 0.095 57.708);
56-
--secondary: oklch(0.967 0.001 286.375);
57-
--secondary-foreground: oklch(0.21 0.006 285.885);
58-
--muted: oklch(0.967 0.001 286.375);
59-
--muted-foreground: oklch(0.552 0.016 285.938);
60-
--accent: oklch(0.967 0.001 286.375);
61-
--accent-foreground: oklch(0.21 0.006 285.885);
53+
--popover-foreground: oklch(0.147 0.004 49.25);
54+
--primary: oklch(0.216 0.006 56.043);
55+
--primary-foreground: oklch(0.985 0.001 106.423);
56+
--secondary: oklch(0.97 0.001 106.424);
57+
--secondary-foreground: oklch(0.216 0.006 56.043);
58+
--muted: oklch(0.97 0.001 106.424);
59+
--muted-foreground: oklch(0.553 0.013 58.071);
60+
--accent: oklch(0.97 0.001 106.424);
61+
--accent-foreground: oklch(0.216 0.006 56.043);
6262
--destructive: oklch(0.577 0.245 27.325);
63-
--border: oklch(0.92 0.004 286.32);
64-
--input: oklch(0.92 0.004 286.32);
65-
--ring: oklch(0.795 0.184 86.047);
63+
--border: oklch(0.923 0.003 48.717);
64+
--input: oklch(0.923 0.003 48.717);
65+
--ring: oklch(0.709 0.01 56.259);
6666
--chart-1: oklch(0.646 0.222 41.116);
6767
--chart-2: oklch(0.6 0.118 184.704);
6868
--chart-3: oklch(0.398 0.07 227.392);
6969
--chart-4: oklch(0.828 0.189 84.429);
7070
--chart-5: oklch(0.769 0.188 70.08);
71-
--sidebar: oklch(0.985 0 0);
72-
--sidebar-foreground: oklch(0.141 0.005 285.823);
73-
--sidebar-primary: oklch(0.795 0.184 86.047);
74-
--sidebar-primary-foreground: oklch(0.421 0.095 57.708);
75-
--sidebar-accent: oklch(0.967 0.001 286.375);
76-
--sidebar-accent-foreground: oklch(0.21 0.006 285.885);
77-
--sidebar-border: oklch(0.92 0.004 286.32);
78-
--sidebar-ring: oklch(0.795 0.184 86.047);
71+
--sidebar: oklch(0.985 0.001 106.423);
72+
--sidebar-foreground: oklch(0.147 0.004 49.25);
73+
--sidebar-primary: oklch(0.216 0.006 56.043);
74+
--sidebar-primary-foreground: oklch(0.985 0.001 106.423);
75+
--sidebar-accent: oklch(0.97 0.001 106.424);
76+
--sidebar-accent-foreground: oklch(0.216 0.006 56.043);
77+
--sidebar-border: oklch(0.923 0.003 48.717);
78+
--sidebar-ring: oklch(0.709 0.01 56.259);
7979
}
8080

8181
.dark {
82-
--background: oklch(0.141 0.005 285.823);
83-
--foreground: oklch(0.985 0 0);
84-
--card: oklch(0.21 0.006 285.885);
85-
--card-foreground: oklch(0.985 0 0);
86-
--popover: oklch(0.21 0.006 285.885);
87-
--popover-foreground: oklch(0.985 0 0);
88-
--primary: oklch(0.795 0.184 86.047);
89-
--primary-foreground: oklch(0.421 0.095 57.708);
90-
--secondary: oklch(0.274 0.006 286.033);
91-
--secondary-foreground: oklch(0.985 0 0);
92-
--muted: oklch(0.274 0.006 286.033);
93-
--muted-foreground: oklch(0.705 0.015 286.067);
94-
--accent: oklch(0.274 0.006 286.033);
95-
--accent-foreground: oklch(0.985 0 0);
82+
--background: oklch(0.147 0.004 49.25);
83+
--foreground: oklch(0.985 0.001 106.423);
84+
--card: oklch(0.216 0.006 56.043);
85+
--card-foreground: oklch(0.985 0.001 106.423);
86+
--popover: oklch(0.216 0.006 56.043);
87+
--popover-foreground: oklch(0.985 0.001 106.423);
88+
--primary: oklch(0.923 0.003 48.717);
89+
--primary-foreground: oklch(0.216 0.006 56.043);
90+
--secondary: oklch(0.268 0.007 34.298);
91+
--secondary-foreground: oklch(0.985 0.001 106.423);
92+
--muted: oklch(0.268 0.007 34.298);
93+
--muted-foreground: oklch(0.709 0.01 56.259);
94+
--accent: oklch(0.268 0.007 34.298);
95+
--accent-foreground: oklch(0.985 0.001 106.423);
9696
--destructive: oklch(0.704 0.191 22.216);
9797
--border: oklch(1 0 0 / 10%);
9898
--input: oklch(1 0 0 / 15%);
99-
--ring: oklch(0.554 0.135 66.442);
99+
--ring: oklch(0.553 0.013 58.071);
100100
--chart-1: oklch(0.488 0.243 264.376);
101101
--chart-2: oklch(0.696 0.17 162.48);
102102
--chart-3: oklch(0.769 0.188 70.08);
103103
--chart-4: oklch(0.627 0.265 303.9);
104104
--chart-5: oklch(0.645 0.246 16.439);
105-
--sidebar: oklch(0.21 0.006 285.885);
106-
--sidebar-foreground: oklch(0.985 0 0);
107-
--sidebar-primary: oklch(0.795 0.184 86.047);
108-
--sidebar-primary-foreground: oklch(0.421 0.095 57.708);
109-
--sidebar-accent: oklch(0.274 0.006 286.033);
110-
--sidebar-accent-foreground: oklch(0.985 0 0);
105+
--sidebar: oklch(0.216 0.006 56.043);
106+
--sidebar-foreground: oklch(0.985 0.001 106.423);
107+
--sidebar-primary: oklch(0.488 0.243 264.376);
108+
--sidebar-primary-foreground: oklch(0.985 0.001 106.423);
109+
--sidebar-accent: oklch(0.268 0.007 34.298);
110+
--sidebar-accent-foreground: oklch(0.985 0.001 106.423);
111111
--sidebar-border: oklch(1 0 0 / 10%);
112-
--sidebar-ring: oklch(0.554 0.135 66.442);
112+
--sidebar-ring: oklch(0.553 0.013 58.071);
113113
}
114114

115115
@layer base {

0 commit comments

Comments
 (0)