From 1a079ca40e49caed3c886a1346a9258f12c1126e Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Thu, 16 Nov 2023 06:05:23 -0500 Subject: [PATCH] pass reset --- src/app/pages/family/family.page.scss | 1 + .../familysettings/familysettings.page.html | 95 ++++++++++++------- .../familysettings/familysettings.page.scss | 4 + .../pages/new-password/new-password.page.ts | 21 ++-- 4 files changed, 78 insertions(+), 43 deletions(-) diff --git a/src/app/pages/family/family.page.scss b/src/app/pages/family/family.page.scss index 3715be9..2bf0072 100644 --- a/src/app/pages/family/family.page.scss +++ b/src/app/pages/family/family.page.scss @@ -8,6 +8,7 @@ ion-content { margin-top: 10px; width: 100%; height: 200px; + background-size: contain; .back { font-size: 25px; diff --git a/src/app/pages/familysettings/familysettings.page.html b/src/app/pages/familysettings/familysettings.page.html index c64a018..9837eac 100644 --- a/src/app/pages/familysettings/familysettings.page.html +++ b/src/app/pages/familysettings/familysettings.page.html @@ -18,41 +18,72 @@
- - - - Add Family - - - - Relatives - - - - Notifications - + + + + Add Family + +
Adding New Member
+ + + + Relatives + +
Relatives list here plus add
+ + + + Family Banner + +
- - - - - - - - - + + Family + + Change Banner + + - +
+ + - - - Family Banner - - Family - - Change Banner - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/app/pages/familysettings/familysettings.page.scss b/src/app/pages/familysettings/familysettings.page.scss index e69de29..5c291ed 100644 --- a/src/app/pages/familysettings/familysettings.page.scss +++ b/src/app/pages/familysettings/familysettings.page.scss @@ -0,0 +1,4 @@ + +ion-accordion-group{ + --background-color: aliceblue; +} \ No newline at end of file diff --git a/src/app/pages/new-password/new-password.page.ts b/src/app/pages/new-password/new-password.page.ts index c3d76b3..dbc8a6e 100644 --- a/src/app/pages/new-password/new-password.page.ts +++ b/src/app/pages/new-password/new-password.page.ts @@ -1,13 +1,5 @@ -/* - 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. -*/ import { Router } from '@angular/router'; -import { NavController } from '@ionic/angular'; +import {LoadingController, NavController} from '@ionic/angular'; import {Component, OnInit, ViewChild} from '@angular/core'; import {WrenchService} from "../../services/wrench.service"; import {SessionDataProviderService} from "../../store/session-data-provider.service"; @@ -26,7 +18,8 @@ export class NewPasswordPage implements OnInit { private navctr: NavController, private router: Router, private wrenchService: WrenchService, - public sessionDataProviderService:SessionDataProviderService + public sessionDataProviderService:SessionDataProviderService, + private loadingCtrl: LoadingController ) { this.resetResult = this.router.getCurrentNavigation().extras.state; if ( this.resetResult != null @@ -64,7 +57,11 @@ export class NewPasswordPage implements OnInit { }; completeResetResults:any; - onCompleteNewReset(){ + async onCompleteNewReset(){ + const loading = await this.loadingCtrl.create({ + message: 'Please wait...', + duration: 6000, + }); if (this.new_password.length < 8 || (this.new_password != this.confirm_new_password) ){ this.showAlert('Error', 'Enter new password to continue, must be 8 or more alphanumeric'); @@ -80,12 +77,14 @@ export class NewPasswordPage implements OnInit { channel:'MOBILE', newpass: this.new_password }; + loading.present(); this.wrenchService.verifyPassReset(this.postData).subscribe( completeResetResults => { this.completeResetResults = completeResetResults; console.log("completeResetResults RETURN->", this.completeResetResults); this.showAlert('Completed', 'Login with new password now'); this.router.navigate(['login']); + loading.dismiss(); } ); }