From 4bb1ec6b436c79a8a35f418a042983514ac1cce0 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Wed, 15 Nov 2023 21:34:24 -0500
Subject: [PATCH] pass reset

---
 .../familysettings/familysettings.page.html   | 62 +++++++-------
 src/app/pages/forgot/forgot.page.html         | 83 ++++++++++---------
 src/app/pages/forgot/forgot.page.ts           |  3 +-
 .../pages/new-password/new-password.page.html | 49 ++++++-----
 .../pages/new-password/new-password.page.ts   |  2 +-
 5 files changed, 107 insertions(+), 92 deletions(-)

diff --git a/src/app/pages/familysettings/familysettings.page.html b/src/app/pages/familysettings/familysettings.page.html
index 7710a38..c64a018 100644
--- a/src/app/pages/familysettings/familysettings.page.html
+++ b/src/app/pages/familysettings/familysettings.page.html
@@ -17,36 +17,42 @@
 
 
 <ion-content>
+    <div class="boxed_contents">
+        <ion-list>
+            <ion-item>
+                <ion-icon aria-hidden="true" name="people" slot="start"></ion-icon>
+                <ion-label>Add Family</ion-label>
+            </ion-item>
+            <ion-item>
+                <ion-icon aria-hidden="true" name="people" slot="start"></ion-icon>
+                <ion-label>Relatives</ion-label>
+            </ion-item>
+            <ion-item>
+                <ion-icon aria-hidden="true" name="chatbubbles-outline" slot="start"></ion-icon>
+                <ion-label>Notifications</ion-label>
+            </ion-item>
 
-  <ion-list>
-    <ion-item>
-      <ion-icon aria-hidden="true" name="people" slot="start"></ion-icon>
-      <ion-label>Add Family</ion-label>
-    </ion-item>
-    <ion-item>
-      <ion-icon aria-hidden="true" name="chatbubbles-outline" slot="start"></ion-icon>
-      <ion-label>Notifications</ion-label>
-    </ion-item>
-<!--    <ion-item>-->
-<!--      <ion-icon aria-hidden="true" name="bluetooth" slot="start"></ion-icon>-->
-<!--      <ion-label>Bluetooth</ion-label>-->
-<!--    </ion-item>-->
-<!--    <ion-item>-->
-<!--      <ion-icon aria-hidden="true" name="call" slot="start"></ion-icon>-->
-<!--      <ion-label>Cellular</ion-label>-->
-<!--    </ion-item>-->
-  </ion-list>
+            <!--    <ion-item>-->
+            <!--      <ion-icon aria-hidden="true" name="bluetooth" slot="start"></ion-icon>-->
+            <!--      <ion-label>Bluetooth</ion-label>-->
+            <!--    </ion-item>-->
+            <!--    <ion-item>-->
+            <!--      <ion-icon aria-hidden="true" name="call" slot="start"></ion-icon>-->
+            <!--      <ion-label>Cellular</ion-label>-->
+            <!--    </ion-item>-->
+        </ion-list>
 
-  <ion-card>
+        <ion-card>
 
-    <ion-card-header>
-<!--      <ion-card-title>Card Title</ion-card-title>-->
-      <ion-card-subtitle>Family Banner</ion-card-subtitle>
-    </ion-card-header>
-    <img alt="Family" src="{{session_image_server}}/{{curr_session}}/familybanner/{{member_uid}}" />
-    <ion-card-content>
-     Change Banner
-    </ion-card-content>
-  </ion-card>
+            <ion-card-header>
+                <!--      <ion-card-title>Card Title</ion-card-title>-->
+                <ion-card-subtitle>Family Banner</ion-card-subtitle>
+            </ion-card-header>
+            <img alt="Family" src="{{session_image_server}}/{{curr_session}}/familybanner/{{member_uid}}" />
+            <ion-card-content>
+                Change Banner
+            </ion-card-content>
+        </ion-card>
+    </div>
 
 </ion-content>
diff --git a/src/app/pages/forgot/forgot.page.html b/src/app/pages/forgot/forgot.page.html
index f8404e3..30d4a5a 100644
--- a/src/app/pages/forgot/forgot.page.html
+++ b/src/app/pages/forgot/forgot.page.html
@@ -1,58 +1,63 @@
 <ion-content class="ion-padding">
-  <div class="page_logo">
-    <img alt="WrenchBoard" src="/assets/images/wrenchboard-line.png" />
-  </div>
+  <div  class="start-pages">
+    <div class="page_logo">
+      <img alt="WrenchBoard" src="/assets/images/wrenchboard-line.png" />
+    </div>
 
-  <div *ngIf="tab == 1" class="ion-padding">
+    <div class="boxed_contents">
 
-    <ion-label class="welcome_lbl">Forgot password</ion-label>
+      <div *ngIf="tab == 1" class="ion-padding">
 
-    <ion-label class="simp_lbl">Select which contact details should we use to reset your password:</ion-label>
+        <ion-label class="welcome_lbl">Forgot password</ion-label>
 
-    <ion-item lines="none">
-      <ion-icon slot="start" name="mail-outline"></ion-icon>
-      <ion-label (click)="tab = 2">Via email</ion-label>
-      <ion-icon slot="end" name="chevron-forward-outline"></ion-icon>
-    </ion-item>
+        <ion-label class="simp_lbl">Select which contact details should we use to reset your password:</ion-label>
 
-    <ion-item lines="none">
-      <ion-icon slot="start" name="phone-portrait-outline"></ion-icon>
-      <ion-label>Via sms</ion-label>
-      <ion-icon slot="end" name="chevron-forward-outline"></ion-icon>
-    </ion-item>
-  </div>
+        <ion-item lines="none">
+          <ion-icon slot="start" name="mail-outline"></ion-icon>
+          <ion-label (click)="tab = 2">Via email</ion-label>
+          <ion-icon slot="end" name="chevron-forward-outline"></ion-icon>
+        </ion-item>
 
-  <div *ngIf="tab == 2" class="ion-padding">
+        <ion-item lines="none">
+          <ion-icon slot="start" name="phone-portrait-outline"></ion-icon>
+          <ion-label>Via sms</ion-label>
+          <ion-icon slot="end" name="chevron-forward-outline"></ion-icon>
+        </ion-item>
+      </div>
 
-    <ion-label class="welcome_lbl">Forgot password</ion-label>
+      <div *ngIf="tab == 2" class="ion-padding">
 
-    <ion-label class="simp_lbl">Enter your registered email</ion-label>
+        <ion-label class="welcome_lbl">Forgot password</ion-label>
 
-    <ion-item lines="none">
-      <ion-input type="email" placeholder="Your username" maxlength="35" [(ngModel)]='username'></ion-input>
-    </ion-item>
+        <ion-label class="simp_lbl">Enter your registered email</ion-label>
 
-    <ion-button (click)="onEnterEmail()" expand="block">
-      Continue
-    </ion-button>
-  </div>
+        <ion-item lines="none">
+          <ion-input type="email" placeholder="Your username" maxlength="35" [(ngModel)]='username'></ion-input>
+        </ion-item>
+
+        <ion-button (click)="onEnterEmail()" expand="block">
+          Continue
+        </ion-button>
+      </div>
 
 
-  <div *ngIf="tab == 3" class="ion-padding">
+      <div *ngIf="tab == 3" class="ion-padding">
 
-    <ion-label class="welcome_lbl">Forgot password</ion-label>
+        <ion-label class="welcome_lbl">Forgot password</ion-label>
 
-    <ion-label class="simp_lbl">Code has been sent to the your registered email</ion-label>
+        <ion-label class="simp_lbl">Code has been sent to the your registered email</ion-label>
 
-    <ion-item lines="none">
-      <ion-input type="text" placeholder="Enter Code"  maxlength="10" [(ngModel)]='reset_pin'></ion-input>
-    </ion-item>
+        <ion-item lines="none">
+          <ion-input type="text" placeholder="Enter Code"  maxlength="10" [(ngModel)]='reset_pin'></ion-input>
+        </ion-item>
 
-    <ion-button (click)="onCompleteReset()" expand="block">
-      Continue
-    </ion-button>
-  </div>
-  <div class="bottom">
-    <ion-label class="last_lbl">Already have an account? <span (click)="onLogin()">Login</span></ion-label>
+        <ion-button (click)="onCompleteReset()" expand="block">
+          Continue
+        </ion-button>
+      </div>
+      <div class="bottom">
+        <ion-label class="last_lbl">Already have an account? <span style="color: #4B5DFA;" (click)="onLogin()">Login</span></ion-label>
+      </div>
+    </div>
   </div>
 </ion-content>
