- Pollen-commits - mailman.cloud.codelutin.com

01/01: catch error in form register
by Chorem.org scm 20 May '14

20 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 3a94b7726c8d92593e58351b2961c1cb2b40cee0 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue May 20 14:33:43 2014 +0200 catch error in form register --- .../src/main/webapp/js/controllers/userCtrl.js | 11 ++++++++++- .../src/main/webapp/partials/user-register.html | 15 ++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index a41f7a0..a484de4 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -20,9 +20,18 @@ */ angular.module('userControllers', []) .controller('UserRegisterCtrl', ['$scope', 'User', function ($scope, User) { + + if (!angular.isDefined($scope.data)) { + $scope.data = {}; + } + $scope.data.user = {login:'', email:'', password:'', password2:''}; + $scope.submit = function () { if ($scope.data.user.password == $scope.data.user.password2) { - User.add({}, $scope.data.user); + User.add({}, $scope.data.user, function (data) { + }, function (error) { + $scope.restError = error.data; + }); } } }]) diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index 66ee85e..93c5dc0 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -21,12 +21,18 @@ <div> <form ng-submit="submit()"> <div class="form-group"> - <label for="formName">Nom d'utilisateur : </label> + <label for="formName"> + Nom d'utilisateur : + <info-error error="restError.login[0]" data="data.user.login"></info-error> + </label> <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.login"/> </div> <div class="form-group"> - <label for="formEmail">E-Mail :</label> + <label for="formEmail"> + E-Mail : + <info-error error="restError.email[0]" data="data.user.email"></info-error> + </label> <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email"/> </div> @@ -35,7 +41,10 @@ <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> </div> <div class="form-group"> - <label for="formPassword2">Confirmation :</label> + <label for="formPassword2"> + Confirmation : + <span class="glyphicon glyphicon-exclamation-sign danger" tooltip="Mot de passe différent" ng-if="data.user.password != data.user.password2"></span> + </label> <input type="password" id="formPassword2" name="password2" class="form-control" ng-model="data.user.password2"/> </div> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: make login works
by Chorem.org scm 20 May '14

