The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
refactor: password form
nafees nazikdc56c2abf2db
diff --git a/apps/web/src/components/forms/password.tsx b/apps/web/src/components/forms/password.tsxindex 47cba1e88..c262719e3 100644--- a/apps/web/src/components/forms/password.tsx+++ b/apps/web/src/components/forms/password.tsx@@ -1,9 +1,7 @@'use client';-import { useState } from 'react';-import { zodResolver } from '@hookform/resolvers/zod';-import { Eye, EyeOff, Loader } from 'lucide-react';+import { Loader } from 'lucide-react';import { useForm } from 'react-hook-form';import { z } from 'zod';@@ -12,12 +10,17 @@ 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 { Input } from '@documenso/ui/primitives/input';-import { Label } from '@documenso/ui/primitives/label';+import {+ Form,+ FormControl,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from '@documenso/ui/primitives/form/form';+import { PasswordInput } from '@documenso/ui/primitives/password-input';import { useToast } from '@documenso/ui/primitives/use-toast';-import { FormErrorMessage } from '../form/form-error-message';-export const ZPasswordFormSchema = z.object({currentPassword: z@@ -48,16 +51,7 @@ export type PasswordFormProps = {export const PasswordForm = ({ className }: PasswordFormProps) => {const { toast } = useToast();- const [showPassword, setShowPassword] = useState(false);- const [showConfirmPassword, setShowConfirmPassword] = useState(false);- const [showCurrentPassword, setShowCurrentPassword] = useState(false);-- const {- register,- handleSubmit,- reset,- formState: { errors, isSubmitting },- } = useForm<TPasswordFormSchema>({+ const form = useForm<TPasswordFormSchema>({values: {currentPassword: '',password: '',@@ -66,6 +60,8 @@ export const PasswordForm = ({ className }: PasswordFormProps) => {resolver: zodResolver(ZPasswordFormSchema),});+ const isSubmitting = form.formState.isSubmitting;+const { mutateAsync: updatePassword } = trpc.profile.updatePassword.useMutation();const onFormSubmit = async ({ currentPassword, password }: TPasswordFormSchema) => {@@ -75,7 +71,7 @@ export const PasswordForm = ({ className }: PasswordFormProps) => {password,});- reset();+ form.reset();toast({title: 'Password updated',@@ -101,117 +97,60 @@ export const PasswordForm = ({ className }: PasswordFormProps) => {};return (- <form- className={cn('flex w-full flex-col gap-y-4', className)}- onSubmit={handleSubmit(onFormSubmit)}- >- <div>- <Label htmlFor="current-password" className="text-muted-foreground">- Current Password- </Label>-- <div className="relative">- <Input- id="current-password"- type={showCurrentPassword ? 'text' : 'password'}- minLength={6}- maxLength={72}- autoComplete="current-password"- className="bg-background mt-2 pr-10"- {...register('currentPassword')}- />-- <Button- variant="link"- type="button"- className="absolute right-0 top-0 flex h-full items-center justify-center pr-3"- aria-label={showCurrentPassword ? 'Mask password' : 'Reveal password'}- onClick={() => setShowCurrentPassword((show) => !show)}- >- {showCurrentPassword ? (- <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.currentPassword} />- </div>- <div>- <Label htmlFor="password" className="text-muted-foreground">- Password- </Label>-- <div className="relative">- <Input- id="password"- type={showPassword ? 'text' : 'password'}- minLength={6}- maxLength={72}- autoComplete="new-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} />- </div>-- <div>- <Label htmlFor="repeated-password" className="text-muted-foreground">- Repeat Password- </Label>-- <div className="relative">- <Input- id="repeated-password"- type={showConfirmPassword ? 'text' : 'password'}- minLength={6}- maxLength={72}- autoComplete="new-password"- className="bg-background mt-2 pr-10"- {...register('repeatedPassword')}- />-- <Button- variant="link"- type="button"- className="absolute right-0 top-0 flex h-full items-center justify-center pr-3"- aria-label={showConfirmPassword ? 'Mask password' : 'Reveal password'}- onClick={() => setShowConfirmPassword((show) => !show)}- >- {showConfirmPassword ? (- <EyeOff className="text-muted-foreground h-5 w-5" />- ) : (- <Eye className="text-muted-foreground h-5 w-5" />- )}+ <Form {...form}>+ <form+ 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>+ )}+ />++ <div className="mt-4">+ <Button type="submit" disabled={isSubmitting}>+ {isSubmitting && <Loader className="mr-2 h-5 w-5 animate-spin" />}+ Update password</Button></div>-- <FormErrorMessage className="mt-1.5" error={errors.repeatedPassword} />- </div>-- <div className="mt-4">- <Button type="submit" disabled={isSubmitting}>- {isSubmitting && <Loader className="mr-2 h-5 w-5 animate-spin" />}- Update password- </Button>- </div>- </form>+ </form>+ </Form>);};