From 6d2db84cf25cfc7d4f25a70931e9cb705c6bc7c5 Mon Sep 17 00:00:00 2001 From: hyusap Date: Wed, 8 Jan 2025 17:52:31 -0500 Subject: [PATCH] fix the shadcn install to fix the toaster --- www/app/globals.css | 49 ++++++++++++++++++-- www/components.json | 8 ++-- www/lib/utils.ts | 6 +++ www/package.json | 1 + www/pnpm-lock.yaml | 12 +++++ www/tailwind.config.ts | 100 +++++++++++++++++++++-------------------- 6 files changed, 120 insertions(+), 56 deletions(-) create mode 100644 www/lib/utils.ts diff --git a/www/app/globals.css b/www/app/globals.css index 6061cea6..23b96c8d 100644 --- a/www/app/globals.css +++ b/www/app/globals.css @@ -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%; } } diff --git a/www/components.json b/www/components.json index 5626bf50..dea737b8 100644 --- a/www/components.json +++ b/www/components.json @@ -12,10 +12,10 @@ }, "aliases": { "components": "@/components", - "utils": "@/utils/helpers", + "utils": "@/lib/utils", "ui": "@/components/ui", "lib": "@/lib", "hooks": "@/hooks" - } -} - + }, + "iconLibrary": "lucide" +} \ No newline at end of file diff --git a/www/lib/utils.ts b/www/lib/utils.ts new file mode 100644 index 00000000..bd0c391d --- /dev/null +++ b/www/lib/utils.ts @@ -0,0 +1,6 @@ +import { clsx, type ClassValue } from "clsx" +import { twMerge } from "tailwind-merge" + +export function cn(...inputs: ClassValue[]) { + return twMerge(clsx(inputs)) +} diff --git a/www/package.json b/www/package.json index 45ea5029..1fd14411 100644 --- a/www/package.json +++ b/www/package.json @@ -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", diff --git a/www/pnpm-lock.yaml b/www/pnpm-lock.yaml index 9e6a532c..50eb24a0 100644 --- a/www/pnpm-lock.yaml +++ b/www/pnpm-lock.yaml @@ -74,6 +74,9 @@ importers: langfuse-vercel: specifier: ^3.32.0 version: 3.32.0(ai@4.0.1(react@18.3.1)(zod@3.23.8)) + lucide-react: + specifier: ^0.469.0 + version: 0.469.0(react@18.3.1) next: specifier: ^14.2.16 version: 14.2.16(@babel/core@7.26.0)(@opentelemetry/api@1.9.0)(react-dom@18.2.0(react@18.3.1))(react@18.3.1) @@ -4217,6 +4220,11 @@ packages: lru-cache@5.1.1: resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} + lucide-react@0.469.0: + resolution: {integrity: sha512-28vvUnnKQ/dBwiCQtwJw7QauYnE7yd2Cyp4tTTJpvglX4EMpbflcdBgrgToX2j71B3YvugK/NH3BGUk+E/p/Fw==} + peerDependencies: + react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0 + magic-string@0.30.12: resolution: {integrity: sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==} @@ -10987,6 +10995,10 @@ snapshots: dependencies: yallist: 3.1.1 + lucide-react@0.469.0(react@18.3.1): + dependencies: + react: 18.3.1 + magic-string@0.30.12: dependencies: '@jridgewell/sourcemap-codec': 1.5.0 diff --git a/www/tailwind.config.ts b/www/tailwind.config.ts index 7c81b841..aca01404 100644 --- a/www/tailwind.config.ts +++ b/www/tailwind.config.ts @@ -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;