20 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit dbae913f3ba7c7e24c7fb00a2c7783089ec5e458 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue May 20 11:57:37 2014 +0200 make login works --- pollen-rest-api/src/main/resources/mapping | 6 +-- .../org/chorem/pollen/rest/api/AuthApiTest.java | 62 ++++++++++++++++++++++ .../service/security/PollenSecurityRealm.java | 13 +++-- .../services/service/security/SecurityService.java | 4 +- 4 files changed, 76 insertions(+), 9 deletions(-) diff --git a/pollen-rest-api/src/main/resources/mapping b/pollen-rest-api/src/main/resources/mapping index 501239a..6f70b40 100644 --- a/pollen-rest-api/src/main/resources/mapping +++ b/pollen-rest-api/src/main/resources/mapping @@ -27,9 +27,9 @@ GET /v1/doc DocApi.showMapping # AuthApi -POST /v1/login AuthApi.login -GET /v1/lostpassword/{token} AuthApi.lostPassword -GET /v1/logout AuthApi.logout +POST,PUT /v1/login AuthApi.login +GET /v1/lostpassword/{token} AuthApi.lostPassword +GET /v1/logout AuthApi.logout # ChoiceApi diff --git a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AuthApiTest.java b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AuthApiTest.java new file mode 100644 index 0000000..cebcedc --- /dev/null +++ b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AuthApiTest.java @@ -0,0 +1,62 @@ +package org.chorem.pollen.rest.api; + +import org.apache.http.client.fluent.Request; +import org.apache.http.client.fluent.Response; +import org.junit.Assert; +import org.junit.Test; + +import java.io.IOException; +import java.net.URISyntaxException; + +import static org.junit.Assert.assertNotNull; + +/** + * Created on 5/20/14. + * + * @author Tony Chemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class AuthApiTest extends AbstractPollenRestApiTest { + + @Test + public void login() throws URISyntaxException, IOException { + + Request request = createRequest("/v1/login") + .addParameter("login", "admin") + .addParameter("password", "admin") + .Post(); + + String content = request.execute().returnContent().asString(); + showTestResult(content); + assertNotNull(content); + + } + + @Test + public void badLogin() throws URISyntaxException, IOException { + + Request request = createRequest("/v1/login") + .addParameter("login", "admin" + System.nanoTime()) + .addParameter("password", "admin" + System.nanoTime()) + .Post(); + + Response response = request.execute(); + int statusCode = response.returnResponse().getStatusLine().getStatusCode(); + Assert.assertEquals(401, statusCode); + + } + + @Test + public void badPassword() throws URISyntaxException, IOException { + + Request request = createRequest("/v1/login") + .addParameter("login", "admin") + .addParameter("password", "admin" + System.nanoTime()) + .Post(); + + Response response = request.execute(); + int statusCode = response.returnResponse().getStatusLine().getStatusCode(); + Assert.assertEquals(401, statusCode); + + } +} diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenSecurityRealm.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenSecurityRealm.java index ba936b7..f873a75 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenSecurityRealm.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenSecurityRealm.java @@ -33,7 +33,9 @@ import org.apache.shiro.authz.AuthorizationInfo; import org.apache.shiro.authz.SimpleAuthorizationInfo; import org.apache.shiro.realm.AuthorizingRealm; import org.apache.shiro.subject.PrincipalCollection; +import org.apache.shiro.util.SimpleByteSource; import org.chorem.pollen.persistence.PollenTopiaPersistenceContext; +import org.chorem.pollen.persistence.entity.PollenUser; import org.chorem.pollen.services.PollenApplicationContext; /** @@ -77,22 +79,23 @@ public class PollenSecurityRealm extends AuthorizingRealm { UsernamePasswordToken upToken = (UsernamePasswordToken) token; String username = upToken.getUsername(); - PollenTopiaPersistenceContext persistenceContext = applicationContext.newPersistenceContext(); try { - boolean loginExists = persistenceContext.getPollenUserDao().loginExists(username); + PollenUser pollenUser = + persistenceContext.getPollenUserDao().forLoginEquals(username).findUniqueOrNull(); - if (!loginExists) { + if (pollenUser == null) { throw new AuthenticationException(); } - char[] password = upToken.getPassword(); + String salt = pollenUser.getSalt(); SimpleAuthenticationInfo result = - new SimpleAuthenticationInfo(username, password, getName()); + new SimpleAuthenticationInfo(username, pollenUser.getPassword(), new SimpleByteSource(salt), getName()); return result; + } finally { persistenceContext.closeContext(); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java index 5d7241b..bc1b27c 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java @@ -67,7 +67,9 @@ public class SecurityService extends PollenServiceSupport { Subject subject = getSubject(); UsernamePasswordToken token = new UsernamePasswordToken(login, password); - token.setRememberMe(rememberMe); + if (rememberMe != null) { + token.setRememberMe(rememberMe); + } try { subject.login(token); -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

04/04: fix register user
by Chorem.org scm 20 May '14

