Compare commits

..

5 Commits

Author SHA1 Message Date
victorAnumudu a61abe718a added footer content to forget pwd page 2025-11-24 19:48:40 +01:00
ameye 2b91506c61 Merge branch 'login-error-fix' of MERMS/MermsPanelReactJS into master 2025-11-23 19:28:20 +00:00
victorAnumudu 253cace3fe fixed login error issue 2025-11-20 20:08:01 +01:00
CHIEFSOFT\ameye aa55a1a4e0 Logi mesage 2025-11-16 07:34:34 -05:00
ameye 8b763882fa Merge branch 'app-download-switch' of MERMS/MermsPanelReactJS into master 2025-10-30 17:02:20 +00:00
3 changed files with 7 additions and 5 deletions
+3 -1
View File
@@ -8,6 +8,7 @@ import siteLinks from '../../links/siteLinks'
import { useMutation } from '@tanstack/react-query'
import { recoverPWD } from '../../services/services';
import getImage from '../../utils/getImage';
import AuthFooter from './AuthFooter';
const validationSchema = Yup.object().shape({
username: Yup.string()
@@ -49,7 +50,7 @@ export default function Forgetpwd2() {
<div className="row no-gutters justify-content-center">
<div className="col-11 col-sm-6 col-lg-5 col-xxl-4 align-self-center order-2 order-sm-1h" style={{maxWidth: '520px'}}>
<div className="mt-5 d-flex">
<div className="bg-white register p-5">
<div className="bg-white register px-5 pt-5 pb-3">
<h1 className="mb-2">{process.env.REACT_APP_PANEL_NAME}</h1>
{!mutation.isSuccess && <p>Please enter your username.</p>}
<Formik
@@ -97,6 +98,7 @@ export default function Forgetpwd2() {
);
}}
</Formik>
<AuthFooter />
</div>
</div>
</div>
+2 -2
View File
@@ -46,12 +46,12 @@ export default function Login() {
console.log(error)
},
onSuccess: (res) => {
if(res?.data?.error_message){
if(res?.data && res?.data?.error_message){
throw({message: res?.data?.error_message})
}
const {token, room, uid} = res?.data
if(!token || !room){
throw({message: 'something went wrong, try again!'})
throw({message: 'Unable to complete your login, Please try again!'})
}
localStorage.setItem('token', token)
localStorage.setItem('room', room)
+2 -2
View File
@@ -26,8 +26,8 @@ const postAuxEnd = (path, postData, media=false) => {
return axios.post(`${basePath}${path}`, postData).then(res => {
return res
}).catch(err => {
// console.log('res', err.response.data)
throw new Error(err.response.data.error_message);
// throw new Error(err.response.data.error_message);
throw new Error(err);
})
}