From f56e49d72eebe3a2851f3b5df9abf0d870c292b1 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 31 May 2021 15:10:37 +0100
Subject: [PATCH 1/4] Improve pin button

---
 .../header-no-search/profile/profile.page.html    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/headers/header-no-search/profile/profile.page.html b/src/app/shared/headers/header-no-search/profile/profile.page.html
index 9f824bf2d..e4d22f6ff 100644
--- a/src/app/shared/headers/header-no-search/profile/profile.page.html
+++ b/src/app/shared/headers/header-no-search/profile/profile.page.html
@@ -46,6 +46,14 @@
 
     </div>
 
+    <div class="d-flex justify-center mt-10">
+      <ion-buttons slot="start" (click)="logout()">
+        <ion-button class="btn-cancel" fill="clear"style="background:#ffe0e0;" >
+          <ion-label style="color:#d30a0a;">Terminar sessão</ion-label>
+        </ion-button>
+      </ion-buttons>
+    </div>
+
   </div>
 
 </ion-content>
@@ -54,13 +62,6 @@
 
 <ion-footer class=" footer-container ion-no-border bg-blue">
   
-  <div class="d-flex justify-center mb-10">
-    <ion-buttons slot="start" (click)="logout()">
-      <ion-button class="btn-cancel" fill="clear"style="background:#ffe0e0;" >
-        <ion-label style="color:#d30a0a;">Terminar sessão</ion-label>
-      </ion-button>
-    </ion-buttons>
-  </div>
 
   <div class="d-flex justify-space-between">
 

From 28483d4affa952feffa56a455421a7c0888cac23 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 31 May 2021 15:45:28 +0100
Subject: [PATCH 2/4] Improve pin

---
 .../header-no-search/profile/profile.page.html      | 13 +++++++------
 .../header-no-search/profile/profile.page.scss      |  4 ++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/app/shared/headers/header-no-search/profile/profile.page.html b/src/app/shared/headers/header-no-search/profile/profile.page.html
index e4d22f6ff..de5157de9 100644
--- a/src/app/shared/headers/header-no-search/profile/profile.page.html
+++ b/src/app/shared/headers/header-no-search/profile/profile.page.html
@@ -47,22 +47,24 @@
     </div>
 
     <div class="d-flex justify-center mt-10">
-      <ion-buttons slot="start" (click)="logout()">
-        <ion-button class="btn-cancel" fill="clear"style="background:#ffe0e0;" >
+      <ion-buttons slot="start" class="buttonSize" (click)="logout()" >
+        <ion-button class="btn-cancel buttonSize" fill="clear" style="background:#ffe0e0;" >
           <ion-label style="color:#d30a0a;">Terminar sessão</ion-label>
         </ion-button>
       </ion-buttons>
     </div>
 
+    <div class="d-flex justify-center mt-10">
+      <ion-button class="btn-ok  buttonSize" fill="clear" color="#fff" >
+        <ion-label>Alterar PIN</ion-label>
+      </ion-button>
+    </div>
   </div>
 
 </ion-content>
 
-
-
 <ion-footer class=" footer-container ion-no-border bg-blue">
   
-
   <div class="d-flex justify-space-between">
 
     <ion-buttons slot="start" (click)="close()">
@@ -75,7 +77,6 @@
           <ion-label>Gravar</ion-label>
         </ion-button>
       </ion-buttons>
-
   </div>
 
 </ion-footer>
\ No newline at end of file
diff --git a/src/app/shared/headers/header-no-search/profile/profile.page.scss b/src/app/shared/headers/header-no-search/profile/profile.page.scss
index 6ee1890b9..acab1b075 100644
--- a/src/app/shared/headers/header-no-search/profile/profile.page.scss
+++ b/src/app/shared/headers/header-no-search/profile/profile.page.scss
@@ -57,4 +57,8 @@
     .checkBox{
         margin-right: 10px;
     }
+}
+
+.buttonSize {
+    width: 100% !important;
 }
\ No newline at end of file

From 0f228da51589a13da619a1df046ce9792bd67bf1 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 1 Jun 2021 10:42:14 +0100
Subject: [PATCH 3/4] Improve

---
 src/app/pages/login/login.page.html                    |  9 +++++++--
 src/app/pages/login/login.page.ts                      |  1 +
 .../headers/header-no-search/profile/profile.page.html |  8 ++++----
 .../headers/header-no-search/profile/profile.page.ts   | 10 ++++++++++
 src/app/shared/pin/pin.page.html                       |  2 +-
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html
index 875fd4c2e..c37e6613b 100644
--- a/src/app/pages/login/login.page.html
+++ b/src/app/pages/login/login.page.html
@@ -55,9 +55,14 @@
         
       </div>
   
