maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-29 13:06:03 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

Validate email address format in email inputs

Browse source
This commit is contained in:
Kimmo Puputti 2017-10-03 11:28:32 +03:00
parent a897c71afd
commit e544ea8692
5 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/containers/ContactDetailsForm/ContactDetailsForm.js
View file

@ -78,6 +78,10 @@ class ContactDetailsFormComponent extends Component {
id: 'ContactDetailsForm.emailRequired',
});
const emailRequired = validators.required(emailRequiredMessage);
const emailInvalidMessage = intl.formatMessage({
id: 'ContactDetailsForm.emailInvalid',
});
const emailValid = validators.emailFormatValid(emailInvalidMessage);
const tooManyVerificationRequests = isTooManyEmailVerificationRequestsError(
sendVerificationEmailError
@ -210,7 +214,7 @@ class ContactDetailsFormComponent extends Component {
id={`${form}.email`}
label={emailLabel}
placeholder={emailPlaceholder}
validate={emailRequired}
validate={[emailRequired, emailValid]}
customErrorText={emailTakenErrorText}
/>
{emailVerifiedInfo}

6
src/containers/LoginForm/LoginForm.js
View file

@ -31,6 +31,10 @@ const LoginFormComponent = props => {
id: 'LoginForm.emailRequired',
});
const emailRequired = validators.required(emailRequiredMessage);
const emailInvalidMessage = intl.formatMessage({
id: 'LoginForm.emailInvalid',
});
const emailValid = validators.emailFormatValid(emailInvalidMessage);
// password
const passwordLabel = intl.formatMessage({
@ -64,7 +68,7 @@ const LoginFormComponent = props => {
id={`${form}.email`}
label={emailLabel}
placeholder={emailPlaceholder}
validate={emailRequired}
validate={[emailRequired, emailValid]}
/>
<TextInputField
className={css.password}

7
src/containers/PasswordRecoveryForm/PasswordRecoveryForm.js
View file

@ -36,8 +36,13 @@ const PasswordRecoveryFormComponent = props => {
const emailNotFoundMessage = intl.formatMessage({
id: 'PasswordRecoveryForm.emailNotFound',
});
const emailInvalidMessage = intl.formatMessage({
id: 'PasswordRecoveryForm.emailInvalid',
});
const emailRequired = validators.required(emailRequiredMessage);
const emailValid = validators.emailFormatValid(emailInvalidMessage);
// In case a given email is not found, pass a custom error message
// to be rendered with the input component
const customErrorText = isPasswordRecoveryEmailNotFoundError(recoveryError)
@ -64,7 +69,7 @@ const PasswordRecoveryFormComponent = props => {
id={`${form}.email`}
label={emailLabel}
placeholder={emailPlaceholder}
validate={emailRequired}
validate={[emailRequired, emailValid]}
customErrorText={customErrorText}
/>

6
src/containers/SignupForm/SignupForm.js
View file

@ -31,6 +31,10 @@ const SignupFormComponent = props => {
id: 'SignupForm.emailRequired',
});
const emailRequired = validators.required(emailRequiredMessage);
const emailInvalidMessage = intl.formatMessage({
id: 'SignupForm.emailInvalid',
});
const emailValid = validators.emailFormatValid(emailInvalidMessage);
// password
const passwordLabel = intl.formatMessage({
@ -106,7 +110,7 @@ const SignupFormComponent = props => {
id={`${form}.email`}
label={emailLabel}
placeholder={emailPlaceholder}
validate={emailRequired}
validate={[emailRequired, emailValid]}
/>
<div className={css.name}>
<TextInputField

8
src/translations/en.json
View file

@ -50,6 +50,7 @@
"CheckoutPage.title": "Book {listingTitle}",
"ContactDetailsForm.confirmChangesInfo": "To change your email, you need to enter your current password.",
"ContactDetailsForm.confirmChangesTitle": "Confirm your changes",
"ContactDetailsForm.emailInvalid": "A valid email address is required",
"ContactDetailsForm.emailLabel": "Your email",
"ContactDetailsForm.emailRequired": "Email is required",
"ContactDetailsForm.emailSent": "Verification email sent!",
@ -166,8 +167,8 @@
"InboxPage.statePending": "Pending",
"InboxPage.stateRequested": "Requested",
"InboxPage.title": "Inbox",
"LandingPage.schemaTitle": "Book saunas everywhere",
"LandingPage.schemaDescription": "You can book a sauna from Saunatime or get some income by sharing your own sauna",
"LandingPage.schemaTitle": "Book saunas everywhere",
"ListingCard.hostedBy": "Hosted by {authorName}.",
"ListingCard.perNight": "per night",
"ListingCard.unsupportedPrice": "({currency})",
@ -190,6 +191,7 @@
"ListingPage.ownListing": "This is your own listing.",
"ListingPage.perNight": "per night",
"ListingPage.viewImagesButton": "View photos ({count})",
"LoginForm.emailInvalid": "A valid email address is required",
"LoginForm.emailLabel": "Email",
"LoginForm.emailPlaceholder": "john.doe@example.com",
"LoginForm.emailRequired": "This field is required",
@ -264,6 +266,7 @@
"PasswordChangePage.emailTabTitle": "Email",
"PasswordChangePage.passwordTabTitle": "Password",
"PasswordChangePage.title": "Password settings",
"PasswordRecoveryForm.emailInvalid": "A valid email address is required",
"PasswordRecoveryForm.emailLabel": "Email",
"PasswordRecoveryForm.emailNotFound": "Hmm. We didn't find an account with that email. Please double-check your email and try again.",
"PasswordRecoveryForm.emailPlaceholder": "john.doe@example.com",
@ -393,11 +396,12 @@
"SearchPage.loadingResults": "Loading search results…",
"SearchPage.noResults": "Could not find any listings.",
"SearchPage.openMapView": "Map view",
"SearchPage.schemaTitle": "Saunatime | search saunas everywhere",
"SearchPage.schemaDescription": "Showing search results",
"SearchPage.schemaTitle": "Saunatime | search saunas everywhere",
"SearchPage.searchError": "Search failed. Please try again.",
"SearchResultsPanel.nextPage": "Next page",
"SearchResultsPanel.previousPage": "Previous page",
"SignupForm.emailInvalid": "A valid email address is required",
"SignupForm.emailLabel": "Email",
"SignupForm.emailPlaceholder": "john.doe@example.com",
"SignupForm.emailRequired": "You need to add an email.",