refactor: signin page

apps/web/src/components/forms/signin.tsx

@@ -1,9 +1,6 @@
 'use client';
 
-import { useState } from 'react';
-
 import { zodResolver } from '@hookform/resolvers/zod';
-import { Eye, EyeOff } from 'lucide-react';
 import { signIn } from 'next-auth/react';
 import { useForm } from 'react-hook-form';
 import { FcGoogle } from 'react-icons/fc';
@@ -12,9 +9,16 @@ import { z } from 'zod';
 import { ErrorCode, isErrorCode } from '@documenso/lib/next-auth/error-codes';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
-import { FormErrorMessage } from '@documenso/ui/primitives/form/form-error-message';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
 import { Input } from '@documenso/ui/primitives/input';
-import { Label } from '@documenso/ui/primitives/label';
+import { PasswordInput } from '@documenso/ui/primitives/password-input';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 const ERROR_MESSAGES = {
@@ -39,13 +43,8 @@ export type SignInFormProps = {
 
 export const SignInForm = ({ className }: SignInFormProps) => {
   const { toast } = useToast();
-  const [showPassword, setShowPassword] = useState(false);
 
-  const {
+  const form = useForm<TSignInFormSchema>({
-    register,
-    handleSubmit,
-    formState: { errors, isSubmitting },
-  } = useForm<TSignInFormSchema>({
     values: {
       email: '',
       password: '',
@@ -53,6 +52,8 @@ export const SignInForm = ({ className }: SignInFormProps) => {
     resolver: zodResolver(ZSignInFormSchema),
   });
 
+  const isSubmitting = form.formState.isSubmitting;
+
   const onFormSubmit = async ({ email, password }: TSignInFormSchema) => {
     try {
       const result = await signIn('credentials', {
@@ -99,80 +100,67 @@ export const SignInForm = ({ className }: SignInFormProps) => {
   };
 
   return (
-    <form
+    <Form {...form}>
-      className={cn('flex w-full flex-col gap-y-4', className)}
+      <form
-      onSubmit={handleSubmit(onFormSubmit)}
+        className={cn('flex w-full flex-col gap-y-4', className)}
-    >
+        onSubmit={form.handleSubmit(onFormSubmit)}
-      <div>
+      >
-        <Label htmlFor="email" className="text-muted-forground">
+        <FormField
-          Email
+          control={form.control}
-        </Label>
+          name="email"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel>Email</FormLabel>
+              <FormControl>
+                <Input type="email" {...field} />
+              </FormControl>
+              <FormMessage />
+            </FormItem>
+          )}
+        />
 
-        <Input id="email" type="email" className="bg-background mt-2" {...register('email')} />
+        <FormField
+          control={form.control}
+          name="password"
+          render={({ field }) => (
+            <FormItem>
+              <FormLabel>Password</FormLabel>
+              <FormControl>
+                <PasswordInput {...field} />
+              </FormControl>
+              <FormMessage />
+            </FormItem>
+          )}
+        />
 
-        <FormErrorMessage className="mt-1.5" error={errors.email} />
+        <Button
-      </div>
+          type="submit"
+          size="lg"
+          loading={isSubmitting}
+          disabled={isSubmitting}
+          className="dark:bg-documenso dark:hover:opacity-90"
+        >
+          {isSubmitting ? 'Signing in...' : 'Sign In'}
+        </Button>
 
-      <div>
+        <div className="relative flex items-center justify-center gap-x-4 py-2 text-xs uppercase">
-        <Label htmlFor="password" className="text-muted-forground">
+          <div className="bg-border h-px flex-1" />
-          <span>Password</span>
+          <span className="text-muted-foreground bg-transparent">Or continue with</span>
-        </Label>
+          <div className="bg-border h-px flex-1" />
-
-        <div className="relative">
-          <Input
-            id="password"
-            type={showPassword ? 'text' : 'password'}
-            minLength={6}
-            maxLength={72}
-            autoComplete="current-password"
-            className="bg-background mt-2 pr-10"
-            {...register('password')}
-          />
-
-          <Button
-            variant="link"
-            type="button"
-            className="absolute right-0 top-0 flex h-full items-center justify-center pr-3"
-            aria-label={showPassword ? 'Mask password' : 'Reveal password'}
-            onClick={() => setShowPassword((show) => !show)}
-          >
-            {showPassword ? (
-              <EyeOff className="text-muted-foreground h-5 w-5" />
-            ) : (
-              <Eye className="text-muted-foreground h-5 w-5" />
-            )}
-          </Button>
         </div>
 
-        <FormErrorMessage className="mt-1.5" error={errors.password} />
+        <Button
-      </div>
+          type="button"
-
+          size="lg"
-      <Button
+          variant={'outline'}
-        size="lg"
+          className="bg-background text-muted-foreground border"
-        loading={isSubmitting}
+          disabled={isSubmitting}
-        disabled={isSubmitting}
+          onClick={onSignInWithGoogleClick}
-        className="dark:bg-documenso dark:hover:opacity-90"
+        >
-      >
+          <FcGoogle className="mr-2 h-5 w-5" />
-        {isSubmitting ? 'Signing in...' : 'Sign In'}
+          Google
-      </Button>
+        </Button>
-
+      </form>
-      <div className="relative flex items-center justify-center gap-x-4 py-2 text-xs uppercase">
+    </Form>
-        <div className="bg-border h-px flex-1" />
-        <span className="text-muted-foreground bg-transparent">Or continue with</span>
-        <div className="bg-border h-px flex-1" />
-      </div>
-
-      <Button
-        type="button"
-        size="lg"
-        variant={'outline'}
-        className="bg-background text-muted-foreground border"
-        disabled={isSubmitting}
-        onClick={onSignInWithGoogleClick}
-      >
-        <FcGoogle className="mr-2 h-5 w-5" />
-        Google
-      </Button>
-    </form>
   );
 };