summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlaster4385 <venkateshchaturvedi12@gmail.com>2022-08-16 16:35:00 +0530
committerBlaster4385 <venkateshchaturvedi12@gmail.com>2022-08-17 16:38:54 +0530
commita6489c671275fc9bf21ec6bdd7db4cb47da86f2c (patch)
treedb1e71104554c70a28ddd6dcb432716022599167
parent3e7f5cbd876b29c92fc1cda58aa54a9c591ef026 (diff)
Mega random super bullshit
-rw-r--r--client/public/assets/images/background.pngbin0 -> 93110 bytes
-rw-r--r--client/public/assets/images/next_icon.svg1
-rw-r--r--client/src/components/Header/Header.jsx4
-rw-r--r--client/src/components/Header/Header.module.css5
-rw-r--r--client/src/components/RadioSelect/RadioSelect.jsx0
-rw-r--r--client/src/components/RadioSelect/RadioSelect.module.css0
-rw-r--r--client/src/components/SubmitButton/SubmitButton.jsx2
-rw-r--r--client/src/constants/RegEx.js (renamed from client/src/components/RegEx/RegEx.jsx)0
-rw-r--r--client/src/index.css5
-rw-r--r--client/src/pages/Enrollment/Address/Address.jsx1
-rw-r--r--client/src/pages/Enrollment/Enrollment.jsx2
-rw-r--r--client/src/pages/Enrollment/FormOne/FormOne.jsx1
-rw-r--r--client/src/pages/Enrollment/FormTwo/FormTwo.jsx4
-rw-r--r--client/src/pages/Update/Demographic/Demographic.jsx2
14 files changed, 10 insertions, 17 deletions
diff --git a/client/public/assets/images/background.png b/client/public/assets/images/background.png
new file mode 100644
index 0000000..acf96a3
--- /dev/null
+++ b/client/public/assets/images/background.png
Binary files differ
diff --git a/client/public/assets/images/next_icon.svg b/client/public/assets/images/next_icon.svg
new file mode 100644
index 0000000..4e5714a
--- /dev/null
+++ b/client/public/assets/images/next_icon.svg
@@ -0,0 +1 @@
+<?xml version="1.0"?><svg fill="#609db3" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="192px" height="192px"> <path d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10C22,6.477,17.523,2,12,2z M10.25,16.321L10.25,16.321 c-0.414-0.414-0.414-1.086,0-1.5L13.071,12L10.25,9.179c-0.414-0.414-0.414-1.086,0-1.5l0,0c0.414-0.414,1.086-0.414,1.5,0 l3.614,3.614c0.391,0.391,0.391,1.024,0,1.414l-3.614,3.614C11.336,16.735,10.664,16.735,10.25,16.321z"/></svg> \ No newline at end of file
diff --git a/client/src/components/Header/Header.jsx b/client/src/components/Header/Header.jsx
index 1116312..d5e08c4 100644
--- a/client/src/components/Header/Header.jsx
+++ b/client/src/components/Header/Header.jsx
@@ -1,12 +1,10 @@
import React from 'react'
-import { useTranslation } from 'react-i18next'
import styles from './Header.module.css'
const Header = ({ subheading }) => {
- const { t } = useTranslation()
return (
<header className={styles.header}>
- <h1 className={styles.header__heading}>{t('AADHAAR')}</h1>
+ <img src={`${process.env.PUBLIC_URL}/favicon.ico`} />
<h3 className={styles.header__subheading}>{subheading}</h3>
</header>
)
diff --git a/client/src/components/Header/Header.module.css b/client/src/components/Header/Header.module.css
index 8e6084f..2214f1b 100644
--- a/client/src/components/Header/Header.module.css
+++ b/client/src/components/Header/Header.module.css
@@ -9,11 +9,6 @@
padding: 20px;
}
-.header__heading {
- font-size: var(--font-large);
- font-weight: 400;
-}
-
.header__subheading {
font-size: var(--font-medium);
font-weight: 400;
diff --git a/client/src/components/RadioSelect/RadioSelect.jsx b/client/src/components/RadioSelect/RadioSelect.jsx
deleted file mode 100644
index e69de29..0000000
--- a/client/src/components/RadioSelect/RadioSelect.jsx
+++ /dev/null
diff --git a/client/src/components/RadioSelect/RadioSelect.module.css b/client/src/components/RadioSelect/RadioSelect.module.css
deleted file mode 100644
index e69de29..0000000
--- a/client/src/components/RadioSelect/RadioSelect.module.css
+++ /dev/null
diff --git a/client/src/components/SubmitButton/SubmitButton.jsx b/client/src/components/SubmitButton/SubmitButton.jsx
index 6098f3c..bcf3543 100644
--- a/client/src/components/SubmitButton/SubmitButton.jsx
+++ b/client/src/components/SubmitButton/SubmitButton.jsx
@@ -7,7 +7,7 @@ const SubmitButton = ({ onClick, onChange }) => {
<button onClick={onClick} className={styles.submit} type="submit" onChange={onChange}>
<img
className={styles.submit__image}
- src={`${process.env.PUBLIC_URL}/assets/images/white-check.svg`}
+ src={`${process.env.PUBLIC_URL}/assets/images/next_icon.svg`}
alt=""
/>
</button>
diff --git a/client/src/components/RegEx/RegEx.jsx b/client/src/constants/RegEx.js
index fca28f1..fca28f1 100644
--- a/client/src/components/RegEx/RegEx.jsx
+++ b/client/src/constants/RegEx.js
diff --git a/client/src/index.css b/client/src/index.css
index 89ba707..27bb2c9 100644
--- a/client/src/index.css
+++ b/client/src/index.css
@@ -12,6 +12,11 @@ body {
-moz-osx-font-smoothing: grayscale;
height: 100%;
width: 100%;
+ background: url('../public/assets/images/background.png') no-repeat center center fixed;
+ -webkit-background-size: cover;
+ -moz-background-size: cover;
+ -o-background-size: cover;
+ background-size: cover;
}
code {
diff --git a/client/src/pages/Enrollment/Address/Address.jsx b/client/src/pages/Enrollment/Address/Address.jsx
index 571d7ad..b6c3809 100644
--- a/client/src/pages/Enrollment/Address/Address.jsx
+++ b/client/src/pages/Enrollment/Address/Address.jsx
@@ -206,7 +206,6 @@ const Address = ({ formData, setFormData }) => {
})
}}
placeholder={t('ENTER_YOUR_AREA_PINCODE')}
- pattern="[0-9]+"
/>
</div>
</div>
diff --git a/client/src/pages/Enrollment/Enrollment.jsx b/client/src/pages/Enrollment/Enrollment.jsx
index 76461d2..d4b0a2a 100644
--- a/client/src/pages/Enrollment/Enrollment.jsx
+++ b/client/src/pages/Enrollment/Enrollment.jsx
@@ -16,7 +16,7 @@ import {
validMobileNumber,
validPincode,
validString
-} from '../../components/RegEx/RegEx'
+} from '../../constants/RegEx'
import { createUser } from '../../services/apiservice'
import { useTranslation } from 'react-i18next'
diff --git a/client/src/pages/Enrollment/FormOne/FormOne.jsx b/client/src/pages/Enrollment/FormOne/FormOne.jsx
index dd336d8..c59621d 100644
--- a/client/src/pages/Enrollment/FormOne/FormOne.jsx
+++ b/client/src/pages/Enrollment/FormOne/FormOne.jsx
@@ -59,7 +59,6 @@ const FormOne = ({ formData, setFormData }) => {
})
}}
placeholder={t('ENTER_YOUR_FULL_NAME')}
- pattern="[a-zA-z]+"
/>
<div className={styles.formone__gender}>
diff --git a/client/src/pages/Enrollment/FormTwo/FormTwo.jsx b/client/src/pages/Enrollment/FormTwo/FormTwo.jsx
index 6bc6223..205b3d9 100644
--- a/client/src/pages/Enrollment/FormTwo/FormTwo.jsx
+++ b/client/src/pages/Enrollment/FormTwo/FormTwo.jsx
@@ -21,9 +21,6 @@ const FormTwo = ({ formData, setFormData }) => {
})
}}
placeholder={t('ENTER_YOUR_MOBILE_NUMBER')}
- pattern="[0-9]+"
- maxLength="10"
- minLength="10"
/>
<Input
id="email"
@@ -37,7 +34,6 @@ const FormTwo = ({ formData, setFormData }) => {
})
}}
placeholder={t('ENTER_YOUR_EMAIL_ID')}
- pattern="[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$"
/>
<SubmitButton />
</div>
diff --git a/client/src/pages/Update/Demographic/Demographic.jsx b/client/src/pages/Update/Demographic/Demographic.jsx
index 5be3e3b..6640cd3 100644
--- a/client/src/pages/Update/Demographic/Demographic.jsx
+++ b/client/src/pages/Update/Demographic/Demographic.jsx
@@ -10,7 +10,7 @@ import {
validMobileNumber,
validPincode,
validString
-} from '../../../components/RegEx/RegEx'
+} from '../../../constants/RegEx'
import UpdateSelect from '../UpdateSelect/UpdateSelect'
import { useTranslation } from 'react-i18next'
import { userContext } from '../../../context/User'