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 @@
-
@@ -18,23 +10,27 @@
+
+

+
Create Your New Password
-
+
-
+
-
-
- Reset Password
-
-
+
+ Reset Password
+
+
+
+
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() {
}