Commit 31d49272 by Arjun

header fix

parent 3501fb56
......@@ -116,13 +116,21 @@
<div *ngIf="isShow" [@slideInOut]>
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="istoggle()">
<img src="../assets/Group17_2.png" />
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>CHANGE LOCATION</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
<ion-content class="sort_wrappper">
......
<ion-header>
<div class="header-cc">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
......@@ -14,6 +15,7 @@
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
<ion-content>
<div class="nearby_map">
......
.header-cc {
background-color: #fff;
}
.nearby_map {
width: 100%;
height: 100%;
......
......@@ -36,32 +36,32 @@ export class AuthService {
this.type = 1;
this.regState = true;
// this.afAuth.authState.subscribe(user => {
// console.log('here');
// console.log(user);
// if (user) {
// this.subjectService.sendLoginData(false);
// this.userData = user;
// console.log(this.userData);
// this.service.set('user', JSON.stringify(this.userData));
// this.SetUserData(user);
// this.loader = false;
// if (this.type === 1) {
// this.regState = true;
// this.router.navigateByUrl('home', { replaceUrl: true });
// } else {
// this.regState = false;
// this.router.navigateByUrl('verification', { replaceUrl: true });
// }
// } else {
// console.log('here too');
// this.loader = false;
// this.subjectService.sendLoginData(true);
// this.service.set('user', null);
// JSON.parse(localStorage.getItem('user'));
// this.router.navigateByUrl('login', { replaceUrl: true });
// }
// });
this.afAuth.authState.subscribe(user => {
console.log('here');
console.log(user);
if (user) {
this.subjectService.sendLoginData(false);
this.userData = user;
console.log(this.userData);
this.service.set('user', JSON.stringify(this.userData));
this.SetUserData(user);
this.loader = false;
if (this.type === 1) {
this.regState = true;
this.router.navigateByUrl('home', { replaceUrl: true });
} else {
this.regState = false;
this.router.navigateByUrl('verification', { replaceUrl: true });
}
} else {
console.log('here too');
this.loader = false;
this.subjectService.sendLoginData(true);
this.service.set('user', null);
JSON.parse(localStorage.getItem('user'));
this.router.navigateByUrl('login', { replaceUrl: true });
}
});
}
checkLogin() {
......
Markdown is supported
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