From 7ee963313dfb8c53b929f0545cdf5e338b4161ab Mon Sep 17 00:00:00 2001 From: lostdesign Date: Tue, 28 Apr 2020 18:17:05 +0200 Subject: [PATCH] :recycle: removes matomo, fixes linting errors, adds fathom --- app.html | 7 + components/OptOutIframe.vue | 3 - components/Search.vue | 28 +- components/Sidebar.vue | 4 +- nuxt.config.js | 4 - package.json | 3 +- pages/cookie-policy.vue | 56 - pages/{imprint.vue => legal-notice.vue} | 2 +- pages/privacy-policy.vue | 93 - plugins/vue-matomo.js | 34 - store/data.js | 8 +- yarn.lock | 11149 ++++++++++++++++++++++ 12 files changed, 11177 insertions(+), 214 deletions(-) delete mode 100644 components/OptOutIframe.vue delete mode 100644 pages/cookie-policy.vue rename pages/{imprint.vue => legal-notice.vue} (98%) delete mode 100644 pages/privacy-policy.vue delete mode 100644 plugins/vue-matomo.js create mode 100644 yarn.lock diff --git a/app.html b/app.html index 3427d3e..c0548d5 100644 --- a/app.html +++ b/app.html @@ -1,6 +1,13 @@ + + + + + {{ HEAD }} diff --git a/components/OptOutIframe.vue b/components/OptOutIframe.vue deleted file mode 100644 index 600c98a..0000000 --- a/components/OptOutIframe.vue +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/components/Search.vue b/components/Search.vue index c77ac29..1b79186 100644 --- a/components/Search.vue +++ b/components/Search.vue @@ -13,20 +13,6 @@ export default { searchPath: '/search', } }, - methods: { - // isTag :: String -> Bool - isTag: R.startsWith('#'), - - // removeFirstChar :: String -> String - removeFirstChar: R.compose( - R.join(''), - R.adjust(0, () => '') - ), - onEnter() { - const searchParams = new URLSearchParams({ ...this.$route.query, enter: true }) - this.$router.push(this.searchPath + '?' + searchParams.toString()) - }, - }, watch: { searchInput(input) { const words = R.filter(isNotEmpty, R.split(' ', input)) @@ -51,6 +37,20 @@ export default { this.searchInput = `${tags} ${keywords}`.trim() }, + methods: { + // isTag :: String -> Bool + isTag: R.startsWith('#'), + + // removeFirstChar :: String -> String + removeFirstChar: R.compose( + R.join(''), + R.adjust(0, () => ''), + ), + onEnter() { + const searchParams = new URLSearchParams({ ...this.$route.query, enter: true }) + this.$router.push(this.searchPath + '?' + searchParams.toString()) + }, + }, } diff --git a/components/Sidebar.vue b/components/Sidebar.vue index 2a652e2..66ec821 100644 --- a/components/Sidebar.vue +++ b/components/Sidebar.vue @@ -5,9 +5,7 @@ //- nuxt-link(:to='$i18n.path(category.slug)') {{ category.title }} nuxt-link(:to='category.slug') {{ category.title }} hr - nuxt-link(to='/privacy-policy') Privacy Policy - nuxt-link(to='/cookie-policy') Cookie Policy - nuxt-link(to='/imprint') Imprint + nuxt-link(to='/legal-notice') Legal Notice hr div(class="toggleWrapper" @click="toggleCardsVisible") div(class="viewToggle" :class="{active: areCardsVisible}") Cards diff --git a/nuxt.config.js b/nuxt.config.js index f08a356..d8a138b 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -62,10 +62,6 @@ export default { plugins: [ '~/plugins/i18n.js', - { - src: '~/plugins/vue-matomo.js', - ssr: false, - }, ], /* ** Nuxt.js modules diff --git a/package.json b/package.json index 843b501..8af4eb9 100644 --- a/package.json +++ b/package.json @@ -18,8 +18,7 @@ "nuxt": "^2.4.0", "nuxt-clipboard2": "^0.2.1", "vue-i18n": "^8.11.2", - "ramda": "^0.26.1", - "vue-matomo": "^3.12.0-5" + "ramda": "^0.26.1" }, "devDependencies": { "@babel/core": "^7.6.4", diff --git a/pages/cookie-policy.vue b/pages/cookie-policy.vue deleted file mode 100644 index 5e75323..0000000 --- a/pages/cookie-policy.vue +++ /dev/null @@ -1,56 +0,0 @@ - - - - - \ No newline at end of file diff --git a/pages/imprint.vue b/pages/legal-notice.vue similarity index 98% rename from pages/imprint.vue rename to pages/legal-notice.vue index a3436cb..1a918ed 100644 --- a/pages/imprint.vue +++ b/pages/legal-notice.vue @@ -1,6 +1,6 @@