From ed9bee0785b71f671ecaf48adb4721f987647a6e Mon Sep 17 00:00:00 2001
From: Odair Trujillo <haldrik@gmail.com>
Date: Sat, 20 Jun 2020 11:02:11 -0500
Subject: [PATCH] Migrating analytics.js to gtag.js as Google recommends.

---
 layouts/partials/footer.html | 19 -------------------
 layouts/partials/head.html   | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 5bc582fa55..fff9e09e73 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -40,22 +40,3 @@
 {{ "<!-- Main Script -->" | safeHTML }}
 {{ $script := resources.Get "js/script.js" | minify}}
 <script src="{{ $script.Permalink }}"></script>
-
-{{ "<!-- google analytics -->" | safeHTML }}
-{{ with .Site.Params.google_analytics_id }}
-<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),
-      m = s.getElementsByTagName(o)[0];
-    a.async = 1;
-    a.src = g;
-    m.parentNode.insertBefore(a, m)
-  })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
-  ga('create', '{{ . }}', 'auto');
-  ga('send', 'pageview');
-</script>
-{{ end }}
\ No newline at end of file
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 823c7edc61..9d5ff29fb0 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -25,4 +25,16 @@
 	<link rel="shortcut icon" href="{{ `images/favicon.png` | absURL }}" type="image/x-icon">
 	<link rel="icon" href="{{ `images/favicon.png` | absURL }}" type="image/x-icon">
 
-</head>
\ No newline at end of file
+	{{ with .Site.Params.google_analytics_id }}
+	{{ "<!-- Global Site Tag (gtag.js) - Google Analytics -->" | safeHTML }}
+	<script async src="https://www.googletagmanager.com/gtag/js?id={{ . }}"></script>
+	<script>
+	  window.dataLayer = window.dataLayer || [];
+	  function gtag(){dataLayer.push(arguments);}
+	  gtag('js', new Date());
+
+	  gtag('config', '{{ . }}');
+	</script>
+	{{ end }}
+
+</head>