From 1f4e0fbef33847853eca2835532398907ebbcbf0 Mon Sep 17 00:00:00 2001 From: Asep Haryana Saputra <90584806+MythEclipse@users.noreply.github.com> Date: Fri, 22 May 2026 18:50:07 +0000 Subject: [PATCH] fix: update environment variable usage in scripts and enhance CSS theming --- apps/api/package.json | 4 ++-- apps/web/src/index.css | 38 +++++++++++++++++++------------------- apps/web/vite.config.ts | 5 +++++ 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/apps/api/package.json b/apps/api/package.json index c805329..0dbd6a8 100644 --- a/apps/api/package.json +++ b/apps/api/package.json @@ -4,8 +4,8 @@ "private": true, "type": "module", "scripts": { - "dev": "bun --watch src/index.ts", - "start": "bun src/index.ts", + "dev": "bun --env-file=../../.env --watch src/index.ts", + "start": "bun --env-file=../../.env src/index.ts", "typecheck": "tsc --project tsconfig.json", "db:generate": "drizzle-kit generate", "db:migrate": "drizzle-kit migrate" diff --git a/apps/web/src/index.css b/apps/web/src/index.css index e6aebc6..6c7e332 100644 --- a/apps/web/src/index.css +++ b/apps/web/src/index.css @@ -1,28 +1,28 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; +@import "tailwindcss"; + +@theme { + --color-background: hsl(48 60% 97%); + --color-foreground: hsl(156 26% 12%); + --color-card: hsl(0 0% 100%); + --color-card-foreground: hsl(156 26% 12%); + --color-primary: hsl(142 60% 32%); + --color-primary-foreground: hsl(0 0% 100%); + --color-muted: hsl(84 35% 90%); + --color-muted-foreground: hsl(156 12% 35%); + --color-border: hsl(84 24% 82%); + --radius-lg: 1rem; + --radius-md: calc(var(--radius-lg) - 2px); + --radius-sm: calc(var(--radius-lg) - 4px); +} @layer base { - :root { - --background: 48 60% 97%; - --foreground: 156 26% 12%; - --card: 0 0% 100%; - --card-foreground: 156 26% 12%; - --primary: 142 60% 32%; - --primary-foreground: 0 0% 100%; - --muted: 84 35% 90%; - --muted-foreground: 156 12% 35%; - --border: 84 24% 82%; - --radius: 1rem; - } - * { - border-color: hsl(var(--border)); + border-color: var(--color-border); } body { - background-color: hsl(var(--background)); - color: hsl(var(--foreground)); + background-color: var(--color-background); + color: var(--color-foreground); -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; font-family: Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts index 93cad99..eb4945f 100644 --- a/apps/web/vite.config.ts +++ b/apps/web/vite.config.ts @@ -4,6 +4,11 @@ import { defineConfig } from 'vite'; export default defineConfig({ plugins: [react()], + server: { + proxy: { + '/api': 'http://localhost:3000', + }, + }, resolve: { alias: { '@': path.resolve(__dirname, './src'),