Commit f40def8a by Adarsh K

Merge branch 'master' into adarsh

parents 6ce03859 6d59bc4b
......@@ -107,4 +107,5 @@
<plugin name="cordova-plugin-nativegeocoder" spec="3.2.2" />
<plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
<plugin name="cordova-plugin-ionic-keyboard" spec="2.2.0" />
<engine name="android" spec="8.1.0" />
</widget>
......@@ -38,11 +38,11 @@
"@types/googlemaps": "^3.39.2",
"agm-direction": "^0.7.9",
"call-number": "^1.0.1",
"cordova-android": "^8.1.0",
"cordova-android": "8.1.0",
"cordova-plugin-device": "^2.0.3",
"cordova-plugin-geolocation": "^4.0.2",
"cordova-plugin-googleplus": "^8.4.0",
"cordova-plugin-ionic-keyboard": "2.2.0",
"cordova-plugin-ionic-keyboard": "^2.2.0",
"cordova-plugin-ionic-webview": "^4.1.3",
"cordova-plugin-nativegeocoder": "^3.2.2",
"cordova-plugin-navigationbar": "^1.0.31",
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
......@@ -6,7 +7,9 @@
<h4>ADD ADDRESS</h4>
</div>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="login_wrapper">
<div class="form_div">
......@@ -15,55 +18,24 @@
<ion-row>
<ion-col>
<h6>
<input
class="styled-checkbox"
id="styled-checkbox-1"
type="radio"
value="Work"
[(ngModel)]="address.addressType"
name="addressType"
#addressType="ngModel"
required
/>
<input class="styled-checkbox" id="styled-checkbox-1" type="radio" value="Work" [(ngModel)]="address.addressType" name="addressType" #addressType="ngModel" required />
<label for="styled-checkbox-1"><span>Work</span></label>
</h6>
</ion-col>
<ion-col>
<h6>
<input
class="styled-checkbox"
id="styled-checkbox-2"
type="radio"
value="Office"
[(ngModel)]="address.addressType"
name="addressType"
#addressType="ngModel"
required
/>
<input class="styled-checkbox" id="styled-checkbox-2" type="radio" value="Office" [(ngModel)]="address.addressType" name="addressType" #addressType="ngModel" required />
<label for="styled-checkbox-2"><span>Office</span></label>
</h6>
</ion-col>
<ion-col>
<h6>
<input
class="styled-checkbox"
id="styled-checkbox-3"
type="radio"
value="Other"
[(ngModel)]="address.addressType"
name="addressType"
#addressType="ngModel"
required
/>
<input class="styled-checkbox" id="styled-checkbox-3" type="radio" value="Other" [(ngModel)]="address.addressType" name="addressType" #addressType="ngModel" required />
<label for="styled-checkbox-3"><span>Others</span></label>
</h6>
</ion-col>
</ion-row>
<div
class="md-errors-spacer"
[hidden]="addressType.valid || submitted == false"
class="ion-padding-start"
>
<div class="md-errors-spacer" [hidden]="addressType.valid || submitted == false" class="ion-padding-start">
Address Type is required
</div>
</ion-grid>
......@@ -74,150 +46,52 @@
</button>
</div>
<div class="row">
<input
class=""
type="text"
placeholder="Address 1"
[(ngModel)]="address.firstAddress"
name="firstAddress"
#firstAddress="ngModel"
required
/>
</div>
<div
class="md-errors-spacer"
[hidden]="firstAddress.valid || submitted == false"
class="ion-padding-start"
>
<input class="" type="text" placeholder="Address 1" [(ngModel)]="address.firstAddress" name="firstAddress" #firstAddress="ngModel" required />
</div>
<div class="md-errors-spacer" [hidden]="firstAddress.valid || submitted == false" class="ion-padding-start">
Address 1 is required
</div>
<div class="row">
<input
class=""
type="text"
placeholder="Address 2"
[(ngModel)]="address.secondAddress"
name="secondAddress"
#secondAddress="ngModel"
/>
<input class="" type="text" placeholder="Address 2" [(ngModel)]="address.secondAddress" name="secondAddress" #secondAddress="ngModel" />
</div>
<div class="row">
<input
class=""
type="text"
placeholder="Country"
[(ngModel)]="address.country"
name="country"
#country="ngModel"
required
/>
</div>
<div
class="md-errors-spacer"
[hidden]="country.valid || submitted == false"
class="ion-padding-start"
>
<input class="" type="text" placeholder="Country" [(ngModel)]="address.country" name="country" #country="ngModel" required />
</div>
<div class="md-errors-spacer" [hidden]="country.valid || submitted == false" class="ion-padding-start">
Country is required
</div>
<div class="row">
<input
class=""
type="text"
placeholder="State"
[(ngModel)]="address.state"
name="state"
#state="ngModel"
required
/>
</div>
<div
class="md-errors-spacer"
[hidden]="state.valid || submitted == false"
class="ion-padding-start"
>
<input class="" type="text" placeholder="State" [(ngModel)]="address.state" name="state" #state="ngModel" required />
</div>
<div class="md-errors-spacer" [hidden]="state.valid || submitted == false" class="ion-padding-start">
State is required
</div>
<div class="row">
<input
class=""
type="text"
placeholder="District"
[(ngModel)]="address.district"
name="district"
#district="ngModel"
required
/>
</div>
<div
class="md-errors-spacer"
[hidden]="district.valid || submitted == false"
class="ion-padding-start"
>
<input class="" type="text" placeholder="District" [(ngModel)]="address.district" name="district" #district="ngModel" required />
</div>
<div class="md-errors-spacer" [hidden]="district.valid || submitted == false" class="ion-padding-start">
District is required
</div>
<div class="row">
<input
class=""
type="text"
placeholder="City"
[(ngModel)]="address.city"
name="city"
#city="ngModel"
required
/>
</div>
<div
class="md-errors-spacer"
[hidden]="city.valid || submitted == false"
class="ion-padding-start"
>
<input class="" type="text" placeholder="City" [(ngModel)]="address.city" name="city" #city="ngModel" required />
</div>
<div class="md-errors-spacer" [hidden]="city.valid || submitted == false" class="ion-padding-start">
City is required
</div>
<div class="row">
<input
class=""
type="text"
placeholder="Area"
[(ngModel)]="address.area"
name="area"
#area="ngModel"
/>
<input class="" type="text" placeholder="Area" [(ngModel)]="address.area" name="area" #area="ngModel" />
</div>
<div class="row">
<input
class=""
type="text"
placeholder="Landmark"
[(ngModel)]="address.landmark"
name="landmark"
#landmark="ngModel"
required
/>
</div>
<div
class="md-errors-spacer"
[hidden]="landmark.valid || submitted == false"
class="ion-padding-start"
>
<input class="" type="text" placeholder="Landmark" [(ngModel)]="address.landmark" name="landmark" #landmark="ngModel" required />
</div>
<div class="md-errors-spacer" [hidden]="landmark.valid || submitted == false" class="ion-padding-start">
Landmark is required
</div>
<div class="row">
<input
class=""
type="text"
placeholder="ZipCode"
[(ngModel)]="address.zip"
name="zip"
#zip="ngModel"
required
/>
</div>
<div
class="md-errors-spacer"
[hidden]="zip.valid || submitted == false"
class="ion-padding-start"
>
<input class="" type="text" placeholder="ZipCode" [(ngModel)]="address.zip" name="zip" #zip="ngModel" required />
</div>
<div class="md-errors-spacer" [hidden]="zip.valid || submitted == false" class="ion-padding-start">
ZipCode is required
</div>
<div class="row">
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png">
</button>
......@@ -6,7 +7,9 @@
<h4>ADD YOUR CARD</h4>
</div>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="login_wrapper">
<div class="form_div">
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
......@@ -6,8 +7,8 @@
<h4>Address</h4>
</div>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="address-wrapper" *ngIf="addressService.addressList">
<ion-grid *ngFor="let address of addressService.addressList; let i = index">
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group22_2.png">
</button>
<div class="nav_title floatLeft">
<input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..."
(click)="goToSearch('searchmodal')"> </div>
<input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="goToSearch('searchmodal')"> </div>
<button class="nav_btn nav_search floatRight">
</button>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="home_wrapper">
<div class="home_sub_header">
......@@ -16,10 +18,8 @@
</div>
<div class="featured_catagory_list">
<ul *ngIf="categoriesService.activecategories && categoriesService.activecategories.length > 0">
<li *ngFor="let categories of categoriesService.activecategories"
(click)="goToPage('catstorelist', categories)">
<img [src]="categories.catImage"
onerror="this.src='../assets/handsome-man-outdoors-drinking-coffee-with-sunglasses-guy-with-beard-instagram-effect_1212-818@3x.png'">
<li *ngFor="let categories of categoriesService.activecategories" (click)="goToPage('catstorelist', categories)">
<img [src]="categories.catImage" onerror="this.src='../assets/handsome-man-outdoors-drinking-coffee-with-sunglasses-guy-with-beard-instagram-effect_1212-818@3x.png'">
<div class="featured_overlay">
<h4>{{categories.catName}}</h4>
</div>
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()"></button>
<div class="nav_title floatLeft">
<input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="clickSearch()" />
......@@ -6,15 +7,15 @@
<button class="nav_btn nav_search floatRight" *ngIf="!searchShow"></button>
<button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="home_wrapper">
<div class="home_sub_header">
Featured Stores
</div>
<div class="featured_slider">
<ion-slides pager="false" [options]="slideOpts"
*ngIf="shopperService.activeshoppers && shopperService.activeshoppers.length > 0">
<ion-slides pager="false" [options]="slideOpts" *ngIf="shopperService.activeshoppers && shopperService.activeshoppers.length > 0">
<ion-slide *ngFor="let shopper of shopperService.activeshoppers">
<div class="feature_product" (click)="goToPage('productlist', shopper)">
<img [src]="shopper.featuredImage" onerror="this.src='./../../assets/getmi_malls/featured/featured1.png'" />
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
......@@ -6,25 +7,22 @@
<h4>Change Address</h4>
</div>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="nearby_map">
<agm-map [latitude]="latitude" [longitude]="longitude" [zoom]="8" [backgroundColor]="'rgba(29, 27, 130,0.2)'">
<agm-marker [latitude]="latitude" [longitude]="longitude" [markerDraggable]="true"
(dragEnd)="markerDragEnd($event)"></agm-marker>
<agm-marker [latitude]="latitude" [longitude]="longitude" [markerDraggable]="true" (dragEnd)="markerDragEnd($event)"></agm-marker>
</agm-map>
<form (ngSubmit)="onSubmit(addressForm.value); addressForm.reset()" #addressForm="ngForm" method="post"
class="form-horizontal">
<form (ngSubmit)="onSubmit(addressForm.value); addressForm.reset()" #addressForm="ngForm" method="post" class="form-horizontal">
<div class="add_address_wrapper">
<h5>DELIVERY</h5>
<p>{{address}}</p>
<input [(ngModel)]="addressForm.building" name="building" #building="ngModel" name="building" required
placeholder="House No./ Building No" />
<input [(ngModel)]="addressForm.building" name="building" #building="ngModel" name="building" required placeholder="House No./ Building No" />
<div class="md-errors-spacer" [hidden]="building.valid || landmark.pristine" class="ion-padding-start">
Building Name is required
</div>
<input [(ngModel)]="addressForm.landmark" name="landmark" #landmark="ngModel" name="landmark" required
placeholder="Landmark" />
<input [(ngModel)]="addressForm.landmark" name="landmark" #landmark="ngModel" name="landmark" required placeholder="Landmark" />
<div class="md-errors-spacer" [hidden]="landmark.valid || landmark.pristine" class="ion-padding-start">
Landmark is required
</div>
......@@ -32,31 +30,24 @@
<ion-row>
<ion-col>
<h6>
<input class="styled-checkbox" id="styled-check-1" type="radio" value="Home"
[(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel"
required />
<input class="styled-checkbox" id="styled-check-1" type="radio" value="Home" [(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required />
<label for="styled-check-1"><span>Home</span></label>
</h6>
</ion-col>
<ion-col>
<h6>
<input class="styled-checkbox" id="styled-check-2" type="radio" value="Work"
[(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel"
required />
<input class="styled-checkbox" id="styled-check-2" type="radio" value="Work" [(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required />
<label for="styled-check-2"><span>Office</span></label>
</h6>
</ion-col>
<ion-col>
<h6>
<input class="styled-checkbox" id="styled-check-3" type="radio" value="Other"
[(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel"
required />
<input class="styled-checkbox" id="styled-check-3" type="radio" value="Other" [(ngModel)]="addressForm.addressType" name="addressType" #addressType="ngModel" required />
<label for="styled-check-3"><span>Others</span></label>
</h6>
</ion-col>
</ion-row>
<div class="md-errors-spacer" [hidden]="addressType.valid || addressType.pristine"
class="ion-padding-start">
<div class="md-errors-spacer" [hidden]="addressType.valid || addressType.pristine" class="ion-padding-start">
Address Type is required
</div>
</ion-grid>
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
......@@ -6,7 +7,10 @@
<h4>CHANGE DETAILS</h4>
</div>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="login_wrapper">
<form class="form_div" #updateForm="ngForm" novalidate>
......@@ -14,8 +18,7 @@
<h6>Personal Details</h6>
</div>
<div class="row">
<input [(value)]="userData && userData.name" name="name" readonly class="" type="text"
placeholder="Change your Name" />
<input [(value)]="userData && userData.name" name="name" readonly class="" type="text" placeholder="Change your Name" />
<!-- <div
class="md-errors-spacer"
[hidden]="name.valid"
......@@ -35,14 +38,12 @@
</div> -->
</div>
<div class="row">
<input [(value)]="userData && userData.emailId" readonly class="" name="emailId" type="mail"
placeholder="email cannot be changed" />
<input [(value)]="userData && userData.emailId" readonly class="" name="emailId" type="mail" placeholder="email cannot be changed" />
</div>
<div class="row">
<input [(value)]="userData && userData.phone" required class="" name="phone" type="number"
pattern="(\(+61\)|\+61|\(0[1-9]\)|0[1-9])?( ?-?[0-9]){6,9}" maxlength="10"
[(ngModel)]="userData && userData.phone" placeholder="Change your Phone Number" #phone="ngModel" />
<input [(value)]="userData && userData.phone" required class="" name="phone" type="number" pattern="(\(+61\)|\+61|\(0[1-9]\)|0[1-9])?( ?-?[0-9]){6,9}" maxlength="10" [(ngModel)]="userData && userData.phone" placeholder="Change your Phone Number" #phone="ngModel"
/>
<div class="md-errors-spacer" [hidden]="phone.valid">
<div *ngIf="phone.errors && phone.errors.required">
Phone number is required
......@@ -57,22 +58,19 @@
<h6>Change Password</h6>
</div>
<div class="row">
<input class="" type="password" minlength="6" #currentPassword="ngModel"
[(ngModel)]="updatePassword.currentPassword" name="currentPassword" placeholder="Current Password" />
<input class="" type="password" minlength="6" #currentPassword="ngModel" [(ngModel)]="updatePassword.currentPassword" name="currentPassword" placeholder="Current Password" />
<div *ngIf="currentPassword.errors && currentPassword.errors.minlength">
Password must be at least 6 characters
</div>
</div>
<div class="row">
<input class="" [(ngModel)]="updatePassword.password" name="password" type="password"
placeholder="New Password" minlength="6" [required]="currentPassword ? true: false" #password="ngModel" />
<input class="" [(ngModel)]="updatePassword.password" name="password" type="password" placeholder="New Password" minlength="6" [required]="currentPassword ? true: false" #password="ngModel" />
<div *ngIf="password.errors && password.errors.minlength">
Password must be at least 6 characters
</div>
</div>
<div class="row">
<input class="" #confirmPassword="ngModel" [(ngModel)]="updatePassword.confirmPassword" name="confirmPassword"
type="password" [required]="currentPassword ? true: false" placeholder="Confirm Password" />
<input class="" #confirmPassword="ngModel" [(ngModel)]="updatePassword.confirmPassword" name="confirmPassword" type="password" [required]="currentPassword ? true: false" placeholder="Confirm Password" />
<div *ngIf="confirmPassword.value !=='' && confirmPassword.value !== password.value">
Password should match
</div>
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png">
</button>
......@@ -6,7 +7,8 @@
<h4>CHANGE PASSWORD</h4>
</div>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="verification_div">
<div class="form_div">
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
......@@ -6,15 +7,14 @@
<h4>Send Us</h4>
</div>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<form novalidate #contactUsForm="ngForm" class="contact_wrapper" *ngIf="userData && contactData">
<div class="form_div">
<div class="row">
<p>Write Us</p>
<textarea required name="writeUs" [(ngModel)]="contactData.message" #writeUs="ngModel" class="form-control"
rows="8" placeholder="Type here.."></textarea>
<textarea required name="writeUs" [(ngModel)]="contactData.message" #writeUs="ngModel" class="form-control" rows="8" placeholder="Type here.."></textarea>
<div class="md-errors-spacer" [hidden]="writeUs.valid || submitted == false" class="ion-padding-start">
This is required.
</div>
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
......@@ -6,64 +7,28 @@
<h4>Complaints & Feedback</h4>
</div>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<form
novalidate
#feedbackForm="ngForm"
class="feedback_wrapper"
*ngIf="userData && feedbackData"
>
<form novalidate #feedbackForm="ngForm" class="feedback_wrapper" *ngIf="userData && feedbackData">
<div class="form_div">
<div class="row">
<p>From</p>
<input
class="form-control"
type="text"
[(ngModel)]="userData.emailId"
name="from"
#from="ngModel"
readonly
[(value)]="userData.emailId"
/>
<input class="form-control" type="text" [(ngModel)]="userData.emailId" name="from" #from="ngModel" readonly [(value)]="userData.emailId" />
</div>
<div class="row">
<p>To</p>
<input
name="to"
class="form-control"
#to="ngModel"
type="text"
readonly
[(ngModel)]="feedbackData.to"
[(value)]="feedbackData.to"
/>
<input name="to" class="form-control" #to="ngModel" type="text" readonly [(ngModel)]="feedbackData.to" [(value)]="feedbackData.to" />
</div>
<div class="row">
<p>Comments</p>
<textarea
required
name="message"
[(ngModel)]="feedbackData.message"
#message="ngModel"
class="form-control"
rows="8"
placeholder="Type here.."
></textarea>
<div
class="md-errors-spacer"
[hidden]="message.valid || submitted == false"
class="ion-padding-start"
>
<textarea required name="message" [(ngModel)]="feedbackData.message" #message="ngModel" class="form-control" rows="8" placeholder="Type here.."></textarea>
<div class="md-errors-spacer" [hidden]="message.valid || submitted == false" class="ion-padding-start">
This is required.
</div>
</div>
<div class="row">
<button
(click)="onFeedbackSubmit(feedbackForm)"
class="login_btn"
[disabled]="submitted"
>
<button (click)="onFeedbackSubmit(feedbackForm)" class="login_btn" [disabled]="submitted">
SENT
</button>
</div>
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goToPage('login')">
<img src="../assets/Group17_2.png" />
</button>
......@@ -6,7 +7,8 @@
<h4>FORGOT PASSWORD</h4>
</div>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="verification_div">
<div class="form_div">
......
<div class="nav_header">
<ion-header>
<div class="nav_header" *ngIf="!isShow">
<ion-menu-toggle>
<button class="nav_btn nav_menu floatLeft"></button>
</ion-menu-toggle>
......@@ -6,13 +7,14 @@
<div class="nav_title floatLeft relative">
<!-- <input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="clickSearch()" (input)="searchFun($event.target.value)" #searchText> -->
<input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..."
(click)="goToPage('searchmodal')" />
<input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="goToPage('searchmodal')" />
</div>
<button class="nav_btn nav_search floatRight" *ngIf="!searchShow" (click)="goToPage('searchmodal')"></button>
<button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="home_wrapper">
<div class="home_banner">
......@@ -32,8 +34,7 @@
<h5>{{center.centerName}}</h5>
<p>{{center.description}}</p>
</div>
<img [src]="center.centerImg"
onerror="this.src='./../../assets/getmi_malls/mall_banner/mall_4.png'" />
<img [src]="center.centerImg" onerror="this.src='./../../assets/getmi_malls/mall_banner/mall_4.png'" />
</ion-slide>
</ion-slides>
</div>
......@@ -41,12 +42,10 @@
Featured Stores
</div>
<div class="featured_slider">
<ion-slides pager="false" [options]="slideOpts"
*ngIf="shopperService.activeshoppers && shopperService.activeshoppers.length > 0">
<ion-slides pager="false" [options]="slideOpts" *ngIf="shopperService.activeshoppers && shopperService.activeshoppers.length > 0">
<ion-slide *ngFor="let shopper of shopperService.activeshoppers">
<div class="feature_product" (click)="goToPage('productlist', shopper)">
<img [src]="shopper.featuredImage"
onerror="this.src='./../../assets/getmi_malls/featured/featured1.png'" />
<img [src]="shopper.featuredImage" onerror="this.src='./../../assets/getmi_malls/featured/featured1.png'" />
<div class="feature_overlay">
<h5>{{shopper.name}}</h5>
<p>{{shopper.caption}}</p>
......@@ -75,8 +74,7 @@
<ul *ngIf="centerService.nearcenters && centerService.nearcenters.length > 0">
<li *ngFor="let center of centerService.nearcenters" (click)="goToPage('storelist', center)">
<div class="nearby_image">
<img [src]="center.centerImg"
onerror="this.src='./../../assets/getmi_malls/mall_298/mall2.png'" />
<img [src]="center.centerImg" onerror="this.src='./../../assets/getmi_malls/mall_298/mall2.png'" />
</div>
<div class="nearby_detail">
<h5>
......@@ -97,10 +95,8 @@
</div>
<div class="featured_catagory_list">
<ul *ngIf="categoriesService.activecategories && categoriesService.activecategories.length > 0">
<li *ngFor="let categories of categoriesService.activecategories"
(click)="goToPage('catstorelist', categories)">
<img [src]="categories.catImage"
onerror="this.src='../assets/handsome-man-outdoors-drinking-coffee-with-sunglasses-guy-with-beard-instagram-effect_1212-818@3x.png'" />
<li *ngFor="let categories of categoriesService.activecategories" (click)="goToPage('catstorelist', categories)">
<img [src]="categories.catImage" onerror="this.src='../assets/handsome-man-outdoors-drinking-coffee-with-sunglasses-guy-with-beard-instagram-effect_1212-818@3x.png'" />
<div class="featured_overlay">
<h4>{{categories.catName}}</h4>
</div>
......@@ -110,6 +106,7 @@
</div>
</ion-content>
<div *ngIf="isShow" [@slideInOut]>
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="istoggle()">
<img src="../assets/Group17_2.png" />
......@@ -119,9 +116,9 @@
</div>
<div class="clear"></div>
</div>
</ion-header>
<ion-content class="sort_wrappper">
<agm-map [zoom]="20" [latitude]="lat" [longitude]="lng" [disableDefaultUI]="false" [zoomControl]="false"
[backgroundColor]="'rgba(29, 27, 130,0.2)'">
<agm-map [zoom]="20" [latitude]="lat" [longitude]="lng" [disableDefaultUI]="false" [zoomControl]="false" [backgroundColor]="'rgba(29, 27, 130,0.2)'">
<agm-marker [latitude]="lat" [longitude]="lng" [iconUrl]="
{
url: './assets/pin.svg',
......@@ -141,9 +138,7 @@
<li *ngFor="let address of addressService.addressList; let i = index">
<div class="floatLeft">
{{address.default}}
<input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio"
(click)="setDefault(address)" [value]="address.addressId" #addressType
[checked]="address.defaultVal == 1" />
<input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio" (click)="setDefault(address)" [value]="address.addressId" #addressType [checked]="address.defaultVal == 1" />
<label for="styled-checkbox-{{i}}">
{{address.addressType}}
</label>
......
......@@ -263,7 +263,7 @@
.add_address_wrapper {
position: fixed;
height: auto;
max-height: 70%;
max-height: 40%;
overflow: scroll;
bottom: 0px;
left: 0px;
......
......@@ -176,7 +176,7 @@ export class HomePage implements OnInit {
istoggle() {
this.isShow = !this.isShow;
console.log(this.isShow);
console.log(this.isShow, 'Is SHow');
this.subjectService.setTabData(!this.isShow);
}
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn floatLeft"></button>
<div class="nav_title floatLeft">
<h4>LOGIN</h4>
</div>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="login_wrapper">
......@@ -13,28 +15,13 @@
</div>
<div class="form_div">
<div class="row">
<input
class=""
type="text"
placeholder="User Name/ Email"
#userName
required
/>
<input class="" type="text" placeholder="User Name/ Email" #userName required />
</div>
<div class="row">
<input
class=""
type="password"
placeholder="Password"
#userPassword
required
/>
<input class="" type="password" placeholder="Password" #userPassword required />
</div>
<div class="row">
<button
class="login_btn"
(click)="authService.SignIn(userName.value, userPassword.value)"
>
<button class="login_btn" (click)="authService.SignIn(userName.value, userPassword.value)">
LOGIN
</button>
</div>
......@@ -44,11 +31,7 @@
</div>
<div class="row">
<div class="social_div">
<div
class="social_btn"
style="border-right:1px solid rgba(215, 213, 228, 1);"
(click)="authService.facebook(1)"
>
<div class="social_btn" style="border-right:1px solid rgba(215, 213, 228, 1);" (click)="authService.facebook(1)">
Facebook
</div>
<div class="social_btn" (click)="authService.google(1)">
......
......@@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
import { AuthService } from './../../config/auth.service';
import { MenuController, Platform } from '@ionic/angular';
import { async } from 'q';
@Component({
selector: 'app-login',
......@@ -17,9 +16,9 @@ export class LoginPage implements OnInit {
public authService: AuthService,
public menuCtrl: MenuController,
private platform: Platform
) { }
) {}
ngOnInit() { }
ngOnInit() {}
ionViewWillEnter() {
this.menuCtrl.enable(false);
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()"></button>
<div class="nav_title floatLeft">
<h4>MY ORDERS</h4>
</div>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="myorder_wrapper" *ngIf="myorder.orders">
<ul *ngIf="myorder.orders.length > 0">
<li *ngFor="let order of myorder.orders; let i = index">
<div class="order_info">
<h5 class="floatLeft">{{order.orderCode}}</h5>
<button class="order_track floatRight" *ngIf="order.orderStatus >= 3 && order.orderStatus < 7"
(click)="orderDetails(i)">
<button class="order_track floatRight" *ngIf="order.orderStatus >= 3 && order.orderStatus < 7" (click)="orderDetails(i)">
Track Order
</button>
<div class="clear"></div>
......@@ -36,8 +38,7 @@
<h6 class="floatRight" *ngIf="order.bookDate">
{{ order.bookDate.seconds * 1000 | date:'MMMM dd, y' }}
</h6>
<span class="floatRight" *ngIf="order.orderStatus < 3 || order.orderStatus >= 7"
(click)="acceptOrder(order)">{{getStatus(order.orderStatus)}}</span>
<span class="floatRight" *ngIf="order.orderStatus < 3 || order.orderStatus >= 7" (click)="acceptOrder(order)">{{getStatus(order.orderStatus)}}</span>
<div class="clear"></div>
<!-- <button class="track_btn" *ngIf="order.orderStatus >= 3 && order.orderStatus < 7" (click)="orderDetails(i)">TRACK</button> -->
<div class="clear"></div>
......
<div class="nav_header">
<ion-header>
<button class="nav_btn nav_back floatLeft" (click)="goBack()" *ngIf="authService.regState">
<img src="../assets/Group17_2.png" />
</button>
......@@ -6,7 +6,7 @@
<h4>NEW ADDRESS</h4>
</div>
<div class="clear"></div>
</div>
</ion-header>
<ion-content>
<div class="nearby_map">
<agm-map [latitude]="latitude" [longitude]="longitude" [zoom]="8" [backgroundColor]="'rgba(29, 27, 130,0.2)'">
......
......@@ -39,7 +39,7 @@
}
}
.add_address_wrapper {
position: fixed;
position: absolute;
bottom: 0px;
left: 0px;
right: 0px;
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<ion-menu-toggle>
<button class="nav_btn nav_menu floatLeft">
</button>
......@@ -9,8 +10,8 @@
<button class="nav_btn nav_search floatRight" *ngIf="!searchShow">
</button>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="no-result-wrapper">
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()" *ngIf="authService.regState">
<img src="../assets/Group17_2.png" />
</button>
......@@ -6,8 +7,9 @@
<h4>Preferences</h4>
</div>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="preference-wrapper">
<div class="pref-wrap-two">
......@@ -15,10 +17,8 @@
<ion-row *ngIf="categoriesService.activecategories && categoriesService.activecategories.length > 0">
<ion-col size="6" *ngFor="let categories of categoriesService.categories">
<div class="preference-box">
<input type="checkbox" class="preference" (click)="selectPrefernce(categories.catId)"
[checked]="selectedPref(categories.catId)" />
<img [src]="categories.catImage"
onerror="this.src='../assets/handsome-man-outdoors-drinking-coffee-with-sunglasses-guy-with-beard-instagram-effect_1212-818@3x.png'" />
<input type="checkbox" class="preference" (click)="selectPrefernce(categories.catId)" [checked]="selectedPref(categories.catId)" />
<img [src]="categories.catImage" onerror="this.src='../assets/handsome-man-outdoors-drinking-coffee-with-sunglasses-guy-with-beard-instagram-effect_1212-818@3x.png'" />
<h1>{{categories.catName}}</h1>
</div>
</ion-col>
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
......@@ -9,7 +10,8 @@
</div>
</button>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="product_detail_wrapper" *ngIf="product">
<div class="product_banner">
......@@ -38,8 +40,7 @@
<ion-col size="8">
<h3>{{unEscape(product.prodName)}}</h3>
<p>
<strong><span><img src="../assets/Path61_2.png" /></span>{{product.rating}}</strong>&nbsp;
{{product.category}}, {{product.subCate}}
<strong><span><img src="../assets/Path61_2.png" /></span>{{product.rating}}</strong>&nbsp; {{product.category}}, {{product.subCate}}
<br />
<span *ngFor="let tag of product.tag"><span *ngIf="tag !=='No-Tag'">#{{tag}}&nbsp;</span></span>
</p>
......@@ -214,8 +215,7 @@
</ul>
</div> -->
<h5 *ngIf="product.similar && product.similar.length > 0">
<span class="floatLeft">Related Products</span><span class="floatRight"
(click)="goToPage('productlist', data)">MORE</span>
<span class="floatLeft">Related Products</span><span class="floatRight" (click)="goToPage('productlist', data)">MORE</span>
<div class="clear"></div>
</h5>
<div class="related_product_slider">
......@@ -247,8 +247,7 @@
<ion-footer *ngIf="product">
<div class="footer_div">
<div class="footer_options">
<button class="share"
(click)="socialShare(product.prodName, product.category, product.subCate, product.price, product.image)"></button>
<button class="share" (click)="socialShare(product.prodName, product.category, product.subCate, product.price, product.image)"></button>
<button [ngClass]="checkFavStatus(product.prodId)" (click)="changeFav(product.prodId)"></button>
<button class="cart" [disabled]="!disCart" (click)="buyNow(product,0)"></button>
</div>
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
<div class="nav_title floatLeft">
<input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..."
(click)="goToPage('searchmodal')" />
<input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="goToPage('searchmodal')" />
</div>
<button class="nav_btn nav_search floatRight" *ngIf="!searchShow" (click)="goToPage('searchmodal')"></button>
<button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="product_list">
<div class="product_taskbar">
......@@ -34,8 +35,7 @@
</div>
<h5 class="ellipse" (click)="prodDetails(i)" [innerHTML]="unEscape(product.prodName)"></h5>
<p (click)="prodDetails(i)">
A$ {{service.formatNumber(product.price)}}<span class="offer"
*ngIf="product.discount > 0">-{{product.discount}}%</span>
A$ {{service.formatNumber(product.price)}}<span class="offer" *ngIf="product.discount > 0">-{{product.discount}}%</span>
</p>
</li>
</ul>
......@@ -84,23 +84,19 @@
<label for="styled-checkbox-2">Relevence</label>
</li> -->
<li>
<input class="styled-checkbox" id="styled-checkbox-1" type="radio" value="newest" name="sort"
(click)="setValue($event.target.value)" />
<input class="styled-checkbox" id="styled-checkbox-1" type="radio" value="newest" name="sort" (click)="setValue($event.target.value)" />
<label for="styled-checkbox-1">Newest First</label>
</li>
<li>
<input class="styled-checkbox" id="styled-checkbox-5" type="radio" value="a-z" name="sort"
(click)="setValue($event.target.value)" />
<input class="styled-checkbox" id="styled-checkbox-5" type="radio" value="a-z" name="sort" (click)="setValue($event.target.value)" />
<label for="styled-checkbox-5">Name A - Z</label>
</li>
<li>
<input class="styled-checkbox" id="styled-checkbox-3" type="radio" value="low" name="sort"
(click)="setValue($event.target.value)" />
<input class="styled-checkbox" id="styled-checkbox-3" type="radio" value="low" name="sort" (click)="setValue($event.target.value)" />
<label for="styled-checkbox-3">Price Low - High</label>
</li>
<li>
<input class="styled-checkbox" id="styled-checkbox-4" type="radio" value="high" name="sort"
(click)="setValue($event.target.value)" />
<input class="styled-checkbox" id="styled-checkbox-4" type="radio" value="high" name="sort" (click)="setValue($event.target.value)" />
<label for="styled-checkbox-4">Price High - Low</label>
</li>
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<ion-menu-toggle>
<button class="nav_btn nav_menu floatLeft"></button>
</ion-menu-toggle>
......@@ -6,7 +7,9 @@
<img src="../../assets/Group [email protected]" />
</div>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="profile_wrapper" *ngIf="loggedUser">
......@@ -27,8 +30,8 @@
<div class="account_wrapper">
<div class="account_header">
<h5 class="floatLeft">ACCOUNT INFORMATION</h5>
<span class="floatRight" (click)="goToPage('changedetails', user && user)"><img src="../../assets/edit.png"
/></span>
<span class="floatRight" (click)="goToPage('changedetails', user && user)"><img
src="../../assets/edit.png" /></span>
<div class="clear"></div>
</div>
<div class="row">
......@@ -40,11 +43,8 @@
</ion-col>
<ion-col class="textRight p0">
<h6>{{loggedUser.phone}}</h6>
<span class="ar-span" *ngIf="loggedUser.phoneVerified == true">Verified</span
>
<span class="ar-span" *ngIf="loggedUser.phoneVerified == false"
>Not Verified yet</span
>
<span class="ar-span" *ngIf="loggedUser.phoneVerified == true">Verified</span>
<span class="ar-span" *ngIf="loggedUser.phoneVerified == false">Not Verified yet</span>
</ion-col>
</ion-row>
</div>
......@@ -57,12 +57,8 @@
</ion-col>
<ion-col class="textRight p0">
<h6>{{loggedUser.emailId}}</h6>
<span class="ar-span" *ngIf="loggedUser.emailVerified == true"
>Verified</span
>
<span class="ar-span" *ngIf="loggedUser.emailVerified == false"
>Not Verified yet</span
>
<span class="ar-span" *ngIf="loggedUser.emailVerified == true">Verified</span>
<span class="ar-span" *ngIf="loggedUser.emailVerified == false">Not Verified yet</span>
</ion-col>
</ion-row>
</div>
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png">
</button>
......@@ -6,7 +7,8 @@
<h4>RATING & REVIEWS</h4>
</div>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="nearby_shop_list">
<ul>
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png">
</button>
......@@ -6,7 +7,8 @@
<h4>REVIEWS</h4>
</div>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="nearby_shop_list">
<ul>
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="closeModal()"></button>
<div class="nav_title floatLeft relative">
<input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="clickSearch()"
(input)="searchFun($event.target.value)" #searchText />
<input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="clickSearch()" (input)="searchFun($event.target.value)" #searchText />
</div>
<button class="nav_btn nav_close floatRight" (click)="closeModal()"></button>
<div class="clear"></div>
</div>
</div>
</ion-header>
<div class="search_item_list">
<ul *ngIf="searchService.searchList">
<li *ngFor="let search of searchService.searchList" (click)="viewPage(search)">{{unEscape(search.text)}}
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goToPage('login')">
<img src="../assets/Group17_2.png" />
</button>
......@@ -6,7 +7,8 @@
<h4>SIGN UP</h4>
</div>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="login_wrapper">
<div class="logo_wrapper">
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()"></button>
<div class="nav_title floatLeft">
<input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..."
(click)="goToSearch('searchmodal')" />
<input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="goToSearch('searchmodal')" />
</div>
<button class="nav_btn nav_search floatRight" *ngIf="!searchShow" (click)="goToSearch('searchmodal')"></button>
<button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="home_wrapper">
<div class="home_sub_header">
Featured Stores
</div>
<div class="featured_slider">
<ion-slides pager="false" [options]="slideOpts"
*ngIf="shopperService.activeshoppers && filterFunction(shopperService.activeshoppers).length > 0">
<ion-slides pager="false" [options]="slideOpts" *ngIf="shopperService.activeshoppers && filterFunction(shopperService.activeshoppers).length > 0">
<ion-slide *ngFor="let shopper of filterFunction(shopperService.activeshoppers)">
<div class="feature_product" (click)="goToPage('productlist', shopper)">
<img [src]="shopper.featuredImage" onerror="this.src='./../../assets/getmi_malls/featured/featured1.png'" />
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png">
</button>
......@@ -6,7 +7,8 @@
<h4>ORDER TRACKING</h4>
</div>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="trackorder_div">
<agm-map [zoom]="20" [latitude]="lat" [longitude]="lng">
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
......@@ -6,7 +7,8 @@
<h4>VERIFICATION</h4>
</div>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="verification_div" *ngIf="authService.userPostData">
<div class="form_div">
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()" *ngIf="authService.regState">
<img src="../assets/Group17_2.png" />
</button>
......@@ -6,7 +7,8 @@
<h4>VERIFICATION</h4>
</div>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="verification_div" *ngIf="authService.userPostData">
<div class="form_div">
......
<div class="nav_header">
<ion-header>
<div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
......@@ -6,8 +7,8 @@
<h4>WISHLIST</h4>
</div>
<div class="clear"></div>
</div>
</div>
</ion-header>
<ion-content>
<div class="wishlist-wrapper">
<ul *ngIf="wishService.whishItem && wishService.whishItem.length > 0">
......
......@@ -25,7 +25,7 @@ export class ProductsService {
this.service.get('userData').then(data => {
console.log(data);
this.user = JSON.parse(data);
this.getFavlist(this.user.uid);
this.getFavlist(this.user.id);
});
}
......
......@@ -394,44 +394,31 @@ button {
text-align: center !important;
}
.ion-page {
padding-top: 50px;
}
app-landing {
padding: 0px !important;
}
app-cart {
padding: 0px !important;
}
app-orderplaced {
padding: 0px !important;
}
app-ordercancelled {
padding: 0px !important;
}
app-delivery {
padding: 0px !important;
}
app-deliverypop {
padding: 0px !important;
}
app-success {
padding: 0px !important;
}
// .ion-page {
// padding-top: 50px;
// }
// app-landing {
// padding: 0px !important;
// }
// app-cart {
// padding: 0px !important;
// }
// app-orderplaced {
// padding: 0px !important;
// }
// app-ordercancelled {
// padding: 0px !important;
// }
// app-delivery {
// padding: 0px !important;
// }
// app-deliverypop {
// padding: 0px !important;
// }
// app-success {
// padding: 0px !important;
// }
.nav_header {
position: fixed;
top: 0px;
left: 0px;
right: 0px;
z-index: 9999;
background-color: #fff;
-webkit-box-shadow: 0px 0px 5px 0px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0px 0px 5px 0px rgba(0, 0, 0, 0.2);
......
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