diff --git a/front-api/controllers/user.rb b/front-api/controllers/user.rb
index f2a0338..82058c5 100644
--- a/front-api/controllers/user.rb
+++ b/front-api/controllers/user.rb
@@ -1,7 +1,27 @@
-get '/user/auth' do
- # TODO: do something that makes sense here
- res = User.find_by(id: 1).try(:authenticate, 'spassword') # => false
- res.to_json
+
+post '/user/login' do
+ request.body.rewind
+ login_details = JSON.parse(request.body.read)
+
+ email = login_details['email']
+ password = login_details['password']
+
+ res = User.find_by(email: email).try(:authenticate, password) # => false
+ if res
+ #TODO : encrypt this cookie
+ response.set_cookie('ribica_auth', :path=> '/', :httponly => true, :value=>res.id, :expires=>Time.now+100.year)
+ res.to_json(except: 'password_digest')
+ else
+ status 401
+ {:error => "email ili lozinka neispravni!"}.to_json
+ end
+end
+
+get '/user' do
+ auth = cookies['ribica_auth']
+ if not auth.nil?
+ return User.find_by(id: auth).to_json(except: 'password_digest')
+ end
end
post '/user' do
diff --git a/front-ui/app/actions/userActions.js b/front-ui/app/actions/userActions.js
index 646cb92..1df9eb1 100644
--- a/front-ui/app/actions/userActions.js
+++ b/front-ui/app/actions/userActions.js
@@ -12,12 +12,9 @@ var UserActions = {
user.save(null, {
success: function() {
- alert('saved!');
UserActions.registrationSuccess();
},
error: function(model, response, options) {
- alert('error');
- console.log('error:', response);
UserActions.registrationFailure(response);
}
});
@@ -32,8 +29,36 @@ var UserActions = {
actionType: UserConstants.REGISTRATION_FAILURE,
error: error
});
- }
+ },
+ userLogin: function(loginDetails) {
+ AppDispatcher.handleAction({
+ actionType: UserConstants.USER_LOGIN,
+ loginDetails: loginDetails
+ });
+ loginDetails.save(null, {
+ success: function(){
+ alert('ok')
+ UserActions.loginSuccess();
+ },
+
+ error: function(model, response, options){
+ alert('error!');
+ UserActions.loginFailure(response);
+ }
+ });
+ },
+ loginSuccess: function() {
+ AppDispatcher.handleAction({
+ actionType: UserConstants.LOGIN_SUCCESS
+ });
+ },
+ loginFailure: function(error) {
+ AppDispatcher.handleAction({
+ actionType: UserConstants.LOGIN_FAILURE,
+ error: error
+ });
+ }
};
module.exports = UserActions;
diff --git a/front-ui/app/components/account/login.js b/front-ui/app/components/account/login.js
index 1beccd5..75e6af5 100644
--- a/front-ui/app/components/account/login.js
+++ b/front-ui/app/components/account/login.js
@@ -1,41 +1,117 @@
var React = require("react");
var NavigationActions = require('../../actions/navigationActions');
+var UserActions = require('../../actions/userActions');
var Router = require('react-router');
var Link = Router.Link;
-var Login = React.createClass({
-
+var RibicaValidationMixin = require('../../components/shared/mixins/ribicaValidationMixin');
+var ValidationUtils = require('../../utils/validation.js');
+var LoginModel = require('../../models/login');
+var UserStore = require('../../stores/userStore');
+var Login = React.createClass({
+ mixins: [RibicaValidationMixin],
+ componentDidMount:function() {
+ UserStore.addChangeListener(this.onUserStoreChange);
+ },
+ componentWillUnmount: function() {
+ UserStore.removeChangeListener(this.onUserStoreChange);
+ },
+ onUserStoreChange: function() {
+ var loginState = UserStore.getLoginState();
+
+ if (loginState.loggedIn) {
+ NavigationActions.goToHome();
+ } else {
+
+ this.setState({login: loginState});
+ }
+ },
+ getInitialState: function() {
+ return {
+ email: '',
+ password: '',
+ errors: {},
+ login: UserStore.getLoginState()
+ };
+ },
+ validations: {
+ email:function(value) {
+
+ if(!ValidationUtils.isValidEmail(value)) {
+ return ['Neispravna email adresa.'];
+ }
+ return [];
+ },
+ password: function(value) {
+ if(!ValidationUtils.isValidRequired(value)) {
+ return ["Šifra je obavezna."];
+ }
+ return [];
+ }
+ },
+ renderErrorMessage: function(message){
+ return ({message}
)
+ },
+ doLogin: function(e) {
+
+ if(this.validate()) {
+ var loginInfo = new LoginModel({
+ email: this.state.email,
+ password: this.state.password
+ });
+
+ UserActions.userLogin(loginInfo);
+
+ }
+
+ e.preventDefault();
+ },
+ renderLoginFailure: function() {
+
+ var loginState = this.state.login;
+ if(!loginState.loggedIn) {
+ return ({loginState.error}
)
+ }
+
+ return ()
+ },
render : function() {
return ();
+
+
+
+
+ Niste registrovani? Kliknite ovdje da se registrujete!
+
+
+
+
+ );
}
-})
+});
+
module.exports = Login;
diff --git a/front-ui/app/components/account/register.js b/front-ui/app/components/account/register.js
index 1b866a6..f321df5 100644
--- a/front-ui/app/components/account/register.js
+++ b/front-ui/app/components/account/register.js
@@ -3,7 +3,8 @@ var React = require("react/addons"),
RibicaValidationMixin = require('../../components/shared/mixins/ribicaValidationMixin'),
UserStore = require('../../stores/userStore'),
NavigationActions = require('../../actions/navigationActions'),
- UserActions = require('../../actions/userActions');
+ UserActions = require('../../actions/userActions'),
+ ValidationUtils = require('../../utils/validation');
@@ -18,7 +19,7 @@ var Register = React.createClass({
password: '',
passwordConfirmation: '',
errors: {},
- registrationState: UserStore.getRegistrationState()
+ registration: UserStore.getRegistrationState()
};
},
myBabyChange: function() {
@@ -96,12 +97,12 @@ var Register = React.createClass({
},
validations: {
firstName: function(value) {
- if (!value || value === '') {
+ if (!ValidationUtils.isValidRequired(value)) {
return ["Ime je obavezno."];
}
},
password: function(value, callback) {
- if(value === undefined || value === "") {
+ if(!ValidationUtils.isValidRequired(value)) {
return ["Šifra je obavezna."];
}
@@ -119,16 +120,14 @@ var Register = React.createClass({
}
},
lastName : function(value) {
- if (!value || value === '') {
+ if (!ValidationUtils.isValidRequired(value)) {
return ["Prezime je obavezno."];
}
},
- _emailRe: /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
_emailTimeoutId: null,
email: function(value, callback) {
- var validEmail = this._emailRe.test(value);
- if (validEmail) {
+ if (ValidationUtils.isValidEmail(value)) {
//clearTimeout(this._emailTimeoutId);
//this._emailTimeoutId = setTimeout(function(){
@@ -162,11 +161,10 @@ var Register = React.createClass({
},
onUserStoreChange: function() {
this.setState({
- registrationState: UserStore.getRegistrationState()
+ registration: UserStore.getRegistrationState()
});
},
register: function(e) {
- // TODO: move this to the UserRegistrationStore
if(this.validate()) {
var user = new UserRegistration({
first_name: this.state.firstName,
@@ -186,24 +184,24 @@ var Register = React.createClass({
e.preventDefault();
},
renderRegistrationState: function() {
- var rs = this.state.registrationState;
+ var rs = this.state.registration;
if (!rs.performed) {
return ()
} else if(rs.performed && !rs.success){
return (
- Desila se pogreska pri registraciji. Detalji greske su:
+ Desila se pogreška pri registraciji. Detalji greške su:
{rs.error.responseJSON}
)
} else if (rs.performed && rs.success) {
return (
- Uspjesno ste se registrovali na Ribicu. Kliknite
ovdje za nastavak.
+ Uspješno ste se registrovali na Ribicu. Kliknite
ovdje za nastavak.