diff --git a/src/app/auth/reset-password/reset-password.page.html b/src/app/auth/reset-password/reset-password.page.html index 0a035ab58508624b3031d349e830a5295d9ab847..5645b593eef44e2c72e18defd142cfd12d0ee3cc 100644 --- a/src/app/auth/reset-password/reset-password.page.html +++ b/src/app/auth/reset-password/reset-password.page.html @@ -1,6 +1,11 @@ <ion-header> - <ion-toolbar> - <ion-title>Reset Password</ion-title> + <ion-toolbar color="awPrimary"> + <ion-buttons slot="start"> + <ion-menu-button></ion-menu-button> + </ion-buttons> + <ion-title slot="start"> + Change Password + </ion-title> </ion-toolbar> </ion-header> diff --git a/src/app/auth/reset-password/reset-password.page.ts b/src/app/auth/reset-password/reset-password.page.ts index 895132786724c8baf7985a81695afc9008c66180..bc4080eab9bc79169580ee59dfb5be64a9c0a89b 100644 --- a/src/app/auth/reset-password/reset-password.page.ts +++ b/src/app/auth/reset-password/reset-password.page.ts @@ -31,7 +31,9 @@ export class ResetPasswordPage implements OnInit { this.router.navigateByUrl('/login'); } resetPassword(){ - if(this.confirmPassword!=this.newPassword) + if(this.oldPassword=="" || this.confirmPassword=="" || this.newPassword=="") + this.toastService.showToast("All Feilds are mandatory"); + else if(this.confirmPassword!=this.newPassword) this.toastService.showToast("Please Confirm Password Again"); else{ this.storage.get('token').then((token) => { diff --git a/src/app/reset-password/reset-password.page.html b/src/app/reset-password/reset-password.page.html deleted file mode 100644 index 055104ba0b62d67805c874a03700f729d67ecb34..0000000000000000000000000000000000000000 --- a/src/app/reset-password/reset-password.page.html +++ /dev/null @@ -1,42 +0,0 @@ -<ion-header> - <ion-toolbar> - <ion-title>Reset Password</ion-title> - </ion-toolbar> -</ion-header> - -<ion-content> - - <form> - <ion-grid> - <ion-row justify-content-center> - <ion-col align-self-center size-md="6" size-lg="5" size-xs="12"> - <div padding> - <img src="../../../assets/images/bike2gologo.png"> - </div> - <div class="ion-text"> - <h3>Reset Password</h3> - - </div> - - - <ion-item ><ion-input type="text" disabled="true" placeholder="Bob@mail.com"></ion-input></ion-item> - - - - - <ion-item ><ion-input type="password" placeholder="Old Password"></ion-input></ion-item> - <ion-item ><ion-input type="password" placeholder="New Password"></ion-input></ion-item> - <ion-item ><ion-input type="password" placeholder="Confirm Password"></ion-input></ion-item> - - - <div padding> - <ion-button size="large" expand="block" (click)="resetPassword()">Reset Password</ion-button> - </div> - <div padding> - <ion-button size="large" expand="block" (click)="login()">Login</ion-button> - </div> - </ion-col> - </ion-row> - </ion-grid> - </form> -</ion-content> \ No newline at end of file diff --git a/src/app/reset-password/reset-password.page.ts b/src/app/reset-password/reset-password.page.ts deleted file mode 100644 index f0395c2078352ee2408f0e3e13d96c720ce90599..0000000000000000000000000000000000000000 --- a/src/app/reset-password/reset-password.page.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-reset-password', - templateUrl: './reset-password.page.html', - styleUrls: ['./reset-password.page.scss'], -}) -export class ResetPasswordPage implements OnInit { - - constructor() { } - - ngOnInit() { - } - -}