diff --git a/backend/package-lock.json b/backend/package-lock.json index 3635c8039..73eb533c4 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -1,12 +1,12 @@ { "name": "idurar-erp-crm", - "version": "4.0.0", + "version": "4.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "idurar-erp-crm", - "version": "4.0.0", + "version": "4.1.0", "license": "Fair-code License", "dependencies": { "@aws-sdk/client-s3": "^3.509.0", diff --git a/frontend/src/pages/Login.jsx b/frontend/src/pages/Login.jsx index c1f8a1f5d..981eb4832 100644 --- a/frontend/src/pages/Login.jsx +++ b/frontend/src/pages/Login.jsx @@ -1,4 +1,4 @@ -import { useEffect } from 'react'; +import { useEffect, useState } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import { useNavigate } from 'react-router-dom'; @@ -18,9 +18,13 @@ const LoginPage = () => { const { isLoading, isSuccess } = useSelector(selectAuth); const navigate = useNavigate(); // const size = useSize(); + const [remember, setRemember] = useState(true); const dispatch = useDispatch(); const onFinish = (values) => { + if (!values.remember) { + setRemember(false); + } dispatch(login({ loginData: values })); }; @@ -36,7 +40,7 @@ const LoginPage = () => { name="normal_login" className="login-form" initialValues={{ - remember: true, + remember: remember ? true : isLoading && false, }} onFinish={onFinish} >