ZPS-303 Configured google analytics

glowspace · Jan 26, 2021 · 3e454a4 · 3e454a4
1 parent 6a518aa
commit 3e454a4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/nuxt.config.js b/nuxt.config.js
@@ -85,7 +85,10 @@ export default {
      ** Nuxt.js dev-modules
      */
     buildModules: [
-        ['@nuxtjs/google-analytics', { id: 'G-CTBZFXNL2E' }],
+        ['@nuxtjs/google-gtag', {
+            id: 'G-2NKB4371EG',
+            config: { anonymize_ip: true }
+        }],
         '@nuxtjs/router',
         '@nuxtjs/dotenv',
         ['@nuxtjs/vuetify', { treeShake: true, theme: { disable: true } }],

diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@nuxtjs/date-fns": "^1.4.1",
     "@nuxtjs/dotenv": "^1.4.1",
-    "@nuxtjs/google-analytics": "^2.2.3",
+    "@nuxtjs/google-gtag": "^1.0.4",
     "@nuxtjs/proxy": "^1.3.3",
     "eslint-config-prettier": "^6.10.0",
     "eslint-plugin-prettier": "^3.1.2",

diff --git a/pages/song/components/Tags.vue b/pages/song/components/Tags.vue
@@ -45,7 +45,7 @@
         ></tag-category>
         <div
             class="d-flex"
-            v-if="song.songbook_records.length"
+            v-if="publicSongbookRecords.length" 
         >
             <div>
                 <span class="tag tag-category" title="zpěvníky"><i class="fas fa-book"></i></span>
@@ -54,7 +54,7 @@
                 <component
                     :is="whichComponent"
                     class="tag tag-yellow songbook-tag"
-                    v-for="(sb, key) in song.songbook_records"
+                    v-for="(sb, key) in publicSongbookRecords"
                     :key="'sb' + key"
                     :to="'/?zpevniky=' + sb.songbook.id"
                 >
@@ -108,6 +108,10 @@ export default {
             return 'nuxt-link';
         },
 
+        publicSongbookRecords() {
+            return this.song.songbook_records.filter(sb => !sb.songbook.is_private)
+        },
+
         bibleRefs() {
             if (this.song.bible_refs_src) {
                 const lines = this.song.bible_refs_src.split('\n');

diff --git a/yarn.lock b/yarn.lock
@@ -1639,12 +1639,10 @@
     consola "^2.10.1"
     dotenv "^8.1.0"
 
-"@nuxtjs/google-analytics@^2.2.3":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@nuxtjs/google-analytics/-/google-analytics-2.4.0.tgz#3bb9f398a05cc23340d1f423f8d8653dc4114f46"
-  integrity sha512-rDQTwHIjyjVrx8GywHPuWykJ3jRFGaHl5Iqji/y8tQWUc0yGEeHxOoR0yimzxnTS1Ph2/PubQYpgnVeEPEdL/A==
-  dependencies:
-    vue-analytics "^5.22.1"
+"@nuxtjs/google-gtag@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@nuxtjs/google-gtag/-/google-gtag-1.0.4.tgz#57562d8ec4c7694573e77edf72097da4a34b0d68"
+  integrity sha512-0Xgbx1uQ9pKeV2QdU9xoxJVdgH66qyGQJ0l8pzVxz5X476qvJunj6fbcjWk0gT+MEX/VOAhfT/zw0Z1z9q9oNg==
 
 "@nuxtjs/proxy@^1.3.3":
   version "1.3.3"
@@ -11684,11 +11682,6 @@ vscode-uri@^1.0.6:
   resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59"
   integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ==
 
-vue-analytics@^5.22.1:
-  version "5.22.1"
-  resolved "https://registry.yarnpkg.com/vue-analytics/-/vue-analytics-5.22.1.tgz#9d6b32da56daee1b9dfb23a267b50349a03f710f"
-  integrity sha512-HPKQMN7gfcUqS5SxoO0VxqLRRSPkG1H1FqglsHccz6BatBatNtm/Vyy8brApktZxNCfnAkrSVDpxg3/FNDeOgQ==
-
 vue-apollo@^3.0.0-rc.2:
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/vue-apollo/-/vue-apollo-3.0.5.tgz#d4c7e8c7f36d76a7eed005fe565621eb0fb20522"