From af982cdfbb43595c3b244d04f70427d4411b1c6e Mon Sep 17 00:00:00 2001
From: iatopilskii <iatopilskii@gmail.com>
Date: Mon, 2 Dec 2024 20:44:09 +0100
Subject: [PATCH] fix: linter fixes

---
 packages/ui/src/components/button.tsx            | 8 ++++----
 packages/ui/src/components/checkbox.tsx          | 4 ++--
 packages/ui/src/components/index.ts              | 2 --
 packages/ui/src/components/input.tsx             | 8 ++++----
 packages/ui/src/components/label.tsx             | 2 +-
 packages/ui/src/components/radio-group.tsx       | 2 +-
 packages/ui/src/components/select.tsx            | 2 +-
 packages/ui/src/components/textarea.tsx          | 2 +-
 packages/ui/src/components/toast/toast.tsx       | 4 ++--
 packages/ui/src/views/repo/repo-create/index.tsx | 6 +++---
 10 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/packages/ui/src/components/button.tsx b/packages/ui/src/components/button.tsx
index dd6d2516ee..a85665e0f6 100644
--- a/packages/ui/src/components/button.tsx
+++ b/packages/ui/src/components/button.tsx
@@ -12,11 +12,11 @@ const buttonVariants = cva(
       variant: {
         default:
           'bg-background-5 text-foreground-6 hover:bg-background-10 disabled:bg-background-6 disabled:text-foreground-9',
-        destructive: 'bg-destructive text-destructive-foreground hover:bg-destructive/90 shadow-sm',
+        destructive: 'bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90',
         outline:
-          'border-borders-2 hover:border-borders-6 text-foreground-2 hover:text-foreground-8 border bg-transparent',
-        secondary: 'bg-secondary text-secondary-foreground hover:bg-secondary/80 shadow-sm',
-        tertiary: 'bg-tertiary text-secondary-foreground hover:bg-tertiary/80 shadow-sm',
+          'border border-borders-2 bg-transparent text-foreground-2 hover:border-borders-6 hover:text-foreground-8',
+        secondary: 'bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80',
+        tertiary: 'bg-tertiary text-secondary-foreground shadow-sm hover:bg-tertiary/80',
         ghost: 'hover:bg-background-12 hover:text-accent-foreground',
         link: 'text-primary underline-offset-4 hover:underline',
         link_accent: 'text-foreground-accent underline-offset-4 hover:underline',
diff --git a/packages/ui/src/components/checkbox.tsx b/packages/ui/src/components/checkbox.tsx
index 00f6caf62c..752f9bf7c1 100644
--- a/packages/ui/src/components/checkbox.tsx
+++ b/packages/ui/src/components/checkbox.tsx
@@ -15,7 +15,7 @@ const Checkbox = React.forwardRef<React.ElementRef<typeof CheckboxPrimitive.Root
     <div className={cn('flex gap-x-2.5', className)}>
       <CheckboxPrimitive.Root
         ref={ref}
-        className="border-icons-1 data-[state=checked]:bg-primary data-[state=checked]:border-icons-2 data-[state=checked]:text-primary-foreground hover:border-icons-3 disabled:border-icons-4 peer size-4 shrink-0 rounded-sm border shadow disabled:cursor-not-allowed"
+        className="peer size-4 shrink-0 rounded-sm border border-icons-1 shadow hover:border-icons-3 disabled:cursor-not-allowed disabled:border-icons-4 data-[state=checked]:border-icons-2 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground"
         {...props}
       >
         <CheckboxPrimitive.Indicator className={cn('flex items-center justify-center text-current')}>
@@ -23,7 +23,7 @@ const Checkbox = React.forwardRef<React.ElementRef<typeof CheckboxPrimitive.Root
         </CheckboxPrimitive.Indicator>
       </CheckboxPrimitive.Root>
       {label && (
-        <Label className="text-foreground-1 font-normal leading-tight tracking-tight" htmlFor={props.id}>
+        <Label className="font-normal leading-tight tracking-tight text-foreground-1" htmlFor={props.id}>
           {label}
         </Label>
       )}
diff --git a/packages/ui/src/components/index.ts b/packages/ui/src/components/index.ts
index b3d20f083b..2eef7ac34b 100644
--- a/packages/ui/src/components/index.ts
+++ b/packages/ui/src/components/index.ts
@@ -25,9 +25,7 @@ export * from './no-data'
 export * from './tabs'
 export * from './command'
 export * from './search-files'
-export * from './input'
 export * from './radio-group'
-export * from './textarea'
 export * from './checkbox'
 export * from './toast'
 export * from './styled-link'
diff --git a/packages/ui/src/components/input.tsx b/packages/ui/src/components/input.tsx
index 88a7422d3c..cd02f9a6c8 100644
--- a/packages/ui/src/components/input.tsx
+++ b/packages/ui/src/components/input.tsx
@@ -13,11 +13,11 @@ export interface BaseInputProps
   size?: 'sm' | 'md'
 }
 
-const inputVariants = cva('text-foreground-1 bg-transparent px-2.5 py-1 disabled:cursor-not-allowed', {
+const inputVariants = cva('bg-transparent px-2.5 py-1 text-foreground-1 disabled:cursor-not-allowed', {
   variants: {
     variant: {
       default:
-        'placeholder:text-foreground-4 flex w-full rounded border text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium focus-visible:rounded focus-visible:outline-none',
+        'flex w-full rounded border text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-foreground-4 focus-visible:rounded focus-visible:outline-none',
       extended: 'grow border-none focus-visible:outline-none'
     },
     size: {
@@ -26,7 +26,7 @@ const inputVariants = cva('text-foreground-1 bg-transparent px-2.5 py-1 disabled
     },
     theme: {
       default:
-        'border-borders-2 focus-visible:border-borders-3 disabled:placeholder:text-foreground-9 disabled:border-borders-1',
+        'border-borders-2 focus-visible:border-borders-3 disabled:border-borders-1 disabled:placeholder:text-foreground-9',
       danger: 'border-borders-danger'
     }
   },
@@ -71,7 +71,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
           </FormErrorMessage>
         )}
         {caption && (
-          <Text className="text-foreground-4 mt-1 leading-snug" size={2}>
+          <Text className="mt-1 leading-snug text-foreground-4" size={2}>
             {caption}
           </Text>
         )}
diff --git a/packages/ui/src/components/label.tsx b/packages/ui/src/components/label.tsx
index 70f83ff7ff..778ebac3d0 100644
--- a/packages/ui/src/components/label.tsx
+++ b/packages/ui/src/components/label.tsx
@@ -41,7 +41,7 @@ interface LabelProps extends VariantProps<typeof labelVariants>, React.PropsWith
 const Label = ({ htmlFor, optional, theme, variant, children, className }: LabelProps) => {
   return (
     <LabelRoot htmlFor={htmlFor} variant={variant} theme={theme} className={className}>
-      {children} {optional && <span className="text-foreground-7 align-top">(optional)</span>}
+      {children} {optional && <span className="align-top text-foreground-7">(optional)</span>}
     </LabelRoot>
   )
 }
diff --git a/packages/ui/src/components/radio-group.tsx b/packages/ui/src/components/radio-group.tsx
index 3461d230bc..9f1d7f24d5 100644
--- a/packages/ui/src/components/radio-group.tsx
+++ b/packages/ui/src/components/radio-group.tsx
@@ -68,7 +68,7 @@ const RadioButton = React.forwardRef<
       )}
       {...props}
     >
-      <RadioGroupPrimitive.Indicator className="bg-icons-2 size-2 rounded-full" />
+      <RadioGroupPrimitive.Indicator className="size-2 rounded-full bg-icons-2" />
     </RadioGroupPrimitive.Item>
   )
 })
