Commit db76e59f authored by Ratnadeep Rajendra Kharade's avatar Ratnadeep Rajendra Kharade
Browse files

Merge branch '34-navigation-menu-is-getting-displayed-on-login-page' into 'master'

Resolve "navigation menu is getting displayed on login page."

Closes #34

See merge request 92khra1mst/hft_awado_app!13
parents d38661cb 7fa348ca
master 15-find-the-street-name-by-geo-location-data 16-create-search-location-functionality 18-design-feedback-page-2 20-ride-history 20-ride-history-2 22-hire-reserved-bike 24-routing-from-users-current-position-to-the-bike 25-current-bike-reservation-workflow 28-routing-from-bike-location-to-user-s-destination 36-cancel-hired-bike 37-display-username-on-homepage 38-display-calculated-name-of-the-street-on-reservation-and-hire-page 39-validation-on-login-page 40-map-performance-improvement-map-angle-doesn-t-change-when-selected-3d 41-display-live-location-of-user-on-map 42-add-log-in-button-on-registration-page-add-extra-messages-for-email-and-password-validation 42-add-log-in-button-on-registration-page-add-extra-messages-for-email-and-password-validation-2 45-show-stepwise-navigation-instructions-on-my-ride-page 46-show-bicycle-route-between-bike-and-user-s-destination 47-show-alternate-routes-for-bike-to-destination 48-create-a-common-service-for-getting-user-s-current-location-and-live-location 49-show-loading-page 50-add-dependencies-locally-to-improve-app-performance 51-while-navigating-between-pages-map-doesn-t-load-properly 52-page-loader-is-getting-displayed-everywhere 53-scrollining-in-ride-history 53-scrollining-in-ride-history-2 55-change-password 56-create-dummy-page-or-menu-for-hotline-contact 57-registration-not-working-from-app 58-add-flow-on-navigate-button-to-route-from-user-to-bike 60-create-common-theming-styles-and-colors 61-chnage-styles-for-bike-list-and-bug-fixes 62-change-in-feedback-workflow 63-password-reset-api-integration 64-close-button-on-home-page-to-redirect-to-bike-list 66-highlight-selected-route-from-list-of-different-routes 67-deactivate-user-api-integration 68-display-no-go-areas-on-map 69-add-launcher-icon-for-application-on-android 70-add-validation-for-feedback-should-not-be-empty 71-prediction-ui-implementation-send-location-of-bike-to-backend 72-feedback-toast-message 73-removal-here-maps-api-key Show-Bike-details-when-bike-icon-is-clicked search_functionality
1 merge request!13Resolve "navigation menu is getting displayed on login page."
Showing with 22 additions and 5 deletions
+22 -5
<ion-app>
<ion-split-pane contentId="main-content">
<ion-menu contentId="main-content" type="overlay">
<ion-menu contentId="main-content" type="overlay" *ngIf="restService.isUserLoggedIn">
<ion-header>
<ion-toolbar>
<ion-title>Menu</ion-title>
......
......@@ -3,6 +3,10 @@ import { Component } from '@angular/core';
import { Platform } from '@ionic/angular';
import { SplashScreen } from '@ionic-native/splash-screen/ngx';
import { StatusBar } from '@ionic-native/status-bar/ngx';
import { Storage } from '@ionic/storage';
import { Router } from '@angular/router';
import { RestService } from './rest.service';
@Component({
selector: 'app-root',
......@@ -10,6 +14,9 @@ import { StatusBar } from '@ionic-native/status-bar/ngx';
styleUrls: ['app.component.scss']
})
export class AppComponent {
public appPages = [
{
title: 'Home',
......@@ -26,9 +33,19 @@ export class AppComponent {
constructor(
private platform: Platform,
private splashScreen: SplashScreen,
private statusBar: StatusBar
private statusBar: StatusBar,
public restService: RestService,
private storage: Storage,
private router: Router
) {
this.initializeApp();
this.storage.get('token').then((token) => {
if(token === "") {
this.router.navigateByUrl('/login');
} else {
this.restService.isUserLoggedIn = true;
}
});
}
initializeApp() {
......
......@@ -46,7 +46,5 @@ export class LoginPage implements OnInit {
}
register() {
this.router.navigateByUrl('/register');
}
}
......@@ -6,11 +6,13 @@ import { Storage } from '@ionic/storage';
})
export class RestService {
public isUserLoggedIn = false;
constructor(private storage: Storage) { }
setToken(token) {
// set a key/value
this.storage.set('token', token);
this.isUserLoggedIn = true;
}
getToken() {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment