From 5cd7a9c63e1784abb67ecd8f9253089f433a3e8b Mon Sep 17 00:00:00 2001 From: sakrecoer Date: Mon, 30 Nov 2020 17:37:02 +0100 Subject: [PATCH 1/4] cross stie tracking --- _config.yml | 4 ++++ _includes/analytics.js | 51 ++++++++++++++++++++++++------------------ _includes/matomo.js | 40 +++++++++++++++++++++++++++++---- 3 files changed, 69 insertions(+), 26 deletions(-) diff --git a/_config.yml b/_config.yml index 042b01e..1a80f60 100644 --- a/_config.yml +++ b/_config.yml @@ -44,6 +44,10 @@ social: - https://mastodon.art/@sakrecoer - https://sakrecoer.bandcamp.com/ +## Matomo +matomo_site_id: '3' +matomo_container: 'fHO88MfH' + categories: - releases - ramblings diff --git a/_includes/analytics.js b/_includes/analytics.js index 79cf64e..3194c76 100644 --- a/_includes/analytics.js +++ b/_includes/analytics.js @@ -1,33 +1,40 @@ -{% if page.url == '/404.html' %} +{% if page.url == '/404/' %} //* Matomo *// - var _paq = window._paq || []; - /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ - _paq.push(['setDocumentTitle', '404/URL = ' + encodeURIComponent(document.location.pathname+document.location.search) + '/From = ' + encodeURIComponent(document.referrer)]); - _paq.push(['disableCookies']); - _paq.push(['trackPageView']); - _paq.push(['enableLinkTracking']); - (function() { - var u="https://terminalnetwork.matomo.cloud/"; - _paq.push(['setTrackerUrl', u+'matomo.php']); - _paq.push(['setSiteId', '4']); - var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; - g.type='text/javascript'; g.async=true; g.defer=true; g.src='//cdn.matomo.cloud/terminalnetwork.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s); - })(); - +var _paq = window._paq = window._paq || []; +_paq.push(['setDocumentTitle', '404/URL = ' + encodeURIComponent(document.location.pathname+document.location.search) + '/From = ' + encodeURIComponent(document.referrer)]); +_paq.push(["setCookieDomain", "*.basspistol.com"]); +_paq.push(["setDomains", ["*.basspistol.org","*.basspistol.com","*.pauvrecoude.basspistol.com","*.paxnion.basspistol.com","*.radio.basspistol.com","*.sakrecoer.basspistol.com","*.sakrecoer.com","*.sethybowoy.basspistol.com","*.setto.basspistol.com","*.tfb.basspistol.com","*.v.basspistol.org"]]); +_paq.push(["enableCrossDomainLinking"]); +_paq.push(['trackPageView']); +_paq.push(['enableLinkTracking']); +(function() { + var u="https://terminalnetwork.matomo.cloud/"; + _paq.push(['setTrackerUrl', u+'matomo.php']); + _paq.push(['setSiteId', '{{ site.matomo_site_id }}']); + var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; + g.type='text/javascript'; g.async=true; g.src='https://cdn.matomo.cloud/terminalnetwork.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s); +})(); //* End Matomo *// - - {% else %} -//* Matomo Tag Manager *// - var _mtm = _mtm || []; - _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'}); + +var _paq = window._paq = window._paq || []; +_paq.push(["setDocumentTitle", document.domain + "/" + document.title]); +_paq.push(["setCookieDomain", "*.basspistol.com"]); +_paq.push(["setDomains", ["*.basspistol.org","*.basspistol.com","*.pauvrecoude.basspistol.com","*.paxnion.basspistol.com","*.radio.basspistol.com","*.sakrecoer.basspistol.com","*.sakrecoer.com","*.sethybowoy.basspistol.com","*.setto.basspistol.com","*.tfb.basspistol.com","*.v.basspistol.org"]]); +_paq.push(["enableCrossDomainLinking"]); +_paq.push(['trackPageView']); +_paq.push(['enableLinkTracking']); +(function() { + var u="https://terminalnetwork.matomo.cloud/"; + _paq.push(['setTrackerUrl', u+'matomo.php']); + _paq.push(['setSiteId', '{{ site.matomo_site_id }}']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; - g.type='text/javascript'; g.async=true; g.defer=true; g.src='https://cdn.matomo.cloud/terminalnetwork.matomo.cloud/container_sc9z00rL.js'; s.parentNode.insertBefore(g,s); + g.type='text/javascript'; g.async=true; g.src='https://cdn.matomo.cloud/terminalnetwork.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s); +})(); -//* End Matomo Tag Manager *// {% endif %} diff --git a/_includes/matomo.js b/_includes/matomo.js index cabb1ac..696067c 100644 --- a/_includes/matomo.js +++ b/_includes/matomo.js @@ -1,13 +1,45 @@ -var _paq = window._paq || []; +{% if page.url == '/404/' %} + +//* Matomo *// + +var _paq = window._paq = window._paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ -_paq.push(["setDocumentTitle", document.domain + "/" + document.title]); +_paq.push(['setDocumentTitle', '404/URL = ' + encodeURIComponent(document.location.pathname+document.location.search) + '/From = ' + encodeURIComponent(document.referrer)]); +_paq.push(["setCookieDomain", "*.basspistol.com"]); +_paq.push(["setDomains", ["*.basspistol.org","*.basspistol.com","*.pauvrecoude.basspistol.com","*.paxnion.basspistol.com","*.radio.basspistol.com","*.sakrecoer.basspistol.com","*.sakrecoer.com","*.sethybowoy.basspistol.com","*.setto.basspistol.com","*.tfb.basspistol.com","*.v.basspistol.org"]]); +_paq.push(["enableCrossDomainLinking"]); _paq.push(["disableCookies"]); _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u="https://terminalnetwork.matomo.cloud/"; _paq.push(['setTrackerUrl', u+'matomo.php']); - _paq.push(['setSiteId', '4']); + _paq.push(['setSiteId', '{{ site.matomo_site_id }}']); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; - g.type='text/javascript'; g.async=true; g.defer=true; g.src='//cdn.matomo.cloud/terminalnetwork.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s); + g.type='text/javascript'; g.async=true; g.src='https://cdn.matomo.cloud/terminalnetwork.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s); })(); +//* End Matomo *// + +{% else %} + +//* Matomo *// + +var _paq = window._paq = window._paq || []; +_paq.push(["setDocumentTitle", document.domain + "/" + document.title]); +_paq.push(["setCookieDomain", "*.basspistol.com"]); +_paq.push(["setDomains", ["*.basspistol.org","*.basspistol.com","*.pauvrecoude.basspistol.com","*.paxnion.basspistol.com","*.radio.basspistol.com","*.sakrecoer.basspistol.com","*.sakrecoer.com","*.sethybowoy.basspistol.com","*.setto.basspistol.com","*.tfb.basspistol.com","*.v.basspistol.org"]]); +_paq.push(["enableCrossDomainLinking"]); +_paq.push(["disableCookies"]); +_paq.push(['trackPageView']); +_paq.push(['enableLinkTracking']); +(function() { + var u="https://terminalnetwork.matomo.cloud/"; + _paq.push(['setTrackerUrl', u+'matomo.php']); + _paq.push(['setSiteId', '{{ site.matomo_site_id }}']); + var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; + g.type='text/javascript'; g.async=true; g.src='https://cdn.matomo.cloud/terminalnetwork.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s); +})(); + +//* End Matomo *// + +{% endif %} \ No newline at end of file From 9c4c7a025330d0a10877922abe09acb1e7c222e8 Mon Sep 17 00:00:00 2001 From: Set Sakrecoer Date: Tue, 30 Mar 2021 12:33:24 +0200 Subject: [PATCH 2/4] upgrade kramdown etall --- Gemfile.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a982461..1940aa7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,15 +4,15 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) - concurrent-ruby (1.1.6) - em-websocket (0.5.1) + concurrent-ruby (1.1.8) + em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) - ffi (1.13.1) + ffi (1.15.0) forwardable-extended (2.6.0) http_parser.rb (0.6.0) - i18n (1.8.4) + i18n (1.8.9) concurrent-ruby (~> 1.0) jekyll (4.0.0) addressable (~> 2.4) @@ -38,24 +38,24 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (2.3.0) + kramdown (2.3.1) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.2.1) + listen (3.5.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) pathutil (0.16.2) forwardable-extended (~> 2.6) posix-spawn (0.3.15) - public_suffix (4.0.5) + public_suffix (4.0.6) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.4) - rouge (3.21.0) + rouge (3.26.0) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) From 3478c8eb8e8fded16ca862dd2b61ae398935c68c Mon Sep 17 00:00:00 2001 From: Set Sakrecoer Date: Mon, 14 Jun 2021 14:54:14 +0200 Subject: [PATCH 3/4] update stores --- _data/stores.yml | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/_data/stores.yml b/_data/stores.yml index f209f87..92151ac 100644 --- a/_data/stores.yml +++ b/_data/stores.yml @@ -3,22 +3,11 @@ icon: fa-bandcamp download: true - name: Spotify - url: https://open.spotify.com/artist/5jprKqAFDZqYFTgiAmAUkJ + url: https://open.spotify.com/artist/55XpuZnmDjfZwhbTt1x1BP icon: fa-spotify download: false -- name: Apple Music - url: https://music.apple.com/us/artist/sakrecoer/1446870897 - icon: fa-apple - download: false -- name: Google Play - url: https://play.google.com/store/music/artist?id=Abe6ltznpx3qoh6wpfwh4hgmsxa - icon: fa-google-play - download: false -- name: Deezer - url: https://www.deezer.com/en/artist/56059462 +- name: Audius + url: https://audius.co/sakrecoer icon: fa-creative-commons-sampling download: false -- name: Napster - url: https://us.napster.com/artist/sakrecoer - icon: fa-napster - download: false + From ce6af1965fd2ae58c4de04413db46444f75738fa Mon Sep 17 00:00:00 2001 From: Set Sakrecoer Date: Mon, 14 Jun 2021 15:08:28 +0200 Subject: [PATCH 4/4] update to latest jekyll --- Gemfile | 2 +- Gemfile.lock | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Gemfile b/Gemfile index e3b3f02..066003e 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'jekyll', '4.0.0' +gem 'jekyll', '4.2.0' group :jekyll_plugins do gem 'jekyll-sitemap', '1.4.0' diff --git a/Gemfile.lock b/Gemfile.lock index 1940aa7..7ba612d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,31 +4,31 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) - ffi (1.15.0) + ffi (1.15.1) forwardable-extended (2.6.0) http_parser.rb (0.6.0) - i18n (1.8.9) + i18n (1.8.10) concurrent-ruby (~> 1.0) - jekyll (4.0.0) + jekyll (4.2.0) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (>= 0.9.5, < 2) + i18n (~> 1.0) jekyll-sass-converter (~> 2.0) jekyll-watch (~> 2.0) - kramdown (~> 2.1) + kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.3.3) + mercenary (~> 0.4.0) pathutil (~> 0.9) rouge (~> 3.0) safe_yaml (~> 1.0) - terminal-table (~> 1.8) + terminal-table (~> 2.0) jekyll-last-modified-at (1.1.0) jekyll (>= 3.7, < 5.0) posix-spawn (~> 0.3.9) @@ -43,23 +43,23 @@ GEM kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.5.0) + listen (3.5.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - mercenary (0.3.6) + mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) posix-spawn (0.3.15) public_suffix (4.0.6) - rb-fsevent (0.10.4) + rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) - rexml (3.2.4) + rexml (3.2.5) rouge (3.26.0) safe_yaml (1.0.5) sassc (2.4.0) ffi (~> 1.9) - terminal-table (1.8.0) + terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) unicode-display_width (1.7.0) @@ -67,7 +67,7 @@ PLATFORMS ruby DEPENDENCIES - jekyll (= 4.0.0) + jekyll (= 4.2.0) jekyll-last-modified-at (= 1.1.0) jekyll-sitemap (= 1.4.0)