🎨 Simplify search.vue & minor changes

🎨 Simplify toggling between views
2019-11-15 18:27:34 +01:00 · 2019-11-15 17:56:44 +01:00
11 changed files with 72 additions and 87 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,3 @@
 {
-  "editor.formatOnSave": false,
-  "vue-i18n-ally.localesPaths": "locales",
-  "i18n-ally.localesPaths": "locales"
+  "editor.formatOnSave": false
 }
--- a/app.html
+++ b/app.html
@@ -2,6 +2,25 @@
 <html {{ HTML_ATTRS }}>
  <head {{ HEAD_ATTRS }}>
    {{ HEAD }}
+    <!-- Matomo -->
+    <script type="text/javascript">
+      var _paq = window._paq || [];
+      /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+      _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
+      _paq.push(["setCookieDomain", "*.webgems.io"]);
+      _paq.push(["setDomains", ["*.webgems.io"]]);
+      _paq.push(['trackPageView']);
+      _paq.push(['enableLinkTracking']);
+      (function() {
+        var u="//stats.lost.services/";
+        _paq.push(['setTrackerUrl', u+'matomo.php']);
+        _paq.push(['setSiteId', '1']);
+        var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+        g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+      })();
+    </script>
+    <noscript><p><img src="//stats.lost.services/matomo.php?idsite=1&amp;rec=1" style="border:0;" alt="" /></p></noscript>
+    <!-- End Matomo Code -->
  </head>
  <body {{ BODY_ATTRS }}>
    {{ APP }}
