Skip to content

The Open Source DocuSign Alternative.

refactor: forms

nafees nazik6bbeaa084ce4
diff --git a/apps/web/src/components/forms/forgot-password.tsx b/apps/web/src/components/forms/forgot-password.tsx
index 141f3780f..55e313c33 100644
--- a/apps/web/src/components/forms/forgot-password.tsx
+++ b/apps/web/src/components/forms/forgot-password.tsx
@@ -9,9 +9,15 @@ import { z } from 'zod';
import { trpc } from '@documenso/trpc/react';
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 { useToast } from '@documenso/ui/primitives/use-toast';
export const ZForgotPasswordFormSchema = z.object({
@@ -28,18 +34,15 @@ export const ForgotPasswordForm = ({ className }: ForgotPasswordFormProps) => {
const router = useRouter();
const { toast } = useToast();
- const {
- register,
- handleSubmit,
- reset,
- formState: { errors, isSubmitting },
- } = useForm<TForgotPasswordFormSchema>({
+ const form = useForm<TForgotPasswordFormSchema>({
values: {
email: '',
},
resolver: zodResolver(ZForgotPasswordFormSchema),
});
+ const isSubmitting = form.formState.isSubmitting;
+
const { mutateAsync: forgotPassword } = trpc.profile.forgotPassword.useMutation();
const onFormSubmit = async ({ email }: TForgotPasswordFormSchema) => {
@@ -52,29 +55,37 @@ export const ForgotPasswordForm = ({ className }: ForgotPasswordFormProps) => {
duration: 5000,
});
- reset();
+ form.reset();
router.push('/check-email');
};
return (
- <form
- className={cn('flex w-full flex-col gap-y-4', className)}
- onSubmit={handleSubmit(onFormSubmit)}
- >
- <div>
- <Label htmlFor="email" className="text-muted-foreground">
- Email
- </Label>
-
- <Input id="email" type="email" className="bg-background mt-2" {...register('email')} />
-
- <FormErrorMessage className="mt-1.5" error={errors.email} />
- </div>
-
- <Button size="lg" loading={isSubmitting}>
- {isSubmitting ? 'Sending Reset Email...' : 'Reset Password'}
- </Button>
- </form>
+ <Form {...form}>
+ <form
+ className={cn('flex w-full flex-col gap-y-4', className)}
+ onSubmit={form.handleSubmit(onFormSubmit)}
+ >
+ <fieldset className="flex w-full flex-col gap-y-4" disabled={isSubmitting}>
+ <FormField
+ control={form.control}
+ name="email"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Email</FormLabel>
+ <FormControl>
+ <Input type="email" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ </fieldset>
+
+ <Button size="lg" loading={isSubmitting} loadingText="Sending Reset Email...">
+ Reset Password
+ </Button>
+ </form>
+ </Form>
);
};
diff --git a/apps/web/src/components/forms/password.tsx b/apps/web/src/components/forms/password.tsx
index c262719e3..b6b41264c 100644
--- a/apps/web/src/components/forms/password.tsx
+++ b/apps/web/src/components/forms/password.tsx
@@ -1,7 +1,6 @@
'use client';
import { zodResolver } from '@hookform/resolvers/zod';
-import { Loader } from 'lucide-react';
import { useForm } from 'react-hook-form';
import { z } from 'zod';
@@ -102,51 +101,52 @@ export const PasswordForm = ({ className }: PasswordFormProps) => {
className={cn('flex w-full flex-col gap-y-4', className)}
onSubmit={form.handleSubmit(onFormSubmit)}
>
- <FormField
- control={form.control}
- name="currentPassword"
- render={({ field }) => (
- <FormItem>
- <FormLabel>Current Password</FormLabel>
- <FormControl>
- <PasswordInput autoComplete="current-password" {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
-
- <FormField
- control={form.control}
- name="password"
- render={({ field }) => (
- <FormItem>
- <FormLabel>Password</FormLabel>
- <FormControl>
- <PasswordInput autoComplete="new-password" {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
-
- <FormField
- control={form.control}
- name="repeatedPassword"
- render={({ field }) => (
- <FormItem>
- <FormLabel> Repeat Password</FormLabel>
- <FormControl>
- <PasswordInput autoComplete="new-password" {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
+ <fieldset className="flex w-full flex-col gap-y-4" disabled={isSubmitting}>
+ <FormField
+ control={form.control}
+ name="currentPassword"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Current Password</FormLabel>
+ <FormControl>
+ <PasswordInput autoComplete="current-password" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+
+ <FormField
+ control={form.control}
+ name="password"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Password</FormLabel>
+ <FormControl>
+ <PasswordInput autoComplete="new-password" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+
+ <FormField
+ control={form.control}
+ name="repeatedPassword"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Repeat Password</FormLabel>
+ <FormControl>
+ <PasswordInput autoComplete="new-password" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ </fieldset>
<div className="mt-4">
- <Button type="submit" disabled={isSubmitting}>
- {isSubmitting && <Loader className="mr-2 h-5 w-5 animate-spin" />}
+ <Button type="submit" loadingText="Updating password..." loading={isSubmitting}>
Update password
</Button>
</div>
diff --git a/apps/web/src/components/forms/profile.tsx b/apps/web/src/components/forms/profile.tsx
index 6f611bed9..dc6e3c4d5 100644
--- a/apps/web/src/components/forms/profile.tsx
+++ b/apps/web/src/components/forms/profile.tsx
@@ -3,8 +3,7 @@
import { useRouter } from 'next/navigation';
import { zodResolver } from '@hookform/resolvers/zod';
-import { Loader } from 'lucide-react';
-import { Controller, useForm } from 'react-hook-form';
+import { useForm } from 'react-hook-form';
import { z } from 'zod';
import { User } from '@documenso/prisma/client';
@@ -12,13 +11,19 @@ import { TRPCClientError } from '@documenso/trpc/client';
import { trpc } from '@documenso/trpc/react';
import { cn } from '@documenso/ui/lib/utils';
import { Button } from '@documenso/ui/primitives/button';
+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 { SignaturePad } from '@documenso/ui/primitives/signature-pad';
import { useToast } from '@documenso/ui/primitives/use-toast';
-import { FormErrorMessage } from '../form/form-error-message';
-
export const ZProfileFormSchema = z.object({
name: z.string().trim().min(1, { message: 'Please enter a valid name.' }),
signature: z.string().min(1, 'Signature Pad cannot be empty'),
@@ -36,12 +41,7 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => {
const { toast } = useToast();
- const {
- register,
- control,
- handleSubmit,
- formState: { errors, isSubmitting },
- } = useForm<TProfileFormSchema>({
+ const form = useForm<TProfileFormSchema>({
values: {
name: user.name ?? '',
signature: user.signature || '',
@@ -49,6 +49,8 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => {
resolver: zodResolver(ZProfileFormSchema),
});
+ const isSubmitting = form.formState.isSubmitting;
+
const { mutateAsync: updateProfile } = trpc.profile.updateProfile.useMutation();
const onFormSubmit = async ({ name, signature }: TProfileFormSchema) => {
@@ -84,56 +86,57 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => {
};
return (
- <form
- className={cn('flex w-full flex-col gap-y-4', className)}
- onSubmit={handleSubmit(onFormSubmit)}
- >
- <div>
- <Label htmlFor="full-name" className="text-muted-foreground">
- Full Name
- </Label>
-
- <Input id="full-name" type="text" className="bg-background mt-2" {...register('name')} />
-
- <FormErrorMessage className="mt-1.5" error={errors.name} />
- </div>
-
- <div>
- <Label htmlFor="email" className="text-muted-foreground">
- Email
- </Label>
-
- <Input id="email" type="email" className="bg-muted mt-2" value={user.email} disabled />
- </div>
-
- <div>
- <Label htmlFor="signature" className="text-muted-foreground">
- Signature
- </Label>
-
- <div className="mt-2">
- <Controller
- control={control}
+ <Form {...form}>
+ <form
+ className={cn('flex w-full flex-col gap-y-4', className)}
+ onSubmit={form.handleSubmit(onFormSubmit)}
+ >
+ <fieldset className="flex w-full flex-col gap-y-4" disabled={isSubmitting}>
+ <FormField
+ control={form.control}
+ name="name"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Full Name</FormLabel>
+ <FormControl>
+ <Input type="text" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+
+ <div>
+ <Label htmlFor="email" className="text-muted-foreground">
+ Email
+ </Label>
+ <Input id="email" type="email" className="bg-muted mt-2" value={user.email} disabled />
+ </div>
+
+ <FormField
+ control={form.control}
name="signature"
render={({ field: { onChange } }) => (
- <SignaturePad
- className="h-44 w-full"
- containerClassName="rounded-lg border bg-background"
- defaultValue={user.signature ?? undefined}
- onChange={(v) => onChange(v ?? '')}
- />
+ <FormItem>
+ <FormLabel>Signature</FormLabel>
+ <FormControl>
+ <SignaturePad
+ className="h-44 w-full"
+ containerClassName="rounded-lg border bg-background"
+ defaultValue={user.signature ?? undefined}
+ onChange={(v) => onChange(v ?? '')}
+ />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
)}
/>
- <FormErrorMessage className="mt-1.5" error={errors.signature} />
- </div>
- </div>
+ </fieldset>
- <div className="mt-4">
- <Button type="submit" disabled={isSubmitting}>
- {isSubmitting && <Loader className="mr-2 h-5 w-5 animate-spin" />}
+ <Button type="submit" loadingText="Updating profile..." loading={isSubmitting}>
Update profile
</Button>
- </div>
- </form>
+ </form>
+ </Form>
);
};
diff --git a/apps/web/src/components/forms/reset-password.tsx b/apps/web/src/components/forms/reset-password.tsx
index e29686999..e7c701667 100644
--- a/apps/web/src/components/forms/reset-password.tsx
+++ b/apps/web/src/components/forms/reset-password.tsx
@@ -95,35 +95,38 @@ export const ResetPasswordForm = ({ className, token }: ResetPasswordFormProps)
className={cn('flex w-full flex-col gap-y-4', className)}
onSubmit={form.handleSubmit(onFormSubmit)}
>
- <FormField
- control={form.control}
- name="password"
- render={({ field }) => (
- <FormItem>
- <FormLabel>Password</FormLabel>
- <FormControl>
- <PasswordInput {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
- <FormField
- control={form.control}
- name="repeatedPassword"
- render={({ field }) => (
- <FormItem>
- <FormLabel>Repeat Password</FormLabel>
- <FormControl>
- <PasswordInput {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
-
- <Button type="submit" size="lg" loading={isSubmitting}>
- {isSubmitting ? 'Resetting Password...' : 'Reset Password'}
+ <fieldset className="flex w-full flex-col gap-y-4" disabled={isSubmitting}>
+ <FormField
+ control={form.control}
+ name="password"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Password</FormLabel>
+ <FormControl>
+ <PasswordInput {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+
+ <FormField
+ control={form.control}
+ name="repeatedPassword"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Repeat Password</FormLabel>
+ <FormControl>
+ <PasswordInput {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ </fieldset>
+
+ <Button type="submit" loadingText="Resetting Password..." size="lg" loading={isSubmitting}>
+ Reset Password
</Button>
</form>
</Form>
diff --git a/apps/web/src/components/forms/signin.tsx b/apps/web/src/components/forms/signin.tsx
index b93a2cd46..bc58e68e1 100644
--- a/apps/web/src/components/forms/signin.tsx
+++ b/apps/web/src/components/forms/signin.tsx
@@ -105,42 +105,44 @@ export const SignInForm = ({ className }: SignInFormProps) => {
className={cn('flex w-full flex-col gap-y-4', className)}
onSubmit={form.handleSubmit(onFormSubmit)}
>
- <FormField
- control={form.control}
- name="email"
- render={({ field }) => (
- <FormItem>
- <FormLabel>Email</FormLabel>
- <FormControl>
- <Input type="email" {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
-
- <FormField
- control={form.control}
- name="password"
- render={({ field }) => (
- <FormItem>
- <FormLabel>Password</FormLabel>
- <FormControl>
- <PasswordInput {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
+ <fieldset className="flex w-full flex-col gap-y-4" disabled={isSubmitting}>
+ <FormField
+ control={form.control}
+ name="email"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Email</FormLabel>
+ <FormControl>
+ <Input type="email" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+
+ <FormField
+ control={form.control}
+ name="password"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Password</FormLabel>
+ <FormControl>
+ <PasswordInput {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ </fieldset>
<Button
type="submit"
size="lg"
loading={isSubmitting}
- disabled={isSubmitting}
className="dark:bg-documenso dark:hover:opacity-90"
+ loadingText="Signing in..."
>
- {isSubmitting ? 'Signing in...' : 'Sign In'}
+ Sign In
</Button>
<div className="relative flex items-center justify-center gap-x-4 py-2 text-xs uppercase">
diff --git a/apps/web/src/components/forms/signup.tsx b/apps/web/src/components/forms/signup.tsx
index fb70e4c2f..ad803d9c1 100644
--- a/apps/web/src/components/forms/signup.tsx
+++ b/apps/web/src/components/forms/signup.tsx
@@ -88,75 +88,77 @@ export const SignUpForm = ({ className }: SignUpFormProps) => {
className={cn('flex w-full flex-col gap-y-4', className)}
onSubmit={form.handleSubmit(onFormSubmit)}
>
- <FormField
- control={form.control}
- name="name"
- render={({ field }) => (
- <FormItem>
- <FormLabel>Name</FormLabel>
- <FormControl>
- <Input type="text" {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
-
- <FormField
- control={form.control}
- name="email"
- render={({ field }) => (
- <FormItem>
- <FormLabel>Email</FormLabel>
- <FormControl>
- <Input type="email" {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
-
- <FormField
- control={form.control}
- name="password"
- render={({ field }) => (
- <FormItem>
- <FormLabel>Password</FormLabel>
- <FormControl>
- <PasswordInput {...field} />
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
-
- <FormField
- control={form.control}
- name="signature"
- render={({ field: { onChange } }) => (
- <FormItem>
- <FormLabel> Sign Here</FormLabel>
- <FormControl>
- <SignaturePad
- className="h-36 w-full"
- containerClassName="mt-2 rounded-lg border bg-background"
- onChange={(v) => onChange(v ?? '')}
- />
- </FormControl>
-
- <FormMessage />
- </FormItem>
- )}
- />
+ <fieldset className="flex w-full flex-col gap-y-4" disabled={isSubmitting}>
+ <FormField
+ control={form.control}
+ name="name"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Name</FormLabel>
+ <FormControl>
+ <Input type="text" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+
+ <FormField
+ control={form.control}
+ name="email"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Email</FormLabel>
+ <FormControl>
+ <Input type="email" {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+
+ <FormField
+ control={form.control}
+ name="password"
+ render={({ field }) => (
+ <FormItem>
+ <FormLabel>Password</FormLabel>
+ <FormControl>
+ <PasswordInput {...field} />
+ </FormControl>
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+
+ <FormField
+ control={form.control}
+ name="signature"
+ render={({ field: { onChange } }) => (
+ <FormItem>
+ <FormLabel>Sign Here</FormLabel>
+ <FormControl>
+ <SignaturePad
+ className="h-36 w-full"
+ containerClassName="mt-2 rounded-lg border bg-background"
+ onChange={(v) => onChange(v ?? '')}
+ />
+ </FormControl>
+
+ <FormMessage />
+ </FormItem>
+ )}
+ />
+ </fieldset>
<Button
type="submit"
size="lg"
loading={isSubmitting}
- disabled={isSubmitting}
+ loadingText="Signing up..."
className="dark:bg-documenso dark:hover:opacity-90"
>
- {isSubmitting ? 'Signing up...' : 'Sign Up'}
+ Sign Up
</Button>
</form>
</Form>