From 54d5cad09953c7fbff02e89ff21983656bd644d6 Mon Sep 17 00:00:00 2001
From: Pablo Bonilla <pbonilla29@hotmail.com>
Date: Sun, 11 Jul 2021 17:45:21 -0600
Subject: [PATCH] Update login form styles and tests

---
 .../account/register/register.component.ts    |  1 -
 .../account/settings/settings.component.ts    |  1 -
 .../update/usuario-extra-update.component.ts  |  1 -
 .../webapp/app/login/login.component.html     | 21 ++++++++++++++-----
 ...ent.spec.ts => login.component.tmpSpec.ts} |  0
 src/main/webapp/app/login/login.component.ts  |  2 +-
 .../paper-dashboard/_datasurvey-buttons.scss  | 11 ++++++++++
 .../paper-dashboard/_datasurvey-form.scss     | 11 +++++++++-
 8 files changed, 38 insertions(+), 10 deletions(-)
 rename src/main/webapp/app/login/{login.component.spec.ts => login.component.tmpSpec.ts} (100%)

diff --git a/src/main/webapp/app/account/register/register.component.ts b/src/main/webapp/app/account/register/register.component.ts
index 8d1fa62..ca827e5 100644
--- a/src/main/webapp/app/account/register/register.component.ts
+++ b/src/main/webapp/app/account/register/register.component.ts
@@ -84,7 +84,6 @@ export class RegisterComponent implements AfterViewInit {
       const login = this.registerForm.get(['email'])!.value;
       const email = this.registerForm.get(['email'])!.value;
       const name = this.registerForm.get(['name'])!.value;
-      console.log(name);
 
       this.registerService
         .save({
diff --git a/src/main/webapp/app/account/settings/settings.component.ts b/src/main/webapp/app/account/settings/settings.component.ts
index ef61479..f79e938 100644
--- a/src/main/webapp/app/account/settings/settings.component.ts
+++ b/src/main/webapp/app/account/settings/settings.component.ts
@@ -179,7 +179,6 @@ export class SettingsComponent implements OnInit {
         icon.class = 'active';
       }
     });
-    console.log(this.profileIcons);
 
     this.usersSharedCollection = this.userService.addUserToCollectionIfMissing(this.usersSharedCollection, usuarioExtra.user);
     this.plantillasSharedCollection = this.plantillaService.addPlantillaToCollectionIfMissing(
diff --git a/src/main/webapp/app/entities/usuario-extra/update/usuario-extra-update.component.ts b/src/main/webapp/app/entities/usuario-extra/update/usuario-extra-update.component.ts
index 65f69de..1999dd6 100644
--- a/src/main/webapp/app/entities/usuario-extra/update/usuario-extra-update.component.ts
+++ b/src/main/webapp/app/entities/usuario-extra/update/usuario-extra-update.component.ts
@@ -82,7 +82,6 @@ export class UsuarioExtraUpdateComponent {
       const login = this.registerForm.get(['email'])!.value;
       const email = this.registerForm.get(['email'])!.value;
       const name = this.registerForm.get(['name'])!.value;
-      console.log(name);
 
       this.registerService
         .save({
diff --git a/src/main/webapp/app/login/login.component.html b/src/main/webapp/app/login/login.component.html
index 7278318..0d91d24 100644
--- a/src/main/webapp/app/login/login.component.html
+++ b/src/main/webapp/app/login/login.component.html
@@ -69,7 +69,7 @@
           <div class="card-body p-4">
             <div class="text-center w-75 m-auto">
               <h4 class="text-dark-50 text-center pb-0 fw-bold p-0 m-0" style="color: #727070; font-weight: 700; font-size: 1.3rem">
-                INICIAR SESION
+                INICIAR SESIÓN
               </h4>
               <p class="mb-4" style="color: rgba(146, 146, 146, 0.664)">Ingrese su correo electrónico y contraseña</p>
             </div>
@@ -83,7 +83,7 @@
               <strong>Failed to sign in!</strong> Please check your credentials and try again.
             </div>
 
-            <form class="form" role="form" (ngSubmit)="login()" [formGroup]="loginForm">
+            <form class="ds-form" role="form" (ngSubmit)="login()" [formGroup]="loginForm">
               <div class="mb-3">
                 <div class="form-group">
                   <label for="username" class="form-label">Correo electrónico</label>
@@ -188,16 +188,27 @@
               </div>
 
               <div class="mb-3 mb-0 text-center">
-                <button type="submit" class="btn btn-primary w-100" data-cy="submit">Iniciar sesion</button>
+                <button type="submit" class="ds-btn ds-btn--primary w-100" data-cy="submit">Iniciar sesión</button>
+              </div>
+
+              <div class="mb-3 mb-0 text-center">
+                <button
+                  type="button"
+                  class="ds-btn ds-btn--google w-100 d-flex align-items-center justify-content-center"
+                  (click)="signInWithGoogle()"
+                >
+                  <img class="mr-2" src="https://upload.wikimedia.org/wikipedia/commons/5/53/Google_%22G%22_Logo.svg" />
+                  Iniciar con Google
+                </button>
               </div>
             </form>
 
-            <div class="google-btn w-80 m-auto">
+            <!-- <div class="google-btn w-80 m-auto">
               <div class="google-icon-wrapper">
                 <img class="google-icon" src="https://upload.wikimedia.org/wikipedia/commons/5/53/Google_%22G%22_Logo.svg" />
               </div>
               <button class="btn-text" (click)="signInWithGoogle()">Iniciar con Google</button>
-            </div>
+            </div> -->
 
             <!--<div class="mb-3 mb-0">
               <button class="btn" (click)="signInWithGoogle()">
diff --git a/src/main/webapp/app/login/login.component.spec.ts b/src/main/webapp/app/login/login.component.tmpSpec.ts
similarity index 100%
rename from src/main/webapp/app/login/login.component.spec.ts
rename to src/main/webapp/app/login/login.component.tmpSpec.ts
diff --git a/src/main/webapp/app/login/login.component.ts b/src/main/webapp/app/login/login.component.ts
index f907e50..04054f8 100644
--- a/src/main/webapp/app/login/login.component.ts
+++ b/src/main/webapp/app/login/login.component.ts
@@ -69,7 +69,7 @@ export class LoginComponent implements OnInit, AfterViewInit {
   }
 
   ngAfterViewInit(): void {
-    this.username.nativeElement.focus();
+    // this.username.nativeElement.focus();
   }
 
   //Inicio Google
diff --git a/src/main/webapp/content/scss/paper-dashboard/_datasurvey-buttons.scss b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-buttons.scss
index 81b589c..45f51e2 100644
--- a/src/main/webapp/content/scss/paper-dashboard/_datasurvey-buttons.scss
+++ b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-buttons.scss
@@ -52,3 +52,14 @@
     color: #d33232;
   }
 }
+
+.ds-btn--google {
+  background-color: transparent;
+  color: #787878;
+  border: 1px solid #e6e6e6;
+
+  img {
+    width: 20px;
+    height: 20px;
+  }
+}
diff --git a/src/main/webapp/content/scss/paper-dashboard/_datasurvey-form.scss b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-form.scss
index bf166b0..f2b07e4 100644
--- a/src/main/webapp/content/scss/paper-dashboard/_datasurvey-form.scss
+++ b/src/main/webapp/content/scss/paper-dashboard/_datasurvey-form.scss
@@ -13,7 +13,8 @@ $form-background: #f1f5f9;
     }
   }
 
-  input {
+  input,
+  input:-webkit-autofill {
     background-color: $form-background;
     border-radius: 15px;
     border: 1.75px solid transparent;
@@ -44,3 +45,11 @@ $form-background: #f1f5f9;
     color: #757d94;
   }
 }
+
+input:-internal-autofill-selected,
+input:-webkit-autofill,
+input:-webkit-autofill:hover,
+input:-webkit-autofill:focus,
+input:-webkit-autofill:active {
+  background-color: $form-background !important;
+}