diff --git a/front-ui/app/actions/userActions.js b/front-ui/app/actions/userActions.js index 4224728..6b9ff7e 100644 --- a/front-ui/app/actions/userActions.js +++ b/front-ui/app/actions/userActions.js @@ -58,6 +58,8 @@ var UserActions = { actionType: UserConstants.USER_LOGIN }); + + superagent.post(globals.ApiUrl + '/user/login') .withCredentials() .send(loginDetails) diff --git a/front-ui/app/components/account/login.js b/front-ui/app/components/account/login.js index 8494f1c..b1d157f 100644 --- a/front-ui/app/components/account/login.js +++ b/front-ui/app/components/account/login.js @@ -31,7 +31,6 @@ var Login = React.createClass({ return { email: '', password: '', - errors: {}, login: UserStore.getLoginState() }; }, diff --git a/front-ui/app/components/account/register.js b/front-ui/app/components/account/register.js index efa3a43..c61217c 100644 --- a/front-ui/app/components/account/register.js +++ b/front-ui/app/components/account/register.js @@ -18,7 +18,6 @@ var Register = React.createClass({ email: '', password: '', passwordConfirmation: '', - errors: {}, registration: UserStore.getRegistrationState() }; }, diff --git a/front-ui/app/components/shared/mixins/ribicaValidationMixin.js b/front-ui/app/components/shared/mixins/ribicaValidationMixin.js index 86e66a7..e8bf0c1 100644 --- a/front-ui/app/components/shared/mixins/ribicaValidationMixin.js +++ b/front-ui/app/components/shared/mixins/ribicaValidationMixin.js @@ -11,7 +11,7 @@ var RibicaValidationMixin = { _validate: function(prop, value) { if(this.validations && this.validations[prop]) { var cb = function(err, revalidateFields) { - var errors = this.state.errors; + var errors = this.state.errors || {}; if (err !== undefined) { if(err.length > 0) { errors[prop] = err; @@ -44,7 +44,8 @@ var RibicaValidationMixin = { }, getValidationMessages:function(prop) { - return (this.state.errors[prop] || []); + var errors = this.state.errors || {}; + return (errors[prop] || []); }, validateField: function(field) { this._validate(field, this.state[field]); @@ -58,7 +59,8 @@ var RibicaValidationMixin = { return this.isValid(); }, isValid: function() { - return Object.keys(this.state.errors).length === 0; + var errors = this.state.errors || {}; + return Object.keys(errors).length === 0; }, componentDidMount : function(){ if (this.validations) {