Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cartdetail 158024162 #156

Merged
merged 3 commits into from
Jun 7, 2018
Merged

Cartdetail 158024162 #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1c8afc
Ui Fixes
jaypal412 Jun 6, 2018
c3b6813
work on cart page
jaypal412 Jun 6, 2018
1b845e9
Work on the product cart page
jaypal412 Jun 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/app/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@
<section>
<ng-progress [color]="'red'" [spinner]="false"></ng-progress>

<app-header *ngIf="currentUrl && !isCheckoutRoute()"></app-header>
<app-checkout-header [currentStep]="currentStep" *ngIf="currentUrl && isCheckoutRoute()"></app-checkout-header>

<app-header *ngIf="currentUrl"></app-header>

<main class="main-body">
<router-outlet></router-outlet>
</main>

<app-checkout-footer *ngIf="currentUrl && isCheckoutRoute()"></app-checkout-footer>
<app-footer *ngIf="currentUrl && !isCheckoutRoute()"></app-footer>
</main>
<app-footer *ngIf="currentUrl"></app-footer>

</section>
</div>
15 changes: 8 additions & 7 deletions src/app/checkout/cart/cart.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
<div class="cart-section container">
<div *ngIf="(totalCartItems$ | async) > 0 else emptyCart">
<div class="left">

<div *ngIf="(totalCartItems$ | async) > 0 else emptyCart" class="row">
<div class="left col-md-9">
<div class="checkout-header-container">
<div class="checkout-header">
<span class="text">My Shopping Bag ({{totalCartItems$ | async}})</span>
<span class="text">Your Shopping Cart</span>
</div>
<div class="total-price">Total: ${{totalCartValue$ | async | number:'1.2-2'}}</div>
</div>
<div class="prod-set">
<app-line-item-list></app-line-item-list>
<a class="wishlist-link">
<!-- <a class="wishlist-link">
<span class="icon"></span>
<span class="coming-soon">Add more from wishlist</span>
</a>
</a> -->
</div>
</div>
<div class="right">
<div class="right col-md-3">
<app-order-total-summary [totalCartValue]="totalCartValue$ | async"></app-order-total-summary>
</div>
</div>

