diff --git a/src/components/Activities/ReportTaskComments.jsx b/src/components/Activities/ReportTaskComments.jsx index 3a48bffb..d946d204 100644 --- a/src/components/Activities/ReportTaskComments.jsx +++ b/src/components/Activities/ReportTaskComments.jsx @@ -142,8 +142,8 @@ const ReportTaskComments = ( {commentsData, closeModal} ) => )}
- - + +
diff --git a/src/pages/authentication/LoginPage.jsx b/src/pages/authentication/LoginPage.jsx index d89231c6..68990e97 100644 --- a/src/pages/authentication/LoginPage.jsx +++ b/src/pages/authentication/LoginPage.jsx @@ -7,41 +7,40 @@ import AuthRepository from "../../repositories/AuthRepository"; import showToast from "../../services/toastService"; import { useForm } from "react-hook-form"; import { zodResolver } from "@hookform/resolvers/zod"; -import {z} from "zod" +import { z } from "zod"; -const loginScheam = z.object( { +const loginScheam = z.object({ username: z.string().email(), - password: z.string().min( 1, {message: "Password required"} ), + password: z.string().min(1, { message: "Password required" }), rememberMe: z.boolean(), -} ) +}); const LoginPage = () => { const navigate = useNavigate(); - const [ loading, setLoading ] = useState( false ); - const[hidepass,setHidepass] = useState(true) + const [loading, setLoading] = useState(false); + const [hidepass, setHidepass] = useState(true); - const {register, - handleSubmit, - formState: { errors }, - reset, - getValues } = useForm( { - resolver: zodResolver( loginScheam ), - - }) + const { + register, + handleSubmit, + formState: { errors }, + reset, + getValues, + } = useForm({ + resolver: zodResolver(loginScheam), + }); - const onSubmit = async ( data ) => - { + const onSubmit = async (data) => { setLoading(true); try { - let userCredential = { username: data.username, - password:data.password - } + password: data.password, + }; const response = await AuthRepository.login(userCredential); localStorage.setItem("jwtToken", response.data.token); - localStorage.setItem( "refreshToken", response.data.refreshToken ); + localStorage.setItem("refreshToken", response.data.refreshToken); setLoading(false); navigate("/dashboard"); } catch (err) { @@ -57,8 +56,12 @@ const LoginPage = () => { Please sign-in to your account and start the adventure

-
-
+ +
@@ -71,14 +74,14 @@ const LoginPage = () => { placeholder="Enter your email or username" autoFocus /> - {errors.username && ( -
- {errors.username.message} -
- )} + {errors.username && ( +
+ {errors.username.message} +
+ )}
@@ -94,7 +97,7 @@ const LoginPage = () => {
{ placeholder="············" aria-describedby="password" /> - setHidepass(!hidepass)}>{ hidepass ? :} + setHidepass(!hidepass)} + > + {hidepass ? ( + + ) : ( + + )} +
{errors.password && ( -
- {errors.password.message} -
- )} +
+ {errors.password.message} +
+ )}