From be22e9c1e61a228441c5eeeaf1861f10a714f10c Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <nickdesaulniers@users.noreply.github.com>
Date: Fri, 10 Feb 2023 15:43:00 -0800
Subject: Support Google Analytics 4 using hugo internal template (#76)

* Support Google Analytics 4 using hugo internal template

Use https://gohugo.io/templates/internal/#google-analytics
in footer partial. Update sample-config.toml; googleAnalytics
now needs to be top level rather than under [params] for the
internal template to work. This might be a concern for folks
upgrading their Hugo-Octopress theme.

Fixes: #75

* remove duplicate google analytics tag from header

It's already in the footer, and
https://gohugo.io/templates/internal/#use-the-google-analytics-template
states that "The async template is not suitable for Google Analytics 4."
which is the non-depracated version of GA.

Keep the sync script in the footer to not block page loading.
---
 layouts/partials/footer.html | 9 +--------
 layouts/partials/header.html | 3 ---
 sample-config.toml           | 8 +++++---
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 4817304..6569b9c 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -26,13 +26,6 @@
     {{ end }}
     <!-- End Piwik Code -->
 
-    {{ with .Site.Params.googleAnalytics }}
-      <script>
-        var _gaq=[['_setAccount','{{ . }}'],['_trackPageview']];
-        (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
-        g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
-        s.parentNode.insertBefore(g,s)}(document,'script'));
-      </script>
-    {{ end }}
+    {{ template "_internal/google_analytics.html" . }}
   </body>
 </html>
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 6294536..2ebd50a 100755
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -51,9 +51,6 @@
   <!-- Generator version for usage tracking -->
   {{ hugo.Generator }}
 
-  <!-- Google Analytics -->
-  {{ template "_internal/google_analytics_async.html" . }}
-
   <!-- Enable Twitter card -->
   {{ with .Site.Params.twitterCardEnabled }}
     {{ partial "custom_twitter_card.html" $ }}
diff --git a/sample-config.toml b/sample-config.toml
index ab48af1..5f77ded 100755
--- a/sample-config.toml
+++ b/sample-config.toml
@@ -87,9 +87,6 @@ post = "/blog/:year-:month-:day-:title/" # change the post URL to look like the
   # For example, &rarr; == right arrow.
   continueReadingText = "Would you like to know more? &rarr;"
 
-  # Google analytics code - remove if you do not have/want Google Analytics - needs JavaScript
-  # googleAnalytics = "UA-XXXXX-X"
-
   # Optional piwik tracking
   # [params.analytics.piwik]
   #  URL = "https://stats.example.com"
@@ -154,6 +151,11 @@ post = "/blog/:year-:month-:day-:title/" # change the post URL to look like the
   # Site's custom favicon, this is a relative path to the `/static` directory
   # favicon = "newfav.png"
 
+# Google analytics code - remove if you do not have/want Google
+# Analytics - needs JavaScript.
+# googleAnalytics = "G-MEASUREMENT_ID"
+
+
 # Menu
 # If navigationNewWindow (under [params]) is set to true then all links except root ("/") will open in a new window
 # If it does not exist or is set to false then links will open in the same window
-- 
cgit v1.2.3