From 964ab061cd6d0d87a7f4c86a241df4c58616c7c8 Mon Sep 17 00:00:00 2001 From: Milos Date: Thu, 8 Feb 2024 16:17:03 +0100 Subject: [PATCH 1/2] add matomo tracking --- package.json | 1 + src/main.js | 21 ++++++++++++++++++++- yarn.lock | 5 +++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index b9a5d16..4e68901 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "oidc-client-ts": "^2.1.0", "sass-loader": "^13.2.0", "vue": "^3.2.47", + "vue-matomo": "^4.2.0", "vue-router": "^4.1.5", "vue3-form-wizard": "^0.1.8", "vuex": "^4.0.2", diff --git a/src/main.js b/src/main.js index 3d95ed6..168b3e9 100644 --- a/src/main.js +++ b/src/main.js @@ -1,5 +1,6 @@ import { createApp } from "vue" import App from "./App.vue" +import VueMatomo from 'vue-matomo' import router from "./router" import store from "./store" import { sync } from "vuex-router-sync" @@ -16,7 +17,23 @@ library.add(faPencil) library.add(faTrash) library.add(faDownload) -const app = createApp(App) +let matomoHost = '' +let matomoSiteId = 0 +if(window.location.origin === 'http://localhost:8080') { + matomoHost = 'https://matomo.bbmri-eric.eu/' + matomoSiteId = 1 +}else if(window.location.origin === 'https://negotiator.acc.bbmri-eric.eu') { + matomoHost = 'https://negotiator.acc.bbmri-eric.eu' + matomoSiteId = 2 +}else if(window.location.origin === 'https://negotiator.bbmri-eric.eu') { + matomoHost = 'https://negotiator.bbmri-eric.eu' + matomoSiteId = 3 +} + +const app = createApp(App).use(VueMatomo, { + host: matomoHost, + siteId: matomoSiteId, + }) app.use(router) app.use(store) @@ -28,4 +45,6 @@ sync(store, router) app.mount("#app") +window._paq.push(['trackPageView']); // To track a page view + import "./assets/scss/bbmri.scss" diff --git a/yarn.lock b/yarn.lock index 70fc9f3..1b03857 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6720,6 +6720,11 @@ vue-loader@^17.0.0: hash-sum "^2.0.0" watchpack "^2.4.0" +vue-matomo@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/vue-matomo/-/vue-matomo-4.2.0.tgz#d65e369e4ead1d95ef790bef3627512cac3d25e9" + integrity sha512-m5hCw7LH3wPDcERaF4sp/ojR9sEx7Rl8TpOyH/4jjQxMF2DuY/q5pO+i9o5Dx+BXLSa9+IQ0qhAbWYRyESQXmA== + vue-router@^4.1.5: version "4.2.0" resolved "https://registry.npmjs.org/vue-router/-/vue-router-4.2.0.tgz" From 9b1f82f67fad643139b8cb80a4cbb1006c9a9790 Mon Sep 17 00:00:00 2001 From: Milos Date: Fri, 9 Feb 2024 16:21:19 +0100 Subject: [PATCH 2/2] add config --- src/config/matomo.js | 6 ++++++ src/main.js | 18 +++--------------- start.sh | 2 ++ 3 files changed, 11 insertions(+), 15 deletions(-) create mode 100644 src/config/matomo.js diff --git a/src/config/matomo.js b/src/config/matomo.js new file mode 100644 index 0000000..b34eb0a --- /dev/null +++ b/src/config/matomo.js @@ -0,0 +1,6 @@ +const matomo = { + matomoHost: "MATOMO_HOST_PLACEHOLDER", + matomoId: "MATOMO_SITE_ID_PLACEHOLDER" +} + +export default matomo \ No newline at end of file diff --git a/src/main.js b/src/main.js index 168b3e9..4145092 100644 --- a/src/main.js +++ b/src/main.js @@ -11,28 +11,16 @@ import "bootstrap/dist/css/bootstrap.css" import "bootstrap-vue-next/dist/bootstrap-vue-next.css" import "bootstrap" import "bootstrap-icons/font/bootstrap-icons.css" +import matomo from "./config/matomo.js" library.add(faSpinner) library.add(faPencil) library.add(faTrash) library.add(faDownload) -let matomoHost = '' -let matomoSiteId = 0 -if(window.location.origin === 'http://localhost:8080') { - matomoHost = 'https://matomo.bbmri-eric.eu/' - matomoSiteId = 1 -}else if(window.location.origin === 'https://negotiator.acc.bbmri-eric.eu') { - matomoHost = 'https://negotiator.acc.bbmri-eric.eu' - matomoSiteId = 2 -}else if(window.location.origin === 'https://negotiator.bbmri-eric.eu') { - matomoHost = 'https://negotiator.bbmri-eric.eu' - matomoSiteId = 3 -} - const app = createApp(App).use(VueMatomo, { - host: matomoHost, - siteId: matomoSiteId, + host: matomo.matomoHost, + siteId: matomo.matomoId, }) app.use(router) diff --git a/start.sh b/start.sh index 74c49eb..9b192da 100755 --- a/start.sh +++ b/start.sh @@ -10,6 +10,8 @@ do sed -i 's|REDIRECT_URI_PLACEHOLDER|'${REDIRECT_URI}'|g' $file sed -i 's|LOGOUT_URI_PLACEHOLDER|'${LOGOUT_URI}'|g' $file sed -i 's|RESOURCES_PLACEHOLDER|'${API_RESOURCES}'|g' $file + sed -i 's|MATOMO_HOST_PLACEHOLDER|'${MATOMO_HOST}'|g' $file + sed -i 's|MATOMO_SITE_ID_PLACEHOLDER|'${MATOMO_SITE_ID}'|g' $file done