From 262a1cf857e66ad70fe5fd08bf0ffaf3f66ad0a4 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Sun, 3 Sep 2023 15:19:45 -0400
Subject: [PATCH] new pass

---
 .../pages/familymember/familymember.page.scss |  8 +++---
 .../pages/new-password/new-password.page.html | 26 ++++++++-----------
 .../pages/new-password/new-password.page.ts   | 18 ++++++++++++-
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/src/app/pages/familymember/familymember.page.scss b/src/app/pages/familymember/familymember.page.scss
index 1c3cf7a..40f3f49 100644
--- a/src/app/pages/familymember/familymember.page.scss
+++ b/src/app/pages/familymember/familymember.page.scss
@@ -1,9 +1,11 @@
 
 ion-content {
   .back_image {
-    width: 100%;
-    height: 230px;
-
+    width: auto;
+    height: 130px;
+    background-size: contain;
+    background-repeat: no-repeat;
+    
     .back {
       font-size: 25px;
       color: white;
diff --git a/src/app/pages/new-password/new-password.page.html b/src/app/pages/new-password/new-password.page.html
index 39489fb..09d2402 100644
--- a/src/app/pages/new-password/new-password.page.html
+++ b/src/app/pages/new-password/new-password.page.html
@@ -1,11 +1,3 @@
-<!--
-  Authors : initappz (Rahul Jograna)
-  Website : https://initappz.com/
-  App Name : E-Learning App Template
-  This App Template Source code is licensed as per the
-  terms found in the Website https://initappz.com/license
-  Copyright and Good Faith Purchasers © 2021-present initappz.
- -->
 <ion-header mode="ios" class="ion-no-border">
   <ion-toolbar>
     <ion-buttons slot="start" (click)="onBack()">
@@ -18,23 +10,27 @@
 </ion-header>
 
 <ion-content class="ion-padding">
+  <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="Password"></ion-input>
+    <ion-input type="password" placeholder="New Password" maxlength="15"></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"></ion-input>
+    <ion-input type="password" placeholder="Confirm Password" maxlength="15"></ion-input>
   </ion-item>
 
-  <ion-item lines="none">
-    <ion-button (click)="onCompleteNewReset()" expand="block">
-      Reset Password
-    </ion-button>
-  </ion-item>
+  <ion-button (click)="onCompleteNewReset()" expand="block">
+    Reset Password
+  </ion-button>
+
+<!--  <ion-item lines="none">-->
+  <!--  </ion-item>-->
 
 </ion-content>
 
diff --git a/src/app/pages/new-password/new-password.page.ts b/src/app/pages/new-password/new-password.page.ts
index 3e34093..a617f4a 100644
--- a/src/app/pages/new-password/new-password.page.ts
+++ b/src/app/pages/new-password/new-password.page.ts
@@ -17,10 +17,26 @@ import { Component, OnInit } from '@angular/core';
 })
 export class NewPasswordPage implements OnInit {
 
+  resetResult;any;
   constructor(
     private navctr: NavController,
     private router: Router
-  ) { }
+  ) {
+    this.resetResult  =  this.router.getCurrentNavigation().extras.state;
+    if ( this.resetResult != null
+        &&  this.resetResult.internal_return == 0 &&
+        this.resetResult.lostpass_id > 0 &&
+        this.resetResult.reset_uid !='' &&
+        this.resetResult.m_uid != '' ) {
+      //     this.reset_uid = resetResult.reset_uid;
+      //     this.m_uid = resetResult.m_uid;
+      //     this.password_reset_id = resetResult.password_reset_id;
+    }
+    else
+    {
+      this.onLogin();
+    }
+  }
 
   ngOnInit() {
   }