From 461aab100f7a275add95e99ef52d3b375bffc182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=98=81=EC=95=A0?= <choiaeyoung1001@gmail.com>
Date: Thu, 13 Mar 2025 12:07:28 +0900
Subject: [PATCH 1/8] =?UTF-8?q?feature:=20helperlabel=20=EB=A7=88=ED=81=AC?=
 =?UTF-8?q?=EC=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/HelperLabel/HelperLabel.tsx        | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 src/components/common/HelperLabel/HelperLabel.tsx

diff --git a/src/components/common/HelperLabel/HelperLabel.tsx b/src/components/common/HelperLabel/HelperLabel.tsx
new file mode 100644
index 0000000..6d30763
--- /dev/null
+++ b/src/components/common/HelperLabel/HelperLabel.tsx
@@ -0,0 +1,38 @@
+import * as React from 'react'
+import { cn } from '@/lib/utils'
+import { cva, type VariantProps } from 'class-variance-authority'
+
+const helperLabelVariants = cva('', {
+  variants: {
+    variant: {
+      error: 'text-error',
+      success: 'text-success',
+      default: 'text-alternative',
+    },
+    size: {
+      default: 'typo-caption2',
+    },
+  },
+  defaultVariants: {
+    variant: 'default',
+    size: 'default',
+  },
+})
+
+interface HelperLabelProps
+  extends React.HTMLAttributes<HTMLParagraphElement>,
+    VariantProps<typeof helperLabelVariants> {}
+
+const HelperLabel = ({ className, variant, children, ...props }: HelperLabelProps) => {
+  return (
+    <p
+      data-slot="label"
+      className={cn(helperLabelVariants({ variant }), 'flex gap-1', className)}
+      {...props}
+    >
+      <span>{children}</span>
+    </p>
+  )
+}
+
+export { HelperLabel }

From bbabaeae26e1316a6e18c20e21d0038bd613c4ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=98=81=EC=95=A0?= <choiaeyoung1001@gmail.com>
Date: Thu, 13 Mar 2025 12:28:32 +0900
Subject: [PATCH 2/8] =?UTF-8?q?feature:=20label=20=EB=A7=88=ED=81=AC?=
 =?UTF-8?q?=EC=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/Label/Label.tsx | 33 +++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 src/components/common/Label/Label.tsx

diff --git a/src/components/common/Label/Label.tsx b/src/components/common/Label/Label.tsx
new file mode 100644
index 0000000..881d3af
--- /dev/null
+++ b/src/components/common/Label/Label.tsx
@@ -0,0 +1,33 @@
+import * as React from 'react'
+import { cn } from '@/lib/utils'
+import { cva, VariantProps } from 'class-variance-authority'
+import * as LabelPrimitive from '@radix-ui/react-label'
+
+const LabelVariants = cva('', {
+  variants: {
+    variant: {
+      caption1: 'typo-caption1',
+      button1: 'typo-button1',
+      button2: 'typo-button2',
+    },
+  },
+  defaultVariants: {
+    variant: 'caption1',
+  },
+})
+
+interface LabelProps
+  extends React.LabelHTMLAttributes<HTMLLabelElement>,
+    VariantProps<typeof LabelVariants> {}
+
+function Label({ className, variant, ...props }: LabelProps) {
+  return (
+    <LabelPrimitive.Root
+      data-slot="label"
+      className={cn(LabelVariants({ variant }), '', className)}
+      {...props}
+    />
+  )
+}
+
+export { Label }

From 6d7694ff70a905e0cd6f870e1cf1c80ed2cd96fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=98=81=EC=95=A0?= <choiaeyoung1001@gmail.com>
Date: Thu, 13 Mar 2025 16:46:09 +0900
Subject: [PATCH 3/8] =?UTF-8?q?feature:=20input=20=EB=A7=88=ED=81=AC?=
 =?UTF-8?q?=EC=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/Input/Input.tsx | 53 +++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 src/components/common/Input/Input.tsx

