Merge 3f16b1c into 8cf19c3

vuestorefront · Jan 12, 2021 · 97aa1d4 · 97aa1d4
2 parents 8cf19c3 + 3f16b1c
commit 97aa1d4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 29 deletions.
diff --git a/packages/core/nuxt-theme-module/theme/components/AppHeader.vue b/packages/core/nuxt-theme-module/theme/components/AppHeader.vue
@@ -20,7 +20,6 @@
     <template #navigation>
       <SfHeaderNavigationItem class="nav-item" data-cy="app-header-url_women" label="WOMEN" :link="localePath('/c/women')" />
       <SfHeaderNavigationItem class="nav-item"  data-cy="app-header-url_men" label="MEN" :link="localePath('/c/men')" />
-      <SfHeaderNavigationItem class="nav-item" data-cy="app-header-url_kids" label="KIDS" :link="localePath('/c/kids')" />
     </template>
     <template #aside>
       <LocaleSelector class="smartphone-only" />

diff --git a/packages/core/nuxt-theme-module/theme/components/CartSidebar.vue b/packages/core/nuxt-theme-module/theme/components/CartSidebar.vue
@@ -42,18 +42,6 @@
                     />
                   </div>
                 </template>
-                <template #actions>
-                  <div class="desktop-only collected-product__actions">
-                    <SfButton class="sf-button--text collected-product__save">
-                      {{ $t('Save for later') }}
-                    </SfButton>
-                    <SfButton
-                      class="sf-button--text collected-product__compare"
-                    >
-                      {{ $t('Add to compare') }}
-                    </SfButton>
-                  </div>
-                </template>
               </SfCollectedProduct>
             </transition-group>
           </div>

diff --git a/packages/core/nuxt-theme-module/theme/pages/Category.vue b/packages/core/nuxt-theme-module/theme/pages/Category.vue
@@ -199,6 +199,7 @@
               :is-on-wishlist="false"
               class="products__product-card-horizontal"
               @click:wishlist="addItemToWishlist({ product })"
+              @click:add-to-cart="addItemToCart({ product, quantity: 1 })"
               :link="localePath(`/p/${productGetters.getId(product)}/${productGetters.getSlug(product)}`)"
             >
               <template #configuration>
@@ -218,13 +219,6 @@
                 >
                   {{ $t('Save for later') }}
                 </SfButton>
-                <SfButton
-                  class="sf-button--text desktop-only"
-                  style="margin: 0 0 0 auto; display: block;"
-                  @click="() => {}"
-                >
-                  {{ $t('Add to compare') }}
-                </SfButton>
               </template>
             </SfProductCardHorizontal>
           </transition-group>
@@ -248,7 +242,7 @@
             <span class="products__show-on-page__label">{{ $t('Show on page') }}</span>
             <LazyHydrate on-interaction>
               <SfSelect
-                :value="pagination.itemsPerPage"
+                :value="pagination.itemsPerPage.toString()"
                 class="products__items-per-page"
                 @input="th.changeItemsPerPage"
               >
@@ -373,6 +367,7 @@ import { onSSR } from '@vue-storefront/core';
 import LazyHydrate from 'vue-lazy-hydration';
 import Vue from 'vue';
 
+// TODO(addToCart qty, horizontal): https://github.com/vuestorefront/storefront-ui/issues/1606
 export default {
   transition: 'fade',
   setup(props, context) {
@@ -387,7 +382,7 @@ export default {
     const breadcrumbs = computed(() => facetGetters.getBreadcrumbs(result.value));
     const sortBy = computed(() => facetGetters.getSortOptions(result.value));
     const facets = computed(() => facetGetters.getGrouped(result.value, ['color', 'size']));
-    const pagination = computed(() => facetGetters.getPagination(result.value).toString());
+    const pagination = computed(() => facetGetters.getPagination(result.value));
     const activeCategory = computed(() => {
       const items = categoryTree.value.items;
 

diff --git a/packages/core/nuxt-theme-module/theme/pages/Product.vue b/packages/core/nuxt-theme-module/theme/pages/Product.vue
@@ -65,7 +65,7 @@
               {{size.label}}
             </SfSelectOption>
           </SfSelect>
-          <div v-if="options.color" class="product__colors desktop-only">
+          <div v-if="options.color && options.color.length > 1" class="product__colors desktop-only">
             <p class="product__color-label">{{ $t('Color') }}:</p>
             <SfColor
               data-cy="product-color_update"
@@ -85,12 +85,6 @@
             class="product__add-to-cart"
             @click="addItem({ product, quantity: parseInt(qty) })"
           />
-          <SfButton data-cy="product-btn_save-later" class="sf-button--text desktop-only product__save">
-            {{ $t('Save for later') }}
-          </SfButton>
-          <SfButton data-cy="product-btn_add-to-compare" class="sf-button--text desktop-only product__compare">
-            {{ $t('Add to compare') }}
-          </SfButton>
         </div>
 
         <LazyHydrate when-idle>