From d11c458c8c0fe7506639e44bb59cd8d8d352e2fb Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Sat, 10 Jul 2021 22:34:55 -0600 Subject: [PATCH 01/14] agregar estilos que pidio Pablo --- .../delete/categoria-delete-dialog.component.html | 8 ++++---- .../detail/categoria-detail.component.html | 4 ++-- .../categoria/list/categoria.component.html | 15 ++++++++++----- .../update/categoria-update.component.html | 14 ++++++++++---- src/main/webapp/app/login/login.component.spec.ts | 1 + 5 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.html b/src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.html index ed57d17..3fae047 100644 --- a/src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.html +++ b/src/main/webapp/app/entities/categoria/delete/categoria-delete-dialog.component.html @@ -1,8 +1,8 @@ -
+

Confirm delete operation

- +
@@ -14,11 +14,11 @@
- -
diff --git a/src/main/webapp/app/entities/categoria/detail/categoria-detail.component.html b/src/main/webapp/app/entities/categoria/detail/categoria-detail.component.html index fe0ee96..9531c6c 100644 --- a/src/main/webapp/app/entities/categoria/detail/categoria-detail.component.html +++ b/src/main/webapp/app/entities/categoria/detail/categoria-detail.component.html @@ -24,11 +24,11 @@ - - diff --git a/src/main/webapp/app/entities/categoria/list/categoria.component.html b/src/main/webapp/app/entities/categoria/list/categoria.component.html index 0a2a444..0f7fc16 100644 --- a/src/main/webapp/app/entities/categoria/list/categoria.component.html +++ b/src/main/webapp/app/entities/categoria/list/categoria.component.html @@ -3,7 +3,7 @@ Categorias
- @@ -11,7 +11,7 @@ - diff --git a/src/main/webapp/app/entities/categoria/update/categoria-update.component.html b/src/main/webapp/app/entities/categoria/update/categoria-update.component.html index 01dea01..778d75c 100644 --- a/src/main/webapp/app/entities/categoria/update/categoria-update.component.html +++ b/src/main/webapp/app/entities/categoria/update/categoria-update.component.html @@ -1,8 +1,8 @@
- +

- Create or edit a Categoria + Create or edit a Category