--- a/components/CardsView.vue
+++ b/components/CardsView.vue
@@ -0,0 +1,13 @@
+<template lang="pug">
+  .cards
+    Card(v-for='resource in resources' :resource='resource' :key='resource.title' :createCopyUrl="createCopyUrl" :isActive='activeCard === resource.cleanTitle')
+</template>
+
+<script>
+import Card from './Card'
+
+export default {
+  components: { Card },
+  props: ['resources', 'createCopyUrl', 'activeCard'],
+}
+</script>
--- a/components/TableView.vue
+++ b/components/TableView.vue
@@ -0,0 +1,13 @@
+<template lang="pug">
+  table
+    TableRow(v-for='resource in resources' :resource='resource' :key='resource.title' :createCopyUrl="createCopyUrl" :isActive='activeCard === resource.cleanTitle')
+</template>
+
+<script>
+import TableRow from '../components/TableRow'
+
+export default {
+  components: { TableRow },
+  props: ['resources', 'createCopyUrl', 'activeCard'],
+}
+</script>
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -15,10 +15,10 @@ export default {
      { name: 'viewport', content: 'width=device-width, initial-scale=1' },
      { hid: 'description', name: 'description', content: pkg.description },
      { hid: 'keywords', name: 'keywords', content: 'css, html, php, server, resources, design, gems, nuxt, javascript, tutorials, development, software'},
-
+      
      { name: 'robots', content: 'index, follow' },
-      { name: 'distribution', content: 'global'},
-
+      { name: 'distribution', content: 'global'},  
+      
      { name:'theme-color', content: '#ffffff' },
      { name: 'msapplication-TileColor', content: '#da532c' },
      { rel: 'mask-icon', href: '/safari-pinned-tab.svg', color: '#5bbad5' },
@@ -62,10 +62,6 @@ export default {

  plugins: [
    '~/plugins/i18n.js',
-    {
-      src: '~/plugins/vue-matomo.js',
-      ssr: false,
-    },
  ],
  /*
  ** Nuxt.js modules
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "webgems.io",
+  "name": "webgems",
  "version": "1.0.0",
  "lockfileVersion": 1,
  "requires": true,
@@ -13651,11 +13651,6 @@
        "vue-style-loader": "^4.1.0"
      }
    },
-    "vue-matomo": {
-      "version": "3.12.0-5",
-      "resolved": "https://registry.npmjs.org/vue-matomo/-/vue-matomo-3.12.0-5.tgz",
-      "integrity": "sha512-n69Nmry7Eg0vooGlEMViaAbjsMGM5Hfno0G9C0o8q5aNIShzez5h2JCLRdHktC1ZdI7p4Wtg0csm++zIO+tWCQ=="
-    },
    "vue-meta": {
      "version": "1.6.0",
      "resolved": "https://registry.npmjs.org/vue-meta/-/vue-meta-1.6.0.tgz",
--- a/package.json
+++ b/package.json
@@ -17,9 +17,8 @@
    "cross-env": "^5.2.0",
    "nuxt": "^2.4.0",
    "nuxt-clipboard2": "^0.2.1",
-    "vue-i18n": "^8.11.2",
    "ramda": "^0.26.1",
-    "vue-matomo": "^3.12.0-5"
+    "vue-i18n": "^8.11.2"
  },
  "devDependencies": {
    "@babel/core": "^7.6.4",
--- a/pages/_category.vue
+++ b/pages/_category.vue
@@ -3,21 +3,21 @@
    transition(name="fade-title" @after-enter="afterEnter")
      h1(v-if="showTitle") {{ category.title }}
    transition(name="fade-card")
-      .cards(v-if="areCardsVisible && showCards")
-        template(v-for='resource in category.resources' )
-          Card(:resource='resource' :key='resource.title' :createCopyUrl="createCopyUrl" :isActive='activeCard === resource.cleanTitle')
-    transition(name="fade-card")
-      table(v-if="!areCardsVisible && showCards")
-        template(v-for='resource in category.resources' )
-          TableRow(:resource='resource' :key='resource.title' :createCopyUrl="createCopyUrl" :isActive='activeCard === resource.cleanTitle')
+      div(v-if="showCards")
+        component(
+          :is="areCardsVisible ? 'CardsView' : 'TableView'"
+          :resources="category.resources"
+          :createCopyUrl="createCopyUrl"
+          :activeCard='activeCard'
+        )
 </template>

 <script>
-import Card from '../components/Card'
-import TableRow from '../components/TableRow'
+import CardsView from '../components/CardsView'
+import TableView from '../components/TableView'

 export default {
-  components: { Card, TableRow },
+  components: { CardsView, TableView },
  data() {
    return {
      categoryRouteTitle: this.$route.params.category,
--- a/pages/search.vue
+++ b/pages/search.vue
@@ -3,26 +3,24 @@
    transition(name="fade-title" @after-enter="afterEnter")
      h1(v-if="showTitle") Search
    transition(name="fade-card")
-      .cards(v-if="areCardsVisible && showCards")
-        template(v-if="resources.length")
-          template(v-for='resource in resources' )
-            Card(:resource='resource' :key='resource.title' :createCopyUrl="createCopyUrl" :isActive='activeCard === resource.cleanTitle')
-        p(v-else) No results
-    transition(name="fade-card")
-      table(v-if="!areCardsVisible && showCards")
-        template(v-if="resources.length")
-          template(v-for='resource in resources' )
-            TableRow(:resource='resource' :key='resource.title' :createCopyUrl="createCopyUrl" :isActive='activeCard === resource.cleanTitle')
+      div(showCards)
+        component(
+          v-if="resources.length"
+          :is="areCardsVisible ? 'CardsView' : 'TableView'"
+          :createCopyUrl="createCopyUrl"
+          :activeCard="activeCard"
+          :resources="resources"
+        )
        p(v-else) No results
 </template>

 <script>
-import Card from '../components/Card'
-import TableRow from '../components/TableRow'
+import CardsView from '../components/CardsView'
+import TableView from '../components/TableView'
 import * as R from 'ramda'

 export default {
-  components: { Card, TableRow },
+  components: { CardsView, TableView },
  data() {
    return {
      activeCard: '',
--- a/plugins/vue-matomo.js
+++ b/plugins/vue-matomo.js
@@ -1,34 +0,0 @@
-import Vue from 'vue'
-import VueMatomo from 'vue-matomo'
-
-export default ({
-  app,
-}) => {
-  Vue.use(VueMatomo, {
-    router: app.router,
-    // Configure your matomo server and site by providing
-    host: 'https://stats.lost.services',
-    siteId: 1,
-
-    // Changes the default .js and .php endpoint's filename
-    // Default: 'piwik'
-    trackerFileName: 'matomo',
-
-    // Enables link tracking on regular links. Note that this won't
-    // work for routing links (ie. internal Vue router links)
-    // Default: true
-    enableLinkTracking: true,
-
-    // Require consent before sending tracking information to matomo
-    // Default: false
-    requireConsent: false,
-
-    // Whether to track the initial page view
-    // Default: true
-    trackInitialView: true,
-
-    // Whether or not to log debug information
-    // Default: false
-    debug: false,
-  })
-}
--- a/resources/utility.json
+++ b/resources/utility.json
@@ -175,18 +175,6 @@
      "desc": "Messed up some of your commits? Make it undone",
      "url": "https://bokub.github.io/git-history-editor/",
      "tags": ["import", "export", "author", "messages"]
-    },
-    {
-      "title": "CodeSandbox.io",
-      "desc": "CodeSandbox is an online code editor with a focus on creating and sharing web application projects",
-      "url": "https://codesandbox.io/",
-      "tags": ["development", "ide","editor", "share", "testing"]
-    },
-    {
-      "title": "Postwoman.io",
-      "desc": "The Postwoman API request builder helps you create your requests faster, saving you precious time on your development.",
-      "url": "https://Postwoman.io/",
-      "tags": ["testing","api"]
    }
  ]
 }
Author	SHA1	Message	Date
Kevin	75bb55a6a3	🎨 Simplify search.vue & minor changes	2019-11-15 18:27:34 +01:00
Kevin	5388f2fe44	🎨 Simplify toggling between views	2019-11-15 17:56:44 +01:00