From 66e6f0c96bf2ca3ebcd62b4b1ad8c1794d3bbf47 Mon Sep 17 00:00:00 2001 From: tkostuch Date: Tue, 29 Oct 2019 12:07:39 +0100 Subject: [PATCH 1/6] change links in promoted_offers --- .../default/resource/banners/de_promoted_offers.json | 8 ++++---- .../default/resource/banners/it_promoted_offers.json | 8 ++++---- src/themes/default/resource/promoted_offers.json | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/themes/default/resource/banners/de_promoted_offers.json b/src/themes/default/resource/banners/de_promoted_offers.json index deb423d5d2..54a9c64068 100644 --- a/src/themes/default/resource/banners/de_promoted_offers.json +++ b/src/themes/default/resource/banners/de_promoted_offers.json @@ -4,7 +4,7 @@ "title": "Büro lässig", "subtitle": "Kollektion", "image": "/assets/ban1.jpg", - "link": "/c/frauen-20" + "link": "/women/frauen-20" } ], "smallBanners": [ @@ -12,13 +12,13 @@ "title": "Sheinen", "subtitle": "Zubehör", "image": "/assets/ban2.jpg", - "link": "/c/herren-11" + "link": "/men/herren-11" }, { "title": "Der Frühling kommt", "subtitle": "Hüte", "image": "/assets/ban3.jpg", - "link": "/c/gerat-3" + "link": "/gear/gerat-3" } ], "productBanners": [ @@ -26,7 +26,7 @@ "title": "Der Frühling kommt", "subtitle": "Hüte", "image": "/assets/ban3.jpg", - "link": "/c/gerat-3" + "link": "/gear/gerat-3" } ] } diff --git a/src/themes/default/resource/banners/it_promoted_offers.json b/src/themes/default/resource/banners/it_promoted_offers.json index 810b93166f..da98c29b5d 100644 --- a/src/themes/default/resource/banners/it_promoted_offers.json +++ b/src/themes/default/resource/banners/it_promoted_offers.json @@ -4,7 +4,7 @@ "title": "Ufficio casual", "subtitle": "Collezione", "image": "/assets/ban1.jpg", - "link": "/c/la-donne-20" + "link": "/women/la-donne-20" } ], "smallBanners": [ @@ -12,13 +12,13 @@ "title": "Brilla", "subtitle": "Accessori", "image": "/assets/ban2.jpg", - "link": "/c/signori-11" + "link": "/men/signori-11" }, { "title": "La primavera sta arrivando", "subtitle": "Cappelli", "image": "/assets/ban3.jpg", - "link": "/c/equipaggiamento-3" + "link": "/gear/equipaggiamento-3" } ], "productBanners": [ @@ -26,7 +26,7 @@ "title": "La primavera sta arrivando", "subtitle": "Cappelli", "image": "/assets/ban3.jpg", - "link": "/c/equipaggiamento-3" + "link": "/gear/equipaggiamento-3" } ] } diff --git a/src/themes/default/resource/promoted_offers.json b/src/themes/default/resource/promoted_offers.json index 1a35bdf134..e6f309df77 100644 --- a/src/themes/default/resource/promoted_offers.json +++ b/src/themes/default/resource/promoted_offers.json @@ -4,7 +4,7 @@ "title": "Office casual", "subtitle": "Collection", "image": "/assets/ban1.jpg", - "link": "/c/women-20" + "link": "/women/women-20" } ], "smallBanners": [ @@ -12,13 +12,13 @@ "title": "Shine on", "subtitle": "Accesories", "image": "/assets/ban2.jpg", - "link": "/c/men-11" + "link": "/men/men-11" }, { "title": "Spring is coming", "subtitle": "Hats", "image": "/assets/ban3.jpg", - "link": "/c/gear-3" + "link": "/gear/gear-3" } ], "productBanners": [ @@ -26,7 +26,7 @@ "title": "Spring is coming", "subtitle": "Hats", "image": "/assets/ban3.jpg", - "link": "/c/gear-3" + "link": "/gear/gear-3" } ] } \ No newline at end of file From 45230adbe461dd208a2091e8fdc526ba62da0558 Mon Sep 17 00:00:00 2001 From: tkostuch Date: Tue, 29 Oct 2019 12:17:08 +0100 Subject: [PATCH 2/6] update formatCategoryLink --- core/modules/url/helpers/index.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/core/modules/url/helpers/index.ts b/core/modules/url/helpers/index.ts index be799affe6..782b35a19e 100644 --- a/core/modules/url/helpers/index.ts +++ b/core/modules/url/helpers/index.ts @@ -59,8 +59,17 @@ export function normalizeUrlPath (url: string): string { return url } -export function formatCategoryLink (category: { url_path: string, slug: string }): string { - return config.seo.useUrlDispatcher ? ('/' + category.url_path) : ('/c/' + category.slug) +export function formatCategoryLink (category: Category, storeCode: string = currentStoreView().storeCode): string { + storeCode ? storeCode += '/' : storeCode = ''; + + if (currentStoreView().appendStoreCode === false) { + storeCode = '' + } + + if (category) { + return config.seo.useUrlDispatcher ? ('/' + storeCode + category.url_path) : ('/' + storeCode + 'c/' + category.slug) + } + return '/' + storeCode; } export function formatProductLink ( From 4e21f41ffb84970f559d63a027151fec2fec9aa5 Mon Sep 17 00:00:00 2001 From: tkostuch Date: Tue, 29 Oct 2019 12:26:34 +0100 Subject: [PATCH 3/6] format category link in menu --- core/modules/url/helpers/index.ts | 2 +- .../components/core/blocks/SidebarMenu/SidebarMenu.vue | 6 +++++- .../components/core/blocks/SidebarMenu/SubCategory.vue | 8 ++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/core/modules/url/helpers/index.ts b/core/modules/url/helpers/index.ts index 782b35a19e..29a940f018 100644 --- a/core/modules/url/helpers/index.ts +++ b/core/modules/url/helpers/index.ts @@ -59,7 +59,7 @@ export function normalizeUrlPath (url: string): string { return url } -export function formatCategoryLink (category: Category, storeCode: string = currentStoreView().storeCode): string { +export function formatCategoryLink (category: { url_path: string, slug: string }, storeCode: string = currentStoreView().storeCode): string { storeCode ? storeCode += '/' : storeCode = ''; if (currentStoreView().appendStoreCode === false) { diff --git a/src/themes/default/components/core/blocks/SidebarMenu/SidebarMenu.vue b/src/themes/default/components/core/blocks/SidebarMenu/SidebarMenu.vue index ab9c699941..e2d6af05f9 100644 --- a/src/themes/default/components/core/blocks/SidebarMenu/SidebarMenu.vue +++ b/src/themes/default/components/core/blocks/SidebarMenu/SidebarMenu.vue @@ -52,7 +52,7 @@ {{ category.name }} @@ -140,6 +140,7 @@ import i18n from '@vue-storefront/i18n' import SidebarMenu from '@vue-storefront/core/compatibility/components/blocks/SidebarMenu/SidebarMenu' import SubBtn from 'theme/components/core/blocks/SidebarMenu/SubBtn' import SubCategory from 'theme/components/core/blocks/SidebarMenu/SubCategory' +import { formatCategoryLink } from '@vue-storefront/core/modules/url/helpers' export default { components: { @@ -218,6 +219,9 @@ export default { this.$router.push({ name: 'my-account' }) }) } + }, + categoryLink (category) { + return formatCategoryLink(category) } } } diff --git a/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue b/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue index 6fbe07b960..abd55e8b3f 100644 --- a/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue +++ b/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue @@ -11,7 +11,7 @@ > {{ $t('View all') }} @@ -35,7 +35,7 @@ {{ link.name }} @@ -84,6 +84,7 @@ import { mapState } from 'vuex' import SubBtn from './SubBtn.vue' import i18n from '@vue-storefront/i18n' import config from 'config' +import { formatCategoryLink } from '@vue-storefront/core/modules/url/helpers' export default { name: 'SubCategory', @@ -154,6 +155,9 @@ export default { action1: { label: i18n.t('OK') } }) } + }, + categoryLink (category) { + return formatCategoryLink(category) } } } From 6d164dc43b4afdf5fd3277068b35fc359ca2bfe1 Mon Sep 17 00:00:00 2001 From: tkostuch Date: Tue, 29 Oct 2019 13:26:41 +0100 Subject: [PATCH 4/6] update breadcrumbs component --- .../default/components/core/Breadcrumbs.vue | 42 ++++++++++++++++--- .../core/blocks/Checkout/ThankYouPage.vue | 1 + src/themes/default/pages/Compare.vue | 2 +- src/themes/default/pages/MyAccount.vue | 1 + src/themes/default/pages/Static.vue | 2 +- 5 files changed, 41 insertions(+), 7 deletions(-) diff --git a/src/themes/default/components/core/Breadcrumbs.vue b/src/themes/default/components/core/Breadcrumbs.vue index 0fb73675b5..5761a7f93b 100644 --- a/src/themes/default/components/core/Breadcrumbs.vue +++ b/src/themes/default/components/core/Breadcrumbs.vue @@ -1,20 +1,52 @@ diff --git a/src/themes/default/components/core/blocks/Checkout/ThankYouPage.vue b/src/themes/default/components/core/blocks/Checkout/ThankYouPage.vue index e474309622..1e948053e8 100644 --- a/src/themes/default/components/core/blocks/Checkout/ThankYouPage.vue +++ b/src/themes/default/components/core/blocks/Checkout/ThankYouPage.vue @@ -3,6 +3,7 @@
diff --git a/src/themes/default/pages/Compare.vue b/src/themes/default/pages/Compare.vue index a32b940c68..2fb2619993 100644 --- a/src/themes/default/pages/Compare.vue +++ b/src/themes/default/pages/Compare.vue @@ -2,7 +2,7 @@
- +

