From 9ca92d0fd5f10f5dcff271194ffbd9ce4e4f2897 Mon Sep 17 00:00:00 2001
From: Filip Rakowski <frakowski@divante.pl>
Date: Mon, 26 Nov 2018 11:02:08 +0100
Subject: [PATCH 1/4] feature/2007-remove-markdown

---
 core/build/webpack.base.config.js             | 12 -------
 core/package.json                             |  1 -
 package.json                                  |  1 -
 src/themes/default/components/core/Modal.vue  | 11 +-----
 .../components/theme/StaticContent.vue        | 36 -------------------
 .../theme/blocks/Static/Example.vue           | 22 ++++++++++++
 src/themes/default/pages/Static.vue           | 34 +++++++++++-------
 src/themes/default/resource/about.md          | 13 -------
 src/themes/default/resource/contact.md        |  4 ---
 src/themes/default/resource/lorem.md          | 11 ------
 src/themes/default/resource/terms.md          | 11 ------
 11 files changed, 44 insertions(+), 112 deletions(-)
 delete mode 100644 src/themes/default/components/theme/StaticContent.vue
 create mode 100644 src/themes/default/components/theme/blocks/Static/Example.vue
 delete mode 100644 src/themes/default/resource/about.md
 delete mode 100644 src/themes/default/resource/contact.md
 delete mode 100644 src/themes/default/resource/lorem.md
 delete mode 100644 src/themes/default/resource/terms.md

diff --git a/core/build/webpack.base.config.js b/core/build/webpack.base.config.js
index f38bfb1e50..6ff930742b 100644
--- a/core/build/webpack.base.config.js
+++ b/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'
diff --git a/core/package.json b/core/package.json
index da07b518f3..0368a5fa77 100644
--- a/core/package.json
+++ b/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",
diff --git a/package.json b/package.json
index c8b0de3b71..a2aceddb79 100755
--- a/package.json
+++ b/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",
diff --git a/src/themes/default/components/core/Modal.vue b/src/themes/default/components/core/Modal.vue
index e88a4d5167..70e54633ad 100644
--- a/src/themes/default/components/core/Modal.vue
+++ b/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
diff --git a/src/themes/default/components/theme/StaticContent.vue b/src/themes/default/components/theme/StaticContent.vue
deleted file mode 100644
index 1f34acc019..0000000000
--- a/src/themes/default/components/theme/StaticContent.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-  <static :is="staticLoaded"/>
-</template>
-<script>
-export default {
-  components: {
-    static: null
-  },
-  data () {
-    return {
-      staticLoaded: false
-    }
-  },
-  props: {
-    file: {
-      type: String,
-      required: true
-    }
-  },
-  watch: {
-    file: function (newFile) {
-      this.loadContent(newFile)
-    }
-  },
-  mounted () {
-    this.loadContent()
-  },
-  methods: {
-    loadContent (file = this.file) {
-      this.staticLoaded = false
-      this.$options.components.static = require('../../resource/' + file + '.md').default
-      this.staticLoaded = 'static'
-    }
-  }
-}
-</script>
diff --git a/src/themes/default/components/theme/blocks/Static/Example.vue b/src/themes/default/components/theme/blocks/Static/Example.vue
new file mode 100644
index 0000000000..4cfe566c7e
--- /dev/null
+++ b/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>
diff --git a/src/themes/default/pages/Static.vue b/src/themes/default/pages/Static.vue
index e5bb81b8a2..5d32eb8669 100644
--- a/src/themes/default/pages/Static.vue
+++ b/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,12 +29,11 @@
 <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 {
@@ -42,6 +41,9 @@ export default {
       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,23 @@ 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('Contact us'), link: '/contact', component: StaticExample }
+      ],
+      activeComponent: null
     }
   }
 }
diff --git a/src/themes/default/resource/about.md b/src/themes/default/resource/about.md
deleted file mode 100644
index f581165174..0000000000
--- a/src/themes/default/resource/about.md
+++ /dev/null
@@ -1,13 +0,0 @@
-## About us
-
-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.
-
-### Luma Security
-
-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.
-
-### Luma Privacy Policy
-
-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.
-
-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.
diff --git a/src/themes/default/resource/contact.md b/src/themes/default/resource/contact.md
deleted file mode 100644
index 140732f3e3..0000000000
--- a/src/themes/default/resource/contact.md
+++ /dev/null
@@ -1,4 +0,0 @@
-### Contact
-
-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.
-
diff --git a/src/themes/default/resource/lorem.md b/src/themes/default/resource/lorem.md
deleted file mode 100644
index a168d84a01..0000000000
--- a/src/themes/default/resource/lorem.md
+++ /dev/null
@@ -1,11 +0,0 @@
-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.
-
-### Luma Security
-
-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.
-
-### Luma Privacy Policy
-
-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.
-
-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.
diff --git a/src/themes/default/resource/terms.md b/src/themes/default/resource/terms.md
deleted file mode 100644
index a168d84a01..0000000000
--- a/src/themes/default/resource/terms.md
+++ /dev/null
@@ -1,11 +0,0 @@
-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.
-
-### Luma Security
-
-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.
-
-### Luma Privacy Policy
-
-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.
-
-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.

From 9cf1d5e14c3abbd9fc8b93a728fb3d40184d738e Mon Sep 17 00:00:00 2001
From: Filip Rakowski <frakowski@divante.pl>
Date: Mon, 26 Nov 2018 11:20:31 +0100
Subject: [PATCH 2/4] added size guide

---
 src/themes/default/pages/Static.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/themes/default/pages/Static.vue b/src/themes/default/pages/Static.vue
index 5d32eb8669..70995e6071 100644
--- a/src/themes/default/pages/Static.vue
+++ b/src/themes/default/pages/Static.vue
@@ -68,6 +68,8 @@ export default {
         { 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('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

From 41511928b8c5c1aa6ea8c09d22aa6ea6d34d4edd Mon Sep 17 00:00:00 2001
From: Filip Rakowski <frakowski@divante.pl>
Date: Mon, 26 Nov 2018 11:25:24 +0100
Subject: [PATCH 3/4] removed duplicated privacy policy link

---
 src/themes/default/pages/Static.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/themes/default/pages/Static.vue b/src/themes/default/pages/Static.vue
index 70995e6071..21a34000c9 100644
--- a/src/themes/default/pages/Static.vue
+++ b/src/themes/default/pages/Static.vue
@@ -68,8 +68,7 @@ export default {
         { 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('Privacy policy'), link: '/privacy', component: StaticExample },
-        { title: i18n.t('Size  guide'), link: '/size-guide', component: StaticExample },
+        { title: i18n.t('Size guide'), link: '/size-guide', component: StaticExample },
         { title: i18n.t('Contact us'), link: '/contact', component: StaticExample }
       ],
       activeComponent: null

From d06a19e395a17ad40c83b9ad420b2087c8fc600f Mon Sep 17 00:00:00 2001
From: Filip Rakowski <frakowski@divante.pl>
Date: Mon, 26 Nov 2018 11:40:43 +0100
Subject: [PATCH 4/4] added node typings

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index a2aceddb79..8c08597805 100755
--- a/package.json
+++ b/package.json
@@ -139,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",