diff --git a/gulpfile.js b/gulpfile.js index ad7e299..a2ac68d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,13 +1,14 @@ -const templateCache = require('gulp-angular-templatecache'); -const concat = require('gulp-concat'); const clean = require('gulp-clean'); -const htmlmin = require('gulp-htmlmin'); -const rename = require('gulp-rename'); -const uglify = require('gulp-uglify-es').default; +const concat = require('gulp-concat'); +const connect = require('gulp-connect'); const gulp = require('gulp'); -const pump = require('pump'); +const htmlmin = require('gulp-htmlmin'); const jshint = require('gulp-jshint'); +const pump = require('pump'); +const rename = require('gulp-rename'); const replace = require('gulp-replace'); +const templateCache = require('gulp-angular-templatecache'); +const uglify = require('gulp-uglify-es').default; var paths = { srcJS: 'src/js/*.js', @@ -16,7 +17,7 @@ var paths = { dist: 'dist/' }; -gulp.task('templates', function() { +gulp.task('templates', ['clean'], function() { return pump( [ gulp.src(paths.srcViews), @@ -38,7 +39,7 @@ gulp.task('uglify', ['templates'], function() { 'tmp/views.js' ]), concat('foca-login.js'), - replace("['ngRoute', 'ngCookies']",'[]'), + replace("['ngRoute', 'ngCookies', 'focaDirectivas']",'[]'), replace('src/views/', ''), gulp.dest(paths.tmp), rename('foca-login.min.js'), diff --git a/index.html b/index.html index 4ec92eb..e593d13 100644 --- a/index.html +++ b/index.html @@ -13,6 +13,7 @@ + diff --git a/package.json b/package.json index 84cb196..bd741f6 100644 --- a/package.json +++ b/package.json @@ -8,14 +8,14 @@ "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" + "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" }, "pre-commit": [ "gulp-pre-commit" ], "repository": { "type": "git", - "url": "https://192.168.0.11/modulos-npm/foca-login.git" + "url": "https://debo.suite.repo/modulos-npm/foca-login.git" }, "author": "Foca Software", "license": "ISC", @@ -31,16 +31,18 @@ "gulp-replace": "^1.0.x", "gulp-uglify-es": "^1.0.x", "jshint": "^2.9.x", - "pump": "^3.0.x" + "pump": "^3.0.x", + "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas" }, "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.1", + "gulp-angular-templatecache": "^2.2.2", "gulp-clean": "^0.4.0", "gulp-connect": "^5.6.1", "gulp-htmlmin": "^5.0.1", diff --git a/src/js/app.js b/src/js/app.js index aee6bc6..b912c42 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -1,4 +1,4 @@ -angular.module('focaLogin', ['ngRoute', 'ngCookies']) +angular.module('focaLogin', ['ngRoute', 'ngCookies', 'focaDirectivas']) .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 6be89af..79b5227 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -2,6 +2,7 @@ angular.module('focaLogin') .controller('focaLoginController', [ '$scope', 'focaLoginService', '$location', '$cookies', function($scope, focaLoginService, $location, $cookies) { + $scope.paso = 1; $scope.enviar = function() { focaLoginService.login($scope.usuario).then(function(datos) { $cookies.put('idUsuario', $scope.usuario.idUsuario); @@ -9,6 +10,9 @@ angular.module('focaLogin') $location.path('/'); }); }; + $scope.irPaso = function(numeroPaso){ + $scope.paso = numeroPaso; + }; } ]) .controller('focaLogoutController', [ diff --git a/src/views/foca-login.html b/src/views/foca-login.html index d5b8a94..35c71fe 100644 --- a/src/views/foca-login.html +++ b/src/views/foca-login.html @@ -5,11 +5,21 @@