From 6e9f1e602e7738367cb9788afa4b7d0cf8429fcc Mon Sep 17 00:00:00 2001
From: Johan Guldmyr <martbhell@protonmail.com>
Date: Sun, 16 Apr 2023 09:52:55 +0300
Subject: [PATCH 1/3] Add support for GA4 gtag.js Google Analytics

---
 alchemy/templates/include/analytics.html | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/alchemy/templates/include/analytics.html b/alchemy/templates/include/analytics.html
index a8a97e8..4950fe5 100644
--- a/alchemy/templates/include/analytics.html
+++ b/alchemy/templates/include/analytics.html
@@ -16,6 +16,18 @@
   </script>
 {% endif %}
 
+{% if GOOGLE_ANALYTICS_GTAG %}
+  <!-- Google tag (gtag.js) -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id={{ GOOGLE_ANALYTICS_GTAG }}"></script>
+  <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
+  
+    gtag('config', '{{ GOOGLE_ANALYTICS_GTAG }}');
+  </script>
+{% endif %}
+
 {% if GAUGES %}
   <script>
     var _gauges = _gauges || [];

From 94e078c72bb5befb39bcb5221b2aef073d85f7c7 Mon Sep 17 00:00:00 2001
From: Johan Guldmyr <martbhell@protonmail.com>
Date: Sun, 16 Apr 2023 10:03:54 +0300
Subject: [PATCH 2/3] Not adding another newline to every page

Using jinja2 whitespace control.
---
 alchemy/templates/include/analytics.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/alchemy/templates/include/analytics.html b/alchemy/templates/include/analytics.html
index 4950fe5..b8eebba 100644
--- a/alchemy/templates/include/analytics.html
+++ b/alchemy/templates/include/analytics.html
@@ -16,8 +16,7 @@
   </script>
 {% endif %}
 
-{% if GOOGLE_ANALYTICS_GTAG %}
-  <!-- Google tag (gtag.js) -->
+{%- if GOOGLE_ANALYTICS_GTAG %}
   <script async src="https://www.googletagmanager.com/gtag/js?id={{ GOOGLE_ANALYTICS_GTAG }}"></script>
   <script>
     window.dataLayer = window.dataLayer || [];
@@ -26,7 +25,7 @@
   
     gtag('config', '{{ GOOGLE_ANALYTICS_GTAG }}');
   </script>
-{% endif %}
+{%- endif %}
 
 {% if GAUGES %}
   <script>

From 26937d659f6c598419dc88a11f2d988f6ca5faa3 Mon Sep 17 00:00:00 2001
From: Johan Guldmyr <martbhell@protonmail.com>
Date: Mon, 17 Apr 2023 10:59:43 +0300
Subject: [PATCH 3/3] Replace old analytics.js with gtag.js

---
 alchemy/templates/include/analytics.html | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/alchemy/templates/include/analytics.html b/alchemy/templates/include/analytics.html
index b8eebba..88046ee 100644
--- a/alchemy/templates/include/analytics.html
+++ b/alchemy/templates/include/analytics.html
@@ -1,31 +1,13 @@
 {% if GOOGLE_ANALYTICS %}
-  <script>
-    (function(i, s, o, g, r, a, m) {
-      i['GoogleAnalyticsObject'] = r;
-      i[r] = i[r] || function() {
-        (i[r].q = i[r].q || []).push(arguments)
-      }, i[r].l = 1 * new Date();
-      a = s.createElement(o);
-      a.async = 1;
-      a.src = g;
-      m = s.getElementsByTagName(o)[0];
-      m.parentNode.insertBefore(a, m)
-    })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
-    ga('create', '{{ GOOGLE_ANALYTICS }}', 'auto');
-    ga('send', 'pageview');
-  </script>
-{% endif %}
-
-{%- if GOOGLE_ANALYTICS_GTAG %}
-  <script async src="https://www.googletagmanager.com/gtag/js?id={{ GOOGLE_ANALYTICS_GTAG }}"></script>
+  <script async src="https://www.googletagmanager.com/gtag/js?id={{ GOOGLE_ANALYTICS }}"></script>
   <script>
     window.dataLayer = window.dataLayer || [];
     function gtag(){dataLayer.push(arguments);}
     gtag('js', new Date());
   
-    gtag('config', '{{ GOOGLE_ANALYTICS_GTAG }}');
+    gtag('config', '{{ GOOGLE_ANALYTICS }}');
   </script>
-{%- endif %}
+{% endif %}
 
 {% if GAUGES %}
   <script>