Merge pull request #5371 from vuestorefront/revert-5283-mega-menu-in-…

…app-header Revert "Next: Mega menu in app header"
vuestorefront · Jan 5, 2021 · bde1e74 · bde1e74
2 parents f947ada + d4c0c3a
commit bde1e74
Show file tree

Hide file tree

Showing 17 changed files with 68 additions and 419 deletions.
diff --git a/packages/boilerplate/api-client/src/api/getCategory/index.ts b/packages/boilerplate/api-client/src/api/getCategory/index.ts
@@ -5,115 +5,70 @@ export default async function getCategory(context, params, customQuery?: CustomQ
   return Promise.resolve([
     {
       id: 1,
-      name: 'New',
-      slug: 'new',
-      children: [
-        {
-          id: 15,
-          name: 'Women',
-          slug: 'new-women',
-          children: [
-            {
-              id: 16,
-              name: 'Clothing',
-              slug: 'new-women-clothing',
-              children: []
-            },
-            {
-              id: 17,
-              name: 'Shoes',
-              slug: 'new-women-shoes',
-              children: []
-            }
-          ]
-        },
-        {
-          id: 11,
-          name: 'Men',
-          slug: 'new-men',
-          children: [
-            {
-              id: 18,
-              name: 'Clothing',
-              slug: 'new-men-clothing',
-              children: []
-            },
-            {
-              id: 19,
-              name: 'Shoes',
-              slug: 'new-men-shoes',
-              children: []
-            }
-          ]
-        }
-      ]
-    },
-    {
-      id: 2,
       name: 'Women',
       slug: 'women',
-      children: [
+      items: [
         {
           id: 4,
           name: 'Women jackets',
           slug: 'women-jackets',
-          children: [
+          items: [
             {
               id: 9,
               name: 'Winter jackets',
               slug: 'winter-jackets',
-              children: []
+              items: []
             },
             {
               id: 10,
               name: 'Autumn jackets',
               slug: 'autmun-jackets',
-              children: []
+              items: []
             }
           ]
         },
         {
           id: 5,
           name: 'Skirts',
           slug: 'skirts',
-          children: []
+          items: []
         }
       ]
     },
     {
-      id: 3,
+      id: 2,
       name: 'Men',
       slug: 'men',
-      children: [
+      items: [
         {
           id: 6,
           name: 'Men T-shirts',
           slug: 'men-tshirts',
-          children: []
+          items: []
         }
       ]
     },
     {
-      id: 4,
+      id: 3,
       name: 'Kids',
       slug: 'kids',
-      children: [
+      items: [
         {
           id: 7,
           name: 'Toys',
           slug: 'toys',
-          children: [
+          items: [
             {
               id: 8,
               name: 'Toy Cars',
               slug: 'toy-cars',
-              children: []
+              items: []
             },
             {
               id: 8,
               name: 'Dolls',
               slug: 'dolls',
-              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/api-client/src/api/getCategory/defaultQuery.ts b/packages/commercetools/api-client/src/api/getCategory/defaultQuery.ts
@@ -1,16 +1,29 @@
 import gql from 'graphql-tag';
-import { CategoryFragment } from './../../fragments';
 
-export default gql`    
-  ${CategoryFragment}
-  
+export default gql`
   fragment Children on Category {
     id
     slug(acceptLanguage: $acceptLanguage)
     name(acceptLanguage: $acceptLanguage)
     childCount
   }
 
+  fragment DefaultCategory on Category {
+    id
+    slug(acceptLanguage: $acceptLanguage)
+    name(acceptLanguage: $acceptLanguage)
+    childCount
+    children {
+      ...Children
+      children {
+        ...Children
+        children {
+          ...Children
+        }
+      }
+    }
+  }
+
   query categories($where: String, $sort: [String!], $limit: Int, $offset: Int, $acceptLanguage: [Locale!]) {
     categories(where: $where, sort: $sort, limit: $limit, offset: $offset) {
       offset

diff --git a/packages/commercetools/api-client/src/fragments/index.ts b/packages/commercetools/api-client/src/fragments/index.ts
@@ -297,20 +297,3 @@ export const OrderFragment = `
   }
 `;
 
-export const CategoryFragment = `
-  fragment DefaultCategory on Category {
-    id
-    slug(acceptLanguage: $acceptLanguage)
-    name(acceptLanguage: $acceptLanguage)
-    childCount
-    children {
-      ...Children
-      children {
-        ...Children
-        children {
-          ...Children
-        }
-      }
-    }
-  }
-`;
diff --git a/packages/commercetools/theme/components/header/HeaderNav.vue b/packages/commercetools/theme/components/header/HeaderNav.vue
diff --git a/packages/commercetools/theme/queries/topCategories.ts b/packages/commercetools/theme/queries/topCategories.ts
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/commercetools/changelog.md b/packages/core/docs/commercetools/changelog.md
@@ -1,7 +1,6 @@
 # Changelog
 
 ## 1.1.0 (not released)
-- added MegaMenu to theme ([#5267](https://github.com/vuestorefront/vue-storefront/issues/5267))
 - fix getOrders api ([#5328](https://github.com/DivanteLtd/vue-storefront/issues/5328))
 - added bottom margin to fix visibility of last footer category ([#5253](https://github.com/DivanteLtd/vue-storefront/issues/5253))
 - [BREAKING] refactored names of many factory methods and composable methods, details in linked PR ([#5299](https://github.com/DivanteLtd/vue-storefront/pull/5299))

diff --git a/packages/core/docs/contributing/changelog.md b/packages/core/docs/contributing/changelog.md
@@ -1,7 +1,6 @@
 # Changelog
 
 ## 2.2.0 (not released)
-- added MegaMenu to theme ([#5267](https://github.com/vuestorefront/vue-storefront/issues/5267))
 - added bottom margin to fix visibility of last footer category ([#5253](https://github.com/DivanteLtd/vue-storefront/issues/5253))
 - [BREAKING] refactored names of many factory methods and composable methods, details in linked PR ([#5299](https://github.com/DivanteLtd/vue-storefront/pull/5299))
 - [BREAKING] changed signatures of factory methods to always 2 arguments, details in linked PR ([#5299](https://github.com/DivanteLtd/vue-storefront/pull/5299))

diff --git a/packages/core/nuxt-theme-module/package.json b/packages/core/nuxt-theme-module/package.json
@@ -23,7 +23,6 @@
     "access": "public"
   },
   "dependencies": {
-    "lodash.debounce": "^4.0.8",
     "lodash.merge": "^4.6.2"
   }
 }