<ng-template #emptyCart>
<app-empty-cart></app-empty-cart>
</ng-template>
Expand Down
44 changes: 24 additions & 20 deletions src/app/checkout/cart/cart.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@
@import '../../shared/scss/selected_theme_variables';
.cart-section {
position: relative;
.left {
display: inline-block;
width: 70%;
padding-right: 40px;
border-right: 1px solid #f5f5f6;
min-height: 500px;
padding-right: 40px;
.checkout-header-container {
.checkout-header {
display: inline-block;
padding: 30px 0;
padding: 3rem 0 0.8rem;
.text {
font-size: 18px;
font-weight: 600;
color: #535766;
font-family: $primary-font;;
font-size: 1.8em;
font-weight: normal;
color: $gray-900;
font-family: $primary-font;
;
}
}
.total-price {
float: right;
padding: 30px 0;
display: inline-block;
font-size: 18px;
color: #535766;
color: $gray-900;
}
}
.prod-set {
width: 100%;
display: inline-block;
height: 100%;
overflow: auto;
padding-left: 1px;
padding: 1rem;
background-color: $white;
border-radius: 4px;
box-shadow: 0px 0px 3px #ccc;
.wishlist-link {
cursor: pointer;
.icon {
Expand All @@ -49,17 +49,21 @@
display: block;
height: 40px;
padding-top: 10px;
background: #fff;
color: #535766;
border: 1px solid #eaeaec;
background: $white;
color: $gray-900;
border: 1px solid $gray-10;
font-size: 1.7em;
}
}
}
.right {
display: inline-block;
width: 29%;
vertical-align: top;
margin-top: 52px;
padding-left: 35px;
position: absolute;
right:0;
margin-top: 15.3vh;
background-color:$white;
border-radius:4px ;
box-shadow:0px 0px 4px $gray-10;
padding: 0.9rem 1.4rem;
}
}
47 changes: 22 additions & 25 deletions src/app/checkout/cart/components/line-item-list/line-item/line-item.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,34 @@
<div class="prod-item">
<div class="col1">
<div class="prod-item pb-3">
<div class="col1 col-2 col-sm-2 col-md-2 col-lg-2">
<!--<img [src]="'http://assets.myntassets.com/h_128,q_100,w_96/v1/assets/images/1714052/2017/3/6/11488792709467-HRX-by-Hrithik-Roshan-Men-Black-Printed-Round-Neck-T-Shirt-191488792709172-1.jpg'">-->
<img [src]="image" alt="">
</div>
<div class="col2">
<div class="prod-name">
<a class="c-gray">
{{name}}
</a>
<div class="col2 col-10 col-sm-10 col-md-10 col-lg-10">
<div class="row m-0">
<div class="prod-name col-9">
<div class="c-gray">
{{name}}
</div>
</div>
<div class="size-qty-wrap col-3">
<div class="size-qty">
<span class="qty">
<span class="gray">Qty:</span>
<span class="value">{{quantity}}</span>
</span>
</div>
<!-- <div class="seller">Sold by: Proleague</div> -->
</div>
</div>

<div class="prod-amount">
{{amount}}
</div>
<div class="size-qty-wrap">
<div class="size-qty">
<!-- <span class="size"> -->
<!-- <span class="gray">Size:</span> -->
<!-- <span class="value">L</span> -->
<!-- <\!--<span class="icon"></span>-\-> -->
<!-- </span> -->
<span class="qty">
<span class="gray">Qty:</span>
<span class="value">{{quantity}}</span>
<!--<span class="icon"></span>-->
</span>
</div>
<!-- <div class="seller">Sold by: Proleague</div> -->
</div>
<div class="edit-move-delete">
<div class="actions">
<span (click)="removeLineItem()" class="delete-item">REMOVE</span>
<span class="move-item coming-soon">MOVE TO WISHLIST</span>
<span (click)="removeLineItem()" class="delete-item"><i class="fa fa-times"></i></span>
<!-- <span class="move-item coming-soon">MOVE TO WISHLIST</span> -->
</div>
</div>
</div>
</div>
</div>
190 changes: 94 additions & 96 deletions src/app/checkout/cart/components/line-item-list/line-item/line-item.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,100 +1,98 @@
@import '../../../../../shared/scss/selected_theme_variables';
.prod-item {
background: #fff;
border: 1px solid #eaeaec;
box-shadow: 0 0 4px rgba(40,44,63,.08);
margin-bottom: 30px;
text-transform: none;
padding-bottom: 0!important;
.col1 {
width: 20%;
margin-bottom: 30px;
text-transform: none;
border-bottom: 1px solid $gray-10;
position: relative;
.col1 {
display: inline-block;
vertical-align: bottom;
img {
width: 120px;
height: 160px;
object-fit: contain;
}
}
.col2 {
vertical-align: top;
display: inline-block;
padding: 10px 10px 10px 25px;
min-height: 145px;
position: relative;


.prod-name {
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
padding: 5px 5px 5px 0;
.c-gray {
font-size: 1.3em;
font-family: $primary-font;
font-weight: normal;
color: $gray-900;
margin-right: 6px;
}
}
.prod-amount {
padding: 5px 5px 5px 0;
display: inline-block;
vertical-align: top;
font-weight: 600;
font-size: 1.3em;
font-family: $primary-font;
color: $theme-action-color - 50;
}
.size-qty-wrap {
display: inline-block;
margin: 5px 0;
color: $gray-400;
text-align: right;
.size-qty {
margin: 0 0 4px;
padding-right: 10px;
display: inline-block;
vertical-align: bottom;
img {
width: 120px;
height: 160px;
object-fit: contain;
}
}
.col2 {
vertical-align: top;
display: inline-block;
padding: 10px 10px 10px 25px;
min-height: 145px;
position: relative;
width: 79%;
.prod-name {
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
max-width: 400px;
padding: 5px 5px 5px 0;
a {
font-size: 14px;
font-family: $primary-font;;
font-weight: 600;
color: #535766;
margin-right: 6px;
}
}
.prod-amount {
float: right;
padding: 5px 5px 5px 0;
display: inline-block;
vertical-align: top;
font-weight: 600;
font-size: 14px;
font-family: $primary-font;;
color: #535766;
margin-left: 20px;
}
.size-qty-wrap {
margin: 5px 0;
color: #535766;
.size-qty {
margin: 0 0 4px;
padding-right: 10px;
display: inline-block;
.size, .qty {
cursor: pointer;
margin-right: 20px;
.gray {
color: gray;
}
.icon {
width: 20px;
height: 20px;
background-position: -2570px -13px;
display: inline-block;
overflow: hidden;
background-repeat: no-repeat;
background-size: 4250px 153px;
vertical-align: middle;
background-image: url(/assets/checkout_sprite.png);
}
}
}
}
.edit-move-delete {
position: absolute;
left: 25px;
right: 20px;
bottom: 0;
border-top: 1px solid #eaeaec;
padding-top: 9px;
font-size: 13px;
font-weight: 600;
padding-left: 0;
color: #696e79;
.delete-item, .move-item {
font-family: $primary-font;;
margin: 0 15px 0 0;
cursor: pointer;
}
.move-item {
color: #526cd0;
}
}
}

.size,
.qty {
color: $gray-400;
cursor: pointer;
margin-right: 20px;
font-size: 1.7em;
.gray,.value {
color: $gray-900;
}
.icon {
width: 20px;
height: 20px;
background-position: -2570px -13px;
display: inline-block;
overflow: hidden;
background-repeat: no-repeat;
background-size: 4250px 153px;
vertical-align: middle;
background-image: url(/assets/checkout_sprite.png);
}
}
}
}
.edit-move-delete {
position: absolute;
right: 20px;
top: 0;
color: $gray-11;
right: -14px;
top: -8px;
.delete-item,
.move-item {
margin: 0 15px 0 0;
cursor: pointer;
font-size: 1em;
}
.move-item {
color: $gray-200;
}
}
}
}
Loading