From a6f47bee84c7f631805fc935a6c612a8d8c460f1 Mon Sep 17 00:00:00 2001
From: Ratnadeep Rajendra Kharade <92khra1mst@hft-stuttgart.de>
Date: Fri, 29 Nov 2019 00:06:51 +0100
Subject: [PATCH] Fixed bug on login page.
---
src/app/app.component.html | 2 +-
src/app/app.component.ts | 13 ++++++++++---
src/app/auth/login/login.page.ts | 1 +
src/app/rest.service.ts | 1 +
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/app/app.component.html b/src/app/app.component.html
index b8ca619..5cb5a69 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,6 +1,6 @@
<ion-app>
<ion-split-pane contentId="main-content">
- <ion-menu contentId="main-content" type="overlay" *ngIf="restService.isUserLoggedIn">
+ <ion-menu contentId="main-content" type="overlay" *ngIf="restService.isUserLoggedIn && !restService.isLoginPage">
<ion-header>
<ion-toolbar>
<ion-title>Menu</ion-title>
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 275e977..6993443 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -15,7 +15,7 @@ import { RestService } from './rest.service';
})
export class AppComponent {
-
+ isLoginPage = false;
public appPages = [
{
@@ -36,9 +36,16 @@ export class AppComponent {
private statusBar: StatusBar,
public restService: RestService,
private storage: Storage,
- private router: Router
- ) {
+ private router: Router) {
+
this.initializeApp();
+
+ let href = window.location.pathname
+ if(href === "/login") {
+ this.restService.isLoginPage = true;
+ } else {
+ this.restService.isLoginPage = false;
+ }
this.storage.get('token').then((token) => {
if(token === "") {
this.router.navigateByUrl('/login');
diff --git a/src/app/auth/login/login.page.ts b/src/app/auth/login/login.page.ts
index 5f20f04..863bec5 100644
--- a/src/app/auth/login/login.page.ts
+++ b/src/app/auth/login/login.page.ts
@@ -38,6 +38,7 @@ export class LoginPage implements OnInit {
.subscribe((data) => {
console.log('my data: ', data);
this.restService.setToken(data.token);
+ this.restService.isLoginPage = false;
this.router.navigateByUrl('/home');
}, (error) => {
console.log(error);
diff --git a/src/app/rest.service.ts b/src/app/rest.service.ts
index e6e4ac6..aadef85 100644
--- a/src/app/rest.service.ts
+++ b/src/app/rest.service.ts
@@ -7,6 +7,7 @@ import { Storage } from '@ionic/storage';
export class RestService {
public isUserLoggedIn = false;
+ public isLoginPage = false;
constructor(private storage: Storage) { }
--
GitLab