diff --git a/src/components/common/Input/Input.tsx b/src/components/common/Input/Input.tsx
new file mode 100644
index 0000000..e7222f5
--- /dev/null
+++ b/src/components/common/Input/Input.tsx
@@ -0,0 +1,53 @@
+import * as React from 'react'
+import { cn } from '@/lib/utils'
+import { cva, VariantProps } from 'class-variance-authority'
+
+const InputVariants = cva(
+  'typo-body3 border p-4 rounded-sm outline-none placeholder-assistive text-secondary',
+  {
+    variants: {
+      variant: {
+        default: 'border-assistive',
+        focused: 'border-secondary',
+        error: 'border-error',
+        disabled: 'border-assistive bg-disabled-fill cursor-not-allowed text-disabled',
+      },
+    },
+    defaultVariants: {
+      variant: 'default',
+    },
+  },
+)
+
+interface InputProps
+  extends React.InputHTMLAttributes<HTMLInputElement>,
+    VariantProps<typeof InputVariants> {
+  error?: boolean
+}
+
+function Input({ className, variant, type, disabled, error, ...props }: InputProps) {
+  const [isFocused, setIsFocused] = React.useState(false)
+
+  let currentState = variant
+  if (disabled) {
+    currentState = 'disabled'
+  } else if (isFocused) {
+    currentState = 'focused'
+  } else if (error) {
+    currentState = 'error'
+  }
+
+  return (
+    <input
+      type={type}
+      data-slot="input"
+      className={cn(InputVariants({ variant: currentState }), '', className)}
+      disabled={disabled}
+      onFocus={() => setIsFocused(true)}
+      onBlur={() => setIsFocused(false)}
+      {...props}
+    />
+  )
+}
+
+export { Input }

From 866351e627625991c2dfdb7ab4e744efa7d0152e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=98=81=EC=95=A0?= <choiaeyoung1001@gmail.com>
Date: Thu, 13 Mar 2025 18:42:51 +0900
Subject: [PATCH 4/8] =?UTF-8?q?feature:=20textarea=20=EB=A7=88=ED=81=AC?=
 =?UTF-8?q?=EC=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/Textarea/Textarea.tsx | 51 +++++++++++++++++++++
 src/styles/globals.css                      | 14 ++++++
 2 files changed, 65 insertions(+)
 create mode 100644 src/components/common/Textarea/Textarea.tsx

diff --git a/src/components/common/Textarea/Textarea.tsx b/src/components/common/Textarea/Textarea.tsx
new file mode 100644
index 0000000..a666b49
--- /dev/null
+++ b/src/components/common/Textarea/Textarea.tsx
@@ -0,0 +1,51 @@
+import * as React from 'react'
+import { cn } from '@/lib/utils'
+import { cva, VariantProps } from 'class-variance-authority'
+
+const TextareaVariants = cva(
+  'typo-body3 border p-4 rounded-sm outline-none placeholder-assistive text-secondary resize-none custom-scrollbar',
+  {
+    variants: {
+      variant: {
+        default: 'border-assistive',
+        focused: 'border-secondary',
+        error: 'border-error',
+        disabled: 'border-assistive bg-disabled-fill cursor-not-allowed text-disabled',
+      },
+    },
+    defaultVariants: {
+      variant: 'default',
+    },
+  },
+)
+
+interface TextareaProps
+  extends React.TextareaHTMLAttributes<HTMLTextAreaElement>,
+    VariantProps<typeof TextareaVariants> {
+  error?: boolean
+}
+
+const Textarea = ({ className, variant, disabled, error, ...props }: TextareaProps) => {
+  const [isFocused, setIsFocused] = React.useState(false)
+
+  let currentState = variant
+  if (disabled) {
+    currentState = 'disabled'
+  } else if (isFocused) {
+    currentState = 'focused'
+  } else if (error) {
+    currentState = 'error'
+  }
+  return (
+    <textarea
+      data-slot="textarea"
+      className={cn(TextareaVariants({ variant: currentState }), '', className)}
+      disabled={disabled}
+      onFocus={() => setIsFocused(true)}
+      onBlur={() => setIsFocused(false)}
+      {...props}
+    />
+  )
+}
+
+export { Textarea }
diff --git a/src/styles/globals.css b/src/styles/globals.css
index 84a4e0e..cbbc974 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -139,6 +139,20 @@
   }
 }
 
