Skip to content

Commit

Permalink
Merge branch 'develop' into clue355/implement-menu-dropdown
Browse files Browse the repository at this point in the history
  • Loading branch information
Danielle254 authored Nov 19, 2024
2 parents 993bd01 + aac237b commit 83680b5
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
2 changes: 0 additions & 2 deletions app/(main)/account/recovery/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ const ResetPassword = (): React.JSX.Element => {
const password: string = useWatch({
control: form.control,
name: 'password',
defaultValue: '',
});

/**
Expand All @@ -116,7 +115,6 @@ const ResetPassword = (): React.JSX.Element => {
const confirmPassword: string = useWatch({
control: form.control,
name: 'confirmPassword',
defaultValue: '',
});

/**
Expand Down
6 changes: 4 additions & 2 deletions app/(main)/login/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,20 @@ const Login = (): React.JSX.Element => {

const form = useForm<LoginUserSchemaType>({
resolver: zodResolver(LoginUserSchema),
defaultValues: {
email: '',
password: '',
},
});

const email = useWatch({
control: form.control,
name: 'email',
defaultValue: '',
});

const password = useWatch({
control: form.control,
name: 'password',
defaultValue: '',
});

/**
Expand Down
1 change: 0 additions & 1 deletion app/(main)/recover-password/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ const RecoverPassword = (): React.JSX.Element => {
const email = useWatch({
control: form.control,
name: 'email',
defaultValue: '',
});

/**
Expand Down
8 changes: 5 additions & 3 deletions app/(main)/register/Register.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ const Register = (): JSX.Element => {

const form = useForm<RegisterUserSchemaType>({
resolver: zodResolver(RegisterUserSchema),
defaultValues: {
email: '',
password: '',
confirmPassword: ''
},
});

/**
Expand All @@ -76,7 +81,6 @@ const Register = (): JSX.Element => {
const email: string = useWatch({
control: form.control,
name: 'email',
defaultValue: '',
});

/**
Expand All @@ -86,7 +90,6 @@ const Register = (): JSX.Element => {
const password: string = useWatch({
control: form.control,
name: 'password',
defaultValue: '',
});

/**
Expand All @@ -96,7 +99,6 @@ const Register = (): JSX.Element => {
const confirmPassword: string = useWatch({
control: form.control,
name: 'confirmPassword',
defaultValue: '',
});

/**
Expand Down

0 comments on commit 83680b5

Please sign in to comment.