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/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 ++ 12 files changed, 140 insertions(+), 38 deletions(-) (limited to 'client/src/pages/Update') diff --git a/client/src/pages/Update/Address/Address.jsx b/client/src/pages/Update/Address/Address.jsx index ad0c023..29c2fda 100644 --- a/client/src/pages/Update/Address/Address.jsx +++ b/client/src/pages/Update/Address/Address.jsx @@ -8,6 +8,7 @@ import PopUpModal from '../../../components/Modal/Modal' import { useTranslation } from 'react-i18next' import { userContext } from '../../../context/User' import styles from './Address.module.css' +import AudioAutoplay from '../../../components/AudioAutoplay/AudioAutoplay' const Address = () => { const { userData, setUserData } = userContext() @@ -56,18 +57,29 @@ const Address = () => { setEditable2(!editable2) } - const description = ['UPDATE_THE_REQUIRED_DETAILS_IN_THE_RELEVANT_FIELDS_BY_CLICKING_THE_EDIT_BUTTON', 'IF_REQUIRED_SELECT_THE_STATE_YOU_BELONG_TO_FROM_THE_DROPDOWN_LIST', 'IF_REQUIRED_SELECT_THE_DISTRICT_YOU_BELONG_TO_FROM_THE_DROPDOWN_LIST_THIS_WONT_SHOW_ANY_OPTIONS_UNTIL_YOU_HAVE_SELECTED_THE_STATE'] + const description = [ + 'UPDATE_THE_REQUIRED_DETAILS_IN_THE_RELEVANT_FIELDS_BY_CLICKING_THE_EDIT_BUTTON', + 'IF_REQUIRED_SELECT_THE_STATE_YOU_BELONG_TO_FROM_THE_DROPDOWN_LIST', + 'IF_REQUIRED_SELECT_THE_DISTRICT_YOU_BELONG_TO_FROM_THE_DROPDOWN_LIST_THIS_WONT_SHOW_ANY_OPTIONS_UNTIL_YOU_HAVE_SELECTED_THE_STATE' + ] return ( <>
+
    - {description.map((item) => (
  • {t(item)}
    • ))} + {description.map((item) => ( +
  • + {t(item)} +
    • + ))}
} diff --git a/client/src/pages/Update/Agreement/Agreement.jsx b/client/src/pages/Update/Agreement/Agreement.jsx index 720d8a0..8de9738 100644 --- a/client/src/pages/Update/Agreement/Agreement.jsx +++ b/client/src/pages/Update/Agreement/Agreement.jsx @@ -15,6 +15,7 @@ import PopUpModal from '../../../components/Modal/Modal' import 'react-toastify/dist/ReactToastify.css' import Error from '../../Error/Error' import Spinner from '../../../components/Spinner/Spinner' +import AudioAutoplay from '../../../components/AudioAutoplay/AudioAutoplay' const Agreement = () => { const { t } = useTranslation() @@ -36,7 +37,7 @@ const Agreement = () => { }) }, onLoading: () => { - return + return }, onError: () => { return @@ -81,7 +82,12 @@ const Agreement = () => { }, 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 ( <> @@ -91,13 +97,20 @@ const Agreement = () => { theme={'colored'} />
+
    - {description.map((item) => (
  • {t(item)}
    • ))} + {description.map((item) => ( +
  • + {t(item)} +
    • + ))}
} diff --git a/client/src/pages/Update/BiometricSelect/BiometricSelect.jsx b/client/src/pages/Update/BiometricSelect/BiometricSelect.jsx index 89d2bfb..cf6cae8 100644 --- a/client/src/pages/Update/BiometricSelect/BiometricSelect.jsx +++ b/client/src/pages/Update/BiometricSelect/BiometricSelect.jsx @@ -5,20 +5,31 @@ import SubmitButton from '../../../components/SubmitButton/SubmitButton' import { Link } from 'react-router-dom' import PopUpModal from '../../../components/Modal/Modal' import { useTranslation } from 'react-i18next' +import AudioAutoplay from '../../../components/AudioAutoplay/AudioAutoplay' const BiometricSelect = ({ page, setPage }) => { const { t } = useTranslation() - const description = ['CLICK_ON_THE_EDIT_BUTTON_TO_UPDATE_THE_REQUIRED_BIOMETRICS', 'YOU_CAN_EDIT_YOUR_PHOTOGRAPH_/_FINGERPRINTS_/_IRIS_SCANS'] + const description = [ + 'CLICK_ON_THE_EDIT_BUTTON_TO_UPDATE_THE_REQUIRED_BIOMETRICS', + 'YOU_CAN_EDIT_YOUR_PHOTOGRAPH_/_FINGERPRINTS_/_IRIS_SCANS' + ] return ( <>
+
    - {description.map((item) => (
  • {t(item)}
    • ))} + {description.map((item) => ( +
  • + {t(item)} +
    • + ))}
} diff --git a/client/src/pages/Update/DocumentScanner/DocumentScanner.jsx b/client/src/pages/Update/DocumentScanner/DocumentScanner.jsx index 4ee8a0a..86674af 100644 --- a/client/src/pages/Update/DocumentScanner/DocumentScanner.jsx +++ b/client/src/pages/Update/DocumentScanner/DocumentScanner.jsx @@ -9,6 +9,7 @@ import { useTranslation } from 'react-i18next' import { userContext } from '../../../context/User' import { toast } from 'react-toastify' import { useStyles } from './styles' +import AudioAutoplay from '../../../components/AudioAutoplay/AudioAutoplay' const DocumentScanner = () => { const { userData, oriUserData, setUserData } = userContext() @@ -199,30 +200,39 @@ const DocumentScanner = () => { return ( <>
- {steps.length !== 0 && ( -
    -
  • - {t('CONSISTS_OF_3_STEPS')} -
      -
    • {t('PROOF_OF_IDENTITY')}
      • -
    • {t(t('PROOF_OF_ADDRESS'))}
      • -
    • {t('PROOF_OF_DOB')}
      • -
    -
    • -
  • - {t('ENSURE_THAT_YOUR_DOCUMENTS_ARE_IN_THE_CENTER_OF_THE_FRAME')} -
    • -
  • - {t('YOU_WONT_BE_ABLE_TO_PROCEED_UNTIL_YOU_HAVE_SCANNED_ALL_THE_REQUIRED_DOCUMENTS')} -
    • -
- - } - />)} + + {steps.length !== 0 && ( + +
    +
  • + {t('CONSISTS_OF_3_STEPS')} +
      +
    • {t('PROOF_OF_IDENTITY')}
      • +
    • {t(t('PROOF_OF_ADDRESS'))}
      • +
    • {t('PROOF_OF_DOB')}
      • +
    +
    • +
  • + {t( + 'ENSURE_THAT_YOUR_DOCUMENTS_ARE_IN_THE_CENTER_OF_THE_FRAME' + )} +
    • +
  • + {t( + 'YOU_WONT_BE_ABLE_TO_PROCEED_UNTIL_YOU_HAVE_SCANNED_ALL_THE_REQUIRED_DOCUMENTS' + )} +
    • +
+ + } + /> + )}
diff --git a/client/src/pages/Update/FinalSlip/FinalSlip.jsx b/client/src/pages/Update/FinalSlip/FinalSlip.jsx index 4212be4..2014ce2 100644 --- a/client/src/pages/Update/FinalSlip/FinalSlip.jsx +++ b/client/src/pages/Update/FinalSlip/FinalSlip.jsx @@ -6,6 +6,7 @@ import { Grid, Typography } from '@mui/material' import { useTranslation } from 'react-i18next' import SubmitButton from '../../../components/SubmitButton/SubmitButton' import { useNavigate } from 'react-router-dom' +import AudioAutoplay from '../../../components/AudioAutoplay/AudioAutoplay' const FinalSlip = () => { const { t } = useTranslation() @@ -13,6 +14,9 @@ const FinalSlip = () => { return ( <>
+
{ const { t } = useTranslation() return ( <>
+ { } }, [userData.gender]) - const description = ['SELECT_YOUR_RESIDENCY_BY_SELECTING_THE_APPROPRIATE_CHECKBOX', 'ENTER_YOUR_FULL_NAME_WITHOUT_ANY_TITLE_OR_SALUTATION', 'SELECT_YOUR_GENDER_BY_CLICKING_ON_THE_APPROPRIATE_CARD', 'SELECT_YOUR_DATE_OF_BIRTH_FROM_THE_PROVIDED_CALENDER'] + const description = [ + 'SELECT_YOUR_RESIDENCY_BY_SELECTING_THE_APPROPRIATE_CHECKBOX', + 'ENTER_YOUR_FULL_NAME_WITHOUT_ANY_TITLE_OR_SALUTATION', + 'SELECT_YOUR_GENDER_BY_CLICKING_ON_THE_APPROPRIATE_CARD', + 'SELECT_YOUR_DATE_OF_BIRTH_FROM_THE_PROVIDED_CALENDER' + ] return ( <>
+
    - {description.map((item) => (
  • {t(item)}
    • ))} + {description.map((item) => ( +
  • + {t(item)} +
    • + ))}
} diff --git a/client/src/pages/Update/IrisScan/IrisScan.jsx b/client/src/pages/Update/IrisScan/IrisScan.jsx index 05a34b3..f27ef59 100644 --- a/client/src/pages/Update/IrisScan/IrisScan.jsx +++ b/client/src/pages/Update/IrisScan/IrisScan.jsx @@ -6,12 +6,14 @@ import { Button, Grid, Typography } from '@mui/material' import SubmitButton from '../../../components/SubmitButton/SubmitButton' import { useTranslation } from 'react-i18next' import PopUpModal from '../../../components/Modal/Modal' +import AudioAutoplay from '../../../components/AudioAutoplay/AudioAutoplay' const IrisScan = () => { const { t } = useTranslation() return ( <>
+ { } if (isLoading) { - return + return } if (isError) { @@ -75,7 +76,12 @@ const Otp = () => { setOriUserData(data?.data) } - 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 ( <> @@ -85,13 +91,20 @@ const Otp = () => { theme={'colored'} />
+
    - {description.map((item) => (
  • {t(item)}
    • ))} + {description.map((item) => ( +
  • + {t(item)} +
    • + ))}
} diff --git a/client/src/pages/Update/PhotoCapture/PhotoCapture.jsx b/client/src/pages/Update/PhotoCapture/PhotoCapture.jsx index 4fd4117..b53752c 100644 --- a/client/src/pages/Update/PhotoCapture/PhotoCapture.jsx +++ b/client/src/pages/Update/PhotoCapture/PhotoCapture.jsx @@ -9,6 +9,7 @@ import { Button, Grid, Typography } from '@mui/material' import { useTranslation } from 'react-i18next' import { userContext } from '../../../context/User' import PopUpModal from '../../../components/Modal/Modal' +import AudioAutoplay from '../../../components/AudioAutoplay/AudioAutoplay' const PhotoCapture = () => { const { t } = useTranslation() @@ -30,18 +31,29 @@ const PhotoCapture = () => { } } - const description = ['ENSURE_THAT_YOUR_PHOTO_IS_CLEAR_AND_IN_FOCUS', 'ALSO_ENSURE_THAT_YOU_ARE_IN_THE_CENTER_OF_YOUR_PHOTO', 'YOU_WONT_BE_ABLE_TO_PROCEED_UNTIL_YOU_HAVE_CAPTURED_A_CLEAR_AND_CENTERED_PHOTO'] + const description = [ + 'ENSURE_THAT_YOUR_PHOTO_IS_CLEAR_AND_IN_FOCUS', + 'ALSO_ENSURE_THAT_YOU_ARE_IN_THE_CENTER_OF_YOUR_PHOTO', + 'YOU_WONT_BE_ABLE_TO_PROCEED_UNTIL_YOU_HAVE_CAPTURED_A_CLEAR_AND_CENTERED_PHOTO' + ] return ( <>
+
    - {description.map((item) => (
  • {t(item)}
    • ))} + {description.map((item) => ( +
  • + {t(item)} +
    • + ))}
} diff --git a/client/src/pages/Update/Update.jsx b/client/src/pages/Update/Update.jsx index ecf1677..577573d 100644 --- a/client/src/pages/Update/Update.jsx +++ b/client/src/pages/Update/Update.jsx @@ -8,6 +8,7 @@ import { useNavigate } from 'react-router-dom' import { useTranslation } from 'react-i18next' import { ToastContainer, toast } from 'react-toastify' import { validAadhaar } from '../../constants/RegEx' +import AudioAutoplay from '../../components/AudioAutoplay/AudioAutoplay' const Update = () => { const { aadhaarNumber, setAadhaarNumber } = userContext() @@ -23,6 +24,9 @@ const Update = () => { theme={'colored'} />
+

{t('PROVIDE_YOUR_AADHAAR_NUMBER')} diff --git a/client/src/pages/Update/UpdateSelect/UpdateSelect.jsx b/client/src/pages/Update/UpdateSelect/UpdateSelect.jsx index 3b6a717..5143662 100644 --- a/client/src/pages/Update/UpdateSelect/UpdateSelect.jsx +++ b/client/src/pages/Update/UpdateSelect/UpdateSelect.jsx @@ -5,6 +5,7 @@ import Card from '../../../components/Card/Card' import Header from '../../../components/Header/Header' import SubmitButton from '../../../components/SubmitButton/SubmitButton' import { userContext } from '../../../context/User' +import AudioAutoplay from '../../../components/AudioAutoplay/AudioAutoplay' import styles from './UpdateSelect.module.css' @@ -14,6 +15,9 @@ const UpdateSelect = () => { return ( <>
+