20 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 4ebfd721564a4e2bddec00f5d6e60cc79c6d3628 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue May 20 11:24:39 2014 +0200 fix register user --- pollen-ui-angular/src/main/webapp/js/app.js | 2 +- pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js | 4 +++- pollen-ui-angular/src/main/webapp/js/services.js | 2 +- pollen-ui-angular/src/main/webapp/partials/user-register.html | 10 ++++++++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index f7b1041..d7e72ee 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'ui.bootstrap', 'ngCookies']) +angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userControllers', 'ui.bootstrap', 'ngCookies']) .config(['$httpProvider', '$cookiesProvider', function($httpProvider, $cookies) { $httpProvider.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; //$httpProvider.defaults.headers.put['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index f354db9..a41f7a0 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -21,7 +21,9 @@ angular.module('userControllers', []) .controller('UserRegisterCtrl', ['$scope', 'User', function ($scope, User) { $scope.submit = function () { - User.add({}, $scope.data.user); + if ($scope.data.user.password == $scope.data.user.password2) { + User.add({}, $scope.data.user); + } } }]) diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index fab77a5..eb4c5c4 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -101,7 +101,7 @@ angular.module('pollenServices', ['ngResource']) .factory('User', ['$resource', 'RestInfo', function ($resource, RestInfo) { var transformParam = function (data) { - return 'user='+encodeURIComponent(JSON.stringify(data))+RestInfo; + return 'user='+encodeURIComponent(JSON.stringify(data))+'&generatePassword=false'+RestInfo; } return $resource(conf.restURL+'/users/:userId', {userId : '@id'}, { diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index e70496f..66ee85e 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -31,6 +31,16 @@ </div> <div class="form-group"> + <label for="formPassword">Mot de passe :</label> + <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> + </div> + <div class="form-group"> + <label for="formPassword2">Confirmation :</label> + <input type="password" id="formPassword2" name="password2" class="form-control" ng-model="data.user.password2"/> + </div> + + + <div class="form-group"> <button class="btn btn-primary" type="submit">Envoyer</button> </div> </form> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

03/04: delete conflit on ui conf.js
by Chorem.org scm 20 May '14

20 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 5a8c8fd26e2c8bf107f88bc5b3ded42720d4e65b Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon May 19 16:37:02 2014 +0200 delete conflit on ui conf.js --- .gitignore | 1 + pollen-ui-angular/src/main/webapp/js/app.js | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2d3ae13..63b6d4a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ atlassian-ide-plugin.xml target/* */target/* +pollen-ui-angular/src/main/webapp/js/conf.js diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 477cb3b..f7b1041 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -18,7 +18,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -<<<<<<< HEAD angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'ui.bootstrap', 'ngCookies']) .config(['$httpProvider', '$cookiesProvider', function($httpProvider, $cookies) { $httpProvider.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/04: login user
by Chorem.org scm 20 May '14

20 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 316f318a3de8c620a8c0ec73933c83bb91b817f4 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon May 19 16:06:27 2014 +0200 login user --- pollen-rest-api/src/main/resources/mapping | 2 +- pollen-ui-angular/src/main/webapp/css/style.css | 1 + pollen-ui-angular/src/main/webapp/index.html | 34 ++++------------------ .../src/main/webapp/js/controllers/userCtrl.js | 11 ++++++- pollen-ui-angular/src/main/webapp/js/services.js | 24 +++++++++++++++ .../src/main/webapp/partials/user-login.html | 25 ++++++++++++++++ 6 files changed, 66 insertions(+), 31 deletions(-) diff --git a/pollen-rest-api/src/main/resources/mapping b/pollen-rest-api/src/main/resources/mapping index 481dc72..501239a 100644 --- a/pollen-rest-api/src/main/resources/mapping +++ b/pollen-rest-api/src/main/resources/mapping @@ -27,7 +27,7 @@ GET /v1/doc DocApi.showMapping # AuthApi -PUT /v1/login AuthApi.login +POST /v1/login AuthApi.login GET /v1/lostpassword/{token} AuthApi.lostPassword GET /v1/logout AuthApi.logout diff --git a/pollen-ui-angular/src/main/webapp/css/style.css b/pollen-ui-angular/src/main/webapp/css/style.css index f2100ed..506c383 100644 --- a/pollen-ui-angular/src/main/webapp/css/style.css +++ b/pollen-ui-angular/src/main/webapp/css/style.css @@ -25,6 +25,7 @@ padding-top: 15px; left:auto; right:0px; + width:250px; } .dropdown-menu.form > form { diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 7d14ee1..b057de3 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -52,44 +52,20 @@ <li><a href="#/poll/create">Creer</a></li> <li><a href="#/poll/list">Liste</a></li> </ul> - <ul class="nav navbar-nav pull-right"> + <ul class="nav navbar-nav pull-right" ng-controller="UserLoginCtrl"> <li ng-show="!currentUser.login"> <a href="#/user/register/">S'enregistrer</a> </li> <li class="divider-vertical" ng-show="!currentUser.login"></li> - <li class="dropdown" ng-show="!currentUser.login"> - <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown"> + <li ng-show="!currentUser.login" dropdown> + <a href="#" role="button" class="dropdown-toggle"> Connexion<strong class="caret"></strong> </a> - <div class="dropdown-menu form" role="menu"> - <form id='loginForm'> - - <div class="control-group"> - <label class="control-label">Utilisateur</label> - <input type="text" name='login' /> - <span class="help-block hide"></span> - </div> - - <div class="control-group"> - <label class="control-label" >Mot de Passe</label> - <input type="password" name='password' /> - <span class="help-block hide"></span> - </div> - - <div class="control-group"> - <label class="control-label checkbox" > - <input type="checkbox" name='rememberMe'> Connexion automatique - </label> - </div> - - <div class="form-actions"> - <button type="submit" class="btn btn-primary">Connexion</button> - </div> - - </form> + <div class="dropdown-menu form" role="menu" ng-click="$event.stopPropagation()"> + <div ng-include="'./partials/user-login.html'"></div> </div> </li> diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index 539b351..f354db9 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -23,4 +23,13 @@ $scope.submit = function () { User.add({}, $scope.data.user); } - }]); \ No newline at end of file + }]) + +.controller('UserLoginCtrl', ['$scope', 'UserLogin', function ($scope, UserLogin) { + if (!angular.isDefined($scope.data)) { + $scope.data = {user:{}}; + } + $scope.login = function () { + UserLogin.login({}, $scope.data.user); + } +}]) \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 9d37bf9..fab77a5 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -120,4 +120,28 @@ angular.module('pollenServices', ['ngResource']) } } ); +}]) + +.factory('UserLogin', ['$resource', 'RestInfo', function ($resource, RestInfo) { + var transformParam = function (data) { + var query = 'login='+encodeURIComponent(data.login); + query += '&password='+encodeURIComponent(data.password); + query += '&rememberMe='; + if (data.rememberMe) { + query += "true" ; + } else { + query += "false"; + } + return query+RestInfo; + } + return $resource(conf.restURL+'/login', {}, + { + 'login' : { + method: 'POST', + transformRequest: function (data, headersGetter) { + return transformParam(data); + } + } + } + ); }]) \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/user-login.html b/pollen-ui-angular/src/main/webapp/partials/user-login.html new file mode 100644 index 0000000..e03817f --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/partials/user-login.html @@ -0,0 +1,25 @@ +<form id='loginForm' ng-submit="login()"> + + <div class="control-group"> + <label class="control-label">Utilisateur</label> + <input type="text" name='login' ng-model="data.user.login" class="form-control"/> + <span class="help-block hide"></span> + </div> + + <div class="control-group"> + <label class="control-label" >Mot de Passe</label> + <input type="password" name='password' ng-model="data.user.password" class="form-control"/> + <span class="help-block hide"></span> + </div> + + <div class="control-group"> + <label class="control-label checkbox" > + <input type="checkbox" name='rememberMe' ng-model="data.user.rememberMe"> Connexion automatique + </label> + </div> + + <div class="form-actions"> + <button type="submit" class="btn btn-primary">Connexion</button> + </div> + +</form> \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/04: Add form register new user
by Chorem.org scm 20 May '14

20 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit df7f32632c8f549e5bc90da0917c897f52f46837 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon May 19 14:46:28 2014 +0200 Add form register new user --- pollen-ui-angular/src/main/webapp/index.html | 1 + pollen-ui-angular/src/main/webapp/js/app.js | 2 ++ .../src/main/webapp/js/controllers/userCtrl.js | 26 +++++++++++++++ pollen-ui-angular/src/main/webapp/js/services.js | 23 ++++++++++++++ .../src/main/webapp/partials/user-register.html | 37 ++++++++++++++++++++++ 5 files changed, 89 insertions(+) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index acd5756..7d14ee1 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -38,6 +38,7 @@ <script src="js/app.js"></script> <script src="js/services.js"></script> <script src="js/controllers/pollCtrl.js"></script> + <script src="js/controllers/userCtrl.js"></script> </head> <body> diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 47c75aa..477cb3b 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -18,6 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ +<<<<<<< HEAD angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'ui.bootstrap', 'ngCookies']) .config(['$httpProvider', '$cookiesProvider', function($httpProvider, $cookies) { $httpProvider.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; @@ -36,6 +37,7 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'ui.bo .when('/poll/edit/:pollId', {templateUrl: './partials/poll.html', controller:"PollEditCtrl"}) .when('/poll/vote/:pollId', {templateUrl: './partials/poll.html', controller :"PollVoteCtrl"}) .when('/poll/list', {templateUrl: './partials/poll-list.html', controller :"PollListCtrl"}) + .when('/user/register', {templateUrl: './partials/user-register.html', controller:"UserRegisterCtrl"}) .otherwise({redirectTo: '/'}); }]) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js new file mode 100644 index 0000000..539b351 --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -0,0 +1,26 @@ +/* + * #%L + * Pollen :: UI (Angular) + * %% + * Copyright (C) 2009 - 2014 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + angular.module('userControllers', []) + .controller('UserRegisterCtrl', ['$scope', 'User', function ($scope, User) { + $scope.submit = function () { + User.add({}, $scope.data.user); + } + }]); \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 41be424..9d37bf9 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -97,4 +97,27 @@ angular.module('pollenServices', ['ngResource']) } } ); +}]) + +.factory('User', ['$resource', 'RestInfo', function ($resource, RestInfo) { + var transformParam = function (data) { + return 'user='+encodeURIComponent(JSON.stringify(data))+RestInfo; + } + return $resource(conf.restURL+'/users/:userId', {userId : '@id'}, + { + 'add' : { + method : 'POST', + transformRequest: function (data, headersGetter) { + return transformParam(data); + } + }, + 'update' : + { + method:'PUT', + transformRequest : function (data, headersGetter) { + return transformParam(data); + } + } + } + ); }]) \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html new file mode 100644 index 0000000..e70496f --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -0,0 +1,37 @@ + +<div> + <form ng-submit="submit()"> + <div class="form-group"> + <label for="formName">Nom d'utilisateur : </label> + <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.login"/> + </div> + + <div class="form-group"> + <label for="formEmail">E-Mail :</label> + <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email"/> + </div> + + <div class="form-group"> + <button class="btn btn-primary" type="submit">Envoyer</button> + </div> + </form> +</div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: add .gitignore
by Chorem.org scm 20 May '14

20 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch pollen-1.x in repository Pollen. commit 1e57ee39c3146038e0234ddeec6def69547330ba Author: Maven Release <maven-release(a)codelutin.com> Date: Tue May 20 10:38:46 2014 +0200 add .gitignore --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..067af3b --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +.idea +*.ipr +*.iws +*.iml +atlassian-ide-plugin.xml +target/* +*/target/* \ No newline at end of file -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: use header for locale
by Chorem.org scm 19 May '14

19 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit e67c2d1f57c2e43693e57b1812836cc8dca84221 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon May 19 17:34:44 2014 +0200 use header for locale --- pollen-ui-angular/src/main/webapp/js/app.js | 10 ++++++++-- pollen-ui-angular/src/main/webapp/js/services.js | 8 +------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index 70ff3cb..47c75aa 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -18,11 +18,17 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'ui.bootstrap', 'ngCookies'], function($httpProvider) { +angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'ui.bootstrap', 'ngCookies']) +.config(['$httpProvider', '$cookiesProvider', function($httpProvider, $cookies) { $httpProvider.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; //$httpProvider.defaults.headers.put['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'; -}) + if (!angular.isDefined($cookies.locale)) { + var locale = navigator.language || navigator.userLanguage || 'en'; + $cookies.locale = locale.substring(0,2); + } + $httpProvider.defaults.headers.common['Accept-Language'] = $cookies.locale; +}]) .config(['$routeProvider', function($routeProvider) { $routeProvider.when('/', {templateUrl: './partials/home.html', controller: "HomeCtrl"}) diff --git a/pollen-ui-angular/src/main/webapp/js/services.js b/pollen-ui-angular/src/main/webapp/js/services.js index 4a5306c..41be424 100644 --- a/pollen-ui-angular/src/main/webapp/js/services.js +++ b/pollen-ui-angular/src/main/webapp/js/services.js @@ -20,19 +20,13 @@ */ angular.module('pollenServices', ['ngResource']) -.factory('RestInfo', ['$cookies', '$locale', function ($cookies, $locale) { +.factory('RestInfo', ['$cookies', function ($cookies) { var query = ''; - if (!angular.isDefined($cookies.locale)) { - $cookies.locale = $locale.id; - } - if (angular.isDefined($cookies.token)) { query += '&permission='+$cookies.token; } - query += '&locale='+$cookies.locale; - return query; }]) -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

02/02: delete unused dependence
by Chorem.org scm 19 May '14

19 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 9368f227341c5dc04e5d81d1a85bbe43129f9922 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon May 19 16:13:18 2014 +0200 delete unused dependence --- pollen-ui-angular/pom.xml | 64 -------------------- .../src/main/resources/nuiton-js/wro.properties | 26 -------- .../src/main/resources/nuiton-js/wro.xml | 36 ----------- 3 files changed, 0 insertions(+), 126 deletions(-) diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml index 1fcd36c..bd8ec74 100644 --- a/pollen-ui-angular/pom.xml +++ b/pollen-ui-angular/pom.xml @@ -22,70 +22,6 @@ <skipPostRelease>false</skipPostRelease> </properties> - <build> - - <plugins> - - <plugin> - <groupId>ro.isdc.wro4j</groupId> - <artifactId>wro4j-maven-plugin</artifactId> - <version>1.7.0</version> - <dependencies> - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-wro</artifactId> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery</artifactId> - <version>1.9.1-2</version> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-bootstrap</artifactId> - <version>2.3.2-1</version> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-jquery-i18n-properties</artifactId> - <version>1.0.9-1</version> - </dependency> - - <dependency> - <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-moment</artifactId> - <version>2.0.0-1</version> - </dependency> - - </dependencies> - - <executions> - <execution> - <phase>compile</phase> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - - <configuration> - <targetGroups>pollen-ui-angular</targetGroups> - <minimize>true</minimize> - <wroFile>${basedir}/src/main/resources/nuiton-js/wro.xml</wroFile> - <extraConfigFile>${basedir}/src/main/resources/nuiton-js/wro.properties</extraConfigFile> - <contextFolder>${basedir}/src/main/webapp/</contextFolder> - <destinationFolder>${basedir}/src/main/webapp/</destinationFolder> - <wroManagerFactory>org.nuiton.js.wro.NuitonJsMavenWroManagerFactory</wroManagerFactory> - </configuration> - </plugin> - - </plugins> - </build> - <profiles> <profile> diff --git a/pollen-ui-angular/src/main/resources/nuiton-js/wro.properties b/pollen-ui-angular/src/main/resources/nuiton-js/wro.properties deleted file mode 100644 index 085d205..0000000 --- a/pollen-ui-angular/src/main/resources/nuiton-js/wro.properties +++ /dev/null @@ -1,26 +0,0 @@ -### -# #%L -# Pollen :: UI (JS) -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2013 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -debug=false -preProcessors=forceCssDataUri,cssUrlRewriting,cssImport,semicolonAppender,cssMinJawr -postProcessors=cssVariables,jsMin -uriLocators=uri,classpath \ No newline at end of file diff --git a/pollen-ui-angular/src/main/resources/nuiton-js/wro.xml b/pollen-ui-angular/src/main/resources/nuiton-js/wro.xml deleted file mode 100644 index fc1603e..0000000 --- a/pollen-ui-angular/src/main/resources/nuiton-js/wro.xml +++ /dev/null @@ -1,36 +0,0 @@ - -<groups xmlns="http://www.isdc.ro/wro"> - - <group name='pollen-ui-angular'> - <group-ref>jquery</group-ref> - <group-ref>bootstrap-responsive</group-ref> - <group-ref>jquery.i18n.properties</group-ref> - <group-ref>moment</group-ref> - -  -  -  - </group> - -</groups> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/02: convert int to float javascript
by Chorem.org scm 19 May '14

19 May '14

This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 46ac5366c0cdc3c5b0dd0bfe6670ba77c4918c83 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon May 19 12:22:31 2014 +0200 convert int to float javascript --- .../src/main/webapp/js/controllers/pollCtrl.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index fc7ee83..e4227df 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -293,7 +293,7 @@ angular.module('pollControllers', []) $scope.data.votants = votes; angular.forEach($scope.data.votants, function (vote) { angular.forEach(vote.choice, function (choice) { - if (choice.voteValue != null && choice.voteValue != 0) { + if (choice.voteValue != null && choice.voteValue != 0.0) { choice.voteValue = true; } else { @@ -320,7 +320,7 @@ angular.module('pollControllers', []) $scope.voter = function () { var sendVote = angular.copy($scope.data.vote); angular.forEach(sendVote.choice, function (choice) { - choice.voteValue = (choice.voteValue) ? 1 : 0; + choice.voteValue = (choice.voteValue) ? 1.0 : 0.0; }); PollVote.add({pollId:$routeParams.pollId}, sendVote, function (returnRequest) { -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0