From ea69028b911bb28d6c3f6f9f9b50d1c18bee55da Mon Sep 17 00:00:00 2001 From: rohan09-raj Date: Thu, 25 Aug 2022 23:03:58 +0530 Subject: fixed conflicts --- .../src/components/Accordion/Accordion.module.css | 2 +- admin/src/services/apiservice.js | 5 ++ .../aadhaar-update-status-is-approved-english.mp3 | Bin 0 -> 10848 bytes .../aadhaar-update-status-is-approved-hindi.mp3 | Bin 0 -> 11808 bytes .../aadhaar-update-status-is-pending-english.mp3 | Bin 0 -> 10752 bytes .../aadhaar-update-status-is-pending-hindi.mp3 | Bin 0 -> 11328 bytes client/public/assets/audios/address-english.mp3 | Bin 0 -> 35808 bytes client/public/assets/audios/address-hindi.mp3 | Bin 0 -> 43872 bytes .../assets/audios/address-update-english.mp3 | Bin 0 -> 14016 bytes .../public/assets/audios/address-update-hindi.mp3 | Bin 0 -> 18240 bytes .../assets/audios/biometric-update-english.mp3 | Bin 0 -> 17760 bytes .../assets/audios/biometric-update-hindi.mp3 | Bin 0 -> 23040 bytes .../audios/check-status-main-screen-english.mp3 | Bin 0 -> 39648 bytes .../audios/check-status-main-screen-hindi.mp3 | Bin 0 -> 56640 bytes .../choose-demographic-or-biometric-english.mp3 | Bin 0 -> 19488 bytes .../choose-demographic-or-biometric-hindi.mp3 | Bin 0 -> 24288 bytes ...phic-personal-details-to-be-updated-english.mp3 | Bin 0 -> 11616 bytes ...raphic-personal-details-to-be-updated-hindi.mp3 | Bin 0 -> 14496 bytes .../audios/enrollment-steps-completion- hindi.mp3 | Bin 0 -> 15744 bytes .../audios/enrollment-steps-completion-english.mp3 | Bin 0 -> 13536 bytes .../assets/audios/enter-aadhar-no-english.mp3 | Bin 0 -> 10272 bytes .../public/assets/audios/enter-aadhar-no-hindi.mp3 | Bin 0 -> 13248 bytes .../public/assets/audios/main-screen-english.mp3 | Bin 0 -> 22752 bytes client/public/assets/audios/main-screen-hindi.mp3 | Bin 0 -> 27552 bytes .../assets/audios/mobile-and-email-id-english.mp3 | Bin 0 -> 11232 bytes .../assets/audios/mobile-and-email-id-hindi.mp3 | Bin 0 -> 13248 bytes .../assets/audios/otp-verification-english.mp3 | Bin 0 -> 21120 bytes .../assets/audios/otp-verification-hindi.mp3 | Bin 0 -> 22368 bytes .../assets/audios/personal-details-english.mp3 | Bin 0 -> 17568 bytes .../assets/audios/personal-details-hindi.mp3 | Bin 0 -> 22656 bytes .../assets/audios/photograph-update-english.mp3 | Bin 0 -> 19296 bytes .../assets/audios/photograph-update-hindi.mp3 | Bin 0 -> 19296 bytes .../assets/audios/update-document-english.mp3 | Bin 0 -> 14976 bytes .../public/assets/audios/update-document-hindi.mp3 | Bin 0 -> 20544 bytes .../audios/update-message-notification-english.mp3 | Bin 0 -> 19968 bytes .../audios/update-message-notification-hindi.mp3 | Bin 0 -> 23808 bytes ...r-aadhar-enrollment-status-approved-english.mp3 | Bin 0 -> 11616 bytes ...our-aadhar-enrollment-status-approved-hindi.mp3 | Bin 0 -> 12960 bytes ...ur-aadhar-enrollment-status-pending-english.mp3 | Bin 0 -> 11616 bytes ...your-aadhar-enrollment-status-pending-hindi.mp3 | Bin 0 -> 12384 bytes 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 ++ 66 files changed, 264 insertions(+), 54 deletions(-) create mode 100644 client/public/assets/audios/aadhaar-update-status-is-approved-english.mp3 create mode 100644 client/public/assets/audios/aadhaar-update-status-is-approved-hindi.mp3 create mode 100644 client/public/assets/audios/aadhaar-update-status-is-pending-english.mp3 create mode 100644 client/public/assets/audios/aadhaar-update-status-is-pending-hindi.mp3 create mode 100644 client/public/assets/audios/address-english.mp3 create mode 100644 client/public/assets/audios/address-hindi.mp3 create mode 100644 client/public/assets/audios/address-update-english.mp3 create mode 100644 client/public/assets/audios/address-update-hindi.mp3 create mode 100644 client/public/assets/audios/biometric-update-english.mp3 create mode 100644 client/public/assets/audios/biometric-update-hindi.mp3 create mode 100644 client/public/assets/audios/check-status-main-screen-english.mp3 create mode 100644 client/public/assets/audios/check-status-main-screen-hindi.mp3 create mode 100644 client/public/assets/audios/choose-demographic-or-biometric-english.mp3 create mode 100644 client/public/assets/audios/choose-demographic-or-biometric-hindi.mp3 create mode 100644 client/public/assets/audios/demographic-personal-details-to-be-updated-english.mp3 create mode 100644 client/public/assets/audios/demographic-personal-details-to-be-updated-hindi.mp3 create mode 100644 client/public/assets/audios/enrollment-steps-completion- hindi.mp3 create mode 100644 client/public/assets/audios/enrollment-steps-completion-english.mp3 create mode 100644 client/public/assets/audios/enter-aadhar-no-english.mp3 create mode 100644 client/public/assets/audios/enter-aadhar-no-hindi.mp3 create mode 100644 client/public/assets/audios/main-screen-english.mp3 create mode 100644 client/public/assets/audios/main-screen-hindi.mp3 create mode 100644 client/public/assets/audios/mobile-and-email-id-english.mp3 create mode 100644 client/public/assets/audios/mobile-and-email-id-hindi.mp3 create mode 100644 client/public/assets/audios/otp-verification-english.mp3 create mode 100644 client/public/assets/audios/otp-verification-hindi.mp3 create mode 100644 client/public/assets/audios/personal-details-english.mp3 create mode 100644 client/public/assets/audios/personal-details-hindi.mp3 create mode 100644 client/public/assets/audios/photograph-update-english.mp3 create mode 100644 client/public/assets/audios/photograph-update-hindi.mp3 create mode 100644 client/public/assets/audios/update-document-english.mp3 create mode 100644 client/public/assets/audios/update-document-hindi.mp3 create mode 100644 client/public/assets/audios/update-message-notification-english.mp3 create mode 100644 client/public/assets/audios/update-message-notification-hindi.mp3 create mode 100644 client/public/assets/audios/your-aadhar-enrollment-status-approved-english.mp3 create mode 100644 client/public/assets/audios/your-aadhar-enrollment-status-approved-hindi.mp3 create mode 100644 client/public/assets/audios/your-aadhar-enrollment-status-pending-english.mp3 create mode 100644 client/public/assets/audios/your-aadhar-enrollment-status-pending-hindi.mp3 diff --git a/admin/src/components/Accordion/Accordion.module.css b/admin/src/components/Accordion/Accordion.module.css index 2745cb4..0cf2603 100644 --- a/admin/src/components/Accordion/Accordion.module.css +++ b/admin/src/components/Accordion/Accordion.module.css @@ -1,5 +1,5 @@ .accordion { - width: 1500px; + width: 800px; margin: 2rem auto; } diff --git a/admin/src/services/apiservice.js b/admin/src/services/apiservice.js index ff5819f..c000755 100644 --- a/admin/src/services/apiservice.js +++ b/admin/src/services/apiservice.js @@ -23,3 +23,8 @@ export const deleteUser = async (id) => { const response = await apiClient.delete(`/user/${id}`); return response; }; + +export const updatingUsers = async () => { + const response = await apiClient.get(`/users/updating`); + return response; +}; diff --git a/client/public/assets/audios/aadhaar-update-status-is-approved-english.mp3 b/client/public/assets/audios/aadhaar-update-status-is-approved-english.mp3 new file mode 100644 index 0000000..d706c2c Binary files /dev/null and b/client/public/assets/audios/aadhaar-update-status-is-approved-english.mp3 differ diff --git a/client/public/assets/audios/aadhaar-update-status-is-approved-hindi.mp3 b/client/public/assets/audios/aadhaar-update-status-is-approved-hindi.mp3 new file mode 100644 index 0000000..b1f5d10 Binary files /dev/null and b/client/public/assets/audios/aadhaar-update-status-is-approved-hindi.mp3 differ diff --git a/client/public/assets/audios/aadhaar-update-status-is-pending-english.mp3 b/client/public/assets/audios/aadhaar-update-status-is-pending-english.mp3 new file mode 100644 index 0000000..2e4488e Binary files /dev/null and b/client/public/assets/audios/aadhaar-update-status-is-pending-english.mp3 differ diff --git a/client/public/assets/audios/aadhaar-update-status-is-pending-hindi.mp3 b/client/public/assets/audios/aadhaar-update-status-is-pending-hindi.mp3 new file mode 100644 index 0000000..2bc8c9c Binary files /dev/null and b/client/public/assets/audios/aadhaar-update-status-is-pending-hindi.mp3 differ diff --git a/client/public/assets/audios/address-english.mp3 b/client/public/assets/audios/address-english.mp3 new file mode 100644 index 0000000..b21045c Binary files /dev/null and b/client/public/assets/audios/address-english.mp3 differ diff --git a/client/public/assets/audios/address-hindi.mp3 b/client/public/assets/audios/address-hindi.mp3 new file mode 100644 index 0000000..016f7e5 Binary files /dev/null and b/client/public/assets/audios/address-hindi.mp3 differ diff --git a/client/public/assets/audios/address-update-english.mp3 b/client/public/assets/audios/address-update-english.mp3 new file mode 100644 index 0000000..5f02861 Binary files /dev/null and b/client/public/assets/audios/address-update-english.mp3 differ diff --git a/client/public/assets/audios/address-update-hindi.mp3 b/client/public/assets/audios/address-update-hindi.mp3 new file mode 100644 index 0000000..dbae311 Binary files /dev/null and b/client/public/assets/audios/address-update-hindi.mp3 differ diff --git a/client/public/assets/audios/biometric-update-english.mp3 b/client/public/assets/audios/biometric-update-english.mp3 new file mode 100644 index 0000000..0a9d769 Binary files /dev/null and b/client/public/assets/audios/biometric-update-english.mp3 differ diff --git a/client/public/assets/audios/biometric-update-hindi.mp3 b/client/public/assets/audios/biometric-update-hindi.mp3 new file mode 100644 index 0000000..263abf0 Binary files /dev/null and b/client/public/assets/audios/biometric-update-hindi.mp3 differ diff --git a/client/public/assets/audios/check-status-main-screen-english.mp3 b/client/public/assets/audios/check-status-main-screen-english.mp3 new file mode 100644 index 0000000..3a286bf Binary files /dev/null and b/client/public/assets/audios/check-status-main-screen-english.mp3 differ diff --git a/client/public/assets/audios/check-status-main-screen-hindi.mp3 b/client/public/assets/audios/check-status-main-screen-hindi.mp3 new file mode 100644 index 0000000..5319019 Binary files /dev/null and b/client/public/assets/audios/check-status-main-screen-hindi.mp3 differ diff --git a/client/public/assets/audios/choose-demographic-or-biometric-english.mp3 b/client/public/assets/audios/choose-demographic-or-biometric-english.mp3 new file mode 100644 index 0000000..99a3471 Binary files /dev/null and b/client/public/assets/audios/choose-demographic-or-biometric-english.mp3 differ diff --git a/client/public/assets/audios/choose-demographic-or-biometric-hindi.mp3 b/client/public/assets/audios/choose-demographic-or-biometric-hindi.mp3 new file mode 100644 index 0000000..fa70e0d Binary files /dev/null and b/client/public/assets/audios/choose-demographic-or-biometric-hindi.mp3 differ diff --git a/client/public/assets/audios/demographic-personal-details-to-be-updated-english.mp3 b/client/public/assets/audios/demographic-personal-details-to-be-updated-english.mp3 new file mode 100644 index 0000000..e47a633 Binary files /dev/null and b/client/public/assets/audios/demographic-personal-details-to-be-updated-english.mp3 differ diff --git a/client/public/assets/audios/demographic-personal-details-to-be-updated-hindi.mp3 b/client/public/assets/audios/demographic-personal-details-to-be-updated-hindi.mp3 new file mode 100644 index 0000000..d2c5c07 Binary files /dev/null and b/client/public/assets/audios/demographic-personal-details-to-be-updated-hindi.mp3 differ diff --git a/client/public/assets/audios/enrollment-steps-completion- hindi.mp3 b/client/public/assets/audios/enrollment-steps-completion- hindi.mp3 new file mode 100644 index 0000000..1d0b5e8 Binary files /dev/null and b/client/public/assets/audios/enrollment-steps-completion- hindi.mp3 differ diff --git a/client/public/assets/audios/enrollment-steps-completion-english.mp3 b/client/public/assets/audios/enrollment-steps-completion-english.mp3 new file mode 100644 index 0000000..82b9e42 Binary files /dev/null and b/client/public/assets/audios/enrollment-steps-completion-english.mp3 differ diff --git a/client/public/assets/audios/enter-aadhar-no-english.mp3 b/client/public/assets/audios/enter-aadhar-no-english.mp3 new file mode 100644 index 0000000..43cf014 Binary files /dev/null and b/client/public/assets/audios/enter-aadhar-no-english.mp3 differ diff --git a/client/public/assets/audios/enter-aadhar-no-hindi.mp3 b/client/public/assets/audios/enter-aadhar-no-hindi.mp3 new file mode 100644 index 0000000..3ef7abe Binary files /dev/null and b/client/public/assets/audios/enter-aadhar-no-hindi.mp3 differ diff --git a/client/public/assets/audios/main-screen-english.mp3 b/client/public/assets/audios/main-screen-english.mp3 new file mode 100644 index 0000000..67d56a7 Binary files /dev/null and b/client/public/assets/audios/main-screen-english.mp3 differ diff --git a/client/public/assets/audios/main-screen-hindi.mp3 b/client/public/assets/audios/main-screen-hindi.mp3 new file mode 100644 index 0000000..87225c3 Binary files /dev/null and b/client/public/assets/audios/main-screen-hindi.mp3 differ diff --git a/client/public/assets/audios/mobile-and-email-id-english.mp3 b/client/public/assets/audios/mobile-and-email-id-english.mp3 new file mode 100644 index 0000000..c2183fa Binary files /dev/null and b/client/public/assets/audios/mobile-and-email-id-english.mp3 differ diff --git a/client/public/assets/audios/mobile-and-email-id-hindi.mp3 b/client/public/assets/audios/mobile-and-email-id-hindi.mp3 new file mode 100644 index 0000000..dd5144d Binary files /dev/null and b/client/public/assets/audios/mobile-and-email-id-hindi.mp3 differ diff --git a/client/public/assets/audios/otp-verification-english.mp3 b/client/public/assets/audios/otp-verification-english.mp3 new file mode 100644 index 0000000..e326920 Binary files /dev/null and b/client/public/assets/audios/otp-verification-english.mp3 differ diff --git a/client/public/assets/audios/otp-verification-hindi.mp3 b/client/public/assets/audios/otp-verification-hindi.mp3 new file mode 100644 index 0000000..5f1e83f Binary files /dev/null and b/client/public/assets/audios/otp-verification-hindi.mp3 differ diff --git a/client/public/assets/audios/personal-details-english.mp3 b/client/public/assets/audios/personal-details-english.mp3 new file mode 100644 index 0000000..f2ff785 Binary files /dev/null and b/client/public/assets/audios/personal-details-english.mp3 differ diff --git a/client/public/assets/audios/personal-details-hindi.mp3 b/client/public/assets/audios/personal-details-hindi.mp3 new file mode 100644 index 0000000..ca7b56d Binary files /dev/null and b/client/public/assets/audios/personal-details-hindi.mp3 differ diff --git a/client/public/assets/audios/photograph-update-english.mp3 b/client/public/assets/audios/photograph-update-english.mp3 new file mode 100644 index 0000000..103899d Binary files /dev/null and b/client/public/assets/audios/photograph-update-english.mp3 differ diff --git a/client/public/assets/audios/photograph-update-hindi.mp3 b/client/public/assets/audios/photograph-update-hindi.mp3 new file mode 100644 index 0000000..103899d Binary files /dev/null and b/client/public/assets/audios/photograph-update-hindi.mp3 differ diff --git a/client/public/assets/audios/update-document-english.mp3 b/client/public/assets/audios/update-document-english.mp3 new file mode 100644 index 0000000..e705465 Binary files /dev/null and b/client/public/assets/audios/update-document-english.mp3 differ diff --git a/client/public/assets/audios/update-document-hindi.mp3 b/client/public/assets/audios/update-document-hindi.mp3 new file mode 100644 index 0000000..6eaef7a Binary files /dev/null and b/client/public/assets/audios/update-document-hindi.mp3 differ diff --git a/client/public/assets/audios/update-message-notification-english.mp3 b/client/public/assets/audios/update-message-notification-english.mp3 new file mode 100644 index 0000000..4e7b702 Binary files /dev/null and b/client/public/assets/audios/update-message-notification-english.mp3 differ diff --git a/client/public/assets/audios/update-message-notification-hindi.mp3 b/client/public/assets/audios/update-message-notification-hindi.mp3 new file mode 100644 index 0000000..d17a3e3 Binary files /dev/null and b/client/public/assets/audios/update-message-notification-hindi.mp3 differ diff --git a/client/public/assets/audios/your-aadhar-enrollment-status-approved-english.mp3 b/client/public/assets/audios/your-aadhar-enrollment-status-approved-english.mp3 new file mode 100644 index 0000000..df74357 Binary files /dev/null and b/client/public/assets/audios/your-aadhar-enrollment-status-approved-english.mp3 differ diff --git a/client/public/assets/audios/your-aadhar-enrollment-status-approved-hindi.mp3 b/client/public/assets/audios/your-aadhar-enrollment-status-approved-hindi.mp3 new file mode 100644 index 0000000..c989fdc Binary files /dev/null and b/client/public/assets/audios/your-aadhar-enrollment-status-approved-hindi.mp3 differ diff --git a/client/public/assets/audios/your-aadhar-enrollment-status-pending-english.mp3 b/client/public/assets/audios/your-aadhar-enrollment-status-pending-english.mp3 new file mode 100644 index 0000000..51488a3 Binary files /dev/null and b/client/public/assets/audios/your-aadhar-enrollment-status-pending-english.mp3 differ diff --git a/client/public/assets/audios/your-aadhar-enrollment-status-pending-hindi.mp3 b/client/public/assets/audios/your-aadhar-enrollment-status-pending-hindi.mp3 new file mode 100644 index 0000000..b733490 Binary files /dev/null and b/client/public/assets/audios/your-aadhar-enrollment-status-pending-hindi.mp3 differ 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')} +