Skip to content

G
getme
Commit 4ba5e826 by Adarsh K
Options

Merge branch 'arjunlatest' into 'master'

Arjunlatest See merge request !90
parents ccfca2f5 3c6383a9
Showing with 89 additions and 73 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">
<agm-map [latitude]="latitude" [longitude]="longitude" [zoom]="8" [backgroundColor]="'rgba(29, 27, 130,0.2)'" <div class="map-inner">
(mapReady)="mapReady($event)" (centerChange)="centerChange($event)"> <agm-map [latitude]="latitude" [longitude]="longitude" [zoom]="8" [backgroundColor]="'rgba(29, 27, 130,0.2)'" (mapReady)="mapReady($event)" (centerChange)="centerChange($event)">
<agm-marker [latitude]="latitude" [longitude]="longitude" [markerDraggable]="true" <agm-marker [markerDraggable]="true" (dragEnd)="markerDragEnd($event)" [iconUrl]="
(dragEnd)="markerDragEnd($event)" [iconUrl]="
{ {
url: './assets/pin.svg', url: './assets/pin.svg',
scaledSize: { scaledSize: {
width: 28, width: 28,
height: 40 height: 40
}}"></agm-marker> }}"></agm-marker>
</agm-map> </agm-map>
<form (ngSubmit)="onSubmit(addressForm.value); addressForm.reset()" #addressForm="ngForm" method="post" <span class="map-pin"><img src="../../assets/pin.svg" alt=""></span>
class="form-horizontal"> </div>
<form (ngSubmit)="onSubmit(addressForm.value); addressForm.reset()" #addressForm="ngForm" method="post" class="form-horizontal">
<div class="add_address_wrapper"> <div class="add_address_wrapper">
<h5>DELIVERY</h5> <h5>DELIVERY</h5>
<p>{{address}}</p> <p>{{address}}</p>
<input [(ngModel)]="addressForm.building" name="building" #building="ngModel" name="building" required <input [(ngModel)]="addressForm.building" name="building" #building="ngModel" name="building" required placeholder="House No./ Building No" />
placeholder="House No./ Building No" />
<div class="md-errors-spacer" [hidden]="building.valid || landmark.pristine" class="ion-padding-start"> <div class="md-errors-spacer" [hidden]="building.valid || landmark.pristine" class="ion-padding-start">
Building Name is required Building Name is required
</div> </div>
<input [(ngModel)]="addressForm.landmark" name="landmark" #landmark="ngModel" name="landmark" required <input [(ngModel)]="addressForm.landmark" name="landmark" #landmark="ngModel" name="landmark" required placeholder="Landmark" />
placeholder="Landmark" />
<div class="md-errors-spacer" [hidden]="landmark.valid || landmark.pristine" class="ion-padding-start"> <div class="md-errors-spacer" [hidden]="landmark.valid || landmark.pristine" class="ion-padding-start">
Landmark is required Landmark is required
</div> </div>
...@@ -47,31 +47,24 @@ ...@@ -47,31 +47,24 @@
<ion-row> <ion-row>
<ion-col> <ion-col>
<h6> <h6>
<input class="styled-checkbox" id="styled-check-1" type="radio" value="Home" <input class="styled-checkbox" id="styled-check-1" type="radio" value="Home" [(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required />
[(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel"
required />
<label for="styled-check-1"><span>Home</span></label> <label for="styled-check-1"><span>Home</span></label>
</h6> </h6>
</ion-col> </ion-col>
<ion-col> <ion-col>
<h6> <h6>
<input class="styled-checkbox" id="styled-check-2" type="radio" value="Work" <input class="styled-checkbox" id="styled-check-2" type="radio" value="Work" [(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required />
[(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel"
required />
<label for="styled-check-2"><span>Office</span></label> <label for="styled-check-2"><span>Office</span></label>
</h6> </h6>
</ion-col> </ion-col>
<ion-col> <ion-col>
<h6> <h6>
<input class="styled-checkbox" id="styled-check-3" type="radio" value="Other" <input class="styled-checkbox" id="styled-check-3" type="radio" value="Other" [(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required />
[(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel"
required />
<label for="styled-check-3"><span>Others</span></label> <label for="styled-check-3"><span>Others</span></label>
</h6> </h6>
</ion-col> </ion-col>
</ion-row> </ion-row>
<div class="md-errors-spacer" [hidden]="addressType.valid || addressType.pristine" <div class="md-errors-spacer" [hidden]="addressType.valid || addressType.pristine" class="ion-padding-start">
class="ion-padding-start">
Address Type is required Address Type is required
</div> </div>
</ion-grid> </ion-grid>
......
src/app/nearby/nearby.page.scss
.header-cc {
background-color: #fff;
}
.nearby_map { .nearby_map {
width: 100%; width: 100%;
height: 100%; height: 100%;
.map-inner {
height: calc(100% - 348px);
position: relative;
.map-pin {
position: absolute;
top: 50%;
left: 50%;
-webkit-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
width: 25px;
}
}
.overlay { .overlay {
position: absolute; position: absolute;
top: 0px; top: 0px;
...@@ -11,7 +27,7 @@ ...@@ -11,7 +27,7 @@
} }
agm-map { agm-map {
width: 100%; width: 100%;
height: calc(100% - 330px); height: 100% !important;
.overlay { .overlay {
position: absolute; position: absolute;
top: 0px; top: 0px;
...@@ -146,8 +162,7 @@ ...@@ -146,8 +162,7 @@
margin: 0; margin: 0;
} }
} }
agm-map { .map-inner {
width: 100%;
height: calc(100% - 235px); height: calc(100% - 235px);
} }
} }
......
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