Skip to content

Added all the Form enhancements #640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added all the Form enhancements #640

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
416d5df
Added all the Form enhancements
DantrazTrev Oct 4, 2020
13a5ec3
Updated to fix the errors in checks
DantrazTrev Oct 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 36 additions & 4 deletions src/auth/signup-form/signup-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ class SignUpForm extends Component {
cnfPassword: "",
error: { msg: "" },
isValidEmail: true,
isValidFirstName: true,
isValidLastName: true,
isValidPassword: true,
isValidPhone: true,
isValidDesc: true,
Expand Down Expand Up @@ -50,6 +52,8 @@ class SignUpForm extends Component {
isValidDesc,
isValidEmail,
isValidPassword,
isValidFirstName,
isValidLastName,
isValidPhone,
} = this.state;

Expand All @@ -58,8 +62,18 @@ class SignUpForm extends Component {
let validDesc = isValidDesc;
let validPhone = isValidPhone;
let matched = isMatched;
let validFirstName = isValidFirstName;
let validLastName = isValidLastName;

switch (fieldName) {
case "firstName": {
validFirstName = (value.match(/^[a-z][a-z]+[ ]{1}[a-z]*$/i) && value.length<15) ;
break;
}
case "LastName": {
validLastName = value.length<15 && value.match(/^[a-z]+/);
break;
}
case "email": {
validEmail = value.match(/^([\w.%+-]+)@([\w-]+\.)+([\w]{2,})$/i);
break;
Expand All @@ -69,11 +83,11 @@ class SignUpForm extends Component {
break;
}
case "phone": {
validPhone = value.length === 10;
validPhone = value.match(/^*(?:\+?(\d{1,3}))?[-. (]*(\d{3})[-. )]*(\d{3})[-. ]*(\d{4})(?: *x(\d+))?*$/);
break;
}
case "shortDescription": {
validDesc = value.length >= 10;
validDesc = value.length >= 10 && value<=250;
break;
}
case "cnfPassword": {
Expand All @@ -91,6 +105,8 @@ class SignUpForm extends Component {
isValidDesc: validDesc,
isValidPassword: validPass,
isValidPhone: validPhone,
isValidFirstName :validFirstName,
isvalidLastName :validLastName
},
this.validateForm
);
Expand All @@ -103,13 +119,17 @@ class SignUpForm extends Component {
isValidEmail,
isValidPassword,
isValidPhone,
isValidLastName,
isValidFirstName
} = this.state;

if (
isMatched &&
isValidDesc &&
isValidEmail &&
isValidPassword &&
isValidFirstName &&
isValidLastName &&
isValidPhone
) {
this.setState({ isValidForm: true });
Expand Down Expand Up @@ -167,6 +187,8 @@ class SignUpForm extends Component {
password,
cnfPassword,
isValidPassword,
isValidFirstName,
isValidLastName,
isValidEmail,
isValidPhone,
isValidDesc,
Expand All @@ -190,6 +212,11 @@ class SignUpForm extends Component {
onChange={this.onChange}
required
/>
<ul className="list-unstyled">
<li id="validation_msg">
{!isValidFirstName ? "Invalid Name!" : null}
</li>
</ul>
</Form.Group>
</Col>
<Col>
Expand All @@ -203,6 +230,11 @@ class SignUpForm extends Component {
onChange={this.onChange}
required
/>
<ul className="list-unstyled">
<li id="validation_msg">
{!isValidLastName ? "Invalid Name!" : null}
</li>
</ul>
</Form.Group>
</Col>
</Row>
Expand All @@ -229,7 +261,7 @@ class SignUpForm extends Component {
<Form.Group>
<Form.Label>Phone Number</Form.Label>
<Form.Control
type="number"
type="text"
placeholder="Phone"
name="phone"
value={phone}
Expand All @@ -256,7 +288,7 @@ class SignUpForm extends Component {
/>
<ul className="list-unstyled">
<li id="validation_msg">
{!isValidDesc ? "Should be at least 10 characters long!" : null}
{!isValidDesc ? "Should be at least 10 characters long and less then 250 charecters!" : null}
</li>
</ul>
</Form.Group>
Expand Down