Eric Fernandez / foca-login

Commit 62cf1ae31b596a0eb981d1c57df0217ecf43f796

Authored by Pablo Marco del Pont 2018-10-22 17:43:51 -0300

Exists in master

- Agregué módulo foca-directivas para saltar entre inputs.

- Agregué lógica para saltar entre campos.

Showing 6 changed files with 33 additions and 15 deletions Show diff stats

gulpfile.js

Diff comments View file @ 62cf1ae

-const templateCache = require('gulp-angular-templatecache');
-const concat        = require('gulp-concat');
 const clean         = require('gulp-clean');
-const htmlmin       = require('gulp-htmlmin');
+const concat        = require('gulp-concat');
-const rename        = require('gulp-rename');
+const connect       = require('gulp-connect');
-const uglify        = require('gulp-uglify-es').default;
 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',
     srcViews: 'src/views/*.html',
     tmp:   'tmp',
     dist:  'dist/'
 };
-gulp.task('templates', function() {
+gulp.task('templates', ['clean'], function() {
     return pump(
         [
             gulp.src(paths.srcViews),
             htmlmin(),
             templateCache('views.js', {
                 module: 'focaLogin',
                 root: ''
             }),
             gulp.dest(paths.tmp)
         ]
     );
 });
 gulp.task('uglify', ['templates'], function() {
     return pump(
         [
             gulp.src([
                 paths.srcJS,
                 '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'),
             uglify(),
             gulp.dest(paths.dist)
         ]
     );
 });
 gulp.task('clean', function() {
     return gulp.src(['tmp', 'dist'], {read: false})
     .pipe(clean());
 });
 gulp.task('pre-commit', function() {
     pump(
         [
             gulp.src(paths.srcJS),
             jshint('.jshintrc'),
             jshint.reporter('default'),
             jshint.reporter('fail')
         ]
     );
 });
 gulp.task('clean-post-install', function() {
     return gulp.src(['src', 'tmp', '.jshintrc','readme.md', '.gitignore', 'gulpfile.js',
                      'index.html'], {read: false})
     .pipe(clean());
 });
 gulp.task('compile', ['templates', 'uglify']);
 gulp.task('webserver', function() {
     pump [
         connect.server({port: 3000})
     ]
 });

index.html

Diff comments View file @ 62cf1ae

 <html ng-app="focaLogin">
     <head>
         <meta charset="UTF-8"/>
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
         <!--CSS-->
         <link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/>
         <link href="node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
         <!--VENDOR JS-->
         <script src="node_modules/jquery/dist/jquery.min.js"></script>
         <script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
         <script src="node_modules/angular/angular.min.js"></script>
         <script src="node_modules/angular-route/angular-route.min.js"></script>
         <script src="node_modules/angular-cookies/angular-cookies.min.js"></script>
+        <script src="node_modules/foca-directivas/dist/foca-directivas.min.js"></script>
         <script src="src/js/app.js"></script>
         <script src="src/js/route.js"></script>
         <script src="src/js/controller.js"></script>
         <script src="src/js/service.js"></script>
         <script src="src/etc/develop.js"></script>
     </head>
     <body ng-view>
     </body>
 </html>

package.json

Diff comments View file @ 62cf1ae

 {
     "name": "foca-login",
     "version": "0.0.1",
     "description": "Login",
     "main": "dist/foca-login.js",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
         "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",
     "peerDependencies": {
         "angular": "^1.7.x",
         "bootstrap": "^4.1.x",
         "jquery": "^3.3.x",
         "font-awesome": "^4.7.x",
         "gulp": "^3.9.x",
         "gulp-concat": "2.6.x",
         "gulp-jshint": "^2.1.x",
         "gulp-rename": "^1.4.x",
         "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",
         "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.2.1",
         "jquery": "^3.3.1",
         "jshint": "^2.9.6",
         "pre-commit": "^1.2.2",
         "pump": "^3.0.0"
     }
 }

src/js/app.js

Diff comments View file @ 62cf1ae

1	angular.module('focaLogin', ['ngRoute', 'ngCookies'])	1	angular.module('focaLogin', ['ngRoute', 'ngCookies', 'focaDirectivas'])
2	.run(['$rootScope', '$cookies', '$location', function($rootScope, $cookies, $location) {	2	.run(['$rootScope', '$cookies', '$location', function($rootScope, $cookies, $location) {
3	$rootScope.$on('$locationChangeStart', function() {	3	$rootScope.$on('$locationChangeStart', function() {
4	var idUsuario = $cookies.get('idUsuario');	4	var idUsuario = $cookies.get('idUsuario');
5	if(!idUsuario) {	5	if(!idUsuario) {
6	if($location.path() !== '/login') {	6	if($location.path() !== '/login') {
7	$location.path('/login');	7	$location.path('/login');
8	}	8	}
9	}	9	}
10	});	10	});
11	}]);	11	}]);
12		12

src/js/controller.js

Diff comments View file @ 62cf1ae

 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);
                     $cookies.put('token', datos.data.token);
                     $location.path('/');
                 });
             };
+            $scope.irPaso = function(numeroPaso){
+                $scope.paso = numeroPaso;
+            };
         }
     ])
     .controller('focaLogoutController', [
         '$cookies', '$location',
         function($cookies, $location) {
             $cookies.remove('idUsuario');
             $cookies.remove('token');
             $location.path('/login');
         }
     ]);

src/views/foca-login.html

Diff comments View file @ 62cf1ae

 <div class="login">
     <form name="login">
         <div class="login-titulo">
             <span>Ingreso de usuario</span>
         </div>
         <div class="login-campo">
             <label>Usuario</label>
-            <input type="text" ng-model="usuario.idUsuario" />
+            <input
+                type       = "text"
+                ng-model   = "usuario.idUsuario"
+                foca-focus = "paso == 1"
+                ng-keyup   = "$event.keyCode == 13 && irPaso(2)"
+            />
         </div>
         <div class="login-campo">
             <label>Contraseña</label>
-            <input type="password" ng-model="usuario.clave" ng-keyup="$event.keyCode == 13 && enviar()" />
+            <input
+                type       = "password"
+                ng-model   = "usuario.clave"
+                foca-focus = "paso == 2"
+                ng-keyup   = "$event.keyCode == 13 && enviar()"
+            />
         </div>
     </form>
 </div>