Skip to content

Commit

Permalink
Add loading spinner when loading in cart and order list
Browse files Browse the repository at this point in the history
  • Loading branch information
zeina-idris committed Oct 16, 2019
1 parent 84d1a13 commit 1caab60
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 6 deletions.
6 changes: 6 additions & 0 deletions src/assets/scss/_my-account-my-orders.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
border: 1px solid $alto;
padding: 20px;
}

.order-list-spinner {
text-align: center;
padding-top: 80px;
}

.my-orders-title {
text-transform: uppercase;
font-size: 18px;
Expand Down
5 changes: 5 additions & 0 deletions src/assets/scss/_pop.scss
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@
word-spacing: 0.1em;
}

.cart-loading-spinner {
text-align: center;
padding: 50px;
}

#pop-product-list {

@media screen and (min-width: 767px) {
Expand Down
19 changes: 15 additions & 4 deletions src/components/cartdetail/PageCartDetail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!--{{> checkout/start-checkout-link id="cart-checkoutnow-btn"}}-->
</div>
</div>
<div v-if="cartNotEmpty">
<div v-if="!isLoading && cartNotEmpty">
<div class="row">
<div class="col-sm-12">
<div class="current-in-bag">
Expand Down Expand Up @@ -54,11 +54,11 @@
</div>
</div>
</div>
<div v-else

<div v-else-if="!isLoading && !cartNotEmpty"
class="empty-results-container">
<div class="empty-results">
<span
data-test="empty-cart">
<span data-test="empty-cart">
{{ $t('empty') }}
</span>
</div>
Expand All @@ -68,6 +68,11 @@
</router-link>
</div>
</div>

<div v-else
class="cart-loading-spinner">
<img data-test="spinner" src="../../assets/img/spinner.gif"/>
</div>
</div>
</template>

Expand All @@ -92,6 +97,12 @@ export default {
me: null,
}),
computed: {
isLoading() {
return this.$apollo.loading;
},
},
mixins: [cartMixin],
apollo: {
Expand Down
15 changes: 13 additions & 2 deletions src/components/useraccount/myorders/TabOrderList.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div v-if="me"
class="my-orders">
<div v-if="me.orders.results.length"
<div v-if="!isLoading && me.orders.results.length"
class="my-orders-content">
<div class="my-orders-table-wrapper">
<div class="row">
Expand Down Expand Up @@ -76,13 +76,18 @@
</div>
</div>

<div v-else
<div v-else-if="!isLoading && !me.orders.results.length"
data-test="empty-order-list"
class="empty-results-container">
<span class="empty-order-list">
{{ $t('emptyOrders') }}
</span>
</div>

<div v-else
class="order-list-spinner">
<img data-test="spinner" src="../../../assets/img/spinner.gif"/>
</div>
</div>
</template>

Expand All @@ -99,6 +104,12 @@ export default {
me: null,
}),
computed: {
isLoading() {
return this.$apollo.loading;
},
},
methods: {
translateStatus(state) {
return state ? this.$t(state) : '-';
Expand Down

1 comment on commit 1caab60

@zeina-idris
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Solves #160

Please sign in to comment.