-      <div class="voltar d-flex align-center justify-center pt-25 clear" (click)="pin=!pin">
-        Voltar
+      <div *ngIf="!setPint" class="voltar d-flex align-center justify-center pt-25 clear" (click)="pin=!pin">
+        Entrar com senha
       </div>
+
+      <div  *ngIf="setPint" class="voltar d-flex align-center justify-center pt-25 clear" (click)="pin=!pin">
+        Limpar
+      </div>
+
     </div>
   </div>
 
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 37214ff0e..0f5f02e68 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -163,6 +163,7 @@ export class LoginPage implements OnInit {
   }
 
   storePin() {
+
     const code = this.code.join('')
     const encrypted = crypto.SHA1(code)
 
diff --git a/src/app/shared/headers/header-no-search/profile/profile.page.html b/src/app/shared/headers/header-no-search/profile/profile.page.html
index de5157de9..2b730b692 100644
--- a/src/app/shared/headers/header-no-search/profile/profile.page.html
+++ b/src/app/shared/headers/header-no-search/profile/profile.page.html
@@ -29,15 +29,15 @@
 
       <ion-row>
         <ion-col class="align-center d-flex">
-          <div (click)="addPin()" class="d-flex align-center">
-            <ion-checkbox class="checkBox"></ion-checkbox>
+          <div class="d-flex align-center">
+            <ion-checkbox (ionChange)="LoginPreference('pin')" class="checkBox" ></ion-checkbox>
             PIN 
           </div>
 
         </ion-col>
         <ion-col class="align-center d-flex">
           <div (click)="addFingerprint()" class="d-flex align-center">
-            <ion-checkbox class="checkBox"></ion-checkbox>
+            <ion-checkbox (ionChange)="LoginPreference('pin')" class="checkBox"></ion-checkbox>
             Impressão Digital
           </div>
         </ion-col>
@@ -55,7 +55,7 @@
     </div>
 
     <div class="d-flex justify-center mt-10">
-      <ion-button class="btn-ok  buttonSize" fill="clear" color="#fff" >
+      <ion-button (click)="addPin()" class="btn-ok  buttonSize" fill="clear" color="#fff" >
         <ion-label>Alterar PIN</ion-label>
       </ion-button>
     </div>
diff --git a/src/app/shared/headers/header-no-search/profile/profile.page.ts b/src/app/shared/headers/header-no-search/profile/profile.page.ts
index b60974a87..65d7535d6 100644
--- a/src/app/shared/headers/header-no-search/profile/profile.page.ts
+++ b/src/app/shared/headers/header-no-search/profile/profile.page.ts
@@ -110,5 +110,15 @@ export class ProfileComponent implements OnInit {
     this.router.navigate(['/']);
   }
 
+  LoginPreference(type: string) {
+
+    let userData = JSON.parse(localStorage.getItem('UserData')) 
+
+    userData.loginPreference = type
+
+    localStorage.setItem('UserData', JSON.stringify(userData) )
+
+  }
+
 
 }
diff --git a/src/app/shared/pin/pin.page.html b/src/app/shared/pin/pin.page.html
index ea620da82..1e5bde8c7 100644
--- a/src/app/shared/pin/pin.page.html
+++ b/src/app/shared/pin/pin.page.html
@@ -37,7 +37,7 @@
     </div>
 
     <div (click)="close()" class="d-flex align-center justify-center pt-25 clear">
-      Voltar
+      Cancelar
     </div>
   </div>
 

From caf0fbbb8bd371391777c5e1360abe824683b04d Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 1 Jun 2021 11:47:09 +0100
Subject: [PATCH 4/4] Login preference

---
 src/app/pages/login/login.page.html           |  4 +--
 src/app/pages/login/login.page.ts             | 17 +++++++++-
 .../profile/profile.page.html                 |  7 ++--
 .../header-no-search/profile/profile.page.ts  | 32 ++++++++++++++++---
 4 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/src/app/pages/login/login.page.html b/src/app/pages/login/login.page.html
index c37e6613b..805b12836 100644
--- a/src/app/pages/login/login.page.html
+++ b/src/app/pages/login/login.page.html
@@ -1,5 +1,5 @@
 <ion-content class="text-white">