@@ -39,7 +39,13 @@
- @@ -48,7 +54,7 @@ id="save-entity" data-cy="entityCreateSaveButton" [disabled]="editForm.invalid || isSaving" - class="btn btn-primary" + class="btn btn-primary ds-btn ds-btn-primary" >  Save diff --git a/src/main/webapp/app/login/login.component.spec.ts b/src/main/webapp/app/login/login.component.spec.ts index 9631606..9f8675a 100644 --- a/src/main/webapp/app/login/login.component.spec.ts +++ b/src/main/webapp/app/login/login.component.spec.ts @@ -12,6 +12,7 @@ import { AccountService } from 'app/core/auth/account.service'; import { LoginService } from './login.service'; import { LoginComponent } from './login.component'; +import { SocialAuthService } from 'angularx-social-login'; describe('Component Tests', () => { describe('LoginComponent', () => { From 88f05bf269bbddd4bd1b0d17706436b3b36df328 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Sat, 10 Jul 2021 22:35:30 -0600 Subject: [PATCH 02/14] corregir titulo de pagina de edicion y creacion de categoria segun Paola --- src/main/webapp/i18n/es/categoria.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/i18n/es/categoria.json b/src/main/webapp/i18n/es/categoria.json index b5d1305..1007afa 100644 --- a/src/main/webapp/i18n/es/categoria.json +++ b/src/main/webapp/i18n/es/categoria.json @@ -5,7 +5,7 @@ "title": "Categorías", "refreshListLabel": "Refrescar lista", "createLabel": "Crear nueva Categoría", - "createOrEditLabel": "Crear o editar Categoría", + "createOrEditLabel": "Datos de Categoría", "notFound": "Ninguna Categoría encontrada" }, "created": "Una nueva Categoría ha sido creada con el identificador {{ param }}", From 6be855b78bfae286a0e40c8e38fa747a0ba688bd Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Sat, 10 Jul 2021 22:38:54 -0600 Subject: [PATCH 03/14] =?UTF-8?q?reducir=20tama=C3=B1o=20de=20la=20barra?= =?UTF-8?q?=20de=20busqueda?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/app/entities/categoria/list/categoria.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/app/entities/categoria/list/categoria.component.html b/src/main/webapp/app/entities/categoria/list/categoria.component.html index 0f7fc16..12721e2 100644 --- a/src/main/webapp/app/entities/categoria/list/categoria.component.html +++ b/src/main/webapp/app/entities/categoria/list/categoria.component.html @@ -32,7 +32,7 @@
- +
From 78ca0bba184c528a488ab5dbd2d7b6efda14f3ca Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Sat, 10 Jul 2021 22:40:48 -0600 Subject: [PATCH 04/14] Eliminar boton de "vista" de categoria este boton es innecesario dado que las categorias presentan toda su informacion en la tabla --- .../entities/categoria/list/categoria.component.html | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/main/webapp/app/entities/categoria/list/categoria.component.html b/src/main/webapp/app/entities/categoria/list/categoria.component.html index 12721e2..61014bf 100644 --- a/src/main/webapp/app/entities/categoria/list/categoria.component.html +++ b/src/main/webapp/app/entities/categoria/list/categoria.component.html @@ -53,16 +53,6 @@ @@ -62,7 +57,7 @@ >{{ last ? '' : ', ' }} --> -
{{ categoria.estado }}
- - - + +
+ +
+
-
+
+
- +    -
@@ -32,10 +27,10 @@ - - + + - + @@ -62,7 +57,7 @@ >{{ last ? '' : ', ' }} --> -
RolIcono PerfilRolIcono Nombre UsuarioCorreo electrónicoCorreo electrónico Estado +
- +   
+
+ Login name already registered! Please choose another one. +
+
Email is already in use! Please choose another one.
@@ -34,7 +38,7 @@
- + Your email cannot be longer than 100 characters. + + + Se requiere un correo electrónico válido. +
- +
- + diff --git a/src/main/webapp/app/account/register/register.component.ts b/src/main/webapp/app/account/register/register.component.ts index ca827e5..ddcc966 100644 --- a/src/main/webapp/app/account/register/register.component.ts +++ b/src/main/webapp/app/account/register/register.component.ts @@ -59,8 +59,8 @@ export class RegisterComponent implements AfterViewInit { registerForm = this.fb.group({ name: ['', [Validators.required, Validators.minLength(2), Validators.maxLength(254)]], email: ['', [Validators.required, Validators.minLength(5), Validators.maxLength(254), Validators.email]], - password: ['', [Validators.required, Validators.minLength(4), Validators.maxLength(50)]], - confirmPassword: ['', [Validators.required, Validators.minLength(4), Validators.maxLength(50)]], + password: ['', [Validators.required, Validators.minLength(8), Validators.maxLength(50)]], + confirmPassword: ['', [Validators.required, Validators.minLength(8), Validators.maxLength(50)]], }); constructor(private translateService: TranslateService, private registerService: RegisterService, private fb: FormBuilder) {} 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 1f2f81e..3f3437d 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 @@ -9,12 +9,12 @@

- REGISTRAR ADMIN + REGISTRAR ADMINISTRADOR

Ingrese los datos para registrar a un admin.

-
+
Registration saved! Please check your email for confirmation.
@@ -22,6 +22,10 @@ Registration failed! Please try again later.
+
+ Login name already registered! Please choose another one. +
+
Email is already in use! Please choose another one.
@@ -33,13 +37,13 @@
- + @@ -88,7 +92,7 @@ class="form-control" id="email" name="email" - placeholder="{{ 'global.form.email.placeholder' | translate }}" + placeholder="Correo electrónico" formControlName="email" data-cy="email" /> @@ -125,13 +129,17 @@ > Your email cannot be longer than 100 characters. + + + Se requiere un correo electrónico válido. +
- +
- + ¡Registro guardado! Por favor, revise el correo electrónico para confirmar.", "error": { "fail": "¡El registro ha fallado! Por favor, inténtelo de nuevo más tarde.", - "userexists": "¡El nombre de usuario ya está registrado! Por favor, escoja otro usuario.", + "userexists": "¡El correo electrónico ya está en uso! Por favor, escoja otro correo.", "emailexists": "¡El correo electrónico ya está en uso! Por favor, escoja otro email." } } From 6db4b9574a3831e92b18c7c057205ee71027a482 Mon Sep 17 00:00:00 2001 From: Mariela Bonilla Date: Sun, 11 Jul 2021 20:39:20 -0600 Subject: [PATCH 13/14] Nuevos cambios de QA respecto a estilos Se arreglaron estilos de botones --- .../usuario-extra/list/usuario-extra.component.html | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) 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 80261e6..a4ce1c6 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 @@ -3,12 +3,7 @@ Usuarios
- @@ -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 14/14] 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 @@
- +