+@layer base {
+  ::-webkit-scrollbar {
+    @apply w-[5px];
+  }
+
+  ::-webkit-scrollbar-track {
+    @apply bg-transparent;
+  }
+
+  ::-webkit-scrollbar-thumb {
+    @apply rounded-full bg-border-alter;
+  }
+}
+
 @theme inline {
   --animate-accordion-down: accordion-down 0.2s ease-out;
   --animate-accordion-up: accordion-up 0.2s ease-out;

From c46016cb58cb405c552a1f0a9a3b2aa55e022966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=98=81=EC=95=A0?= <choiaeyoung1001@gmail.com>
Date: Thu, 13 Mar 2025 18:46:10 +0900
Subject: [PATCH 5/8] =?UTF-8?q?refact:=20=EC=BB=A8=EB=B2=A4=EC=85=98?=
 =?UTF-8?q?=EC=97=90=20=EB=A7=9E=EA=B2=8C=20input=20=EC=BB=B4=ED=8F=AC?=
 =?UTF-8?q?=EB=84=8C=ED=8A=B8=EB=A5=BC=20=ED=99=94=EC=82=B4=ED=91=9C=20?=
 =?UTF-8?q?=ED=95=A8=EC=88=98=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/Input/Input.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/Input/Input.tsx b/src/components/common/Input/Input.tsx
index e7222f5..bac8459 100644
--- a/src/components/common/Input/Input.tsx
+++ b/src/components/common/Input/Input.tsx
@@ -25,7 +25,7 @@ interface InputProps
   error?: boolean
 }
 
