Skip to content

G
getme
Commit 74b674bd by Adarsh K
Options

new changes

parents 02a480be eed252b7
Showing with 433 additions and 135 deletions
src/app/addaddresss/addaddresss.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>ADD ADDRESS</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
......
src/app/addcard/addcard.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png">
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>ADD YOUR CARD</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
......
src/app/address/address.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>Address</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
<ion-content>
......
src/app/address/address.page.scss
.address-wrapper {
padding: 15px;
padding-bottom: 11%;
padding-bottom: 20%;
.address-radio {
background-image: url('../../assets/radio.png');
-webkit-appearance: none;
......
src/app/app.component.html
......@@ -28,8 +28,7 @@
<div class="sub_menu">
<ul *ngIf="categoryService.activecategories">
<ion-menu-toggle>
<li *ngFor="let category of categoryService.activecategories"
(click)="goToPage('catstorelist', category)">
<li *ngFor="let category of categoryService.activecategories" (click)="goToPage('catstorelist', category)">
{{ category.catName }}
</li>
</ion-menu-toggle>
......
src/app/app.component.ts
......@@ -3,6 +3,7 @@ import { Router, ActivatedRoute } from '@angular/router';
import { Platform, Events } from '@ionic/angular';
import { SplashScreen } from '@ionic-native/splash-screen/ngx';
import { StatusBar } from '@ionic-native/status-bar/ngx';
import {
AngularFirestore,
AngularFirestoreDocument,
......@@ -16,7 +17,7 @@ import { ServiceService } from './../config/service.service';
import { SubjectService } from './../config/subject.service';
import { CategoriesService } from './../config/category.service';
import { SearchmodalPage } from './searchmodal/searchmodal.page';
import { Location } from '@angular/common';
import { trigger, transition, animate, style } from '@angular/animations';
import { NavigationBar } from '@ionic-native/navigation-bar/ngx';
@Component({
......@@ -45,10 +46,6 @@ export class AppComponent {
sec_active5 = false;
sec_active6 = false;
state: boolean;
// Customer Info
// user: User;
menuw: number;
userData: any;
tabData = true;
......@@ -68,11 +65,11 @@ export class AppComponent {
public categoryService: CategoriesService,
public subjectService: SubjectService,
private route: ActivatedRoute,
private navigationBar: NavigationBar
private navigationBar: NavigationBar,
private location: Location,
private events: Events
) {
console.log(this.router.url);
this.state = true;
this.initializeApp();
this.subjectService.getLoginData().subscribe(loginData => {
this.state = loginData;
......@@ -166,7 +163,6 @@ export class AppComponent {
this.setActive6();
}
const index = restrictedUrl.findIndex(x => x === currentUrl[1]);
// console.log(currentUrl[1], index, this.state);
if (index > -1 || this.tabData === false) {
return true;
} else {
......
src/app/cart/cart.page.html
......@@ -2,14 +2,23 @@
<div class="cart_wrapper">
<div class="cart_head">
<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()">
<img src="../assets/arrow_white.png" />
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>CART</h4>
</div>
</ion-col>
<ion-col class="no-gutter" size="2">
<button class="nav_btn floatRight"></button>
<div class="clear"></div>
</ion-col>
</ion-row>
</ion-grid>
</div>
<div class="cart_menu_header">
<ul>
......@@ -59,8 +68,8 @@
<p class="textLeft">Total Price:</p>
</ion-col>
<ion-col>
<p class="textRight">A$
{{service.formatNumber(cartService.cartTotal.toFixed(2))}}</p>
<p class="textRight">A$ {{service.formatNumber(cartService.cartTotal.toFixed(2))}}
</p>
</ion-col>
</ion-row>
</div>
......@@ -104,8 +113,7 @@
<ion-row>
<ion-col class="p0">
<h6>
{{addressService.custAddress.building}},<br />
{{addressService.custAddress.landmark}},
{{addressService.custAddress.building}},<br /> {{addressService.custAddress.landmark}},
<br /> {{addressService.custAddress.address}}
</h6>
</ion-col>
......@@ -125,8 +133,7 @@
</label>
</div> -->
<div class="payment_method">
<input type="radio" name="payments" id="paypal" name="radio-group"
(click)="getwaypaypal()" checked="true" />
<input type="radio" name="payments" id="paypal" name="radio-group" (click)="getwaypaypal()" checked="true" />
<label for="paypal">
<p>PayPal</p>
</label>
......@@ -135,8 +142,7 @@
<input class="card_no borderNone widthFull" placeholder="PayPal ID" />
</div> -->
<div class="payment_method">
<input type="radio" name="payments" id="afterpay" name="radio-group"
(click)="getwayafterpay()" />
<input type="radio" name="payments" id="afterpay" name="radio-group" (click)="getwayafterpay()" />
<label for="afterpay">
<p>AfterPay</p>
</label>
......@@ -146,8 +152,7 @@
<input class="cv_number" placeholder="CVV" />
</div> -->
<div class="payment_method">
<input type="radio" name="payments" id="payk" name="radio-group"
(click)="getwaypayk()" />
<input type="radio" name="payments" id="payk" name="radio-group" (click)="getwaypayk()" />
<label for="payk">
<p>PayK</p>
</label>
......@@ -173,8 +178,7 @@
<hr />
<div class="coupon_code">
<div class="promo-row">
<input class="" placeholder="COUPON CODE: GET50" #promo /><button
class="add_btn apply_btn" (click)="promoApply(promo.value)">
<input class="" placeholder="COUPON CODE: GET50" #promo /><button class="add_btn apply_btn" (click)="promoApply(promo.value)">
APPLY
</button>
</div>
......@@ -241,20 +245,17 @@
</div>
</div>
</ion-content>
<ion-footer>
<ion-footer class="hide-on-keyboard-open">
<div class="footer_btnbay" *ngIf="cartService.carts && cartService.carts.length > 0" [hidden]="currentIndex != 0">
<div class="continue" (click)="goToPage('productlist')">
CONTINUE SHOPPING
</div>
<div class="checkout" (click)="next(1)">CHECKOUT</div>
</div>
<div class="footer_btn" *ngIf="cartService.carts && cartService.carts.length > 0" [hidden]="currentIndex != 1"
(click)="next(2);">
<div class="footer_btn" *ngIf="cartService.carts && cartService.carts.length > 0" [hidden]="currentIndex != 1" (click)="next(2);">
PAY
</div>
<!-- <div class="footer_btn" [hidden]="currentIndex != 2" (click)="finishpop()">
FINISH
</div> -->
</ion-footer>
<div class="loader" *ngIf="loader">
<div class="lds-ripple">
......@@ -274,8 +275,7 @@
<div class="clear"></div>
</div>
<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"></agm-marker>
</agm-map>
<div class="add_address_wrapper">
......@@ -288,9 +288,7 @@
<li *ngFor="let address of addressService.nearestList; let i = index">
<div class="floatLeft">
{{address.default}}
<input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio"
(click)="setDefault(address.addressId, i)" [value]="address.addressId" #addressType
[checked]="address.defaultVal == 1" />
<input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio" (click)="setDefault(address.addressId, i)" [value]="address.addressId" #addressType [checked]="address.defaultVal == 1" />
<label for="styled-checkbox-{{i}}"> {{address.addressType}} </label>
</div>
<div class="floatLeft">
......@@ -301,8 +299,7 @@
<div class="clear"></div>
</li>
</ul>
<div class="textCenter" *ngIf="addressService.nearestList && addressService.nearestList.length === 0">No
Address Found in the nearest center</div>
<div class="textCenter" *ngIf="addressService.nearestList && addressService.nearestList.length === 0">No Address Found in the nearest center</div>
</div>
<!-- <div class="loader" *ngIf="loader">
......
src/app/cart/cart.page.scss
.cart_wrapper {
width: 100%;
height: 100%;
.cart_head {
width: 100%;
height: 220px;
......@@ -463,7 +464,7 @@
text-align: center;
color: #fff;
font-size: 18px;
padding: 15px;
padding: 10px;
font-weight: 300;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
......@@ -481,7 +482,7 @@
border-top-left-radius: 15px;
text-align: center;
font-size: 18px;
padding: 15px;
padding: 10px;
font-weight: 300;
float: left;
border-top: 1px solid #d7d5e4;
......@@ -495,7 +496,7 @@
text-align: center;
color: #fff;
font-size: 18px;
padding: 15px;
padding: 10px;
font-weight: 300;
float: right;
}
......@@ -597,3 +598,17 @@
}
}
}
@media only screen and (max-width: 350px) {
.cart_wrapper {
.cart_head {
.cart_menu_header {
ul {
li {
font-size: 12px;
}
}
}
}
}
}
\ No newline at end of file
src/app/cart/cart.page.ts
......@@ -10,6 +10,7 @@ import { ServiceService } from './../../config/service.service';
import { AddressService } from './../../config/address.service';
import { AddressList } from './../../config/services/address';
import { trigger, transition, animate, style } from '@angular/animations';
import { Events } from '@ionic/angular';
import { zip } from 'rxjs';
@Component({
......@@ -63,6 +64,7 @@ export class CartPage implements OnInit {
public modalController: ModalController,
public service: ServiceService,
public addressService: AddressService,
private event: Events
) {
console.log('cart loaded');
this.bookDate = this.formatDate();
......@@ -98,7 +100,6 @@ export class CartPage implements OnInit {
setTimeout(() => {
this.setAddress();
}, 1000); */
}
private setCurrentLocation() {
......@@ -175,6 +176,7 @@ export class CartPage implements OnInit {
}
goBack() {
this.event.publish('home');
this.location.back();
}
......@@ -208,11 +210,15 @@ export class CartPage implements OnInit {
paymentMethod: this.paymentMethod
};
const state = this.orderService
.checkOut(this.cartService.carts, otherCharges, this.addressService.centerLoc)
.checkOut(
this.cartService.carts,
otherCharges,
this.addressService.centerLoc
)
.then(data => {
this.cartService.cartCenter = '';
const cartCount = this.orderService.cartCount;
const timer = ((cartCount - 1) * 20) + 60;
const timer = (cartCount - 1) * 20 + 60;
const totalTime = this.add_minutes(timer);
console.log('ready for slide');
this.timeinterval = setInterval(() => {
......@@ -248,7 +254,7 @@ export class CartPage implements OnInit {
getTimeRemaining(endtime, currDate) {
const t = Date.parse(endtime) - Date.parse(currDate);
const hours = Math.floor((((t / 1000) / 60) / 60) % 60);
const hours = Math.floor((t / 1000 / 60 / 60) % 60);
const seconds = Math.floor((t / 1000) % 60);
const minutes = Math.floor((t / 1000 / 60) % 60);
return {
......@@ -306,7 +312,9 @@ export class CartPage implements OnInit {
if (value[0].type === 1) {
const rate = value[0].amount;
const upto = value[0].amount;
const percentage = Math.round((this.cartService.cartTotal * rate) / 100).toFixed(2);
const percentage = Math.round(
(this.cartService.cartTotal * rate) / 100
).toFixed(2);
this.discount = percentage > upto ? upto : percentage;
} else {
this.discount = value[0].amount;
......
src/app/catagory/catagory.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group22_2.png">
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<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>
<div class="clear"></div>
</ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
......
src/app/catstorelist/catstorelist.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goBack()"></button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="clickSearch()" />
</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_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button>
<div class="clear"></div>
</ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
<ion-content>
......
src/app/changeaddress/changeaddress.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>Change Address</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
<ion-content>
......
src/app/changedetails/changedetails.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>CHANGE DETAILS</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
......
src/app/changepass/changepass.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png">
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>CHANGE PASSWORD</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
<ion-content>
......
src/app/contact/contact.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>Send Us</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
<ion-content>
......
src/app/delivery/delivery.page.html
......@@ -2,15 +2,24 @@
<div class="cart_wrapper">
<div class="cart_head">
<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()">
<img src="../assets/arrow_white.png">
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4></h4>
</div>
</ion-col>
<ion-col class="no-gutter" size="2">
<button class="nav_btn floatRight">
</button>
<div class="clear"></div>
</ion-col>
</ion-row>
</ion-grid>
</div>
<img src="../assets/white_tick.png">
<h4>RIDER HAS<br> DELIVERED YOUR ORDER </h4>
......
src/app/deliverypop/deliverypop.page.html
......@@ -2,15 +2,24 @@
<div class="cart_wrapper">
<div class="cart_head">
<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()">
<img src="../assets/arrow_white.png">
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4></h4>
</div>
</ion-col>
<ion-col class="no-gutter" size="2">
<button class="nav_btn floatRight">
</button>
<div class="clear"></div>
</ion-col>
</ion-row>
</ion-grid>
</div>
<img src="../assets/white_tick.png">
<h4>RIDER HAS<br> DELIVERED YOUR ORDER </h4>
......
src/app/feedback/feedback.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>Complaints & Feedback</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
<ion-content>
......
src/app/forgot/forgot.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goToPage('login')">
<img src="../assets/Group17_2.png" />
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>FORGOT PASSWORD</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
<ion-content>
......
src/app/home/home.page.html
<ion-header>
<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>
<button class="nav_btn nav_menu floatLeft"></button>
</ion-menu-toggle>
</ion-col>
<ion-col class="no-gutter" size="8">
<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')" />
</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_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button>
<div class="clear"></div>
</ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
......
src/app/home/home.page.scss
......@@ -221,6 +221,7 @@
height: 100%;
object-fit: cover;
object-position: center;
border-radius: 8px;
}
.featured_overlay {
position: absolute;
......
src/app/login/login.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn floatLeft"></button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>LOGIN</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
......
src/app/myorder/myorder.page.html
<ion-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">
<h4>MY ORDERS</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
......
src/app/nearby/nearby.page.html
<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">
<img src="../assets/Group17_2.png" />
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>NEW ADDRESS</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</ion-header>
<ion-content>
<div class="nearby_map">
......
src/app/noresult/noresult.page.html
<ion-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>
<button class="nav_btn nav_menu floatLeft">
</button>
</ion-menu-toggle>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>Shirts</h4>
</div>
</ion-col>
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_search floatRight" *ngIf="!searchShow">
</button>
<div class="clear"></div>
</ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
<ion-content>
......
src/app/ordercancelled/ordercancelled.page.html
......@@ -2,17 +2,23 @@
<div class="cart_wrapper" *ngIf="data">
<div class="cart_head">
<div class="nav_header">
<button
class="nav_btn nav_back_white floatLeft"
(click)="goToPage('myorder')"
>
<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)="goToPage('myorder')">
<img src="../assets/arrow_white.png" />
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4></h4>
</div>
</ion-col>
<ion-col class="no-gutter" size="2">
<button class="nav_btn floatRight"></button>
<div class="clear"></div>
</ion-col>
</ion-row>
</ion-grid>
</div>
<img onerror="this.src='../assets/[email protected]'" />
<h4>ORDER CANCELLED</h4>
......@@ -22,16 +28,12 @@
<ul>
<li (click)="goToPage('productlist')">
<div class="nearby_image">
<img
[src]="data.product[0].image"
onerror="this.src='../assets/[email protected]'"
/>
<img [src]="data.product[0].image" onerror="this.src='../assets/[email protected]'" />
</div>
<div class="nearby_detail">
<h5>
<span class="floatLeft">{{data.shopperName}}</span>
<span class="floatRight"
>4
<span class="floatRight">4
<img src="../assets/Path61_2.png" />
</span>
<div class="clear"></div>
......@@ -53,9 +55,7 @@
<h4>DELIVERY</h4>
<h5 *ngIf="data.deliveryAddress">
{{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}},
<br />
{{data.deliveryAddress.building}}, <br />
{{data.deliveryAddress.landmark}}
<br /> {{data.deliveryAddress.building}}, <br /> {{data.deliveryAddress.landmark}}
</h5>
<!-- <button
class="cancel_btn"
......
src/app/orderplaced/orderplaced.page.html
......@@ -2,14 +2,23 @@
<div class="cart_wrapper" *ngIf="data">
<div class="cart_head">
<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()">
<img src="../assets/arrow_white.png" />
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4></h4>
</div>
</ion-col>
<ion-col class="no-gutter" size="2">
<button class="nav_btn floatRight"></button>
<div class="clear"></div>
</ion-col>
</ion-row>
</ion-grid>
</div>
<img src="../assets/white_tick.png" />
<h4>ORDER IS PLACED</h4>
......@@ -82,8 +91,7 @@
</h6>
<h5>Quantity : <span>{{product.qty}}</span></h5>
<h5>
Amount : <strong>A$ {{service.formatNumber(product.price)}}</strong><span
class="afterpay">{{data.paymentMode}}</span>
Amount : <strong>A$ {{service.formatNumber(product.price)}}</strong><span class="afterpay">{{data.paymentMode}}</span>
</h5>
<h5 *ngIf="data.orderStatus >= 3 && data.orderStatus < 7">
Delivery time : <span>{{deliveryTime}}</span>
......@@ -103,12 +111,9 @@
<h5 *ngIf="data.deliveryAddress">
{{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}},
<br />
{{data.deliveryAddress.building}}, <br />
{{data.deliveryAddress.landmark}}
<br /> {{data.deliveryAddress.building}}, <br /> {{data.deliveryAddress.landmark}}
</h5>
<button class="cancel_btn" (click)="cancelOrder(data.orderId)"
*ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8">
<button class="cancel_btn" (click)="cancelOrder(data.orderId)" *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8">
CANCEL THIS ORDER
</button>
<!-- <hr /> -->
......
src/app/preference/preference.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goBack()" *ngIf="authService.regState">
<img src="../assets/Group17_2.png" />
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>Preferences</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
......
src/app/productdetail/productdetail.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<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')">
<div class="not" *ngIf="cartService.carts">
{{cartService.carts.length}}
</div>
</button>
<div class="clear"></div>
</ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
<ion-content>
......
src/app/productlist/productlist.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..." (click)="goToPage('searchmodal')" />
</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_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button>
<div class="clear"></div>
</ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
<ion-content>
......
src/app/productlist/productlist.page.scss
......@@ -110,6 +110,7 @@
height: 100%;
object-fit: contain;
object-position: center;
background-color: #fff;
}
}
h5 {
......
src/app/profile/profile.page.html
<ion-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>
<button class="nav_btn nav_menu floatLeft"></button>
</ion-menu-toggle>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<img src="../../assets/Group [email protected]" />
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
......@@ -20,9 +28,10 @@
<div class="profile_circle">
<img [src]="loggedUser.profilePhoto" onerror="this.src='./../assets/asset_avatar.png'" />
<div class="edit"></div>
<div class="edit">
<input type="file" accept="image/*;capture=camera" (change)="fileChange($event)" />
</div>
</div>
<h5>{{loggedUser.name}}</h5>
<p (click)="istoggle()">LOGOUT</p>
......
src/app/review/review.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png">
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>RATING & REVIEWS</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
<ion-content>
......
src/app/reviewlist/reviewlist.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png">
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>REVIEWS</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
<ion-content>
......
src/app/searchmodal/searchmodal.page.html
<ion-header>
<div class="nav_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>
</ion-col>
<ion-col class="no-gutter" size="8">
<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 />
</div>
</ion-col>
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_close floatRight" (click)="closeModal()"></button>
<div class="clear"></div>
</div>
</ion-header>
</ion-col>
</ion-row>
</ion-grid>
</div>
<div class="search_item_list">
<ul *ngIf="searchService.searchList">
......
src/app/searchmodal/searchmodal.page.scss
.custom-header {
position: fixed;
top: 0;
left: 0;
right: 0;
z-index: 999;
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);
box-shadow: 0px 0px 5px 0px rgba(0, 0, 0, 0.2);
}
\ No newline at end of file
src/app/signup/signup.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goToPage('login')">
<img src="../assets/Group17_2.png" />
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>SIGN UP</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
<ion-content>
......
src/app/storelist/storelist.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goBack()"></button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<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" *ngIf="!searchShow" (click)="goToSearch('searchmodal')"></button>
<button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button>
<div class="clear"></div>
</ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
......
src/app/trackorder/trackorder.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png">
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>ORDER TRACKING</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
<ion-content>
......
src/app/verficationnumber/verficationnumber.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>VERIFICATION</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
<ion-content>
......
src/app/verification/verification.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goBack()" *ngIf="authService.regState">
<img src="../assets/Group17_2.png" />
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>VERIFICATION</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
<ion-content>
......
src/app/wishlist/wishlist.page.html
<ion-header>
<div class="nav_header">
<ion-grid class="no-gutter">
<ion-row class="no-gutter">
<ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="goBack()">
<img src="../assets/Group17_2.png" />
</button>
</ion-col>
<ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft">
<h4>WISHLIST</h4>
</div>
<div class="clear"></div>
</ion-col>
<ion-col class="no-gutter" size="2"></ion-col>
</ion-row>
</ion-grid>
</div>
</ion-header>
<ion-content>
......@@ -18,7 +26,8 @@
</div>
<div class="wishlist_detail">
<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>
<p (click)="prodDetails(i)">
<span *ngIf="product.color[0] !=='No-Color'">{{product.color[0]}}</span>
......
src/config/auth.service.ts
......@@ -36,32 +36,32 @@ export class AuthService {
this.type = 1;
this.regState = true;
this.afAuth.authState.subscribe(user => {
console.log('here');
console.log(user);
if (user) {
this.subjectService.sendLoginData(false);
this.userData = user;
console.log(this.userData);
this.service.set('user', JSON.stringify(this.userData));
this.SetUserData(user);
this.loader = false;
if (this.type === 1) {
this.regState = true;
this.router.navigateByUrl('home', { replaceUrl: true });
} else {
this.regState = false;
this.router.navigateByUrl('verification', { replaceUrl: true });
}
} else {
console.log('here too');
this.loader = false;
this.subjectService.sendLoginData(true);
this.service.set('user', null);
JSON.parse(localStorage.getItem('user'));
this.router.navigateByUrl('login', { replaceUrl: true });
}
});
// this.afAuth.authState.subscribe(user => {
// console.log('here');
// console.log(user);
// if (user) {
// this.subjectService.sendLoginData(false);
// this.userData = user;
// console.log(this.userData);
// this.service.set('user', JSON.stringify(this.userData));
// this.SetUserData(user);
// this.loader = false;
// if (this.type === 1) {
// this.regState = true;
// this.router.navigateByUrl('home', { replaceUrl: true });
// } else {
// this.regState = false;
// this.router.navigateByUrl('verification', { replaceUrl: true });
// }
// } else {
// console.log('here too');
// this.loader = false;
// this.subjectService.sendLoginData(true);
// this.service.set('user', null);
// JSON.parse(localStorage.getItem('user'));
// this.router.navigateByUrl('login', { replaceUrl: true });
// }
// });
}
checkLogin() {
......
src/global.scss
......@@ -451,7 +451,8 @@ button {
}
.nav_title {
width: calc(100% - 100px);
// width: calc(100% - 100px);
width: 100%;
color: rgba(59, 57, 77, 1);
padding: 12px;
padding-left: 5px;
......@@ -662,3 +663,8 @@ ion-header {
--border-radius: 4px;
--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