From 9d5492c1d16ab012a855ad7e334b98b141c60b86 Mon Sep 17 00:00:00 2001 From: Taraskin Date: Sun, 28 Aug 2022 22:07:41 +0200 Subject: [PATCH 1/3] Added Google Analytics 4 snippet injection by using '@julian_cataldo/astro-analytics' --- package.json | 3 +++ src/layouts/BaseLayout.astro | 2 ++ 2 files changed, 5 insertions(+) diff --git a/package.json b/package.json index 67b4908..bd31622 100644 --- a/package.json +++ b/package.json @@ -19,5 +19,8 @@ "astro-icon": "^0.7.3", "reading-time": "^1.5.0", "subfont": "^6.9.0" + }, + "dependencies": { + "@julian_cataldo/astro-analytics": "^0.11.5" } } diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro index a48bf25..b9dc167 100644 --- a/src/layouts/BaseLayout.astro +++ b/src/layouts/BaseLayout.astro @@ -3,6 +3,7 @@ import "~/assets/styles/base.css"; import MetaTags from "~/components/core/MetaTags.astro"; import BasicScripts from "~/components/core/BasicScripts.astro"; +import Analytics from '@julian_cataldo/astro-analytics/Analytics.astro'; const { meta = {} } = Astro.props; --- @@ -12,6 +13,7 @@ const { meta = {} } = Astro.props; + From fe9141415a0237293eb33cebb62a820fdcfc3cdf Mon Sep 17 00:00:00 2001 From: prototypa <54446028+prototypa@users.noreply.github.com> Date: Sun, 28 Aug 2022 18:46:12 -0400 Subject: [PATCH 2/3] move astro-analytics to devDependencies for now For now we will prioritize SSG, later when everything is quite stable, we will review the possibility of making the template that works in SSR. --- package.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package.json b/package.json index bd31622..3615c92 100644 --- a/package.json +++ b/package.json @@ -14,13 +14,11 @@ "@astrojs/rss": "^1.0.0", "@astrojs/sitemap": "^1.0.0", "@astrojs/tailwind": "^1.0.0", + "@julian_cataldo/astro-analytics": "^0.11.5", "@tailwindcss/typography": "^0.5.4", "astro": "^1.0.0", "astro-icon": "^0.7.3", "reading-time": "^1.5.0", "subfont": "^6.9.0" - }, - "dependencies": { - "@julian_cataldo/astro-analytics": "^0.11.5" } } From 0ea029a242c2f1ff091e471d684d6b87d397cb22 Mon Sep 17 00:00:00 2001 From: prototypa <54446028+prototypa@users.noreply.github.com> Date: Sun, 28 Aug 2022 18:49:04 -0400 Subject: [PATCH 3/3] Make a settings in config for Google Analytics. --- src/layouts/BaseLayout.astro | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro index b9dc167..cf0f9af 100644 --- a/src/layouts/BaseLayout.astro +++ b/src/layouts/BaseLayout.astro @@ -1,4 +1,6 @@ --- +import { SITE } from "~/config.mjs" + import "~/assets/styles/base.css"; import MetaTags from "~/components/core/MetaTags.astro"; @@ -6,6 +8,7 @@ import BasicScripts from "~/components/core/BasicScripts.astro"; import Analytics from '@julian_cataldo/astro-analytics/Analytics.astro'; const { meta = {} } = Astro.props; +const { googleAnalyticsId = false } = SITE; --- @@ -13,7 +16,7 @@ const { meta = {} } = Astro.props; - + {googleAnalyticsId && } @@ -21,4 +24,4 @@ const { meta = {} } = Astro.props; - \ No newline at end of file +