From b30445a5f32b281f485e95c12b4b065fafe95f1b Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 10 Sep 2018 20:21:39 +0200
Subject: [PATCH] Update Google Analytics tracking code.

---
 resources/views/layout/default.twig | 21 +++++++--------------
 resources/views/layout/empty.twig   | 21 +++++++--------------
 resources/views/layout/guest.twig   | 22 +++++++---------------
 3 files changed, 21 insertions(+), 43 deletions(-)

diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig
index 70bf4aa925..43b947ac6f 100644
--- a/resources/views/layout/default.twig
+++ b/resources/views/layout/default.twig
@@ -200,21 +200,14 @@
 {% block scripts %}{% endblock %}
 
 {% if env('ANALYTICS_ID','') != '' %}
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id={{ env('ANALYTICS_ID', 'XXX-XX-X') }}"></script>
     <script>
-        // send pageview
-        (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', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100});
-        ga('send', 'pageview');
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag('js', new Date());
+
+        gtag('config', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}');
     </script>
 {% endif %}
 
diff --git a/resources/views/layout/empty.twig b/resources/views/layout/empty.twig
index 66cd7309b8..8fa38db2ed 100644
--- a/resources/views/layout/empty.twig
+++ b/resources/views/layout/empty.twig
@@ -42,21 +42,14 @@
 
 <script src="js/app.js?v={{ FF_VERSION }}" type="text/javascript"></script>
 {% if env('ANALYTICS_ID','') != '' %}
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id={{ env('ANALYTICS_ID', 'XXX-XX-X') }}"></script>
     <script>
-        // send pageview
-        (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', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100});
-        ga('send', 'pageview');
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag('js', new Date());
+
+        gtag('config', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}');
     </script>
 {% endif %}
 </body>
diff --git a/resources/views/layout/guest.twig b/resources/views/layout/guest.twig
index 72573e1217..f816125985 100644
--- a/resources/views/layout/guest.twig
+++ b/resources/views/layout/guest.twig
@@ -50,23 +50,15 @@
 </div>
 <script src="js/app.js?v={{ FF_VERSION }}" type="text/javascript"></script>
 <script type="text/javascript" src="js/ff/guest.js?v={{ FF_VERSION }}"></script>
-
 {% if env('ANALYTICS_ID','') != '' %}
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id={{ env('ANALYTICS_ID', 'XXX-XX-X') }}"></script>
     <script>
-        // send pageview
-        (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', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100});
-        ga('send', 'pageview');
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag('js', new Date());
+
+        gtag('config', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}');
     </script>
 {% endif %}
 </body>