From fe1d0705e7f983bb146d8f8cbbd4fd465d70f6f6 Mon Sep 17 00:00:00 2001 From: Max Malm Date: Mon, 17 Jun 2019 12:16:11 +0200 Subject: [PATCH 01/12] Update url.md Add link to vsf-mapping-fallback --- docs/guide/basics/url.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/guide/basics/url.md b/docs/guide/basics/url.md index edfb48e570..df25a2c30a 100644 --- a/docs/guide/basics/url.md +++ b/docs/guide/basics/url.md @@ -24,4 +24,8 @@ With all `product/list` Vuex action calls the `url/registerMapping` action is be ## Custom URLs for CMS pages and other content types -You can use the Url Dispatcher feature with all content types. The only thing You need to change is to customize the `url/mappingFallback` Vuex action to properly query other content sources. \ No newline at end of file +You can use the Url Dispatcher feature with all content types. The only thing You need to change is to customize the `url/mappingFallback` Vuex action to properly query other content sources. + +## Modules + +* [vsf-mapping-fallback](https://github.com/kodbruket/vsf-mapping-fallback) simplifies the process of adding URL mappings From 5f23a1d11d1bb4a43d56b2071e602c1199a84ca8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Anio=C5=82?= <33483514+tom-aniol@users.noreply.github.com> Date: Mon, 17 Jun 2019 15:22:54 +0200 Subject: [PATCH 02/12] Add Novusweb, ITT Web, Trellis --- README.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/README.md b/README.md index 7e3a05aded..b8b56b996f 100644 --- a/README.md +++ b/README.md @@ -706,6 +706,53 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s + + Novusweb + + + + + Trellis + + + + + + + ITT Web + + + + + + + + + + + + + Date: Mon, 17 Jun 2019 18:04:00 +0200 Subject: [PATCH 03/12] Add Yireo --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index b8b56b996f..8f38a9bc9b 100644 --- a/README.md +++ b/README.md @@ -735,10 +735,10 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s - + From 6cf85569a25fbcb4526c9e7d3912d03a62309e17 Mon Sep 17 00:00:00 2001 From: pmaureatelabs Date: Tue, 18 Jun 2019 13:23:17 +0530 Subject: [PATCH 04/12] Update ui-store.md Update file location path --- docs/guide/core-themes/ui-store.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guide/core-themes/ui-store.md b/docs/guide/core-themes/ui-store.md index 6583112ac6..f1727c6095 100644 --- a/docs/guide/core-themes/ui-store.md +++ b/docs/guide/core-themes/ui-store.md @@ -1,6 +1,6 @@ # Working with UI Store (Interface state) -We are using Vuex to store the application interface state. The [ui-store file](https://github.com/DivanteLtd/vue-storefront/blob/master/core/store/modules/ui-store/index.ts) contains the information about the state of different pieces of UI, such as overlay visibility, wishlist visibility, etc. Of course, you are not forced to make use of it in your theme, but keep in mind that many core components are using the UI store. +We are using Vuex to store the application interface state. The [store file](https://github.com/DivanteLtd/vue-storefront/blob/master/core/store/index.ts) contains the information about the state of different pieces of UI, such as overlay visibility, wishlist visibility, etc. Of course, you are not forced to make use of it in your theme, but keep in mind that many core components are using the UI store. ## State object From a28c06a828c76cc032af87d9b670547fa35b9d43 Mon Sep 17 00:00:00 2001 From: pmaureatelabs Date: Tue, 18 Jun 2019 14:46:51 +0530 Subject: [PATCH 05/12] Update translations.md Update path of a theme directory --- docs/guide/core-themes/translations.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guide/core-themes/translations.md b/docs/guide/core-themes/translations.md index 0ff36f0a6f..335e885814 100644 --- a/docs/guide/core-themes/translations.md +++ b/docs/guide/core-themes/translations.md @@ -29,7 +29,7 @@ For all helper methods and directives, along with available parameters, please d ## Working with translations -Translations are provided in `i18n/resource/i18n/en-US.csv` file and can be extended / overridden in `theme/resource/i18n/en-US.csv` accordingly. +Translations are provided in `core/i18n/resource/i18n/en-US.csv` file and can be extended / overridden in `src/themes/[your-theme]/resource/i18n/en-US.csv` accordingly. Here's an example of `en-US.csv` for `en-US` locale: @@ -45,7 +45,7 @@ Here's an example of `en-US.csv` for `en-US` locale: "Vue Storefront Logo", "Vue Storefront Logo" ``` -when you create the `en-US.csv` file within your `theme/resource/i18n/` folder and override some messages like: +when you create the `en-US.csv` file within your `src/themes/[your-theme]/resource/i18n/` folder and override some messages like: ```csv "customMessage","You can define or override translation messages here." From 2d77be73ca2fb84a37380f39f14808a92fbd441a Mon Sep 17 00:00:00 2001 From: pmaureatelabs Date: Tue, 18 Jun 2019 15:07:53 +0530 Subject: [PATCH 06/12] Edit translations.md Update theme name directive --- docs/guide/core-themes/translations.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guide/core-themes/translations.md b/docs/guide/core-themes/translations.md index 335e885814..e213e17245 100644 --- a/docs/guide/core-themes/translations.md +++ b/docs/guide/core-themes/translations.md @@ -29,7 +29,7 @@ For all helper methods and directives, along with available parameters, please d ## Working with translations -Translations are provided in `core/i18n/resource/i18n/en-US.csv` file and can be extended / overridden in `src/themes/[your-theme]/resource/i18n/en-US.csv` accordingly. +Translations are provided in `core/i18n/resource/i18n/en-US.csv` file and can be extended / overridden in `src/themes/{themename}/resource/i18n/en-US.csv` accordingly. Here's an example of `en-US.csv` for `en-US` locale: @@ -45,7 +45,7 @@ Here's an example of `en-US.csv` for `en-US` locale: "Vue Storefront Logo", "Vue Storefront Logo" ``` -when you create the `en-US.csv` file within your `src/themes/[your-theme]/resource/i18n/` folder and override some messages like: +when you create the `en-US.csv` file within your `src/themes/{themename}/resource/i18n/` folder and override some messages like: ```csv "customMessage","You can define or override translation messages here." From e08e9b8023c8efa7c504bbba96e25d934ac7bd82 Mon Sep 17 00:00:00 2001 From: przspa Date: Wed, 26 Jun 2019 12:01:29 +0200 Subject: [PATCH 07/12] Fixed attribute name --- core/pages/Category.js | 2 +- core/pages/Checkout.js | 2 +- core/pages/CmsPage.js | 2 +- core/pages/Error.js | 2 +- core/pages/Home.js | 2 +- core/pages/MyAccount.js | 2 +- core/pages/PageNotFound.js | 2 +- core/pages/Product.js | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/pages/Category.js b/core/pages/Category.js index cbb70e8bd4..c88dbc7e5e 100644 --- a/core/pages/Category.js +++ b/core/pages/Category.js @@ -287,7 +287,7 @@ export default { } ], title: htmlDecode(this.category.meta_title || this.categoryName), - meta: this.category.meta_description ? [{ vmid: 'description', description: htmlDecode(this.category.meta_description) }] : [] + meta: this.category.meta_description ? [{ vmid: 'description', content: htmlDecode(this.category.meta_description) }] : [{ vmid: 'description', description: htmlDecode(this.categoryName) }] } } } diff --git a/core/pages/Checkout.js b/core/pages/Checkout.js index c9c6009a50..7818051750 100644 --- a/core/pages/Checkout.js +++ b/core/pages/Checkout.js @@ -337,7 +337,7 @@ export default { metaInfo () { return { title: this.$route.meta.title || i18n.t('Checkout'), - meta: this.$route.meta.description ? [{ vmid: 'description', description: this.$route.meta.description }] : [] + meta: this.$route.meta.description ? [{ vmid: 'description', content: this.$route.meta.description }] : [] } }, asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data diff --git a/core/pages/CmsPage.js b/core/pages/CmsPage.js index 1b6027dd50..d77bc3a245 100644 --- a/core/pages/CmsPage.js +++ b/core/pages/CmsPage.js @@ -39,7 +39,7 @@ export default { metaInfo () { return { title: htmlDecode(this.pageTitle || this.$route.meta.title), - meta: this.$route.meta.description ? [{ vmid: 'description', description: htmlDecode(this.$route.meta.description) }] : [] + meta: this.$route.meta.description ? [{ vmid: 'description', content: htmlDecode(this.$route.meta.description) }] : [] } } } diff --git a/core/pages/Error.js b/core/pages/Error.js index a71248b9dd..2d067da4f2 100644 --- a/core/pages/Error.js +++ b/core/pages/Error.js @@ -15,7 +15,7 @@ export default { metaInfo () { return { title: this.$route.meta.title || i18n.t('Internal Server Error 500'), - meta: this.$route.meta.description ? [{ vmid: 'description', description: this.$route.meta.description }] : [] + meta: this.$route.meta.description ? [{ vmid: 'description', content: this.$route.meta.description }] : [] } } } diff --git a/core/pages/Home.js b/core/pages/Home.js index fba85241e3..127e707167 100644 --- a/core/pages/Home.js +++ b/core/pages/Home.js @@ -31,7 +31,7 @@ export default { metaInfo () { return { title: this.$route.meta.title || i18n.t('Home Page'), - meta: this.$route.meta.description ? [{ vmid: 'description', description: this.$route.meta.description }] : [] + meta: this.$route.meta.description ? [{ vmid: 'description', content: this.$route.meta.description }] : [] } } } diff --git a/core/pages/MyAccount.js b/core/pages/MyAccount.js index f4fc098a54..14a3e2dcc2 100644 --- a/core/pages/MyAccount.js +++ b/core/pages/MyAccount.js @@ -44,7 +44,7 @@ export default { metaInfo () { return { title: this.$route.meta.title || i18n.t('My Account'), - meta: this.$route.meta.description ? [{ vmid: 'description', description: this.$route.meta.description }] : [] + meta: this.$route.meta.description ? [{ vmid: 'description', content: this.$route.meta.description }] : [] } }, asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data diff --git a/core/pages/PageNotFound.js b/core/pages/PageNotFound.js index 915f525b94..a45250ba98 100644 --- a/core/pages/PageNotFound.js +++ b/core/pages/PageNotFound.js @@ -23,7 +23,7 @@ export default { metaInfo () { return { title: this.$route.meta.title || i18n.t('404 Page Not Found'), - meta: this.$route.meta.description ? [{ vmid: 'description', description: this.$route.meta.description }] : [] + meta: this.$route.meta.description ? [{ vmid: 'description', content: this.$route.meta.description }] : [] } } } diff --git a/core/pages/Product.js b/core/pages/Product.js index 76861acdff..5f1e6a0150 100644 --- a/core/pages/Product.js +++ b/core/pages/Product.js @@ -241,7 +241,7 @@ export default { } ], title: htmlDecode(this.product.meta_title || this.productName), - meta: this.product.meta_description ? [{ vmid: 'description', description: htmlDecode(this.product.meta_description) }] : [] + meta: this.product.meta_description ? [{ vmid: 'description', content: htmlDecode(this.product.meta_description) }] : [] } } } From 9647ee5d4de68385a85957eeafcfe8ad94cca7bd Mon Sep 17 00:00:00 2001 From: przspa Date: Wed, 26 Jun 2019 12:02:42 +0200 Subject: [PATCH 08/12] Removed test case --- core/pages/Category.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pages/Category.js b/core/pages/Category.js index c88dbc7e5e..dedb5b3a3e 100644 --- a/core/pages/Category.js +++ b/core/pages/Category.js @@ -287,7 +287,7 @@ export default { } ], title: htmlDecode(this.category.meta_title || this.categoryName), - meta: this.category.meta_description ? [{ vmid: 'description', content: htmlDecode(this.category.meta_description) }] : [{ vmid: 'description', description: htmlDecode(this.categoryName) }] + meta: this.category.meta_description ? [{ vmid: 'description', content: htmlDecode(this.category.meta_description) }] : [] } } } From 3073b4cdfb6f9b9e3c02f519c2e35a673e009e12 Mon Sep 17 00:00:00 2001 From: przspa Date: Wed, 26 Jun 2019 12:16:34 +0200 Subject: [PATCH 09/12] Updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c8be2f903..c7319a4257 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -74,6 +74,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Logo on the Error page has been fixed - @przspa (#3077) - No placeholders / no photos for Get Inspire section in offline - @przspa (#3072) - Back icon on product page causing inconsistent behavior - @patzick (#3056) +- Fixed wrong meta description attribute by page overwrite - @przspa (#3091) ### Changed / Improved - The `cart/sync`, `cart/addItems`, `cart/removeItem` and `cart/updateQuantity` now returns the `diffLog` object with all the notifications, server statuses and items changed during the shopping cart sync From 6cd0938406500c345a9fa482be00f1ae57bd03c8 Mon Sep 17 00:00:00 2001 From: przspa Date: Thu, 27 Jun 2019 10:21:55 +0200 Subject: [PATCH 10/12] Fixed myAccountLinks SubCategory position from fixed to absolute --- .../default/components/core/blocks/SidebarMenu/SubCategory.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue b/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue index 3b68a3b9f0..e06d01d2fb 100644 --- a/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue +++ b/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue @@ -48,7 +48,7 @@
  • Date: Thu, 27 Jun 2019 12:55:44 +0200 Subject: [PATCH 11/12] Added name attribute to meta description override function --- core/pages/Category.js | 2 +- core/pages/Checkout.js | 2 +- core/pages/CmsPage.js | 2 +- core/pages/Error.js | 2 +- core/pages/Home.js | 2 +- core/pages/MyAccount.js | 2 +- core/pages/PageNotFound.js | 2 +- core/pages/Product.js | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/pages/Category.js b/core/pages/Category.js index dedb5b3a3e..7d01c57e46 100644 --- a/core/pages/Category.js +++ b/core/pages/Category.js @@ -287,7 +287,7 @@ export default { } ], title: htmlDecode(this.category.meta_title || this.categoryName), - meta: this.category.meta_description ? [{ vmid: 'description', content: htmlDecode(this.category.meta_description) }] : [] + meta: this.category.meta_description ? [{ vmid: 'description', name: 'description', content: htmlDecode(this.category.meta_description) }] : [] } } } diff --git a/core/pages/Checkout.js b/core/pages/Checkout.js index 7818051750..9fc1b0e885 100644 --- a/core/pages/Checkout.js +++ b/core/pages/Checkout.js @@ -337,7 +337,7 @@ export default { metaInfo () { return { title: this.$route.meta.title || i18n.t('Checkout'), - meta: this.$route.meta.description ? [{ vmid: 'description', content: this.$route.meta.description }] : [] + meta: this.$route.meta.description ? [{ vmid: 'description', name: 'description', content: this.$route.meta.description }] : [] } }, asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data diff --git a/core/pages/CmsPage.js b/core/pages/CmsPage.js index d77bc3a245..e505cefcfe 100644 --- a/core/pages/CmsPage.js +++ b/core/pages/CmsPage.js @@ -39,7 +39,7 @@ export default { metaInfo () { return { title: htmlDecode(this.pageTitle || this.$route.meta.title), - meta: this.$route.meta.description ? [{ vmid: 'description', content: htmlDecode(this.$route.meta.description) }] : [] + meta: this.$route.meta.description ? [{ vmid: 'description', name: 'description', content: htmlDecode(this.$route.meta.description) }] : [] } } } diff --git a/core/pages/Error.js b/core/pages/Error.js index 2d067da4f2..5f5bfc3832 100644 --- a/core/pages/Error.js +++ b/core/pages/Error.js @@ -15,7 +15,7 @@ export default { metaInfo () { return { title: this.$route.meta.title || i18n.t('Internal Server Error 500'), - meta: this.$route.meta.description ? [{ vmid: 'description', content: this.$route.meta.description }] : [] + meta: this.$route.meta.description ? [{ vmid: 'description', name: 'description', content: this.$route.meta.description }] : [] } } } diff --git a/core/pages/Home.js b/core/pages/Home.js index 127e707167..2f82029f99 100644 --- a/core/pages/Home.js +++ b/core/pages/Home.js @@ -31,7 +31,7 @@ export default { metaInfo () { return { title: this.$route.meta.title || i18n.t('Home Page'), - meta: this.$route.meta.description ? [{ vmid: 'description', content: this.$route.meta.description }] : [] + meta: this.$route.meta.description ? [{ vmid: 'description', name: 'description', content: this.$route.meta.description }] : [] } } } diff --git a/core/pages/MyAccount.js b/core/pages/MyAccount.js index 14a3e2dcc2..73808509cd 100644 --- a/core/pages/MyAccount.js +++ b/core/pages/MyAccount.js @@ -44,7 +44,7 @@ export default { metaInfo () { return { title: this.$route.meta.title || i18n.t('My Account'), - meta: this.$route.meta.description ? [{ vmid: 'description', content: this.$route.meta.description }] : [] + meta: this.$route.meta.description ? [{ vmid: 'description', name: 'description', content: this.$route.meta.description }] : [] } }, asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data diff --git a/core/pages/PageNotFound.js b/core/pages/PageNotFound.js index a45250ba98..f84e0e7651 100644 --- a/core/pages/PageNotFound.js +++ b/core/pages/PageNotFound.js @@ -23,7 +23,7 @@ export default { metaInfo () { return { title: this.$route.meta.title || i18n.t('404 Page Not Found'), - meta: this.$route.meta.description ? [{ vmid: 'description', content: this.$route.meta.description }] : [] + meta: this.$route.meta.description ? [{ vmid: 'description', name: 'description', content: this.$route.meta.description }] : [] } } } diff --git a/core/pages/Product.js b/core/pages/Product.js index 5f1e6a0150..a5b85e9160 100644 --- a/core/pages/Product.js +++ b/core/pages/Product.js @@ -241,7 +241,7 @@ export default { } ], title: htmlDecode(this.product.meta_title || this.productName), - meta: this.product.meta_description ? [{ vmid: 'description', content: htmlDecode(this.product.meta_description) }] : [] + meta: this.product.meta_description ? [{ vmid: 'description', name: 'description', content: htmlDecode(this.product.meta_description) }] : [] } } } From aeb363402e9c55f15634808ea06eb688b30fa7a0 Mon Sep 17 00:00:00 2001 From: Patryk Tomczyk <13100280+patzick@users.noreply.github.com> Date: Fri, 28 Jun 2019 09:23:23 +0200 Subject: [PATCH 12/12] Update CHANGELOG.md --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7319a4257..e4205e25e1 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.0-rc.2] - UNRELEASED + +### Fixed +- Fixed wrong meta description attribute by page overwrite - @przspa (#3091) + ## [1.10.0-rc.1] - 2019.06.19 ### Added @@ -74,7 +79,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Logo on the Error page has been fixed - @przspa (#3077) - No placeholders / no photos for Get Inspire section in offline - @przspa (#3072) - Back icon on product page causing inconsistent behavior - @patzick (#3056) -- Fixed wrong meta description attribute by page overwrite - @przspa (#3091) ### Changed / Improved - The `cart/sync`, `cart/addItems`, `cart/removeItem` and `cart/updateQuantity` now returns the `diffLog` object with all the notifications, server statuses and items changed during the shopping cart sync