Skip to content

Commit

Permalink
fix the shadcn install to fix the toaster
Browse files Browse the repository at this point in the history
  • Loading branch information
hyusap committed Jan 8, 2025
1 parent f5c63f7 commit 6d2db84
Show file tree
Hide file tree
Showing 6 changed files with 120 additions and 56 deletions.
49 changes: 45 additions & 4 deletions www/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,58 @@ html {

@layer base {
:root {
--background: 40, 20%, 94%; /* #f3f1ed */
--foreground: 0, 0%, 10%; /* #191919 */
--secondary: 0, 0%, 98%; /* #FAFAFA */
--accent: 0, 0%, 89%; /* #E2E2E2 */
--background: 0, 0%, 10%; /* #191919 */
--foreground: 40, 20%, 94%; /* #f3f1ed */
--secondary: 0, 0%, 0%; /* #000000 */
--accent: 0, 0%, 22%; /* #383838 */
font-size: 87.5%;
--card: 0 0% 100%;
--card-foreground: 0 0% 3.9%;
--popover: 0 0% 100%;
--popover-foreground: 0 0% 3.9%;
--primary: 0 0% 9%;
--primary-foreground: 0 0% 98%;
--secondary-foreground: 0 0% 9%;
--muted: 0 0% 96.1%;
--muted-foreground: 0 0% 45.1%;
--accent-foreground: 0 0% 9%;
--destructive: 0 84.2% 60.2%;
--destructive-foreground: 0 0% 98%;
--border: 0 0% 89.8%;
--input: 0 0% 89.8%;
--ring: 0 0% 3.9%;
--chart-1: 12 76% 61%;
--chart-2: 173 58% 39%;
--chart-3: 197 37% 24%;
--chart-4: 43 74% 66%;
--chart-5: 27 87% 67%;
--radius: 0.5rem;
}
.dark {
--background: 0, 0%, 10%; /* #191919 */
--foreground: 40, 20%, 94%; /* #f3f1ed */
--secondary: 0, 0%, 0%; /* #000000 */
--accent: 0, 0%, 22%; /* #383838 */
--card: 0 0% 3.9%;
--card-foreground: 0 0% 98%;
--popover: 0 0% 3.9%;
--popover-foreground: 0 0% 98%;
--primary: 0 0% 98%;
--primary-foreground: 0 0% 9%;
--secondary-foreground: 0 0% 98%;
--muted: 0 0% 14.9%;
--muted-foreground: 0 0% 63.9%;
--accent-foreground: 0 0% 98%;
--destructive: 0 62.8% 30.6%;
--destructive-foreground: 0 0% 98%;
--border: 0 0% 14.9%;
--input: 0 0% 14.9%;
--ring: 0 0% 83.1%;
--chart-1: 220 70% 50%;
--chart-2: 160 60% 45%;
--chart-3: 30 80% 55%;
--chart-4: 280 65% 60%;
--chart-5: 340 75% 55%;
}
}

Expand Down
8 changes: 4 additions & 4 deletions www/components.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
},
"aliases": {
"components": "@/components",
"utils": "@/utils/helpers",
"utils": "@/lib/utils",
"ui": "@/components/ui",
"lib": "@/lib",
"hooks": "@/hooks"
}
}

},
"iconLibrary": "lucide"
}
6 changes: 6 additions & 0 deletions www/lib/utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { clsx, type ClassValue } from "clsx"
import { twMerge } from "tailwind-merge"

export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs))
}
1 change: 1 addition & 0 deletions www/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"honcho-ai": "^0.0.11",
"katex": "^0.16.11",
"langfuse-vercel": "^3.32.0",
"lucide-react": "^0.469.0",
"next": "^14.2.16",
"next-themes": "^0.3.0",
"openai": "^4.72.0",
Expand Down
12 changes: 12 additions & 0 deletions www/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

100 changes: 52 additions & 48 deletions www/tailwind.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,55 +9,59 @@ const config: Config = {
'./app/**/*.{js,ts,jsx,tsx,mdx}',
],
theme: {
extend: {
colors: {
'neon-green': '#D1EF53',
'dark-green': '#0E281C',
background: 'hsl(var(--background))',
foreground: 'hsl(var(--foreground))',
popover: {
DEFAULT: 'hsl(var(--popover))',
foreground: 'hsl(var(--popover-foreground))',
},
primary: {
DEFAULT: 'hsl(var(--primary))',
foreground: 'hsl(var(--primary-foreground))',
},
secondary: {
DEFAULT: 'hsl(var(--secondary))',
foreground: 'hsl(var(--secondary-foreground))',
},
muted: {
DEFAULT: 'hsl(var(--muted))',
foreground: 'hsl(var(--muted-foreground))',
},
accent: {
DEFAULT: 'hsl(var(--accent))',
foreground: 'hsl(var(--accent-foreground))',
},
destructive: {
DEFAULT: 'hsl(var(--destructive))',
foreground: 'hsl(var(--destructive-foreground))',
},
border: 'hsl(var(--border))',
input: 'hsl(var(--input))',
ring: 'hsl(var(--ring))',
chart: {
'1': 'hsl(var(--chart-1))',
'2': 'hsl(var(--chart-2))',
'3': 'hsl(var(--chart-3))',
'4': 'hsl(var(--chart-4))',
'5': 'hsl(var(--chart-5))',
},
},
borderRadius: {
lg: 'var(--radius)',
md: 'calc(var(--radius) - 2px)',
sm: 'calc(var(--radius) - 4px)',
},
},
extend: {
colors: {
'neon-green': '#D1EF53',
'dark-green': '#0E281C',
background: 'hsl(var(--background))',
foreground: 'hsl(var(--foreground))',
popover: {
DEFAULT: 'hsl(var(--popover))',
foreground: 'hsl(var(--popover-foreground))'
},
primary: {
DEFAULT: 'hsl(var(--primary))',
foreground: 'hsl(var(--primary-foreground))'
},
secondary: {
DEFAULT: 'hsl(var(--secondary))',
foreground: 'hsl(var(--secondary-foreground))'
},
muted: {
DEFAULT: 'hsl(var(--muted))',
foreground: 'hsl(var(--muted-foreground))'
},
accent: {
DEFAULT: 'hsl(var(--accent))',
foreground: 'hsl(var(--accent-foreground))'
},
destructive: {
DEFAULT: 'hsl(var(--destructive))',
foreground: 'hsl(var(--destructive-foreground))'
},
border: 'hsl(var(--border))',
input: 'hsl(var(--input))',
ring: 'hsl(var(--ring))',
chart: {
'1': 'hsl(var(--chart-1))',
'2': 'hsl(var(--chart-2))',
'3': 'hsl(var(--chart-3))',
'4': 'hsl(var(--chart-4))',
'5': 'hsl(var(--chart-5))'
},
card: {
DEFAULT: 'hsl(var(--card))',
foreground: 'hsl(var(--card-foreground))'
}
},
borderRadius: {
lg: 'var(--radius)',
md: 'calc(var(--radius) - 2px)',
sm: 'calc(var(--radius) - 4px)'
}
}
},
plugins: [tailwindcssAnimate],
plugins: [tailwindcssAnimate, require("tailwindcss-animate")],
};

export default config;

0 comments on commit 6d2db84

Please sign in to comment.