Auth: react-hook-form

frontend_reactjs/src/pages/auth/SignIn.tsx

@@ -1,4 +1,5 @@
 import React, { useState, ChangeEvent, FormEvent } from 'react';
+import { useForm, SubmitHandler } from 'react-hook-form';
 import { TextField, Button, Container, Typography, Box } from '@mui/material';
 import axios, { AxiosResponse } from 'axios';
 import { SignInFormData, ApiResponse } from '../../types/auth';
@@ -8,31 +9,24 @@ import axiosInstance from '../../http/axiosInstance';
 import AuthService from '../../services/AuthService';
 
 const SignIn = () => {
-  const [formData, setFormData] = useState<SignInFormData>({
+  const { register, handleSubmit, formState: { errors } } = useForm<SignInFormData>({
-    username: '',
+    defaultValues: {
-    password: '',
+      username: '',
-    grant_type: 'password',
+      password: '',
-    scope: '',
+      grant_type: 'password',
-    client_id: '',
+      scope: '',
-    client_secret: ''
+      client_id: '',
-  });
+      client_secret: ''
+    }
+  })
 
   const authStore = useAuthStore();
-
   const navigate = useNavigate();
 
-  const handleChange = (e: ChangeEvent<HTMLInputElement>) => {
+  const onSubmit: SubmitHandler<SignInFormData> = async (data) => {
-    setFormData({
-      ...formData,
-      [e.target.name]: e.target.value,
-    });
-  };
-
-  const handleSubmit = async (e: FormEvent) => {
-    e.preventDefault();
     const formBody = new URLSearchParams();
-    for (const key in formData) {
+    for (const key in data) {
-      formBody.append(key, formData[key as keyof SignInFormData] as string);
+      formBody.append(key, data[key as keyof SignInFormData] as string);
     }
 
     try {
@@ -42,6 +36,7 @@ const SignIn = () => {
         },
       });
       console.log('Вход произошел успешно:', response.data);
+
       const token = response.data.access_token
 
       const userDataResponse: AxiosResponse<ApiResponse> = await AuthService.getCurrentUser(token)
@@ -49,7 +44,6 @@ const SignIn = () => {
       console.log('Пользователь:', userDataResponse.data)
 
       authStore.setUserData(JSON.stringify(userDataResponse.data))
-
       authStore.login(token)
 
       navigate('/');
@@ -64,25 +58,23 @@ const SignIn = () => {
         <Typography variant="h4" component="h1" gutterBottom>
           Вход
         </Typography>
-        <form onSubmit={handleSubmit}>
+        <form onSubmit={handleSubmit(onSubmit)}>
           <TextField
             fullWidth
             margin="normal"
-            name="username"
             label="Логин"
-            value={formData.username}
+            {...register('username', { required: 'Логин обязателен' })}
-            onChange={handleChange}
+            error={!!errors.username}
-            required
+            helperText={errors.username?.message}
           />
           <TextField
             fullWidth
             margin="normal"
             type="password"
-            name="password"
             label="Пароль"
-            value={formData.password}
+            {...register('password', { required: 'Пароль обязателен' })}
-            onChange={handleChange}
+            error={!!errors.password}
-            required
+            helperText={errors.password?.message}
           />
           <Button type="submit" variant="contained" color="primary">
             Вход

frontend_reactjs/src/pages/auth/SignUp.tsx

@@ -1,33 +1,27 @@
-// src/components/SignUp.tsx
-
 import React, { useState, ChangeEvent, FormEvent } from 'react';
+import { useForm, SubmitHandler } from 'react-hook-form';
 import { TextField, Button, Container, Typography, Box } from '@mui/material';
 import axios, { AxiosResponse } from 'axios';
 import { SignUpFormData, ApiResponse } from '../../types/auth';
 import axiosInstance from '../../http/axiosInstance';
 
-const SignUp: React.FC = () => {
+const SignUp = () => {
-    const [formData, setFormData] = useState<SignUpFormData>({
+    const { register, handleSubmit, formState: { errors } } = useForm<SignUpFormData>({
-        email: '',
+        defaultValues: {
-        login: '',
+            email: '',
-        phone: '',
+            login: '',
-        name: '',
+            phone: '',
-        surname: '',
+            name: '',
-        is_active: true,
+            surname: '',
-        password: '',
+            is_active: true,
-    });
+            password: '',
+        }
+    })
 
-    const handleChange = (e: ChangeEvent<HTMLInputElement>) => {
-        setFormData({
-            ...formData,
-            [e.target.name]: e.target.value,
-        });
-    };
 
-    const handleSubmit = async (e: FormEvent) => {
+    const onSubmit: SubmitHandler<SignUpFormData> = async (data) => {
-        e.preventDefault();
         try {
-            const response: AxiosResponse<ApiResponse> = await axiosInstance.post(`${import.meta.env.VITE_API_AUTH_URL}/auth/user`, formData);
+            const response: AxiosResponse<ApiResponse> = await axiosInstance.post(`${import.meta.env.VITE_API_AUTH_URL}/auth/user`, data);
             console.log('Успешная регистрация:', response.data);
         } catch (error) {
             console.error('Ошибка регистрации:', error);
@@ -40,58 +34,55 @@ const SignUp: React.FC = () => {
                 <Typography variant="h4" component="h1" gutterBottom>
                     Регистрация
                 </Typography>
-                <form onSubmit={handleSubmit}>
+                <form onSubmit={handleSubmit(onSubmit)}>
                     <TextField
                         fullWidth
                         margin="normal"
-                        name="email"
                         label="Email"
-                        value={formData.email}
+                        {...register('email', { required: 'Email обязателен' })}
-                        onChange={handleChange}
+                        error={!!errors.email}
-                        required
+                        helperText={errors.email?.message}
                     />
                     <TextField
                         fullWidth
                         margin="normal"
-                        name="login"
                         label="Логин"
-                        value={formData.login}
+                        {...register('login', { required: 'Логин обязателен' })}
-                        onChange={handleChange}
+                        error={!!errors.login}
-                        required
+                        helperText={errors.login?.message}
                     />
                     <TextField
                         fullWidth
                         margin="normal"
-                        name="phone"
                         label="Телефон"
-                        value={formData.phone}
+                        {...register('phone')}
-                        onChange={handleChange}
+                        error={!!errors.phone}
+                        helperText={errors.phone?.message}
                     />
                     <TextField
                         fullWidth
                         margin="normal"
-                        name="name"
                         label="Имя"
-                        value={formData.name}
+                        {...register('name')}
-                        onChange={handleChange}
+                        error={!!errors.name}
+                        helperText={errors.name?.message}
                     />
                     <TextField
                         fullWidth
                         margin="normal"
-                        name="surname"
                         label="Фамилия"
-                        value={formData.surname}
+                        {...register('surname')}
-                        onChange={handleChange}
+                        error={!!errors.surname}
+                        helperText={errors.surname?.message}
                     />
                     <TextField
                         fullWidth
                         margin="normal"
                         type="password"
-                        name="password"
                         label="Пароль"
-                        value={formData.password}
+                        {...register('password', { required: 'Пароль обязателен' })}
-                        onChange={handleChange}
+                        error={!!errors.password}
-                        required
+                        helperText={errors.password?.message}
                     />
                     <Button type="submit" variant="contained" color="primary">
                         Зарегистрироваться