diff --git a/.eslintrc.json b/.eslintrc.json index 66a8aa2..ba08c79 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -19,5 +19,5 @@ "sourceType": "module" }, "plugins": ["@typescript-eslint", "react", "@tanstack/query"], - "rules": { "react/react-in-jsx-scope": "off" } + "rules": { "react/react-in-jsx-scope": "off", "react/prop-types": "off" } } diff --git a/app/globals.css b/app/globals.css index 64d16fa..4e0f055 100644 --- a/app/globals.css +++ b/app/globals.css @@ -3,6 +3,73 @@ @tailwind utilities; @layer base { + :root { + --background: 0 0% 100%; + --foreground: 222.2 84% 4.9%; + + --card: 0 0% 100%; + --card-foreground: 222.2 84% 4.9%; + + --popover: 0 0% 100%; + --popover-foreground: 222.2 84% 4.9%; + + --primary: 222.2 47.4% 11.2%; + --primary-foreground: 210 40% 98%; + + --secondary: 210 40% 96.1%; + --secondary-foreground: 222.2 47.4% 11.2%; + + --muted: 210 40% 96.1%; + --muted-foreground: 215.4 16.3% 46.9%; + + --accent: 210 40% 96.1%; + --accent-foreground: 222.2 47.4% 11.2%; + + --destructive: 0 84.2% 60.2%; + --destructive-foreground: 210 40% 98%; + + --border: 214.3 31.8% 91.4%; + --input: 214.3 31.8% 91.4%; + --ring: 222.2 84% 4.9%; + + --radius: 0.5rem; + } + + .dark { + --background: 222.2 84% 4.9%; + --foreground: 210 40% 98%; + + --card: 222.2 84% 4.9%; + --card-foreground: 210 40% 98%; + + --popover: 222.2 84% 4.9%; + --popover-foreground: 210 40% 98%; + + --primary: 210 40% 98%; + --primary-foreground: 222.2 47.4% 11.2%; + + --secondary: 217.2 32.6% 17.5%; + --secondary-foreground: 210 40% 98%; + + --muted: 217.2 32.6% 17.5%; + --muted-foreground: 215 20.2% 65.1%; + + --accent: 217.2 32.6% 17.5%; + --accent-foreground: 210 40% 98%; + + --destructive: 0 62.8% 30.6%; + --destructive-foreground: 210 40% 98%; + + --border: 217.2 32.6% 17.5%; + --input: 217.2 32.6% 17.5%; + --ring: 212.7 26.8% 83.9%; + } + * { + @apply border-border; + } + body { + @apply bg-background text-foreground; + } input, textarea { @apply focus:outline-none; diff --git a/app/quizzes/[id]/quiz.tsx b/app/quizzes/[id]/quiz.tsx index df990ab..76d2d1d 100644 --- a/app/quizzes/[id]/quiz.tsx +++ b/app/quizzes/[id]/quiz.tsx @@ -10,8 +10,8 @@ export function Quiz({ id }: { id: number }) { }; return ( -
- {/*
나는 클라이언트 컴포넌트에서 불러온 값!
*/} +
+
나는 클라이언트 컴포넌트에서 불러온 값!
{JSON.stringify(quiz)}
diff --git a/components.json b/components.json new file mode 100644 index 0000000..48c34e4 --- /dev/null +++ b/components.json @@ -0,0 +1,16 @@ +{ + "$schema": "https://ui.shadcn.com/schema.json", + "style": "default", + "rsc": true, + "tsx": true, + "tailwind": { + "config": "tailwind.config.js", + "css": "app/globals.css", + "baseColor": "slate", + "cssVariables": true + }, + "aliases": { + "components": "@/components", + "utils": "@/lib/utils" + } +} \ No newline at end of file diff --git a/components/common/buttons/button.tsx b/components/common/buttons/button.tsx index b4e5e42..b67514d 100644 --- a/components/common/buttons/button.tsx +++ b/components/common/buttons/button.tsx @@ -1,6 +1,6 @@ +import { cn } from '@/libs/utils'; import { cva, type VariantProps } from 'class-variance-authority'; import { forwardRef, type Ref } from 'react'; -import { twMerge } from 'tailwind-merge'; type ButtonProps = React.ButtonHTMLAttributes & VariantProps; @@ -24,7 +24,7 @@ export default forwardRef(function Button( return (