From 1457cada5998a045852656ad42955ee62e483703 Mon Sep 17 00:00:00 2001 From: gromdimon Date: Mon, 6 Nov 2023 13:44:14 +0100 Subject: [PATCH 1/3] fix: matomo linkage --- frontend/index.html | 16 ---------------- frontend/src/main.ts | 14 +++++++++++++- frontend/src/plugins/matomo.ts | 20 ++++++++++---------- 3 files changed, 23 insertions(+), 27 deletions(-) diff --git a/frontend/index.html b/frontend/index.html index 80fc9f82..b039948d 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -5,22 +5,6 @@ Loading REEV... - - - -
diff --git a/frontend/src/main.ts b/frontend/src/main.ts index f20881a3..3ab61783 100644 --- a/frontend/src/main.ts +++ b/frontend/src/main.ts @@ -5,7 +5,7 @@ */ // Components // Composables -import { createApp } from 'vue' +import { createApp, nextTick } from 'vue' // Plugins import { registerPlugins } from '@/plugins' @@ -18,6 +18,18 @@ async function bootstrap() { await registerPlugins(app) app.mount('#app') + await nextTick() + + // @ts-ignore + window._paq.push(['trackPageView']) + // @ts-ignore + window._paq.push(['enableLinkTracking']) + const d = document, + g = d.createElement('script'), + s = d.getElementsByTagName('script')[0] + g.async = true + g.src = 'https://matomo.charite.de/matomo.js' + s.parentNode.insertBefore(g, s) } bootstrap() diff --git a/frontend/src/plugins/matomo.ts b/frontend/src/plugins/matomo.ts index 3489b3af..4097c7d2 100644 --- a/frontend/src/plugins/matomo.ts +++ b/frontend/src/plugins/matomo.ts @@ -12,17 +12,17 @@ async function setupMatomo(app: App, router: any) { try { const client = new SettingsClient() const response = await client.fetchFrontendSettings() - if (!response['matomo_host'] || !response['matomo_site_id']) { - throw new Error('Matomo host and site ID must be set') + if (response['matomo_host'] && response['matomo_site_id']) { + app.use(VueMatomo, { + host: response['matomo_host'], + siteId: response['matomo_site_id'], + router: router, + enableLinkTracking: true, + trackInitialView: true, + requireConsent: true, + disableCookies: true + }) } - - app.use(VueMatomo, { - host: response['matomo_host'], - siteId: response['matomo_site_id'], - router: router, - requireConsent: true, - disableCookies: true - }) } catch (error) { console.error('Failed to initialize Matomo:', error) } From 7f81b2b1bb970d6b4388c883094f57f61cd1b18d Mon Sep 17 00:00:00 2001 From: gromdimon Date: Mon, 6 Nov 2023 14:18:25 +0100 Subject: [PATCH 2/3] wip --- frontend/src/main.ts | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/frontend/src/main.ts b/frontend/src/main.ts index 3ab61783..6dbd0afd 100644 --- a/frontend/src/main.ts +++ b/frontend/src/main.ts @@ -18,18 +18,9 @@ async function bootstrap() { await registerPlugins(app) app.mount('#app') - await nextTick() - // @ts-ignore + await nextTick() window._paq.push(['trackPageView']) - // @ts-ignore - window._paq.push(['enableLinkTracking']) - const d = document, - g = d.createElement('script'), - s = d.getElementsByTagName('script')[0] - g.async = true - g.src = 'https://matomo.charite.de/matomo.js' - s.parentNode.insertBefore(g, s) } bootstrap() From d2149b695f4c0a7993948ee9dbb06c380ce62101 Mon Sep 17 00:00:00 2001 From: gromdimon Date: Mon, 6 Nov 2023 14:46:59 +0100 Subject: [PATCH 3/3] revert index --- frontend/index.html | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/frontend/index.html b/frontend/index.html index b039948d..2ee8d7a7 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -5,6 +5,22 @@ Loading REEV... + + + +