Merge pull request #2024 from filrak/feature/2007-remove-markdown

feature/2007-remove-markdown

core/build/webpack.base.config.js

@@ -179,18 +179,6 @@ module.exports = {
           }
         ]
       },
-      {
-        test: /\.md$/,
-        use: [
-          'vue-loader',
-          {
-            loader: 'markdown-to-vue-loader',
-            options: {
-              componentWrapper: 'div'
-            }
-          }
-        ]
-      },
       {
         test: /\.(woff|woff2|eot|ttf)(\?.*$|$)/,
         loader: 'url-loader?importLoaders=1&limit=10000'

core/package.json

@@ -63,7 +63,6 @@
     "inquirer": "^3.3.0",
     "is-windows": "^1.0.1",
     "jsonfile": "^4.0.0",
-    "markdown-to-vue-loader": "^1.0.0",
     "memory-fs": "^0.4.1",
     "mkdirp": "^0.5.1",
     "node-sass": "^4.9.3",

package.json

@@ -124,7 +124,6 @@
     "karma-spec-reporter": "0.0.32",
     "karma-webpack": "^3.0.0",
     "lerna": "^2.9.0",
-    "markdown-to-vue-loader": "^1.0.0",
     "mkdirp": "^0.5.1",
     "mocha": "^5.2.0",
     "node-sass": "^4.9.3",
@@ -140,6 +139,7 @@
     "sw-precache-webpack-plugin": "^0.11.5",
     "ts-loader": "^5.3.0",
     "typescript": "^3.1.6",
+    "@types/node": "^10.12.10",
     "url-loader": "^1.1.2",
     "url-parse": "^1.4.4",
     "vue-eslint-parser": "^2.0.3",

src/themes/default/components/core/Modal.vue

@@ -20,9 +20,8 @@
               </i>
               <slot name="header"/>
             </header>
-            <div class="modal-content pt30 pb60 px65" v-if="$slots.content || staticData">
+            <div class="modal-content pt30 pb60 px65" v-if="$slots.content">
               <slot name="content"/>
-              <static-content :file="staticData" v-if="staticData"/>
             </div>
             <slot/>
           </div>
@@ -33,7 +32,6 @@
 </template>
 
 <script>
-import StaticContent from 'theme/components/theme/StaticContent'
 import { mapMutations } from 'vuex'
 import onEscapePress from '@vue-storefront/core/mixins/onEscapePress'
 
@@ -44,9 +42,6 @@ export default {
       isVisible: false
     }
   },
-  components: {
-    StaticContent
-  },
   methods: {
     onHide (name, state, params) {
       return name === this.name ? this.toggle(false) : false
@@ -95,10 +90,6 @@ export default {
       type: Number,
       default: 300
     },
-    staticData: {
-      type: String,
-      default: ''
-    },
     width: {
       type: Number,
       default: 0

src/themes/default/components/theme/blocks/Static/Example.vue

@@ -0,0 +1,22 @@
+<template>
+  <div>
+    <p>
+      This website ("website") is operated by Luma Inc., which includes Luma stores, and Luma Private Sales. This privacy policy only covers information collected at this website, and does not cover any information collected offline by Luma. All Luma websites are covered by this privacy policy.
+    </p>
+    <h2>
+      Luma Security
+    </h2>
+    <p>
+      Personal information provided on the website and online credit card transactions are transmitted through a secure server. We are committed to handling your personal information with high standards of information security. We take appropriate physical, electronic, and administrative steps to maintain the security and accuracy of personally identifiable information we collect, including limiting the number of people who have physical access to our database servers, as well as employing electronic security systems and password protections that guard against unauthorized access.
+    </p>
+    <h2>
+      Luma Privacy Policy
+    </h2>
+    <p>
+      To help us achieve our goal of providing the highest quality products and services, we use information from our interactions with you and other customers, as well as from other parties. Because we respect your privacy, we have implemented procedures to ensure that your personal information is handled in a safe, secure, and responsible manner. We have posted this privacy policy in order to explain our information collection practices and the choices you have about the way information is collected and used.
+    </p>
+    <p>
+      As we continue to develop the Luma website and take advantage of advances in technology to improve the services we offer, this privacy policy likely will change. We therefore encourage you to refer to this policy on an ongoing basis so that you understand our current privacy policy.
+    </p>
+  </div>
+</template>

src/themes/default/pages/Static.vue

@@ -13,13 +13,13 @@
           <nav class="static-menu serif h4 mb35">
             <ul class="m0 p0">
               <li class="mb10" v-for="page in navigation" :key="page.id">
-                <router-link :to="localizedRoute(page.link)" class="cl-accent relative">{{ page.title }}</router-link>
+                <router-link :to="localizedRoute(page.link)" @click.native="setContent(page.component)" class="cl-accent relative">{{ page.title }}</router-link>
               </li>
             </ul>
           </nav>
         </div>
         <div class="static-content h4 lh35 col-sm-9">
-          <static-content :file="$props.page"/>
+          <component :is="activeComponent" />
         </div>
       </div>
     </div>
@@ -29,19 +29,21 @@
 <script>
 import i18n from '@vue-storefront/i18n'
 import Breadcrumbs from 'theme/components/core/Breadcrumbs'
-import StaticContent from 'theme/components/theme/StaticContent'
+import StaticExample from 'theme/components/theme/blocks/Static/Example'
 
 export default {
   components: {
-    Breadcrumbs,
-    StaticContent
+    Breadcrumbs
   },
   metaInfo () {
     return {
       title: this.$route.meta.title || this.$props.title,
       meta: this.$route.meta.description ? [{vmid: 'description', description: this.$route.meta.description}] : []
     }
   },
+  created () {
+    this.activeComponent = this.navigation.find(nav => nav.link === this.$route.path).component
+  },
   props: {
     title: {
       type: String,
@@ -52,17 +54,24 @@ export default {
       required: true
     }
   },
+  methods: {
+    setContent (component) {
+      this.activeComponent = component
+    }
+  },
   data () {
     return {
       navigation: [
-        { title: i18n.t('About us'), link: '/about-us' },
-        { title: i18n.t('Customer service'), link: '/customer-service' },
-        { title: i18n.t('Store locator'), link: '/store-locator' },
-        { title: i18n.t('Delivery'), link: '/delivery' },
-        { title: i18n.t('Return policy'), link: '/returns' },
-        { title: i18n.t('Privacy policy'), link: '/privacy' },
-        { title: i18n.t('Contact us'), link: '/contact' }
-      ]
+        { title: i18n.t('About us'), link: '/about-us', component: StaticExample },
+        { title: i18n.t('Customer service'), link: '/customer-service', component: StaticExample },
+        { title: i18n.t('Store locator'), link: '/store-locator', component: StaticExample },
+        { title: i18n.t('Delivery'), link: '/delivery', component: StaticExample },
+        { title: i18n.t('Return policy'), link: '/returns', component: StaticExample },
+        { title: i18n.t('Privacy policy'), link: '/privacy', component: StaticExample },
+        { title: i18n.t('Size guide'), link: '/size-guide', component: StaticExample },
+        { title: i18n.t('Contact us'), link: '/contact', component: StaticExample }
+      ],
+      activeComponent: null
     }
   }
 }