Skip to content

G
getme
Commit 31d49272 by Arjun
Options

header fix

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