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@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@chorem.org>.
participants (1)
-
Chorem.org scm