From ea69028b911bb28d6c3f6f9f9b50d1c18bee55da Mon Sep 17 00:00:00 2001 From: rohan09-raj Date: Thu, 25 Aug 2022 23:03:58 +0530 Subject: fixed conflicts --- client/src/pages/CheckStatus/CheckStatus.jsx | 4 ++ client/src/pages/CheckStatus/EnrollmentStatus.jsx | 7 +++ client/src/pages/CheckStatus/StatusOtp.jsx | 21 ++++++-- client/src/pages/CheckStatus/UpdateStatus.jsx | 7 +++ client/src/pages/Enrollment/Address/Address.jsx | 16 +++++- .../src/pages/Enrollment/Agreement/Agreement.jsx | 21 ++++++-- .../Enrollment/DocumentScanner/DocumentScanner.jsx | 8 ++- .../src/pages/Enrollment/FinalSlip/FinalSlip.jsx | 4 ++ .../pages/Enrollment/Fingerprint/Fingerprint.jsx | 4 ++ client/src/pages/Enrollment/FormOne/FormOne.jsx | 4 +- client/src/pages/Enrollment/FormTwo/FormTwo.jsx | 15 +++++- client/src/pages/Enrollment/IrisScan/IrisScan.jsx | 2 + .../pages/Enrollment/PhotoCapture/PhotoCapture.jsx | 16 +++++- client/src/pages/Home/Home.jsx | 4 ++ client/src/pages/Update/Address/Address.jsx | 16 +++++- client/src/pages/Update/Agreement/Agreement.jsx | 19 +++++-- .../Update/BiometricSelect/BiometricSelect.jsx | 15 +++++- .../Update/DocumentScanner/DocumentScanner.jsx | 58 +++++++++++++--------- client/src/pages/Update/FinalSlip/FinalSlip.jsx | 4 ++ .../src/pages/Update/Fingerprint/Fingerprint.jsx | 4 ++ client/src/pages/Update/FormOne/FormOne.jsx | 17 ++++++- client/src/pages/Update/IrisScan/IrisScan.jsx | 2 + client/src/pages/Update/Otp/Otp.jsx | 19 +++++-- .../src/pages/Update/PhotoCapture/PhotoCapture.jsx | 16 +++++- client/src/pages/Update/Update.jsx | 4 ++ .../src/pages/Update/UpdateSelect/UpdateSelect.jsx | 4 ++ 26 files changed, 258 insertions(+), 53 deletions(-) (limited to 'client/src') diff --git a/client/src/pages/CheckStatus/CheckStatus.jsx b/client/src/pages/CheckStatus/CheckStatus.jsx index 1732d21..3a37310 100644 --- a/client/src/pages/CheckStatus/CheckStatus.jsx +++ b/client/src/pages/CheckStatus/CheckStatus.jsx @@ -10,6 +10,7 @@ import { userContext } from '../../context/User' import styles from './CheckStatus.module.css' import { useNavigate } from 'react-router-dom' +import AudioAutoplay from '../../components/AudioAutoplay/AudioAutoplay' const CheckStatus = () => { const { t } = useTranslation() @@ -28,6 +29,9 @@ const CheckStatus = () => { theme={'colored'} />
+
diff --git a/client/src/pages/CheckStatus/EnrollmentStatus.jsx b/client/src/pages/CheckStatus/EnrollmentStatus.jsx index d1e1f4d..90fa118 100644 --- a/client/src/pages/CheckStatus/EnrollmentStatus.jsx +++ b/client/src/pages/CheckStatus/EnrollmentStatus.jsx @@ -6,6 +6,7 @@ import styles from './EnrollmentStatus.module.css' import { Button } from '@mui/material' import { useNavigate } from 'react-router-dom' import { userContext } from '../../context/User' +import AudioAutoplay from '../../components/AudioAutoplay/AudioAutoplay' const EnrollmentStatus = () => { const { t } = useTranslation() @@ -20,6 +21,9 @@ const EnrollmentStatus = () => {

{t('STATUS')}

{!userData?.verified ? ( <> + { ) : ( <> + { } }) if (isLoading) { - return + return } if (isError) { @@ -86,7 +87,7 @@ const StatusOtp = () => { }) if (isLoading) { - return + return } if (isError) { @@ -98,7 +99,12 @@ const StatusOtp = () => { } } - const description = ['CLICK_ON_SEND_OTP', 'YOU_WILL_RECIEVE_AN_OTP_ON_YOUR_MOBILE_NUMBER', 'YOU_CAN_RESEND_THE_OTP_AFTER_30_SECONDS_IF_YOU_HAVENT_RECEIVED_IT_YET', 'CLICK_ON_VERIFY_OTP_TO_VERIFY_YOUR_MOBILE_NUMBER'] + const description = [ + 'CLICK_ON_SEND_OTP', + 'YOU_WILL_RECIEVE_AN_OTP_ON_YOUR_MOBILE_NUMBER', + 'YOU_CAN_RESEND_THE_OTP_AFTER_30_SECONDS_IF_YOU_HAVENT_RECEIVED_IT_YET', + 'CLICK_ON_VERIFY_OTP_TO_VERIFY_YOUR_MOBILE_NUMBER' + ] return ( <> @@ -108,13 +114,20 @@ const StatusOtp = () => { theme={'colored'} />
+
    - {description.map((item) => (
  • {t(item)}
  • ))} + {description.map((item) => ( +
  • + {t(item)} +
  • + ))}
} diff --git a/client/src/pages/CheckStatus/UpdateStatus.jsx b/client/src/pages/CheckStatus/UpdateStatus.jsx index a9a4b58..73e33d8 100644 --- a/client/src/pages/CheckStatus/UpdateStatus.jsx +++ b/client/src/pages/CheckStatus/UpdateStatus.jsx @@ -6,6 +6,7 @@ import styles from './EnrollmentStatus.module.css' import { Button } from '@mui/material' import { useNavigate } from 'react-router-dom' import { userContext } from '../../context/User' +import AudioAutoplay from '../../components/AudioAutoplay/AudioAutoplay' const UpdateStatus = () => { const { t } = useTranslation() @@ -20,6 +21,9 @@ const UpdateStatus = () => {

{t('STATUS')}

{userData?.isUpdating ? ( <> + { ) : ( <> + { }) } - const description = ['ENTER_YOUR_DETAILS_ACCORDING_TO_THE_RELEVANT_FIELDS', 'SELECT_THE_STATE_YOU_BELONG_TO_FROM_THE_DROPDOWN_LIST', 'SELECT_THE_DISTRICT_YOU_BELONG_TO_FROM_THE_DROPDOWN_LIST'] + const description = [ + 'ENTER_YOUR_DETAILS_ACCORDING_TO_THE_RELEVANT_FIELDS', + 'SELECT_THE_STATE_YOU_BELONG_TO_FROM_THE_DROPDOWN_LIST', + 'SELECT_THE_DISTRICT_YOU_BELONG_TO_FROM_THE_DROPDOWN_LIST' + ] return ( <>
+
    - {description.map((item) => (
  • {t(item)}
  • ))} + {description.map((item) => ( +
  • + {t(item)} +
  • + ))}
} diff --git a/client/src/pages/Enrollment/Agreement/Agreement.jsx b/client/src/pages/Enrollment/Agreement/Agreement.jsx index 704b0d5..69fc9c2 100644 --- a/client/src/pages/Enrollment/Agreement/Agreement.jsx +++ b/client/src/pages/Enrollment/Agreement/Agreement.jsx @@ -11,6 +11,7 @@ import { useMutation } from 'react-query' import { ToastContainer, toast } from 'react-toastify' import PopUpModal from '../../../components/Modal/Modal' import 'react-toastify/dist/ReactToastify.css' +import AudioAutoplay from '../../../components/AudioAutoplay/AudioAutoplay' const Agreement = ({ unverified, setUnverified }) => { const { t } = useTranslation() @@ -46,7 +47,12 @@ const Agreement = ({ unverified, setUnverified }) => { }, 30000) } - const description = ['CLICK_ON_SEND_OTP', 'YOU_WILL_RECIEVE_AN_OTP_ON_YOUR_MOBILE_NUMBER', 'YOU_CAN_RESEND_THE_OTP_AFTER_30_SECONDS_IF_YOU_HAVENT_RECEIVED_IT_YET', 'CLICK_ON_VERIFY_OTP_TO_VERIFY_YOUR_MOBILE_NUMBER'] + const description = [ + 'CLICK_ON_SEND_OTP', + 'YOU_WILL_RECIEVE_AN_OTP_ON_YOUR_MOBILE_NUMBER', + 'YOU_CAN_RESEND_THE_OTP_AFTER_30_SECONDS_IF_YOU_HAVENT_RECEIVED_IT_YET', + 'CLICK_ON_VERIFY_OTP_TO_VERIFY_YOUR_MOBILE_NUMBER' + ] return ( <> @@ -56,13 +62,20 @@ const Agreement = ({ unverified, setUnverified }) => { theme={'colored'} />
+
    - {description.map((item) => (
  • {t(item)}
  • ))} + {description.map((item) => ( +
  • + {t(item)} +
  • + ))}
} @@ -73,7 +86,9 @@ const Agreement = ({ unverified, setUnverified }) => { />
- {t('PLEASE_VERIFY_YOUR_IDENTITY')} + + {t('PLEASE_VERIFY_YOUR_IDENTITY')} +