From c8d646cb991057f2e0193b9158fe8d2e347485b8 Mon Sep 17 00:00:00 2001 From: Priyanka Upadhye <92uppr1mst@hft-stuttgart.de> Date: Sat, 11 Jan 2020 00:04:19 +0100 Subject: [PATCH] ResetPassword removed and some more bugs fixed --- src/app/auth/login/login.page.html | 2 +- src/app/auth/login/login.page.ts | 2 +- src/app/auth/reset-password/reset-password.page.html | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/app/auth/login/login.page.html b/src/app/auth/login/login.page.html index 6871032..5bc2d4d 100644 --- a/src/app/auth/login/login.page.html +++ b/src/app/auth/login/login.page.html @@ -31,7 +31,7 @@ <div padding> <ion-button size="large" expand="block" (click)="login()">Login</ion-button> - <a href="../../reset-password">Forgot your Password?</a> + </div> diff --git a/src/app/auth/login/login.page.ts b/src/app/auth/login/login.page.ts index 1f73808..6a48bb3 100644 --- a/src/app/auth/login/login.page.ts +++ b/src/app/auth/login/login.page.ts @@ -38,7 +38,7 @@ export class LoginPage implements OnInit { } loginApiCall() { - this.loginApi = this.httpClient.post('http://193.196.52.237:8081/authenticate', { + this.loginApi = this.httpClient.post('http://193.196.52.237:8081/login', { "email": this.username, "password": this.password }); diff --git a/src/app/auth/reset-password/reset-password.page.html b/src/app/auth/reset-password/reset-password.page.html index 5645b59..2eda6c1 100644 --- a/src/app/auth/reset-password/reset-password.page.html +++ b/src/app/auth/reset-password/reset-password.page.html @@ -19,7 +19,7 @@ <img src="../../../assets/images/bike2gologo.png"> </div> <div class="ion-text"> - <h3>Reset Password</h3> + <h3>Change Password</h3> </div> @@ -35,11 +35,9 @@ <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> + <ion-button size="large" expand="block" (click)="resetPassword()">Change Password</ion-button> </div> + </ion-col> </ion-row> </ion-grid> -- GitLab