diff --git a/src/app/pages/forgot/forgot.page.ts b/src/app/pages/forgot/forgot.page.ts
index 290a440..a8d24f8 100644
--- a/src/app/pages/forgot/forgot.page.ts
+++ b/src/app/pages/forgot/forgot.page.ts
@@ -70,7 +70,8 @@ export class ForgotPage implements OnInit {
           }
           else
           {
-            alert("SOME WENT WROMNG");
+              this.showAlert("Password Reset Error","We are unable to complete the process, please contact support");
+             // alert("SOME WENT WROMNG");
           }
 
         }
diff --git a/src/app/pages/new-password/new-password.page.html b/src/app/pages/new-password/new-password.page.html
index 99cd9ca..1cc12b6 100644
--- a/src/app/pages/new-password/new-password.page.html
+++ b/src/app/pages/new-password/new-password.page.html
@@ -10,34 +10,37 @@
 </ion-header>
 
 <ion-content class="ion-padding">
-  <div class="page_logo">
-    <img alt="WrenchBoard" src="/assets/images/wrenchboard-line.png" />
+  <div  class="start-pages">
+    <div class="boxed_contents">
+      <div class="page_logo">
+        <img alt="WrenchBoard" src="/assets/images/wrenchboard-line.png" />
+      </div>
+      <ion-label class="create">Create Your New Password</ion-label>
+
+      <ion-item lines="none">
+        <ion-icon slot="start" name="lock-closed-outline"></ion-icon>
+        <ion-input type="password" placeholder="New Password" maxlength="15" [(ngModel)]='new_password'></ion-input>
+      </ion-item>
+
+      <ion-item lines="none">
+        <ion-icon slot="start" name="lock-closed-outline"></ion-icon>
+        <ion-input type="password" placeholder="Confirm Password" maxlength="15" [(ngModel)]='confirm_new_password'></ion-input>
+      </ion-item>
+
+    </div>
+
+    <ion-button shape="round" color="danger" (click)="onCompleteNewReset()" expand="block">
+      Reset Password
+    </ion-button>
+
+    <!--  <ion-item lines="none">-->
+    <!--  </ion-item>-->
   </div>
-  <ion-label class="create">Create Your New Password</ion-label>
-
-  <ion-item lines="none">
-    <ion-icon slot="start" name="lock-closed-outline"></ion-icon>
-    <ion-input type="password" placeholder="New Password" maxlength="15" [(ngModel)]='new_password'></ion-input>
-  </ion-item>
-
-  <ion-item lines="none">
-    <ion-icon slot="start" name="lock-closed-outline"></ion-icon>
-    <ion-input type="password" placeholder="Confirm Password" maxlength="15" [(ngModel)]='confirm_new_password'></ion-input>
-  </ion-item>
-
-  <ion-button (click)="onCompleteNewReset()" expand="block">
-    Reset Password
-  </ion-button>
-
-<!--  <ion-item lines="none">-->
-  <!--  </ion-item>-->
-
 </ion-content>
-
 <ion-footer>
   <ion-toolbar>
     <div class="button" (click)="onLogin()">
-      <ion-label class="text">Done</ion-label>
+      <ion-label class="text">Return to login</ion-label>
     </div>
   </ion-toolbar>
 </ion-footer>
diff --git a/src/app/pages/new-password/new-password.page.ts b/src/app/pages/new-password/new-password.page.ts
index f092910..c3d76b3 100644
--- a/src/app/pages/new-password/new-password.page.ts
+++ b/src/app/pages/new-password/new-password.page.ts
@@ -67,7 +67,7 @@ export class NewPasswordPage implements OnInit {
   onCompleteNewReset(){
 
     if (this.new_password.length < 8 || (this.new_password != this.confirm_new_password) ){
-      this.showAlert('Error', 'Enter new password to continue');
+      this.showAlert('Error', 'Enter new password to continue, must be 8 or more alphanumeric');
       return;
     }
     this.postData = {