-  <div class="wrapper"  *ngIf="pin ==false">
+  <div class="wrapper"  *ngIf="userLoginPreference != 'pin' && userLoginPreference != 'fingerprint' && !setPint">
     <div class="div-logo">
       <img src='assets/images/logo-no-bg.png' alt='logo'>
     </div>
@@ -17,7 +17,7 @@
     </form>
   </div>
 
-  <div class="main-content  height-100" *ngIf="pin">
+  <div class="main-content  height-100" *ngIf="userLoginPreference == 'pin' || setPint">
     <div class=" align-center justify-center">
       <div class="div-top-header">
 
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 0f5f02e68..dec8ade5e 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -37,6 +37,8 @@ export class LoginPage implements OnInit {
 
   pin = localStorage.getItem('PIN') != null
 
+  userLoginPreference: any
+
   constructor(
     private http: HttpClient,
     private notificatinsservice: NotificationsService,
@@ -48,7 +50,17 @@ export class LoginPage implements OnInit {
     public alertController: AlertController,
     private modalController: ModalController
     //private fcm: FCM
-  ) { }
+  ) { 
+
+    let userData = JSON.parse(localStorage.getItem('UserData')) || {}
+
+    if (userData.hasOwnProperty('loginPreference')) {
+      this.userLoginPreference = userData.loginPreference
+    } else {
+      this.userLoginPreference = ''
+    }
+    
+  }
 
   ngOnInit() {}
 
@@ -60,6 +72,7 @@ export class LoginPage implements OnInit {
     );
   }
 
+
   async presentAlert(message: string) {
     const alert = await this.alertController.create({
       cssClass: 'my-custom-class',
@@ -125,6 +138,8 @@ export class LoginPage implements OnInit {
   }
 
   setCode(code: string) {
+    
+
     if(this.code.length < 4) {
       this.code.push(code)
     }
diff --git a/src/app/shared/headers/header-no-search/profile/profile.page.html b/src/app/shared/headers/header-no-search/profile/profile.page.html
index 2b730b692..6d54d67b5 100644
--- a/src/app/shared/headers/header-no-search/profile/profile.page.html
+++ b/src/app/shared/headers/header-no-search/profile/profile.page.html
@@ -29,15 +29,16 @@
 
       <ion-row>
         <ion-col class="align-center d-flex">
-          <div class="d-flex align-center">
-            <ion-checkbox (ionChange)="LoginPreference('pin')" class="checkBox" ></ion-checkbox>
+          <div class="d-flex align-center"  (click)="LoginPreferenceMethod('pin')">
+            <!--  -->
+            <ion-checkbox [checked]="userLoginPreference=='pin' " class="checkBox" ></ion-checkbox>
             PIN 
           </div>
 
         </ion-col>
         <ion-col class="align-center d-flex">
           <div (click)="addFingerprint()" class="d-flex align-center">
-            <ion-checkbox (ionChange)="LoginPreference('pin')" class="checkBox"></ion-checkbox>
+            <ion-checkbox class="checkBox" [checked]="false"></ion-checkbox>
             Impressão Digital
           </div>
         </ion-col>
diff --git a/src/app/shared/headers/header-no-search/profile/profile.page.ts b/src/app/shared/headers/header-no-search/profile/profile.page.ts
index 65d7535d6..a5ca957ea 100644
--- a/src/app/shared/headers/header-no-search/profile/profile.page.ts
+++ b/src/app/shared/headers/header-no-search/profile/profile.page.ts
@@ -110,15 +110,37 @@ export class ProfileComponent implements OnInit {
     this.router.navigate(['/']);
   }
 
-  LoginPreference(type: string) {
+  LoginPreferenceMethod(type: string) {
+    
+    let userData = JSON.parse(localStorage.getItem('UserData')) || {}
 
-    let userData = JSON.parse(localStorage.getItem('UserData')) 
-
-    userData.loginPreference = type
+    if (userData.hasOwnProperty('loginPreference')) { 
+      if (userData.loginPreference != type) {
+        if (type) {
+          userData.loginPreference = type
+        }
+      } else {
+        userData.loginPreference = 'none'
+      }
+    
+    } else {
+      userData.loginPreference = 'none'
+    }
 
     localStorage.setItem('UserData', JSON.stringify(userData) )
-
   }
 
+  get userLoginPreference() {
+
+    let userData = JSON.parse(localStorage.getItem('UserData')) || {}
+
+    if (userData.hasOwnProperty('loginPreference')) {
+      console.log( userData.loginPreference)
+      return userData.loginPreference
+    } else {
+      return false
+    }
+    
+  }
 
 }