From 959f81474baa01ffa15f5c613f45bfbf50d62f21 Mon Sep 17 00:00:00 2001
From: jywarren <jeff@unterbahn.com>
Date: Fri, 23 Feb 2018 12:21:40 -0500
Subject: [PATCH] ga fixes

---
 app/assets/javascripts/application.js        |  3 +--
 app/assets/javascripts/google_analytics.js   |  6 ------
 app/views/layouts/_google_analytics.html.erb | 15 ++++++++-------
 3 files changed, 9 insertions(+), 15 deletions(-)
 delete mode 100644 app/assets/javascripts/google_analytics.js

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index c29f1006aa..160f94c11c 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -48,7 +48,6 @@
 //= require short-code-forms/dist/short-code-prompts.js
 //= require wikis.js
 //= require chart.js/dist/Chart.js
-//  require turbolinks // Temporarily removed while fixing
-//= require google_analytics.js
 //= require header_footer.js
+//  require turbolinks // Temporarily removed while fixing
 
diff --git a/app/assets/javascripts/google_analytics.js b/app/assets/javascripts/google_analytics.js
deleted file mode 100644
index c7b9a1b113..0000000000
--- a/app/assets/javascripts/google_analytics.js
+++ /dev/null
@@ -1,6 +0,0 @@
-$(document).on("ready turbolinks:load", function() {
-	if (typeof ga == "function"){
-		ga("set", "location", event.data.url)
-    	ga("send", "pageview")	
-	}
-});
diff --git a/app/views/layouts/_google_analytics.html.erb b/app/views/layouts/_google_analytics.html.erb
index 765cdd8db4..9740309256 100644
--- a/app/views/layouts/_google_analytics.html.erb
+++ b/app/views/layouts/_google_analytics.html.erb
@@ -1,9 +1,10 @@
 <% if Rails.env.production? %>
-    <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','https://www.google-analytics.com/analytics.js','ga');
-      ga("create", "UA-180781-33", "auto");
-    </script>
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=UA-180781-33"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+  gtag('config', 'UA-180781-33');
+</script>
 <% end %>