diff options
Diffstat (limited to 'client/src/pages')
6 files changed, 95 insertions, 23 deletions
diff --git a/client/src/pages/Enrollment/Agreement/Agreement.jsx b/client/src/pages/Enrollment/Agreement/Agreement.jsx index 7b1b9c6..15bb639 100644 --- a/client/src/pages/Enrollment/Agreement/Agreement.jsx +++ b/client/src/pages/Enrollment/Agreement/Agreement.jsx @@ -18,13 +18,11 @@ const Agreement = ({ unverified, setUnverified }) => { const [finalDisable, setFinalDisable] = useState(false) const [show, setShow] = useState(false) const { userData } = userContext() - console.log(userData) + const { data, mutate } = useMutation(() => sendOTP({ mobile: `+91${userData?.mobile}` }) ) - console.log('Disabled: ', disabled, 'Final Disable: ', finalDisable) - const verifyOTP = () => { if (data?.data?.otpCode === Number(otp)) { console.log('Disabled: ', disabled, 'Final Disable: ', finalDisable) diff --git a/client/src/pages/Update/Agreement/Agreement.jsx b/client/src/pages/Update/Agreement/Agreement.jsx index 2d1361d..e49bbe6 100644 --- a/client/src/pages/Update/Agreement/Agreement.jsx +++ b/client/src/pages/Update/Agreement/Agreement.jsx @@ -3,32 +3,53 @@ import Header from '../../../components/Header/Header' import CardAgreement from '../../../components/Card/CardAgreement' import styles from './Agreement.module.css' import Input from '../../../components/Input/Input' -import { Link } from 'react-router-dom' +import { useNavigate } from 'react-router-dom' import SubmitButton from '../../../components/SubmitButton/SubmitButton' import { Button, Typography } from '@mui/material' import { useTranslation } from 'react-i18next' -import { sendOTP, updateUser } from '../../../services/apiservice' +import { sendOTP, updateUser, sendMessage } from '../../../services/apiservice' import { userContext } from '../../../context/User' import { useMutation } from 'react-query' import { ToastContainer, toast } from 'react-toastify' import 'react-toastify/dist/ReactToastify.css' -const Agreement = ({ unverified, setUnverified }) => { +const Agreement = () => { const { t } = useTranslation() + const navigate = useNavigate() const [otp, setOtp] = useState() + const [unverified, setUnverified] = useState(true) const [disabled, setDisabled] = useState(false) const [finalDisable, setFinalDisable] = useState(false) const [show, setShow] = useState(false) const { userData } = userContext() - const updateUse = useMutation(() => updateUser(userData._id, { ...userData })) + const updateUse = useMutation( + () => updateUser(userData._id, { ...userData }), + { + onSuccess: () => { + setConfirm.mutate({ + mobile: `+91${userData.mobile}`, + id: userData._id + }) + } + } + ) + + const setConfirm = useMutation( + (payload) => { + sendMessage(payload) + }, + { + onSuccess: () => { + navigate('/update/final-slip') + } + } + ) const { data, mutate } = useMutation(() => sendOTP({ mobile: `+91${userData?.mobile}` }) ) - console.log('Disabled: ', disabled, 'Final Disable: ', finalDisable) - const verifyOTP = () => { if (data?.data?.otpCode === Number(otp)) { console.log('Disabled: ', disabled, 'Final Disable: ', finalDisable) @@ -38,7 +59,7 @@ const Agreement = ({ unverified, setUnverified }) => { setUnverified(false) toast.success(t('OTP_VERIFIED!')) } else { - toast.error(t('INCORRECT_OTP!')) + toast.error(t('INCORRECT_OTP')) } } @@ -106,9 +127,15 @@ const Agreement = ({ unverified, setUnverified }) => { </> )} </div> - <Link to="/update/final-slip"> - <SubmitButton onClick={() => updateUse.mutate()} /> - </Link> + <SubmitButton + onClick={() => { + if (unverified) { + toast.error(t('PLEASE_VERIFY_OTP')) + } else { + updateUse.mutate() + } + }} + /> </> ) } diff --git a/client/src/pages/Update/Biometric/Biometric.jsx b/client/src/pages/Update/Biometric/Biometric.jsx index 6737ed9..275df89 100644 --- a/client/src/pages/Update/Biometric/Biometric.jsx +++ b/client/src/pages/Update/Biometric/Biometric.jsx @@ -28,14 +28,14 @@ const Biometric = () => { if (!userData.photo) { setUserData({ ...userData, photo: oriUserData.photo }) } - setPage(page - 1) + setPage(4) // DUMMY VALUE 4 } const handleSubmit = () => { if (!userData.photo) { setUserData({ ...userData, photo: oriUserData.photo }) } - setPage(page + 1) + setPage(4) } const conditionalButton = () => { @@ -51,14 +51,14 @@ const Biometric = () => { return ( <> <SubmitButton onClick={() => setPage(4)} /> - <BackButton onClick={() => setPage(page - 1)} /> + <BackButton onClick={() => setPage(4)} /> </> ) case 2: return ( <> <SubmitButton onClick={() => setPage(4)} /> - <BackButton onClick={() => setPage(page - 1)} /> + <BackButton onClick={() => setPage(4)} /> </> ) } diff --git a/client/src/pages/Update/Demographic/Demographic.jsx b/client/src/pages/Update/Demographic/Demographic.jsx index 0f89fe2..03f107a 100644 --- a/client/src/pages/Update/Demographic/Demographic.jsx +++ b/client/src/pages/Update/Demographic/Demographic.jsx @@ -15,10 +15,15 @@ import { userContext } from '../../../context/User' import { ToastContainer, toast } from 'react-toastify' import BackButton from '../../../components/BackButton/BackButton' import 'react-toastify/dist/ReactToastify.css' +import { useNavigate } from 'react-router-dom' +import { initialUserData } from '../../../constants/userData' const Demographic = () => { const { t } = useTranslation() - const { userData } = userContext() + const { userData, setUserData, setOriUserData, setAadhaarNumber } = + userContext() + + const navigate = useNavigate() const [page, setPage] = useState(0) @@ -91,7 +96,14 @@ const Demographic = () => { return ( <> <SubmitButton onClick={handleSubmit} /> - <BackButton onClick={() => setPage(page - 1)} /> + <BackButton + onClick={() => { + setUserData(initialUserData) + setOriUserData(initialUserData) + setAadhaarNumber('') + navigate('/') + }} + /> </> ) case 1: diff --git a/client/src/pages/Update/DocumentScanner/DocumentScanner.jsx b/client/src/pages/Update/DocumentScanner/DocumentScanner.jsx index 0fe8d42..89c9479 100644 --- a/client/src/pages/Update/DocumentScanner/DocumentScanner.jsx +++ b/client/src/pages/Update/DocumentScanner/DocumentScanner.jsx @@ -71,9 +71,29 @@ const DocumentScanner = () => { }) const handleNext = () => { - if (activeStep === steps.length - 1) { + if ( + activeStep === steps.length - 1 && + documents.POI !== '' && + documents.POA !== '' && + documents.DOB !== '' + ) { setUserData({ ...userData, documents: documents }) + } else if (documents.POI !== '' && documents.POA !== '') { + toast.error(t('SCAN_YOUR_DOCUMENT')) + } else if (documents.POI !== '' && documents.DOB !== '') { + toast.error(t('SCAN_YOUR_DOCUMENT')) + } else if (documents.POA !== '' && documents.DOB !== '') { + toast.error(t('SCAN_YOUR_DOCUMENT')) + } else if (documents.POI !== '') { + toast.error(t('SCAN_YOUR_DOCUMENT')) + } else if (documents.POA !== '') { + toast.error(t('SCAN_YOUR_DOCUMENT')) + } else if (documents.DOB !== '') { + toast.error(t('SCAN_YOUR_DOCUMENT')) + } else { + toast.error(t('SCAN_YOUR_DOCUMENT')) } + if ( (!documents.POI && activeStep === 0) || (!documents.POA && activeStep === 1) || @@ -199,9 +219,20 @@ const DocumentScanner = () => { })} </Stepper> {activeStep === steps.length ? ( - <Typography variant="h3" sx={{ mt: 8, mb: 1 }}> - {t('ALL_STEPS_COMPLETED')} - </Typography> + steps.length === 0 ? ( + <> + <Typography variant="h4" sx={{ mt: 8, mb: 1 }}> + {t("YOU_HAVEN'T_UPDATED_ANYTHING")} + </Typography> + <Typography variant="h4" sx={{ mt: 8, mb: 1 }}> + {t('YOU_MAY_EITHER_UPDATE_OR_MOVE_TO_NEXT_STEP')} + </Typography> + </> + ) : ( + <Typography variant="h3" sx={{ mt: 8, mb: 1 }}> + {t('ALL_STEPS_COMPLETED')} + </Typography> + ) ) : ( <React.Fragment> {activeStep === 0 ? ( diff --git a/client/src/pages/Update/FinalSlip/FinalSlip.jsx b/client/src/pages/Update/FinalSlip/FinalSlip.jsx index ae1ea31..4212be4 100644 --- a/client/src/pages/Update/FinalSlip/FinalSlip.jsx +++ b/client/src/pages/Update/FinalSlip/FinalSlip.jsx @@ -4,9 +4,12 @@ import CardScanner from '../../../components/Card/CardScanner' import styles from './FinalSlip.module.css' import { Grid, Typography } from '@mui/material' import { useTranslation } from 'react-i18next' +import SubmitButton from '../../../components/SubmitButton/SubmitButton' +import { useNavigate } from 'react-router-dom' const FinalSlip = () => { const { t } = useTranslation() + const navigate = useNavigate() return ( <> <Header subheading={t('UPDATE')} /> @@ -24,6 +27,7 @@ const FinalSlip = () => { </Typography> </Grid> </div> + <SubmitButton onClick={() => navigate('/')} /> </> ) } |