diff --git a/packages/ui/src/components/select.tsx b/packages/ui/src/components/select.tsx
index a8c78d5d5d..ea9cb9b782 100644
--- a/packages/ui/src/components/select.tsx
+++ b/packages/ui/src/components/select.tsx
@@ -49,7 +49,7 @@ const Select: React.FC<SelectProps> = ({
       </FormErrorMessage>
     )}
     {caption && (
-      <Text className="text-foreground-4 mt-1 leading-snug" size={2}>
+      <Text className="mt-1 leading-snug text-foreground-4" size={2}>
         {caption}
       </Text>
     )}
diff --git a/packages/ui/src/components/textarea.tsx b/packages/ui/src/components/textarea.tsx
index 9b8f3c1006..9e581e1406 100644
--- a/packages/ui/src/components/textarea.tsx
+++ b/packages/ui/src/components/textarea.tsx
@@ -45,7 +45,7 @@ const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
           </FormErrorMessage>
         )}
         {caption && (
-          <Text className="text-foreground-4 mt-1 leading-snug" size={2}>
+          <Text className="mt-1 leading-snug text-foreground-4" size={2}>
             {caption}
           </Text>
         )}
diff --git a/packages/ui/src/components/toast/toast.tsx b/packages/ui/src/components/toast/toast.tsx
index c8758ad0cd..5f4231e126 100644
--- a/packages/ui/src/components/toast/toast.tsx
+++ b/packages/ui/src/components/toast/toast.tsx
@@ -27,8 +27,8 @@ const toastVariants = cva(
   {
     variants: {
       variant: {
-        default: 'bg-background-3 border-borders-1 text-foreground [&_svg]:text-icons-1',
-        destructive: 'bg-foreground-danger text-foreground-1 [&_svg]:text-icons-2 border-borders-danger'
+        default: 'border-borders-1 bg-background-3 text-foreground [&_svg]:text-icons-1',
+        destructive: 'border-borders-danger bg-foreground-danger text-foreground-1 [&_svg]:text-icons-2'
       }
     },
     defaultVariants: {
diff --git a/packages/ui/src/views/repo/repo-create/index.tsx b/packages/ui/src/views/repo/repo-create/index.tsx
index eaba96c84b..530163157e 100644
--- a/packages/ui/src/views/repo/repo-create/index.tsx
+++ b/packages/ui/src/views/repo/repo-create/index.tsx
@@ -114,7 +114,7 @@ export function RepoCreatePage({
             Create a new repository
           </Text>
           <Spacer size={2.5} />
-          <Text className="text-foreground-2 max-w-[476px]" size={2} as="p">
+          <Text className="max-w-[476px] text-foreground-2" size={2} as="p">
             A repository contains all project files, including the revision history. Already have a project repository
             elsewhere?{' '}
             <StyledLink to="../import" relative="path">
@@ -219,7 +219,7 @@ export function RepoCreatePage({
             {/* ACCESS */}
             <Fieldset>
               <ControlGroup>
-                <Text className="text-foreground-2 leading-none" size={2}>
+                <Text className="leading-none text-foreground-2" size={2}>
                   Who has access
                 </Text>
                 <RadioGroup className="mt-6" value={accessValue} onValueChange={handleAccessChange} id="access">
@@ -250,7 +250,7 @@ export function RepoCreatePage({
             {/* README */}
             <Fieldset>
               <ControlGroup>
-                <Text className="text-foreground-2 leading-none" size={2}>
+                <Text className="leading-none text-foreground-2" size={2}>
                   Initialize this repository with
                 </Text>
                 <RadioGroupItem