diff --git a/gulpfile.js b/gulpfile.js
index 0b3a97f..50852ba 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -39,7 +39,7 @@ gulp.task('uglify', ['templates'], function() {
'tmp/views.js'
]),
concat('foca-login.js'),
- replace("['ngRoute', 'ngCookies', 'focaDirectivas']",'[]'),
+ replace("['ngRoute', 'ngCookies', 'focaDirectivas', 'angular-ladda']",'[]'),
replace('src/views/', ''),
gulp.dest(paths.tmp),
rename('foca-login.min.js'),
diff --git a/package.json b/package.json
index fb52d05..47ff721 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
"compile": "gulp compile",
"gulp-pre-commit": "gulp pre-commit",
"postinstall": "npm run compile && gulp clean-post-install",
- "install-dev": "npm install -D gulp gulp-connect jasmine-core pre-commit angular angular-route angular-cookies bootstrap font-awesome gulp-angular-templatecache gulp-clean gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-sequence gulp-uglify-es gulp-replace jquery jshint pump && npm i -D git+https://debo.suite.repo/modulos-npm/foca-directivas"
+ "install-dev": "npm install -D gulp gulp-connect jasmine-core pre-commit angular angular-route angular-cookies bootstrap font-awesome gulp-angular-templatecache gulp-clean gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-sequence gulp-uglify-es gulp-replace jquery jshint pump && npm i -D git+http://git.focasoftware.com/npm/foca-directivas.git"
},
"pre-commit": [
"gulp-pre-commit"
@@ -32,29 +32,29 @@
"gulp-uglify-es": "^1.0.x",
"jshint": "^2.9.x",
"pump": "^3.0.x",
- "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas"
+ "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git"
},
"devDependencies": {
- "angular": "1.7.5",
- "angular-cookies": "1.7.5",
- "angular-route": "1.7.5",
- "bootstrap": "4.1.3",
- "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas",
- "font-awesome": "4.7.0",
- "gulp": "3.9.1",
- "gulp-angular-templatecache": "2.2.5",
- "gulp-clean": "0.4.0",
- "gulp-connect": "5.6.1",
- "gulp-htmlmin": "5.0.1",
- "gulp-jshint": "2.1.0",
- "gulp-rename": "1.4.0",
- "gulp-replace": "1.0.0",
- "gulp-sequence": "1.0.0",
- "gulp-uglify-es": "1.0.4",
- "jasmine-core": "3.3.0",
- "jquery": "3.3.1",
- "jshint": "2.9.6",
- "pre-commit": "1.2.2",
- "pump": "3.0.0"
+ "angular": "^1.7.5",
+ "angular-cookies": "^1.7.5",
+ "angular-route": "^1.7.5",
+ "bootstrap": "^4.1.3",
+ "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git",
+ "font-awesome": "^4.7.0",
+ "gulp": "^3.9.1",
+ "gulp-angular-templatecache": "^2.2.5",
+ "gulp-clean": "^0.4.0",
+ "gulp-connect": "^5.7.0",
+ "gulp-htmlmin": "^5.0.1",
+ "gulp-jshint": "^2.1.0",
+ "gulp-rename": "^1.4.0",
+ "gulp-replace": "^1.0.0",
+ "gulp-sequence": "^1.0.0",
+ "gulp-uglify-es": "^1.0.4",
+ "jasmine-core": "^3.3.0",
+ "jquery": "^3.3.1",
+ "jshint": "^2.9.7",
+ "pre-commit": "^1.2.2",
+ "pump": "^3.0.0"
}
}
diff --git a/src/js/app.js b/src/js/app.js
index b912c42..af7482f 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -1,4 +1,4 @@
-angular.module('focaLogin', ['ngRoute', 'ngCookies', 'focaDirectivas'])
+angular.module('focaLogin', ['ngRoute', 'ngCookies', 'focaDirectivas', 'angular-ladda'])
.run(['$rootScope', '$cookies', '$location', function($rootScope, $cookies, $location) {
$rootScope.$on('$locationChangeStart', function() {
var idUsuario = $cookies.get('idUsuario');
diff --git a/src/js/controller.js b/src/js/controller.js
index 27d2ad9..f2d37cb 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -1,15 +1,29 @@
angular.module('focaLogin')
.controller('focaLoginController', [
- '$scope', 'focaLoginService', '$location', '$cookies',
- function($scope, focaLoginService, $location, $cookies) {
+ '$scope', 'focaLoginService', '$location', '$cookies', 'focaModalService',
+ function($scope, focaLoginService, $location, $cookies, focaModalService) {
$scope.paso = 1;
$scope.enviar = function() {
- focaLoginService.login($scope.usuario).then(function(datos) {
- $cookies.put('idUsuario', $scope.usuario.idUsuario);
- $cookies.put('token', datos.data.token);
- $location.path('/');
- $scope.$emit('blur');
- });
+ $scope.loginLoading = true;
+ focaLoginService.login($scope.usuario)
+ .then(function(datos) {
+ $scope.loginLoading = false;
+ $cookies.put('idUsuario', $scope.usuario.idUsuario);
+ $cookies.put('token', datos.data.token);
+ $location.path('/');
+ $scope.$emit('blur');
+ })
+ .catch(function(error) {
+ $scope.loginLoading = false;
+ if(error.status === 401) {
+ focaModalService.alert('El usuario y/o la contraseƱa no coinciden');
+ return;
+ }
+ if(error.status === -1) {
+ focaModalService.alert('Sin servicio');
+ return;
+ }
+ });
};
$scope.irPaso = function(numeroPaso) {
$scope.paso = numeroPaso;
diff --git a/src/views/foca-login.html b/src/views/foca-login.html
index a826dd8..a375268 100644
--- a/src/views/foca-login.html
+++ b/src/views/foca-login.html
@@ -10,6 +10,7 @@
ng-model = "usuario.idUsuario"
foca-focus = "paso == 1"
ng-keyup = "$event.keyCode == 13 && irPaso(2)"
+ ladda="loginLoading"
teclado-virtual
/>
@@ -20,9 +21,15 @@
ng-model = "usuario.clave"
foca-focus = "paso == 2"
ng-keyup = "$event.keyCode == 13 && enviar()"
+ ladda="loginLoading"
teclado-virtual
/>
-
+