{{ title }}

diff --git a/src/themes/default/pages/MyAccount.vue b/src/themes/default/pages/MyAccount.vue index 51483132e5..6dbd763dc2 100644 --- a/src/themes/default/pages/MyAccount.vue +++ b/src/themes/default/pages/MyAccount.vue @@ -3,6 +3,7 @@
diff --git a/src/themes/default/pages/Static.vue b/src/themes/default/pages/Static.vue index d2a1132fbf..280f0e334a 100644 --- a/src/themes/default/pages/Static.vue +++ b/src/themes/default/pages/Static.vue @@ -2,7 +2,7 @@
- +

{{ $props.title }}

From d7c9c3a4ce19796f5a3cb721f68d66cb93fe490e Mon Sep 17 00:00:00 2001 From: tkostuch Date: Tue, 29 Oct 2019 13:30:59 +0100 Subject: [PATCH 5/6] update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c30940fc74..0fc5b880e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.10.5] - 29.10.2019 + +### Fixed +- Render correct category links when multistore is active - @gibkigonzo (#3753) + ## [1.10.4] - 18.10.2019 ### Fixed From 154ae9073d5ed5845a74b81dfe966c0e552ef709 Mon Sep 17 00:00:00 2001 From: tkostuch Date: Wed, 30 Oct 2019 08:11:08 +0100 Subject: [PATCH 6/6] update links in main-image and slider --- CHANGELOG.md | 2 +- src/themes/default/resource/banners/de_main-image.json | 2 +- src/themes/default/resource/banners/it_main-image.json | 2 +- src/themes/default/resource/main-image.json | 2 +- src/themes/default/resource/slider.json | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fc5b880e0..08281f90f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [1.10.5] - 29.10.2019 +## [1.10.5] - unreleased ### Fixed - Render correct category links when multistore is active - @gibkigonzo (#3753) diff --git a/src/themes/default/resource/banners/de_main-image.json b/src/themes/default/resource/banners/de_main-image.json index 56d84292cb..79edf26ddd 100644 --- a/src/themes/default/resource/banners/de_main-image.json +++ b/src/themes/default/resource/banners/de_main-image.json @@ -3,6 +3,6 @@ "title": "Laufe den Lauf.", "subtitle": "Eine Mode kann zum vorherrschenden Stil im Verhalten werden oder die neuesten Kreationen von Designern, Technologen, Ingenieuren und Designmanagern manifestieren.", "image": "/assets/full_width_banner.jpg", - "link": "/c/frauen-20" + "link": "/women/frauen-20" } } diff --git a/src/themes/default/resource/banners/it_main-image.json b/src/themes/default/resource/banners/it_main-image.json index 5b6bcc3220..0eb03931c8 100644 --- a/src/themes/default/resource/banners/it_main-image.json +++ b/src/themes/default/resource/banners/it_main-image.json @@ -3,6 +3,6 @@ "title": "Cammina la passeggiata.", "subtitle": "Una moda può diventare lo stile prevalente nel comportamento o manifestare le ultime creazioni di designer, tecnologi, ingegneri e responsabili del design.", "image": "/assets/full_width_banner.jpg", - "link": "/c/la-donne-20" + "link": "/women/la-donne-20" } } diff --git a/src/themes/default/resource/main-image.json b/src/themes/default/resource/main-image.json index 32a57a801c..b156168d9e 100644 --- a/src/themes/default/resource/main-image.json +++ b/src/themes/default/resource/main-image.json @@ -3,6 +3,6 @@ "title": "Walk the walk.", "subtitle": "A fashion can become the prevailing style in behaviour or manifest the newest creations of designers, technologists, engineers, and design managers.", "image": "/assets/full_width_banner.jpg", - "link": "/c/women-20" + "link": "/women/women-20" } } diff --git a/src/themes/default/resource/slider.json b/src/themes/default/resource/slider.json index 5480a908da..45beb6b38a 100644 --- a/src/themes/default/resource/slider.json +++ b/src/themes/default/resource/slider.json @@ -5,21 +5,21 @@ "subtitle": "New collection", "button_text": "Shop now", "image": "/assets/slide_01.jpg", - "link": "/c/women-20" + "link": "/women/women-20" }, { "title": "Luma Fitness", "subtitle": "Collection", "button_text": "Shop now", "image": "/assets/slide_02.jpg", - "link": "/c/men-11" + "link": "/men/men-11" }, { "title": "Luma Fitness", "subtitle": "What's new", "button_text": "Shop now", "image": "/assets/slide_03.jpg", - "link": "/c/training-9" + "link": "/training/training-9" } ], "total": "3"