merge release

CHANGELOG.md

@@ -19,6 +19,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Shipping address is saved as default when not logged in user chooses to create account during checkout - @iwonapiotrowska (#2636)
 - Can set transition style for Modal content - @grimasod (#3146)
 
+## [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

README.md

@@ -709,6 +709,53 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s
         </a>
 </td>
     <td align="center" valign="middle"> 
+<a href="https://www.novusweb.com/">
+          <img
+            src="https://divante.co/partners/Vue-Storefront/blue_novusweb.png"
+            alt="Novusweb"
+            height="30"
+          >
+        </a>
+</td>
+   <td align="center" valign="middle"> 
+<a href="www.trellis.co">
+          <img
+            src="https://divante.co/partners/Vue-Storefront/trellis.png"
+            alt="Trellis"
+            height="30"
+          >
+        </a>
+</td>
+    </tr>
+      <tr>
+      <td align="center" valign="middle"> 
+<a href="https://ittweb.net/it?utm_source=referral&utm_medium=vsf&utm_campaign=partners">
+          <img
+            src="https://divante.co/partners/Vue-Storefront/ITTweb.png"
+            alt="ITT Web"
+            height="40"
+          >
+        </a>
+</td>
+  <td align="center" valign="middle"> 
+<a href="https://www.yireo.com/">
+          <img
+            src="https://divante.co/partners/Vue-Storefront/yireo-logo-trans-520x520.png"
+            alt="Yireo"
+            height="40"
+          >
+        </a>
+</td>
+     <td align="center" valign="middle"> 
+<a href="">
+          <img
+            src=""
+            alt=""
+            height="40"
+          >
+        </a>
+</td>
+    <td align="center" valign="middle"> 
 <a href="">
           <img
             src=""

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', name: 'description', content: htmlDecode(this.category.meta_description) }] : []
     }
   }
 }

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', name: 'description', content: this.$route.meta.description }] : []
     }
   },
   asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data

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', name: 'description', content: htmlDecode(this.$route.meta.description) }] : []
     }
   }
 }

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', name: 'description', content: this.$route.meta.description }] : []
     }
   }
 }

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', name: 'description', content: this.$route.meta.description }] : []
     }
   }
 }

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', name: 'description', content: this.$route.meta.description }] : []
     }
   },
   asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data

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', name: 'description', content: this.$route.meta.description }] : []
     }
   }
 }

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', name: 'description', content: htmlDecode(this.product.meta_description) }] : []
     }
   }
 }

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.
+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

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/{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 `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."

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
 

src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue

@@ -51,7 +51,7 @@
     </ul>
     <ul
       v-if="myAccountLinks && !path.length"
-      class="sidebar-submenu fixed w-100 p0 bg-cl-primary"
+      class="sidebar-submenu absolute w-100 p0 bg-cl-primary"
       :style="styles"
     >
       <li