Merge 35d7a1b into 8b6b395

vuestorefront · Mar 17, 2021 · 34997cf · 34997cf
2 parents 8b6b395 + 35d7a1b
commit 34997cf
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 361 deletions.
diff --git a/packages/boilerplate/api-client/src/api/getCategory/index.ts b/packages/boilerplate/api-client/src/api/getCategory/index.ts
@@ -5,133 +5,70 @@ export default async function getCategory(context, params, customQuery?: CustomQ
   return Promise.resolve([
     {
       id: 1,
-      name: 'New',
-      slug: 'new',
-      childCount: 2,
-      children: [
-        {
-          id: 15,
-          name: 'Women',
-          slug: 'new-women',
-          childCount: 2,
-          children: [
-            {
-              id: 16,
-              name: 'Clothing',
-              slug: 'new-women-clothing',
-              childCount: 0,
-              children: []
-            },
-            {
-              id: 17,
-              name: 'Shoes',
-              slug: 'new-women-shoes',
-              childCount: 0,
-              children: []
-            }
-          ]
-        },
-        {
-          id: 11,
-          name: 'Men',
-          slug: 'new-men',
-          childCount: 1,
-          children: [
-            {
-              id: 18,
-              name: 'Clothing',
-              slug: 'new-men-clothing',
-              childCount: 0,
-              children: []
-            },
-            {
-              id: 19,
-              name: 'Shoes',
-              slug: 'new-men-shoes',
-              childCount: 0,
-              children: []
-            }
-          ]
-        }
-      ]
-    },
-    {
-      id: 2,
       name: 'Women',
       slug: 'women',
-      childCount: 2,
-      children: [
+      items: [
         {
           id: 4,
           name: 'Women jackets',
           slug: 'women-jackets',
-          childCount: 2,
-          children: [
+          items: [
             {
               id: 9,
               name: 'Winter jackets',
               slug: 'winter-jackets',
-              childCount: 0,
-              children: []
+              items: []
             },
             {
               id: 10,
               name: 'Autumn jackets',
               slug: 'autmun-jackets',
-              childCount: 0,
-              children: []
+              items: []
             }
           ]
         },
         {
           id: 5,
           name: 'Skirts',
           slug: 'skirts',
-          childCount: 0,
-          children: []
+          items: []
         }
       ]
     },
     {
-      id: 3,
+      id: 2,
       name: 'Men',
       slug: 'men',
-      childCount: 1,
-      children: [
+      items: [
         {
           id: 6,
           name: 'Men T-shirts',
           slug: 'men-tshirts',
-          childCount: 0,
-          children: []
+          items: []
         }
       ]
     },
     {
-      id: 4,
+      id: 3,
       name: 'Kids',
       slug: 'kids',
-      childCount: 1,
-      children: [
+      items: [
         {
           id: 7,
           name: 'Toys',
           slug: 'toys',
-          childCount: 2,
-          children: [
+          items: [
             {
               id: 8,
               name: 'Toy Cars',
               slug: 'toy-cars',
-              childCount: 0,
-              children: []
+              items: []
             },
             {
               id: 8,
               name: 'Dolls',
               slug: 'dolls',
-              childCount: 0,
-              children: []
+              items: []
             }
           ]
         }

diff --git a/packages/boilerplate/theme/static/megamenu/bannerA.webp b/packages/boilerplate/theme/static/megamenu/bannerA.webp
diff --git a/packages/boilerplate/theme/static/megamenu/bannerB.webp b/packages/boilerplate/theme/static/megamenu/bannerB.webp
diff --git a/packages/commercetools/theme/components/Header/HeaderNav.vue b/packages/commercetools/theme/components/Header/HeaderNav.vue
diff --git a/packages/commercetools/theme/middleware.config.js b/packages/commercetools/theme/middleware.config.js
@@ -24,14 +24,6 @@ module.exports = {
         },
         currency: 'USD',
         country: 'US'
-      },
-      customQueries: {
-        'root-categories-query': ({ query, variables }) => {
-
-          variables.where = 'parent is not defined';
-
-          return { query, variables };
-        }
       }
     }
   }

diff --git a/packages/commercetools/theme/static/megamenu/bannerA.webp b/packages/commercetools/theme/static/megamenu/bannerA.webp
diff --git a/packages/commercetools/theme/static/megamenu/bannerB.webp b/packages/commercetools/theme/static/megamenu/bannerB.webp
diff --git a/packages/core/docs/changelog/5267.js b/packages/core/docs/changelog/5267.js
diff --git a/...ule/theme/components/Header/AppHeader.vue → ...eme-module/theme/components/AppHeader.vue b/...ule/theme/components/Header/AppHeader.vue → ...eme-module/theme/components/AppHeader.vue
@@ -1,6 +1,5 @@
 <template>
   <div>
-    <SfOverlay :visible="!!isOverlayVisible" />
     <SfHeader
       data-cy="app-header"
       class="sf-header--has-mobile-search"
@@ -13,7 +12,8 @@
         </nuxt-link>
       </template>
       <template #navigation>
-        <HeaderNav @setOverlay="isOverlayVisible = $event" />
+        <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')" />
       </template>
       <template #aside>
         <LocaleSelector class="smartphone-only" />
@@ -102,7 +102,6 @@ import { onSSR } from '@vue-storefront/core';
 import { useUiHelpers } from '~/composables';
 import LocaleSelector from './LocaleSelector';
 import SearchResults from '~/components/SearchResults';
-import HeaderNav from './HeaderNav';
 import { clickOutside } from '@storefront-ui/vue/src/utilities/directives/click-outside/click-outside-directive.js';
 import {
   mapMobileObserver,
@@ -120,8 +119,7 @@ export default {
     SfBadge,
     SfSearchBar,
     SearchResults,
-    SfOverlay,
-    HeaderNav
+    SfOverlay
   },
   directives: { clickOutside },
   setup(props, { root }) {
@@ -134,7 +132,6 @@ export default {
     const term = ref(getFacetsFromURL().term);
     const isSearchOpen = ref(false);
     const searchBarRef = ref(null);
-    const isOverlayVisible = ref(false);
 
     const cartTotalItems = computed(() => {
       const count = cartGetters.getTotalItems(cart.value);
@@ -212,8 +209,7 @@ export default {
       result,
       closeOrFocusSearchBar,
       searchBarRef,
-      isMobile,
-      isOverlayVisible
+      isMobile
     };
   }
 };
@@ -224,7 +220,6 @@ export default {
   --header-padding:  var(--spacer-sm);
   @include for-desktop {
     --header-padding: 0;
-    z-index: var(--header-wrapper-z-index, 1);
   }
   &__logo-image {
       height: 100%;