Skip to content

G
getme
Commit 3501fb56 by Arjun
Options

header fixes

parent 8861b78c
Showing with 364 additions and 86 deletions
src/app/addaddresss/addaddresss.page.html
<ion-header> <ion-header>
<div class="nav_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)="goBack()"> <button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>ADD ADDRESS</h4> <h4>ADD ADDRESS</h4>
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
......
src/app/addcard/addcard.page.html
<ion-header> <ion-header>
<div class="nav_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)="goBack()"> <button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png"> <img src="../assets/Group17_2.png">
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>ADD YOUR CARD</h4> <h4>ADD YOUR CARD</h4>
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
......
src/app/address/address.page.html
<ion-header> <ion-header>
<div class="nav_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)="goBack()"> <button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>Address</h4> <h4>Address</h4>
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
......
src/app/address/address.page.scss
.address-wrapper { .address-wrapper {
padding: 15px; padding: 15px;
padding-bottom: 11%; padding-bottom: 20%;
.address-radio { .address-radio {
background-image: url('../../assets/radio.png'); background-image: url('../../assets/radio.png');
-webkit-appearance: none; -webkit-appearance: none;
......
src/app/cart/cart.page.html
...@@ -2,14 +2,23 @@ ...@@ -2,14 +2,23 @@
<div class="cart_wrapper"> <div class="cart_wrapper">
<div class="cart_head"> <div class="cart_head">
<div class="nav_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_white floatLeft" (click)="goBack()"> <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
<img src="../assets/arrow_white.png" /> <img src="../assets/arrow_white.png" />
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>CART</h4> <h4>CART</h4>
</div> </div>
</ion-col>
<ion-col class="no-gutter" size="2">
<button class="nav_btn floatRight"></button> <button class="nav_btn floatRight"></button>
<div class="clear"></div> </ion-col>
</ion-row>
</ion-grid>
</div> </div>
<div class="cart_menu_header"> <div class="cart_menu_header">
<ul> <ul>
......
src/app/catagory/catagory.page.html
<ion-header> <ion-header>
<div class="nav_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)="goBack()"> <button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group22_2.png"> <img src="../assets/Group22_2.png">
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <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>
</ion-col>
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_search floatRight"> <button class="nav_btn nav_search floatRight">
</button> </button>
<div class="clear"></div> </ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
......
src/app/catstorelist/catstorelist.page.html
<ion-header> <ion-header>
<div class="nav_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)="goBack()"></button> <button class="nav_btn nav_back floatLeft" (click)="goBack()"></button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="clickSearch()" /> <input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="clickSearch()" />
</div> </div>
</ion-col>
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_search floatRight" *ngIf="!searchShow"></button> <button class="nav_btn nav_search floatRight" *ngIf="!searchShow"></button>
<button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button> <button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button>
<div class="clear"></div> </ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
......
src/app/changeaddress/changeaddress.page.html
<ion-header> <ion-header>
<div class="nav_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)="goBack()"> <button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>Change Address</h4> <h4>Change Address</h4>
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
......
src/app/changedetails/changedetails.page.html
<ion-header> <ion-header>
<div class="nav_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)="goBack()"> <button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>CHANGE DETAILS</h4> <h4>CHANGE DETAILS</h4>
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
......
src/app/changepass/changepass.page.html
<ion-header> <ion-header>
<div class="nav_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)="goBack()"> <button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png"> <img src="../assets/Group17_2.png">
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>CHANGE PASSWORD</h4> <h4>CHANGE PASSWORD</h4>
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
......
src/app/contact/contact.page.html
<ion-header> <ion-header>
<div class="nav_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)="goBack()"> <button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>Send Us</h4> <h4>Send Us</h4>
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
......
src/app/delivery/delivery.page.html
...@@ -2,15 +2,24 @@ ...@@ -2,15 +2,24 @@
<div class="cart_wrapper"> <div class="cart_wrapper">
<div class="cart_head"> <div class="cart_head">
<div class="nav_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_white floatLeft" (click)="goBack()"> <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
<img src="../assets/arrow_white.png"> <img src="../assets/arrow_white.png">
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4></h4> <h4></h4>
</div> </div>
</ion-col>
<ion-col class="no-gutter" size="2">
<button class="nav_btn floatRight"> <button class="nav_btn floatRight">
</button> </button>
<div class="clear"></div> </ion-col>
</ion-row>
</ion-grid>
</div> </div>
<img src="../assets/white_tick.png"> <img src="../assets/white_tick.png">
<h4>RIDER HAS<br> DELIVERED YOUR ORDER </h4> <h4>RIDER HAS<br> DELIVERED YOUR ORDER </h4>
......
src/app/deliverypop/deliverypop.page.html
...@@ -2,15 +2,24 @@ ...@@ -2,15 +2,24 @@
<div class="cart_wrapper"> <div class="cart_wrapper">
<div class="cart_head"> <div class="cart_head">
<div class="nav_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_white floatLeft" (click)="closeModal()"> <button class="nav_btn nav_back_white floatLeft" (click)="closeModal()">
<img src="../assets/arrow_white.png"> <img src="../assets/arrow_white.png">
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4></h4> <h4></h4>
</div> </div>
</ion-col>
<ion-col class="no-gutter" size="2">
<button class="nav_btn floatRight"> <button class="nav_btn floatRight">
</button> </button>
<div class="clear"></div> </ion-col>
</ion-row>
</ion-grid>
</div> </div>
<img src="../assets/white_tick.png"> <img src="../assets/white_tick.png">
<h4>RIDER HAS<br> DELIVERED YOUR ORDER </h4> <h4>RIDER HAS<br> DELIVERED YOUR ORDER </h4>
......
src/app/feedback/feedback.page.html
<ion-header> <ion-header>
<div class="nav_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)="goBack()"> <button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>Complaints & Feedback</h4> <h4>Complaints & Feedback</h4>
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
......
src/app/forgot/forgot.page.html
<ion-header> <ion-header>
<div class="nav_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)="goToPage('login')"> <button class="nav_btn nav_back floatLeft" (click)="goToPage('login')">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>FORGOT PASSWORD</h4> <h4>FORGOT PASSWORD</h4>
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
......
src/app/home/home.page.html
<ion-header> <ion-header>
<div class="nav_header" *ngIf="!isShow"> <div class="nav_header" *ngIf="!isShow">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<ion-menu-toggle> <ion-menu-toggle>
<button class="nav_btn nav_menu floatLeft"></button> <button class="nav_btn nav_menu floatLeft"></button>
</ion-menu-toggle> </ion-menu-toggle>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft relative"> <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> -->
<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> </div>
</ion-col>
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_search floatRight" *ngIf="!searchShow" (click)="goToPage('searchmodal')"></button> <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> <button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button>
<div class="clear"></div> </ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
......
src/app/login/login.page.html
<ion-header> <ion-header>
<div class="nav_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 floatLeft"></button> <button class="nav_btn floatLeft"></button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>LOGIN</h4> <h4>LOGIN</h4>
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
......
src/app/myorder/myorder.page.html
<ion-header> <ion-header>
<div class="nav_header"> <div class="nav_header">
<button class="nav_btn nav_back floatLeft" (click)="goBack()"></button> <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)="goBack()"></button></ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>MY ORDERS</h4> <h4>MY ORDERS</h4>
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
......
src/app/nearby/nearby.page.html
<ion-header> <ion-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)="goBack()" *ngIf="authService.regState"> <button class="nav_btn nav_back floatLeft" (click)="goBack()" *ngIf="authService.regState">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>NEW ADDRESS</h4> <h4>NEW ADDRESS</h4>
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</ion-header> </ion-header>
<ion-content> <ion-content>
<div class="nearby_map"> <div class="nearby_map">
......
src/app/noresult/noresult.page.html
<ion-header> <ion-header>
<div class="nav_header"> <div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<ion-menu-toggle> <ion-menu-toggle>
<button class="nav_btn nav_menu floatLeft"> <button class="nav_btn nav_menu floatLeft">
</button> </button>
</ion-menu-toggle> </ion-menu-toggle>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>Shirts</h4> <h4>Shirts</h4>
</div> </div>
</ion-col>
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_search floatRight" *ngIf="!searchShow"> <button class="nav_btn nav_search floatRight" *ngIf="!searchShow">
</button> </button>
<div class="clear"></div> </ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
......
src/app/ordercancelled/ordercancelled.page.html
...@@ -2,17 +2,23 @@ ...@@ -2,17 +2,23 @@
<div class="cart_wrapper" *ngIf="data"> <div class="cart_wrapper" *ngIf="data">
<div class="cart_head"> <div class="cart_head">
<div class="nav_header"> <div class="nav_header">
<button <ion-grid class="no-gutter">
class="nav_btn nav_back_white floatLeft" <ion-row class="no-gutter">
(click)="goToPage('myorder')" <ion-col class="no-gutter" size="2">
> <button class="nav_btn nav_back_white floatLeft" (click)="goToPage('myorder')">
<img src="../assets/arrow_white.png" /> <img src="../assets/arrow_white.png" />
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4></h4> <h4></h4>
</div> </div>
</ion-col>
<ion-col class="no-gutter" size="2">
<button class="nav_btn floatRight"></button> <button class="nav_btn floatRight"></button>
<div class="clear"></div> </ion-col>
</ion-row>
</ion-grid>
</div> </div>
<img onerror="this.src='../assets/[email protected]'" /> <img onerror="this.src='../assets/[email protected]'" />
<h4>ORDER CANCELLED</h4> <h4>ORDER CANCELLED</h4>
...@@ -22,16 +28,12 @@ ...@@ -22,16 +28,12 @@
<ul> <ul>
<li (click)="goToPage('productlist')"> <li (click)="goToPage('productlist')">
<div class="nearby_image"> <div class="nearby_image">
<img <img [src]="data.product[0].image" onerror="this.src='../assets/[email protected]'" />
[src]="data.product[0].image"
onerror="this.src='../assets/[email protected]'"
/>
</div> </div>
<div class="nearby_detail"> <div class="nearby_detail">
<h5> <h5>
<span class="floatLeft">{{data.shopperName}}</span> <span class="floatLeft">{{data.shopperName}}</span>
<span class="floatRight" <span class="floatRight">4
>4
<img src="../assets/Path61_2.png" /> <img src="../assets/Path61_2.png" />
</span> </span>
<div class="clear"></div> <div class="clear"></div>
...@@ -53,9 +55,7 @@ ...@@ -53,9 +55,7 @@
<h4>DELIVERY</h4> <h4>DELIVERY</h4>
<h5 *ngIf="data.deliveryAddress"> <h5 *ngIf="data.deliveryAddress">
{{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}}, {{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}},
<br /> <br /> {{data.deliveryAddress.building}}, <br /> {{data.deliveryAddress.landmark}}
{{data.deliveryAddress.building}}, <br />
{{data.deliveryAddress.landmark}}
</h5> </h5>
<!-- <button <!-- <button
class="cancel_btn" class="cancel_btn"
......
src/app/orderplaced/orderplaced.page.html
...@@ -2,14 +2,23 @@ ...@@ -2,14 +2,23 @@
<div class="cart_wrapper" *ngIf="data"> <div class="cart_wrapper" *ngIf="data">
<div class="cart_head"> <div class="cart_head">
<div class="nav_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_white floatLeft" (click)="goBack()"> <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
<img src="../assets/arrow_white.png" /> <img src="../assets/arrow_white.png" />
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4></h4> <h4></h4>
</div> </div>
</ion-col>
<ion-col class="no-gutter" size="2">
<button class="nav_btn floatRight"></button> <button class="nav_btn floatRight"></button>
<div class="clear"></div> </ion-col>
</ion-row>
</ion-grid>
</div> </div>
<img src="../assets/white_tick.png" /> <img src="../assets/white_tick.png" />
<h4>ORDER IS PLACED</h4> <h4>ORDER IS PLACED</h4>
...@@ -82,8 +91,7 @@ ...@@ -82,8 +91,7 @@
</h6> </h6>
<h5>Quantity : <span>{{product.qty}}</span></h5> <h5>Quantity : <span>{{product.qty}}</span></h5>
<h5> <h5>
Amount : <strong>A$ {{service.formatNumber(product.price)}}</strong><span Amount : <strong>A$ {{service.formatNumber(product.price)}}</strong><span class="afterpay">{{data.paymentMode}}</span>
class="afterpay">{{data.paymentMode}}</span>
</h5> </h5>
<h5 *ngIf="data.orderStatus >= 3 && data.orderStatus < 7"> <h5 *ngIf="data.orderStatus >= 3 && data.orderStatus < 7">
Delivery time : <span>{{deliveryTime}}</span> Delivery time : <span>{{deliveryTime}}</span>
...@@ -103,12 +111,9 @@ ...@@ -103,12 +111,9 @@
<h5 *ngIf="data.deliveryAddress"> <h5 *ngIf="data.deliveryAddress">
{{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}}, {{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}},
<br /> <br /> {{data.deliveryAddress.building}}, <br /> {{data.deliveryAddress.landmark}}
{{data.deliveryAddress.building}}, <br />
{{data.deliveryAddress.landmark}}
</h5> </h5>
<button class="cancel_btn" (click)="cancelOrder(data.orderId)" <button class="cancel_btn" (click)="cancelOrder(data.orderId)" *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8">
*ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8">
CANCEL THIS ORDER CANCEL THIS ORDER
</button> </button>
<!-- <hr /> --> <!-- <hr /> -->
......
src/app/preference/preference.page.html
<ion-header> <ion-header>
<div class="nav_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)="goBack()" *ngIf="authService.regState"> <button class="nav_btn nav_back floatLeft" (click)="goBack()" *ngIf="authService.regState">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>Preferences</h4> <h4>Preferences</h4>
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
......
src/app/productdetail/productdetail.page.html
<ion-header> <ion-header>
<div class="nav_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)="goBack()"> <button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"></div> <div class="nav_title floatLeft"></div>
</ion-col>
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_cart floatRight" (click)="goToPage('cart')"> <button class="nav_btn nav_cart floatRight" (click)="goToPage('cart')">
<div class="not" *ngIf="cartService.carts"> <div class="not" *ngIf="cartService.carts">
{{cartService.carts.length}} {{cartService.carts.length}}
</div> </div>
</button> </button>
<div class="clear"></div> </ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
......
src/app/productlist/productlist.page.html
<ion-header> <ion-header>
<div class="nav_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)="goBack()"> <button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <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> </div>
</ion-col>
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_search floatRight" *ngIf="!searchShow" (click)="goToPage('searchmodal')"></button> <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> <button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button>
<div class="clear"></div> </ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
......
src/app/profile/profile.page.html
<ion-header> <ion-header>
<div class="nav_header"> <div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<ion-menu-toggle> <ion-menu-toggle>
<button class="nav_btn nav_menu floatLeft"></button> <button class="nav_btn nav_menu floatLeft"></button>
</ion-menu-toggle> </ion-menu-toggle>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<img src="../../assets/Group [email protected]" /> <img src="../../assets/Group [email protected]" />
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
......
src/app/review/review.page.html
<ion-header> <ion-header>
<div class="nav_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)="goBack()"> <button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png"> <img src="../assets/Group17_2.png">
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>RATING & REVIEWS</h4> <h4>RATING & REVIEWS</h4>
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
......
src/app/reviewlist/reviewlist.page.html
<ion-header> <ion-header>
<div class="nav_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)="goBack()"> <button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png"> <img src="../assets/Group17_2.png">
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>REVIEWS</h4> <h4>REVIEWS</h4>
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
......
src/app/searchmodal/searchmodal.page.html
<div class="custom-header"> <div class="custom-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)="closeModal()"></button> <button class="nav_btn nav_back floatLeft" (click)="closeModal()"></button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft relative"> <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> </div>
</ion-col>
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_close floatRight" (click)="closeModal()"></button> <button class="nav_btn nav_close floatRight" (click)="closeModal()"></button>
<div class="clear"></div> </ion-col>
</ion-row>
</ion-grid>
</div> </div>
<div class="search_item_list"> <div class="search_item_list">
......
src/app/signup/signup.page.html
<ion-header> <ion-header>
<div class="nav_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)="goToPage('login')"> <button class="nav_btn nav_back floatLeft" (click)="goToPage('login')">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>SIGN UP</h4> <h4>SIGN UP</h4>
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
......
src/app/storelist/storelist.page.html
<ion-header> <ion-header>
<div class="nav_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)="goBack()"></button> <button class="nav_btn nav_back floatLeft" (click)="goBack()"></button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <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> </div>
</ion-col>
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_search floatRight" *ngIf="!searchShow" (click)="goToSearch('searchmodal')"></button> <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> <button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button>
<div class="clear"></div> </ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
......
src/app/trackorder/trackorder.page.html
<ion-header> <ion-header>
<div class="nav_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)="goBack()"> <button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png"> <img src="../assets/Group17_2.png">
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>ORDER TRACKING</h4> <h4>ORDER TRACKING</h4>
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
......
src/app/verficationnumber/verficationnumber.page.html
<ion-header> <ion-header>
<div class="nav_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)="goBack()"> <button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>VERIFICATION</h4> <h4>VERIFICATION</h4>
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
......
src/app/verification/verification.page.html
<ion-header> <ion-header>
<div class="nav_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)="goBack()" *ngIf="authService.regState"> <button class="nav_btn nav_back floatLeft" (click)="goBack()" *ngIf="authService.regState">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>VERIFICATION</h4> <h4>VERIFICATION</h4>
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
......
src/app/wishlist/wishlist.page.html
<ion-header> <ion-header>
<div class="nav_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)="goBack()"> <button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>WISHLIST</h4> <h4>WISHLIST</h4>
</div> </div>
<div class="clear"></div> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
...@@ -18,7 +26,8 @@ ...@@ -18,7 +26,8 @@
</div> </div>
<div class="wishlist_detail"> <div class="wishlist_detail">
<p class="floatLeft" (click)="prodDetails(i)">{{unEscape(product.prodName)}}</p> <p class="floatLeft" (click)="prodDetails(i)">{{unEscape(product.prodName)}}</p>
<span class="floatRight"><img src="../../assets/heart.png" (click)="removeItem(product.prodId)" /></span> <span class="floatRight"><img src="../../assets/heart.png"
(click)="removeItem(product.prodId)" /></span>
<div class="clear"></div> <div class="clear"></div>
<p (click)="prodDetails(i)"> <p (click)="prodDetails(i)">
<span *ngIf="product.color[0] !=='No-Color'">{{product.color[0]}}</span> <span *ngIf="product.color[0] !=='No-Color'">{{product.color[0]}}</span>
......
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() {
......
src/global.scss
...@@ -451,7 +451,8 @@ button { ...@@ -451,7 +451,8 @@ button {
} }
.nav_title { .nav_title {
width: calc(100% - 100px); // width: calc(100% - 100px);
width: 100%;
color: rgba(59, 57, 77, 1); color: rgba(59, 57, 77, 1);
padding: 12px; padding: 12px;
padding-left: 5px; padding-left: 5px;
...@@ -662,3 +663,8 @@ ion-header { ...@@ -662,3 +663,8 @@ ion-header {
--border-radius: 4px; --border-radius: 4px;
--color: #fff; --color: #fff;
} }
.no-gutter {
padding: 0;
margin: 0;
}
\ No newline at end of file
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