Commit 489ab6eccdc78b855eadb98d3da2aa5a2a47ad78
Exists in
facturador
Merge branch 'facturador' of git.focasoftware.com:mpuebla/foca-login into facturador
# Conflicts: # package.json # src/views/foca-login.html
Showing
2 changed files
Show diff stats
package.json
| 1 | { | 1 | { |
| 2 | "name": "foca-login", | 2 | "name": "foca-login", |
| 3 | "version": "0.0.1", | 3 | "version": "0.0.1", |
| 4 | "description": "Login", | 4 | "description": "Login", |
| 5 | "main": "dist/foca-login.js", | 5 | "main": "dist/foca-login.js", |
| 6 | "scripts": { | 6 | "scripts": { |
| 7 | "refresh": "gulp uglify && cp tmp/foca-login.js ../wrapper-demo/node_modules/foca-login/dist/foca-login.min.js", | ||
| 8 | "frefresh": "gulp uglify && cp tmp/foca-login.js ../wrapper-facturador/node_modules/foca-login/dist/foca-login.min.js", | ||
| 7 | "refresh": "gulp uglify && cp tmp/foca-login.js ../wrapper-demo/node_modules/foca-login/dist/foca-login.min.js", | 9 | "test": "echo \"Error: no test specified\" && exit 1", |
| 8 | "test": "echo \"Error: no test specified\" && exit 1", | 10 | "gulp-pre-commit": "gulp pre-commit", |
| 9 | "gulp-pre-commit": "gulp pre-commit", | 11 | "postinstall": "gulp uglify && gulp clean-post-install", |
| 10 | "postinstall": "gulp uglify && gulp clean-post-install", | 12 | "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 gulp-replace jquery jshint pump && npm i -D git+https://debo.suite.repo/modulos-npm/foca-directivas" |
| 11 | "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 gulp-replace jquery jshint pump && npm i -D git+https://debo.suite.repo/modulos-npm/foca-directivas" | 13 | }, |
| 12 | }, | 14 | "pre-commit": [ |
| 13 | "pre-commit": [ | 15 | "gulp-pre-commit" |
| 14 | "gulp-pre-commit" | 16 | ], |
| 15 | ], | 17 | "repository": { |
| 16 | "repository": { | 18 | "type": "git", |
| 17 | "type": "git", | 19 | "url": "https://debo.suite.repo/modulos-npm/foca-login.git" |
| 18 | "url": "https://debo.suite.repo/modulos-npm/foca-login.git" | 20 | }, |
| 19 | }, | 21 | "author": "Foca Software", |
| 20 | "author": "Foca Software", | 22 | "license": "ISC", |
| 21 | "license": "ISC", | 23 | "peerDependencies": { |
| 22 | "peerDependencies": { | 24 | "angular": "^1.7.x", |
| 23 | "angular": "^1.7.x", | 25 | "bootstrap": "^4.1.x", |
| 24 | "bootstrap": "^4.1.x", | 26 | "jquery": "^3.3.x", |
| 25 | "jquery": "^3.3.x", | 27 | "font-awesome": "^4.7.x", |
| 26 | "font-awesome": "^4.7.x", | 28 | "gulp": "^3.9.x", |
| 27 | "gulp": "^3.9.x", | 29 | "gulp-concat": "2.6.x", |
| 28 | "gulp-concat": "2.6.x", | 30 | "gulp-jshint": "^2.1.x", |
| 29 | "gulp-jshint": "^2.1.x", | 31 | "gulp-rename": "^1.4.x", |
| 30 | "gulp-rename": "^1.4.x", | 32 | "gulp-replace": "^1.0.x", |
| 31 | "gulp-replace": "^1.0.x", | 33 | "gulp-uglify-es": "^1.0.x", |
| 32 | "gulp-uglify-es": "^1.0.x", | 34 | "jshint": "^2.9.x", |
| 33 | "jshint": "^2.9.x", | 35 | "pump": "^3.0.x", |
| 34 | "pump": "^3.0.x", | 36 | "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git" |
| 35 | "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git" | 37 | }, |
| 36 | }, | 38 | "devDependencies": { |
| 37 | "devDependencies": { | 39 | "angular": "^1.7.5", |
| 38 | "angular": "^1.7.5", | 40 | "angular-cookies": "^1.7.5", |
| 39 | "angular-cookies": "^1.7.5", | 41 | "angular-route": "^1.7.5", |
| 40 | "angular-route": "^1.7.5", | 42 | "bootstrap": "^4.1.3", |
| 41 | "bootstrap": "^4.1.3", | 43 | "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git", |
| 42 | "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git", | 44 | "font-awesome": "^4.7.0", |
| 43 | "font-awesome": "^4.7.0", | 45 | "gulp": "^3.9.1", |
| 44 | "gulp": "^3.9.1", | 46 | "gulp-angular-templatecache": "^2.2.2", |
| 45 | "gulp-angular-templatecache": "^2.2.2", | 47 | "gulp-clean": "^0.4.0", |
| 46 | "gulp-clean": "^0.4.0", | 48 | "gulp-connect": "^5.7.0", |
| 47 | "gulp-connect": "^5.7.0", | 49 | "gulp-htmlmin": "^5.0.1", |
| 48 | "gulp-htmlmin": "^5.0.1", | 50 | "gulp-jshint": "^2.1.0", |
| 49 | "gulp-jshint": "^2.1.0", | 51 | "gulp-rename": "^1.4.0", |
| 50 | "gulp-rename": "^1.4.0", | 52 | "gulp-replace": "^1.0.0", |
| 51 | "gulp-replace": "^1.0.0", | 53 | "gulp-sequence": "^1.0.0", |
| 52 | "gulp-sequence": "^1.0.0", | 54 | "gulp-uglify": "^3.0.1", |
| 53 | "gulp-uglify": "^3.0.1", | 55 | "jasmine-core": "^3.3.0", |
| 54 | "jasmine-core": "^3.3.0", | 56 | "jquery": "^3.3.1", |
| 55 | "jquery": "^3.3.1", | 57 | "jshint": "^2.9.7", |
| 56 | "jshint": "^2.9.7", | 58 | "pre-commit": "^1.2.2", |
| 57 | "pre-commit": "^1.2.2", | 59 | "pump": "^3.0.0" |
| 58 | "pump": "^3.0.0" | 60 | } |
| 59 | } | 61 | } |
| 60 | } | 62 |
src/views/foca-login.html
| 1 | <div class="row justify-content-center align-items-center"> | 1 | <div class="row justify-content-center align-items-center"> |
| 2 | <div class="col-12 my-2"> | 2 | <div class="col-12 my-2"> |
| 3 | <img src="img/logo.png" class="img-login mx-auto d-block"> | 3 | <img src="img/logo.png" class="img-login mx-auto d-block"> |
| 4 | </div> | 4 | </div> |
| 5 | <div class="col-8 col-sm-6 col-md-4 col-lg-3 my-2 align-self-stretch"> | ||
| 6 | <div class="bg-gradient-login border-0 rounded shadow-sm text-center"> | ||
| 5 | <div class="col-8 col-sm-6 col-md-4 col-lg-3 my-2 align-self-stretch"> | 7 | <form class="p-3 m-0" name="login"> |
| 6 | <div class="bg-gradient-login border-0 rounded shadow-sm text-center"> | 8 | <div class="pt-3 pb-2 mb-3 border-bottom border-white"> |
| 7 | <form class="p-3 m-0" name="login"> | 9 | <span>Ingreso de usuario</span> |
| 8 | <div class="pt-3 pb-2 mb-3 border-bottom border-white"> | 10 | </div> |
| 9 | <span>Ingreso de usuario</span> | 11 | <!-- USUARIO --> |
| 10 | </div> | 12 | <label |
| 11 | <!-- USUARIO --> | 13 | for="user" |
| 12 | <label | 14 | class="login-small-text m-0"> |
| 13 | for="user" | 15 | Usuario |
| 14 | class="login-small-text m-0"> | 16 | </label> |
| 15 | Usuario | 17 | <div class="input-group mb-2"> |
| 16 | </label> | 18 | <input |
| 19 | class="form-control form-control-sm rounded-pill text-transform-none" | ||
| 20 | type="text" | ||
| 21 | id="user" | ||
| 22 | ng-model="usuario.idUsuario" | ||
| 23 | ng-focus="paso = 1" | ||
| 24 | foca-focus="paso === 1" | ||
| 25 | ng-keyup="$event.keyCode == 13 && irPaso(2)" | ||
| 26 | ladda="loginLoading" | ||
| 27 | teclado-virtual | ||
| 28 | /> | ||
| 29 | </div> | ||
| 30 | <!-- CONTRASEÑA --> | ||
| 31 | <label | ||
| 32 | for="password" | ||
| 33 | class="login-small-text m-0"> | ||
| 34 | Contraseña | ||
| 35 | </label> | ||
| 36 | <div class="input-group mb-2"> | ||
| 37 | <input | ||
| 38 | class="form-control form-control-sm rounded-pill text-transform-none pr-5" | ||
| 39 | id="password" | ||
| 40 | type="{{hidePassword ? 'password' : 'text'}}" | ||
| 41 | ng-model="usuario.clave" | ||
| 42 | foca-focus="paso == 2" | ||
| 43 | ng-keyup="$event.keyCode == 13 && enviar()" | ||
| 44 | ladda="loginLoading" | ||
| 45 | teclado-virtual | ||
| 46 | /> | ||
| 47 | <div class="input-icon px-3"> | ||
| 48 | <div ng-show="!hidePassword" ng-click="hidePassword = !hidePassword"> | ||
| 49 | <i class="fade-in fa fa-eye"></i> | ||
| 50 | </div> | ||
| 51 | <div ng-show="hidePassword" ng-click="hidePassword = !hidePassword"> | ||
| 52 | <i class="fade-in fa fa-eye-slash"></i> | ||
| 53 | </div> | ||
| 54 | </div> | ||
| 55 | </div> | ||
| 56 | <button | ||
| 57 | type="button" | ||
| 58 | ng-click="enviar()" | ||
| 59 | class="btn btn-primary btn-block my-3" | ||
| 17 | <div class="input-group mb-2"> | 60 | ladda="loginLoading"> |
| 18 | <input | 61 | Ingresar |
| 19 | class="form-control form-control-sm rounded-pill text-transform-none" | ||
| 20 | type="text" | ||
| 21 | id="user" | ||
| 22 | ng-model="usuario.idUsuario" | ||
| 23 | ng-focus="paso = 1" | ||
| 24 | foca-focus="paso === 1" | ||
| 25 | ng-keyup="$event.keyCode == 13 && irPaso(2)" | ||
| 26 | ladda="loginLoading" | ||
| 27 | teclado-virtual |