-function Input({ className, variant, type, disabled, error, ...props }: InputProps) {
+const Input = ({ className, variant, type, disabled, error, ...props }: InputProps) => {
   const [isFocused, setIsFocused] = React.useState(false)
 
   let currentState = variant

From e813472a768f080e83462ccef581849b89469779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=98=81=EC=95=A0?= <choiaeyoung1001@gmail.com>
Date: Thu, 13 Mar 2025 18:47:07 +0900
Subject: [PATCH 6/8] =?UTF-8?q?file:=20import=20=ED=98=BC=EB=8F=99=20?=
 =?UTF-8?q?=EB=B0=A9=EC=A7=80=EB=A5=BC=20=EC=9C=84=ED=95=B4=20=EA=B8=B0?=
 =?UTF-8?q?=EC=A1=B4=20shadcn=20input=20=ED=8C=8C=EC=9D=BC=20=EC=A0=9C?=
 =?UTF-8?q?=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ui/input.tsx | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 src/components/ui/input.tsx

diff --git a/src/components/ui/input.tsx b/src/components/ui/input.tsx
deleted file mode 100644
index c08b54c..0000000
--- a/src/components/ui/input.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import * as React from 'react'
-
-import { cn } from '@/lib/utils'
-
-function Input({ className, type, ...props }: React.ComponentProps<'input'>) {
-  return (
-    <input
-      type={type}
-      data-slot="input"
-      className={cn(
-        'border-input file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
-        'focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]',
-        'aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive',
-        className,
-      )}
-      {...props}
-    />
-  )
-}
-
-export { Input }

From 9ed63610c692b971f3133390a413f15c4145989b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=98=81=EC=95=A0?= <choiaeyoung1001@gmail.com>
Date: Thu, 13 Mar 2025 21:30:37 +0900
Subject: [PATCH 7/8] =?UTF-8?q?fix:=20=EB=B3=80=EA=B2=BD=EB=90=9C=20global?=
 =?UTF-8?q?=20css=EC=97=90=20=EB=A7=9E=EC=B6=B0=20css=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/Input/Input.tsx       | 4 ++--
 src/components/common/Textarea/Textarea.tsx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/common/Input/Input.tsx b/src/components/common/Input/Input.tsx
index bac8459..a638d1a 100644
--- a/src/components/common/Input/Input.tsx
+++ b/src/components/common/Input/Input.tsx
@@ -7,10 +7,10 @@ const InputVariants = cva(
   {
     variants: {
       variant: {
-        default: 'border-assistive',
+        default: 'border-assist-line',
         focused: 'border-secondary',
         error: 'border-error',
-        disabled: 'border-assistive bg-disabled-fill cursor-not-allowed text-disabled',
+        disabled: 'border-assist-line bg-disabled-fill cursor-not-allowed text-disabled',
       },
     },
     defaultVariants: {
diff --git a/src/components/common/Textarea/Textarea.tsx b/src/components/common/Textarea/Textarea.tsx
index a666b49..8e16c07 100644
--- a/src/components/common/Textarea/Textarea.tsx
+++ b/src/components/common/Textarea/Textarea.tsx
@@ -7,10 +7,10 @@ const TextareaVariants = cva(
   {
     variants: {
       variant: {
-        default: 'border-assistive',
+        default: 'border-assist-line',
         focused: 'border-secondary',
         error: 'border-error',
-        disabled: 'border-assistive bg-disabled-fill cursor-not-allowed text-disabled',
+        disabled: 'border-assist-line bg-disabled-fill cursor-not-allowed text-disabled',
       },
     },
     defaultVariants: {

From 0a9579f2a7acc6a683972630b44b2847b0117b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EC=98=81=EC=95=A0?= <choiaeyoung1001@gmail.com>
Date: Thu, 13 Mar 2025 22:43:35 +0900
Subject: [PATCH 8/8] =?UTF-8?q?file:=20=EC=9E=98=EB=AA=BB=20=EC=98=AC?=
 =?UTF-8?q?=EB=A0=A4=EC=A7=84=20=ED=8C=8C=EC=9D=BC=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/HelperLabel/HelperLabel.tsx        | 38 -------------------
 src/components/common/Label/Label.tsx         | 33 ----------------
 2 files changed, 71 deletions(-)
 delete mode 100644 src/components/common/HelperLabel/HelperLabel.tsx
 delete mode 100644 src/components/common/Label/Label.tsx

diff --git a/src/components/common/HelperLabel/HelperLabel.tsx b/src/components/common/HelperLabel/HelperLabel.tsx
deleted file mode 100644
index 6d30763..0000000
--- a/src/components/common/HelperLabel/HelperLabel.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import * as React from 'react'
-import { cn } from '@/lib/utils'
-import { cva, type VariantProps } from 'class-variance-authority'
-
-const helperLabelVariants = cva('', {
-  variants: {
-    variant: {
-      error: 'text-error',
-      success: 'text-success',
-      default: 'text-alternative',
-    },
-    size: {
-      default: 'typo-caption2',
-    },
-  },
-  defaultVariants: {
-    variant: 'default',
-    size: 'default',
-  },
-})
-
-interface HelperLabelProps
-  extends React.HTMLAttributes<HTMLParagraphElement>,
-    VariantProps<typeof helperLabelVariants> {}
-
-const HelperLabel = ({ className, variant, children, ...props }: HelperLabelProps) => {
-  return (
-    <p
-      data-slot="label"
-      className={cn(helperLabelVariants({ variant }), 'flex gap-1', className)}
-      {...props}
-    >
-      <span>{children}</span>
-    </p>
-  )
-}
-
-export { HelperLabel }
diff --git a/src/components/common/Label/Label.tsx b/src/components/common/Label/Label.tsx
deleted file mode 100644
index 881d3af..0000000
--- a/src/components/common/Label/Label.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import * as React from 'react'
-import { cn } from '@/lib/utils'
-import { cva, VariantProps } from 'class-variance-authority'
-import * as LabelPrimitive from '@radix-ui/react-label'
-
-const LabelVariants = cva('', {
-  variants: {
-    variant: {
-      caption1: 'typo-caption1',
-      button1: 'typo-button1',
-      button2: 'typo-button2',
-    },
-  },
-  defaultVariants: {
-    variant: 'caption1',
-  },
-})
-
-interface LabelProps
-  extends React.LabelHTMLAttributes<HTMLLabelElement>,
-    VariantProps<typeof LabelVariants> {}
-
-function Label({ className, variant, ...props }: LabelProps) {
-  return (
-    <LabelPrimitive.Root
-      data-slot="label"
-      className={cn(LabelVariants({ variant }), '', className)}
-      {...props}
-    />
-  )
-}
-
-export { Label }