From 73a639713343bbaf8bd1870d3f1fec64415836c6 Mon Sep 17 00:00:00 2001 From: Mariela Bonilla Date: Sun, 11 Jul 2021 20:09:56 -0600 Subject: [PATCH 1/4] Cambios solicitador por QA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Se realizaron los cambios que QA solicitó realizar, además de algunas de arreglar algunas traducciones del inglés al español --- package-lock.json | 48 +++++++++++++++++++ .../list/usuario-extra.component.html | 19 +++----- .../list/usuario-extra.component.scss | 4 ++ .../list/usuario-extra.component.ts | 4 +- src/main/webapp/i18n/es/accesoEncuesta.json | 4 +- src/main/webapp/i18n/es/estadoCategoria.json | 4 +- .../webapp/i18n/es/estadoColaborador.json | 4 +- src/main/webapp/i18n/es/estadoEncuesta.json | 8 ++-- src/main/webapp/i18n/es/estadoPlantilla.json | 8 ++-- src/main/webapp/i18n/es/estadoUsuario.json | 4 +- .../webapp/i18n/es/preguntaCerradaTipo.json | 4 +- src/main/webapp/i18n/es/rolColaborador.json | 4 +- src/main/webapp/i18n/es/usuarioExtra.json | 26 +++++----- 13 files changed, 95 insertions(+), 46 deletions(-) diff --git a/package-lock.json b/package-lock.json index 250092c..24ede43 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,6 +23,8 @@ "@ng-bootstrap/ng-bootstrap": "9.1.3", "@ngx-translate/core": "13.0.0", "@ngx-translate/http-loader": "6.0.0", + "@types/gapi.auth2": "0.0.54", + "angularx-social-login": "^4.0.1", "bootstrap": "4.6.0", "dayjs": "1.10.5", "ngx-infinite-scroll": "10.0.1", @@ -4227,6 +4229,19 @@ "@types/node": "*" } }, + "node_modules/@types/gapi": { + "version": "0.0.40", + "resolved": "https://registry.npmjs.org/@types/gapi/-/gapi-0.0.40.tgz", + "integrity": "sha512-HzV7JIp5vgCZYPLzTg+LJCEVbTbZ/wNSCatNYThNvDTtiNXU+ccrUfFLUF2akHsil+KCpf2yp9OUhLUflsOuBw==" + }, + "node_modules/@types/gapi.auth2": { + "version": "0.0.54", + "resolved": "https://registry.npmjs.org/@types/gapi.auth2/-/gapi.auth2-0.0.54.tgz", + "integrity": "sha512-4HEphaKsGndb9+tnd2PBBmxloaij04iYXVsjgHpFxqbPFt5Le6pasoh5g5BEtwp/YEm9xDbzssp44BYR2/7RcQ==", + "dependencies": { + "@types/gapi": "*" + } + }, "node_modules/@types/glob": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", @@ -5091,6 +5106,18 @@ "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", "dev": true }, + "node_modules/angularx-social-login": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/angularx-social-login/-/angularx-social-login-4.0.1.tgz", + "integrity": "sha512-dL65y0HXlKd8hhuH70/FFTxWsndEBU5DX2I1x7AcJ1ZAYpU6LPtQMbnzy10eSOcWZNeZX8XzaRaIbc4P+GjmvA==", + "dependencies": { + "tslib": "^2.0.0" + }, + "peerDependencies": { + "@angular/common": "^12.0.0", + "@angular/core": "^12.0.0" + } + }, "node_modules/ansi-colors": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", @@ -30320,6 +30347,19 @@ "@types/node": "*" } }, + "@types/gapi": { + "version": "0.0.40", + "resolved": "https://registry.npmjs.org/@types/gapi/-/gapi-0.0.40.tgz", + "integrity": "sha512-HzV7JIp5vgCZYPLzTg+LJCEVbTbZ/wNSCatNYThNvDTtiNXU+ccrUfFLUF2akHsil+KCpf2yp9OUhLUflsOuBw==" + }, + "@types/gapi.auth2": { + "version": "0.0.54", + "resolved": "https://registry.npmjs.org/@types/gapi.auth2/-/gapi.auth2-0.0.54.tgz", + "integrity": "sha512-4HEphaKsGndb9+tnd2PBBmxloaij04iYXVsjgHpFxqbPFt5Le6pasoh5g5BEtwp/YEm9xDbzssp44BYR2/7RcQ==", + "requires": { + "@types/gapi": "*" + } + }, "@types/glob": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", @@ -30984,6 +31024,14 @@ "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", "dev": true }, + "angularx-social-login": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/angularx-social-login/-/angularx-social-login-4.0.1.tgz", + "integrity": "sha512-dL65y0HXlKd8hhuH70/FFTxWsndEBU5DX2I1x7AcJ1ZAYpU6LPtQMbnzy10eSOcWZNeZX8XzaRaIbc4P+GjmvA==", + "requires": { + "tslib": "^2.0.0" + } + }, "ansi-colors": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", diff --git a/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.html b/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.html index 95b20ad..80261e6 100644 --- a/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.html +++ b/src/main/webapp/app/entities/usuario-extra/list/usuario-extra.component.html @@ -1,13 +1,8 @@

- Usuario Extras + Usuarios
- -

@@ -32,10 +27,10 @@ - - + + - + @@ -62,7 +57,7 @@ >{{ last ? '' : ', ' }} --> -
RolIcono PerfilRolIcono Nombre UsuarioCorreo electrónicoCorreo electrónico Estado +
- +    -
@@ -32,10 +27,10 @@ - - + + - + @@ -62,7 +57,7 @@ >{{ last ? '' : ', ' }} --> -
RolIcono PerfilRolIcono Nombre UsuarioCorreo electrónicoCorreo electrónico Estado +
- +    @@ -62,14 +57,14 @@    - From 5c892b296a31dd6f94e47d833c0be875c5f4dddd Mon Sep 17 00:00:00 2001 From: Mariela Bonilla Date: Sun, 11 Jul 2021 21:40:38 -0600 Subject: [PATCH 4/4] Cambio estilo de botones --- .../update/usuario-extra-update.component.html | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/app/entities/usuario-extra/update/usuario-extra-update.component.html b/src/main/webapp/app/entities/usuario-extra/update/usuario-extra-update.component.html index 3f3437d..a56a4be 100644 --- a/src/main/webapp/app/entities/usuario-extra/update/usuario-extra-update.component.html +++ b/src/main/webapp/app/entities/usuario-extra/update/usuario-extra-update.component.html @@ -34,7 +34,15 @@ The password and its confirmation do not match!
-
+
@@ -86,7 +94,7 @@
- +