From ce40b4240d7d23d4a6817dea1a6bc45546419718 Mon Sep 17 00:00:00 2001 From: Blaster4385 Date: Thu, 25 Aug 2022 22:57:19 +0530 Subject: Kaand number 2 --- client/src/components/Header/Header.module.css | 4 +- .../src/components/LabelCard/LabelCard.module.css | 2 + .../components/UpdateInput/UpdateInput.module.css | 19 +++++---- client/src/index.css | 6 +++ client/src/pages/Enrollment/Address/Address.jsx | 5 ++- .../pages/Enrollment/Address/Address.module.css | 4 ++ .../src/pages/Enrollment/Agreement/Agreement.jsx | 6 +-- .../Enrollment/DocumentScanner/DocumentScanner.jsx | 10 ++--- .../DocumentScanner/DocumentScanner.module.css | 4 ++ .../pages/Enrollment/Fingerprint/Fingerprint.jsx | 4 +- client/src/pages/Enrollment/FormOne/FormOne.jsx | 41 +++++++++++------- .../pages/Enrollment/FormOne/FormOne.module.css | 5 +++ client/src/pages/Enrollment/IrisScan/IrisScan.jsx | 4 +- .../pages/Enrollment/PhotoCapture/PhotoCapture.jsx | 6 ++- .../PhotoCapture/PhotoCapture.module.css | 2 +- client/src/pages/Update/Address/Address.jsx | 11 ++--- client/src/pages/Update/Address/Address.module.css | 4 ++ .../Update/DocumentScanner/DocumentScanner.jsx | 6 +-- .../DocumentScanner/DocumentScanner.module.css | 8 ++++ client/src/pages/Update/FormOne/FormOne.jsx | 49 +++++++++++++++------- client/src/pages/Update/FormOne/FormOne.module.css | 8 ++++ 21 files changed, 143 insertions(+), 65 deletions(-) diff --git a/client/src/components/Header/Header.module.css b/client/src/components/Header/Header.module.css index daf82ef..ade1e6f 100644 --- a/client/src/components/Header/Header.module.css +++ b/client/src/components/Header/Header.module.css @@ -16,6 +16,6 @@ } .header__image { - width: 250px; - height: 250px; + width: 150px; + height: 150px; } diff --git a/client/src/components/LabelCard/LabelCard.module.css b/client/src/components/LabelCard/LabelCard.module.css index 8511596..3b80827 100644 --- a/client/src/components/LabelCard/LabelCard.module.css +++ b/client/src/components/LabelCard/LabelCard.module.css @@ -12,6 +12,8 @@ .card__image { border: 3px solid var(--color-black); border-radius: 10px; + width: 158px; + height: 158px; } .card__title { diff --git a/client/src/components/UpdateInput/UpdateInput.module.css b/client/src/components/UpdateInput/UpdateInput.module.css index d4d7ee5..391937d 100644 --- a/client/src/components/UpdateInput/UpdateInput.module.css +++ b/client/src/components/UpdateInput/UpdateInput.module.css @@ -1,8 +1,13 @@ +.input__edit { + display: flex; + flex-direction: row; +} + .input { display: flex; justify-content: center; font-family: 'Barlow'; - font-size: var(--font-medium-s); + font-size: 1.75rem; } .input__container { @@ -10,16 +15,12 @@ flex-direction: column; } -.input__edit { - display: flex; - flex-direction: row; -} - .input__field { - width: 330px; + width: 500px; + height: 80px; margin: 10px 0px; padding: 18px 10px; border: 3px solid; border-radius: 10px; - font-size: 1rem; -} + font-size: 1.5rem; +} \ No newline at end of file diff --git a/client/src/index.css b/client/src/index.css index 4a8cd4f..ccca7a6 100644 --- a/client/src/index.css +++ b/client/src/index.css @@ -24,3 +24,9 @@ code { font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace; } + +.MuiOutlinedInput-input { + border: none !important; + border-color: aqua; + font-size: 1.5rem !important; +} diff --git a/client/src/pages/Enrollment/Address/Address.jsx b/client/src/pages/Enrollment/Address/Address.jsx index fc27448..cb2db5a 100644 --- a/client/src/pages/Enrollment/Address/Address.jsx +++ b/client/src/pages/Enrollment/Address/Address.jsx @@ -29,10 +29,11 @@ const Address = () => { const customStyles = { control: (base) => ({ ...base, - width: '330px', - height: '60px', + width: '500px', + height: '80px', margin: '10px 0px', border: '3px solid', + fontSize: '1.5rem', borderRadius: '10px !important' }), input: (base) => ({ diff --git a/client/src/pages/Enrollment/Address/Address.module.css b/client/src/pages/Enrollment/Address/Address.module.css index eafa781..612d233 100644 --- a/client/src/pages/Enrollment/Address/Address.module.css +++ b/client/src/pages/Enrollment/Address/Address.module.css @@ -15,3 +15,7 @@ font-family: 'Barlow'; font-size: var(--font-medium-s); } + +.input__container label { + font-size: 1.75rem; +} diff --git a/client/src/pages/Enrollment/Agreement/Agreement.jsx b/client/src/pages/Enrollment/Agreement/Agreement.jsx index 5b7950b..704b0d5 100644 --- a/client/src/pages/Enrollment/Agreement/Agreement.jsx +++ b/client/src/pages/Enrollment/Agreement/Agreement.jsx @@ -46,7 +46,7 @@ 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 ( <> @@ -73,14 +73,14 @@ const Agreement = ({ unverified, setUnverified }) => { />
- {t('PLEASE_VERIFY_YOUR_IDENTITY')} + {t('PLEASE_VERIFY_YOUR_IDENTITY')} @@ -48,6 +49,7 @@ const Fingerprint = () => { size="large" type="submit" variant="contained" + sx={{ margin: '20px 0px', fontSize: '1.5rem', padding: '10px 30px' }} > {t('RESET')} @@ -56,7 +58,7 @@ const Fingerprint = () => {

- + {t('PLEASE_PUT_YOUR_FINGERS_ON_THE_FINGERPRINT_SCANNER')}
{t('WAIT_FOR_PROMPT_AND_BEEP_SOUND_TO_REMOVE_YOUR_FINGERS')} diff --git a/client/src/pages/Enrollment/FormOne/FormOne.jsx b/client/src/pages/Enrollment/FormOne/FormOne.jsx index da05ed4..4b588b0 100644 --- a/client/src/pages/Enrollment/FormOne/FormOne.jsx +++ b/client/src/pages/Enrollment/FormOne/FormOne.jsx @@ -78,7 +78,7 @@ const FormOne = () => { }} required /> - + { }} required /> - @@ -158,19 +158,30 @@ const FormOne = () => {
- - { - setUserData({ - ...userData, - dob: e - }) - }} - renderInput={(params) => } - /> - +
+ + { + setUserData({ + ...userData, + dob: e + }) + }} + renderInput={(params) => } + /> + +
{/* { size="large" type="submit" variant="contained" + sx={{ fontSize: '1.5rem', padding: '10px 30px' }} > {t('SCAN')} @@ -48,6 +49,7 @@ const IrisScan = () => { size="large" type="submit" variant="contained" + sx={{ fontSize: '1.5rem', padding: '10px 30px' }} > {t('RESET')} @@ -56,7 +58,7 @@ const IrisScan = () => {

- + {t('PLEASE_PUT_YOUR_EYES_INSIDE_THE_IRIS_SCANNER')}
{t('WAIT_FOR_PROMPT_AND_BEEP_SOUND_TO_REMOVE_YOUR_EYES')} diff --git a/client/src/pages/Enrollment/PhotoCapture/PhotoCapture.jsx b/client/src/pages/Enrollment/PhotoCapture/PhotoCapture.jsx index fd5a051..b5a800b 100644 --- a/client/src/pages/Enrollment/PhotoCapture/PhotoCapture.jsx +++ b/client/src/pages/Enrollment/PhotoCapture/PhotoCapture.jsx @@ -20,7 +20,7 @@ const PhotoCapture = () => { setUserData({ ...userData, photo: imageSrc }) }) - 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 ( <> @@ -61,6 +61,7 @@ const PhotoCapture = () => { size="large" type="submit" variant="contained" + sx={{ fontSize: '1.5rem', padding: '10px 30px' }} onClick={(e) => { e.preventDefault() capture() @@ -75,6 +76,7 @@ const PhotoCapture = () => { size="large" type="submit" variant="contained" + sx={{ fontSize: '1.5rem', padding: '10px 48px' }} onClick={(e) => { e.preventDefault() setUserData({ ...userData, photo: '' }) @@ -87,7 +89,7 @@ const PhotoCapture = () => {

- + {t('PLEASE_LOOK_INTO_THE_CAMERA')}

{t('CLICK_CAPTURE_TO_CAPTURE_THE_PHOTO')} diff --git a/client/src/pages/Enrollment/PhotoCapture/PhotoCapture.module.css b/client/src/pages/Enrollment/PhotoCapture/PhotoCapture.module.css index a1ff9c0..ad193e1 100644 --- a/client/src/pages/Enrollment/PhotoCapture/PhotoCapture.module.css +++ b/client/src/pages/Enrollment/PhotoCapture/PhotoCapture.module.css @@ -2,4 +2,4 @@ display: flex; justify-content: center; margin: 10px; -} +} \ No newline at end of file diff --git a/client/src/pages/Update/Address/Address.jsx b/client/src/pages/Update/Address/Address.jsx index 39d3f13..ad0c023 100644 --- a/client/src/pages/Update/Address/Address.jsx +++ b/client/src/pages/Update/Address/Address.jsx @@ -29,11 +29,12 @@ const Address = () => { const customStyles = { control: (base) => ({ ...base, - width: '330px', - height: '60px', + width: '500px', + height: '80px', margin: '10px 0px', border: '3px solid', - borderRadius: '10px !important' + borderRadius: '10px !important', + fontSize: '1.5rem' }), input: (base) => ({ ...base, @@ -106,7 +107,7 @@ const Address = () => { placeholder={t('ENTER_YOUR_VILLAGE_TOWN')} />
- +
{ {activeStep === steps.length ? ( steps.length === 0 ? ( - <> +
{t("YOU_HAVEN'T_UPDATED_ANYTHING")} - + {t('YOU_MAY_EITHER_UPDATE_OR_MOVE_TO_NEXT_STEP')} - +
) : ( {t('ALL_STEPS_COMPLETED')} diff --git a/client/src/pages/Update/DocumentScanner/DocumentScanner.module.css b/client/src/pages/Update/DocumentScanner/DocumentScanner.module.css index f73d192..87c9380 100644 --- a/client/src/pages/Update/DocumentScanner/DocumentScanner.module.css +++ b/client/src/pages/Update/DocumentScanner/DocumentScanner.module.css @@ -48,3 +48,11 @@ display: flex; align-items: center; } + +.typo__container { + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + margin-top: 180px; +} \ No newline at end of file diff --git a/client/src/pages/Update/FormOne/FormOne.jsx b/client/src/pages/Update/FormOne/FormOne.jsx index fc7ec1c..730f2cd 100644 --- a/client/src/pages/Update/FormOne/FormOne.jsx +++ b/client/src/pages/Update/FormOne/FormOne.jsx @@ -7,6 +7,10 @@ import Gender from '../../../components/Gender/Gender' import { useTranslation } from 'react-i18next' import { userContext } from '../../../context/User' import PopUpModal from '../../../components/Modal/Modal' +import { MobileDatePicker } from '@mui/x-date-pickers/MobileDatePicker' +import { TextField } from '@mui/material' +import { AdapterMoment } from '@mui/x-date-pickers/AdapterMoment' +import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider' const FormOne = () => { const { userData, setUserData } = userContext() @@ -78,23 +82,36 @@ const FormOne = () => { />
- +
- { - setUserData({ - ...userData, - dob: e.target.value - }) - }} - required - /> +
+
+ + { + setUserData({ + ...userData, + dob: e + }) + }} + renderInput={(params) => } + /> + +
+
diff --git a/client/src/pages/Update/FormOne/FormOne.module.css b/client/src/pages/Update/FormOne/FormOne.module.css index e0cff0e..e186de8 100644 --- a/client/src/pages/Update/FormOne/FormOne.module.css +++ b/client/src/pages/Update/FormOne/FormOne.module.css @@ -45,3 +45,11 @@ display: flex; flex-direction: row; } + +.dob { + border : none; +} + +.label { + font-size: 1.75rem; +} \ No newline at end of file -- cgit v1.2.3-73-gaa49b