- {hasError &&
{errorText.error}}
-
-
-
-
+
+ {/* login with end */}
+
+ {/* or end */}
-
-
-
+ {hasError &&
{errorText}}
+
+
+
+
+
+
+
+
+
+
+
+ {/* input end */}
+
+
+ this.props.fields.remember.onChange(!this.props.fields.remember.value)}
+ id="remember"
+ >
+ Remember me
+
+
+
-
- {/* input end */}
-
-
-
this.props.fields.remember.onChange(!this.props.fields.remember.value)}
- id="remember"
+
+
+
+
+
+ }
+ { this.state.showForgetPassword === true &&
+
-
-
-
-
-
+
+ }
-
-
);
}
}
LogInModal.propTypes = {
- handleSubmit: PropTypes.func.isRequired,
+ handleSubmit: PropTypes.func,
fields: PropTypes.object,
- handleLoggedIn: PropTypes.func.isRequired,
- loggedUser: PropTypes.bool,
+ loginAction: PropTypes.func.isRequired,
hasError: PropTypes.bool,
errorText: PropTypes.string,
};
@@ -183,9 +239,21 @@ const fields = ['remember', 'email', 'password', 'emailUp', 'passwordUp'];
const validate = (values) => {
const errors = {};
+ if (!values.emailUp && !values.email) {
+ errors.emailUp = 'Email is required';
+ } else if (!EMAIL_REGEX.test(values.emailUp) && !values.email) {
+ errors.emailUp = 'Invalid email address';
+ }
+
+ if (errors.emailUp && (values.emailUp || values.email)) {
+ return errors;
+ } else if (values.emailUp) {
+ return errors;
+ }
+
if (!values.email) {
errors.email = 'Email is required';
- } else if (!/^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i.test(values.email)) {
+ } else if (!EMAIL_REGEX.test(values.email)) {
errors.email = 'Invalid email address';
}
if (!values.password) {
diff --git a/src/routes/Home/components/SignupModal/SignupModal.jsx b/src/routes/Home/components/SignupModal/SignupModal.jsx
index 213d6e6..f51bf4b 100644
--- a/src/routes/Home/components/SignupModal/SignupModal.jsx
+++ b/src/routes/Home/components/SignupModal/SignupModal.jsx
@@ -6,6 +6,8 @@ import Modal from 'react-modal';
import Button from 'components/Button';
import TextField from 'components/TextField';
import styles from './SignupModal.scss';
+import {defaultAuth0Service} from '../../../../services/AuthService';
+import {toastr} from 'react-redux-toastr';
/*
* customStyles
@@ -79,6 +81,32 @@ class SignupModal extends React.Component {
}, 100);
}
+ /**
+ * Login using google social network,
+ * this method internally uses auth0 service
+ */
+ googleLogin() {
+ defaultAuth0Service.login({connection: 'google-oauth2'}, (error) => {
+ if (error) {
+ const message = error.message || 'something went wrong, please try again';
+ toastr.error(message);
+ }
+ });
+ }
+
+ /**
+ * Login using facebook social network,
+ * this method internally uses auth0 service
+ */
+ facebookLogin() {
+ defaultAuth0Service.login({connection: 'facebook'}, (error) => {
+ if (error) {
+ const message = error.message || 'something went wrong, please try again';
+ toastr.error(message);
+ }
+ });
+ }
+
render() {
const {handleSubmit, fields, handleSigned, signedUser, hasError, errorText} = this.props;
@@ -103,14 +131,14 @@ class SignupModal extends React.Component {