conflix
Showing
src/app/addaddresss/addaddresss.page.css
0 → 100644
src/app/addaddresss/addaddresss.page.css.map
0 → 100644
src/app/addcard/addcard.page.css
0 → 100644
src/app/addcard/addcard.page.css.map
0 → 100644
src/app/app.component.css
0 → 100644
src/app/app.component.css.map
0 → 100644
... | @@ -3,12 +3,17 @@ | ... | @@ -3,12 +3,17 @@ |
<ion-menu> | <ion-menu> | ||
<ion-content> | <ion-content> | ||
<div class="side_menu_wrapper"> | <div class="side_menu_wrapper"> | ||
<<<<<<< HEAD | |||
<ion-menu-toggle> | <ion-menu-toggle> | ||
<div class="top_banner" (click)="goToPage('profile')"> | <div class="top_banner" (click)="goToPage('profile')"> | ||
======= | |||
<ion-menu-toggle *ngIf="userData"> | |||
<div class="top_banner"> | |||
>>>>>>> b35f226916e6e5b4feacc30b355445f087230416 | |||
<div class="top_image"></div> | <div class="top_image"></div> | ||
<div class="top_detail"> | <div class="top_detail"> | ||
<h4>John Doe</h4> | <h4>{{userData.name}}</h4> | ||
<p>[email protected]</p> | <p>{{userData.emailId}}</p> | ||
</div> | </div> | ||
<div class="clear"></div> | <div class="clear"></div> | ||
</div> | </div> | ||
... | @@ -95,7 +100,7 @@ | ... | @@ -95,7 +100,7 @@ |
class="icon_sec m6_icon" | class="icon_sec m6_icon" | ||
[class.m6_icon_act]="sec_active6" | [class.m6_icon_act]="sec_active6" | ||
(click)="setActive6()" | (click)="setActive6()" | ||
></div> | menuClose></div> | ||
</li> | </li> | ||
</ul> | </ul> | ||
</div> | </div> |
src/app/cart/cart.page.css
0 → 100644
This diff is collapsed.
Click to expand it.
src/app/cart/cart.page.css.map
0 → 100644
This diff is collapsed.
Click to expand it.
src/app/changedetails/changedetails.page.css
0 → 100644
src/app/changepass/changepass.page.css
0 → 100644
src/app/changepass/changepass.page.css.map
0 → 100644
src/app/forgot/forgot.page.css
0 → 100644
src/app/forgot/forgot.page.css.map
0 → 100644
This diff is collapsed.
Click to expand it.
src/app/landing/landing.page.css
0 → 100644
src/app/landing/landing.page.css.map
0 → 100644
src/app/login/login.page.css
0 → 100644
src/app/login/login.page.css.map
0 → 100644
src/app/myorder/myorder.page.css
0 → 100644
src/app/myorder/myorder.page.css.map
0 → 100644
src/app/nearby/nearby.page.css
0 → 100644
src/app/nearby/nearby.page.css.map
0 → 100644
<ion-content> | <ion-content> | ||
<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 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> | ||
<div class="nav_title floatLeft"> | <div class="nav_title floatLeft"> | ||
<h4></h4> | <h4></h4> | ||
</div> | |||
<button class="nav_btn floatRight"> | |||
</button> | |||
<div class="clear"></div> | |||
</div> | |||
<img src="../assets/white_tick.png"> | |||
<h4>ORDER IS PLACED</h4> | |||
<p>{{ data.bookDate.seconds * 1000 | date:'MMMM dd, y' }}</p> | |||
</div> | </div> | ||
<div class="order_status"> | <button class="nav_btn floatRight"></button> | ||
<div class="clear"></div> | |||
<div class="clear"></div> | </div> | ||
<div class="status_div go_green"> | <img src="../assets/white_tick.png" /> | ||
<h4>Order Placed</h4> | <h4>ORDER IS PLACED</h4> | ||
<h6>{{ data.bookDate.seconds * 1000 | date:'MMMM dd, y' }}</h6> | <p>{{ data.bookDate.seconds * 1000 | date:'MMMM dd, y' }}</p> | ||
</div> | </div> | ||
<!-- <div class="status_gap go_green"> | <div class="order_status"> | ||
<div class="clear"></div> | |||
<div class="status_div go_green"> | |||
<h4>Order Placed</h4> | |||
<h6>{{ data.bookDate.seconds * 1000 | date:'MMMM dd, y' }}</h6> | |||
</div> | |||
<!-- <div class="status_gap go_green"> | |||
</div> | </div> | ||
<div class="status_div go_green"> | <div class="status_div go_green"> | ||
<h4>Retailer Accepted</h4> | <h4>Retailer Accepted</h4> | ||
... | @@ -56,41 +54,56 @@ | ... | @@ -56,41 +54,56 @@ |
<div class="status_div"> | <div class="status_div"> | ||
<h4>Your product is delivered</h4> | <h4>Your product is delivered</h4> | ||
</div> --> | </div> --> | ||
</div> | </div> | ||
<div class="nearby_shop_list"> | <div class="nearby_shop_list"> | ||
<ul> | <ul> | ||
<li (click)="goToPage('productlist')"> | <li (click)="goToPage('productlist')"> | ||
<div class="nearby_image"> | <div class="nearby_image"> | ||
<img src="../assets/[email protected]"> | <img | ||
</div> | [src]="data.product[0].image" | ||
<div class="nearby_detail"> | onerror="this.src='../assets/[email protected]'" | ||
<h5> | /> | ||
<span class="floatLeft">{{data.shopperName}}</span> | </div> | ||
<span class="floatRight">0 | <div class="nearby_detail"> | ||
<img src="../assets/Path61_2.png"> | |||
</span> | |||
<div class="clear"></div> | |||
</h5> | |||
<p>Men's & Women's Fashion</p> | |||
</div> | |||
<div class="clear"></div> | |||
</li> | |||
</ul> | |||
</div> | |||
<div class="product_detail" *ngFor="let product of data.product"> | |||
<h6>{{product.color}}, {{product.size}}</h6> | |||
<h5>Quantity : <span>{{product.qty}}</span></h5> | |||
<h5>Amount : <strong>A$ {{product.price}}</strong><span class="afterpay">COD</span></h5> | |||
<h5>Delivery time : <span>Delivery in 1 hour</span></h5> | |||
<h4>DELIVERY</h4> | |||
<h5> | <h5> | ||
{{deliveryAddress}} | <span class="floatLeft">{{data.shopperName}}</span> | ||
<span class="floatRight" | |||
>{{data.product[0].qty}} | |||
<img src="../assets/Path61_2.png" /> | |||
</span> | |||
<div class="clear"></div> | |||
</h5> | </h5> | ||
<button class="cancel_btn" (click)="goToPage('ordercancelled')">CANCEL THIS ORDER</button> | <p class="prodName">{{data.product[0].prodName}}</p> | ||
<hr> | </div> | ||
</div> | <div class="clear"></div> | ||
</li> | |||
</ul> | |||
</div> | |||
<div class="product_detail" *ngFor="let product of data.product"> | |||
<h6> | |||
<span *ngIf="product.color !== 'No-Color'">{{product.color}}, </span> | |||
<span *ngIf="product.size !== 'Any-Size'">{{product.size}}</span> | |||
</h6> | |||
<h5>Quantity : <span>{{product.qty}}</span></h5> | |||
<h5> | |||
Amount : <strong>A$ {{product.price}}</strong | |||
><span class="afterpay">COD</span> | |||
</h5> | |||
<h5>Delivery time : <span>{{deliveryTime}}</span></h5> | |||
<h4>DELIVERY</h4> | |||
<h5 *ngIf="data.deliveryAddress"> | |||
{{data.deliveryAddress.addressType}},<br />{{data.deliveryAddress.address}}, | |||
<br /> | |||
{{data.deliveryAddress.building}}, <br /> | |||
{{data.deliveryAddress.landmark}} | |||
</h5> | |||
<button class="cancel_btn" (click)="goToPage('ordercancelled')"> | |||
CANCEL THIS ORDER | |||
</button> | |||
<hr /> | |||
</div> | |||
<!-- <div class="related_product_slider"> | <!-- <div class="related_product_slider"> | ||
<h5> | <h5> | ||
<span class="floatLeft">Related Products</span><span class="floatRight">MORE</span> | <span class="floatLeft">Related Products</span><span class="floatRight">MORE</span> | ||
<div class="clear"></div> | <div class="clear"></div> | ||
... | @@ -145,5 +158,5 @@ | ... | @@ -145,5 +158,5 @@ |
</ion-slides> | </ion-slides> | ||
</ul> | </ul> | ||
</div> --> | </div> --> | ||
</div> | </div> | ||
</ion-content> | </ion-content> | ||
\ No newline at end of file |
This diff is collapsed.
Click to expand it.
src/app/productdetail/productdetail.page.css
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
src/app/productlist/productlist.page.css
0 → 100644
src/app/productlist/productlist.page.css.map
0 → 100644
src/app/profile/profile.page.css
0 → 100644
src/app/profile/profile.page.css.map
0 → 100644
src/app/searchmodal/searchmodal.page.css
0 → 100644
src/app/searchmodal/searchmodal.page.css.map
0 → 100644
src/app/signup/signup.page.css
0 → 100644
src/app/signup/signup.page.css.map
0 → 100644
src/app/sortby/sortby.page.css
0 → 100644
src/app/sortby/sortby.page.css.map
0 → 100644
src/app/tab1/tab1.page.css
0 → 100644
src/app/tab1/tab1.page.css.map
0 → 100644
src/app/tab2/tab2.page.css
0 → 100644
src/app/tab2/tab2.page.css.map
0 → 100644
src/app/tab3/tab3.page.css
0 → 100644
src/app/tab3/tab3.page.css.map
0 → 100644
src/app/tabs/tabs.page.css
0 → 100644
src/app/tabs/tabs.page.css.map
0 → 100644
src/app/trackorder/trackorder.page.css
0 → 100644
src/app/trackorder/trackorder.page.css.map
0 → 100644
src/app/verification/verification.page.css
0 → 100644
src/app/wishlist/wishlist.page.css
0 → 100644
src/app/wishlist/wishlist.page.css.map
0 → 100644
This diff is collapsed.
Click to expand it.
src/theme/variables.css
0 → 100644
src/theme/variables.css.map
0 → 100644
Please
register
or
sign in
to comment