From 0efb864eaf00fee344b9150d2ef8bdc903041863 Mon Sep 17 00:00:00 2001
From: Robin Dunlop <robin@dunlopweb.com>
Date: Thu, 24 Nov 2022 08:56:30 -0500
Subject: [PATCH] add google analytics 4 tracking code

---
 app/views/layouts/application.html.haml       |  1 +
 app/views/layouts/error.html.haml             |  1 +
 app/views/layouts/global.html.haml            |  1 +
 app/views/layouts/minimal.html.haml           |  1 +
 app/views/shared/analytics/_google_4.html.erb | 11 +++++++++++
 config/application.rb                         |  1 +
 6 files changed, 16 insertions(+)
 create mode 100644 app/views/shared/analytics/_google_4.html.erb

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 0d9653bb7..429aee620 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -11,6 +11,7 @@
 
     = csrf_meta_tags
     = render "shared/analytics/google"
+    = render "shared/analytics/google_4"
     /[if lt IE 7]
       <style media="screen" type="text/css">
       \#container {
diff --git a/app/views/layouts/error.html.haml b/app/views/layouts/error.html.haml
index 5ff7bb055..0ec0fa46f 100644
--- a/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@ -7,6 +7,7 @@
     = javascript_include_tag "application"
     = csrf_meta_tags
     = render "shared/analytics/google"
+    = render "shared/analytics/google_4"
     /[if lt IE 7]
       <style media="screen" type="text/css">
       \#container {
diff --git a/app/views/layouts/global.html.haml b/app/views/layouts/global.html.haml
index 19b6e5deb..e62a10a3c 100644
--- a/app/views/layouts/global.html.haml
+++ b/app/views/layouts/global.html.haml
@@ -7,6 +7,7 @@
     = javascript_include_tag "application"
     = csrf_meta_tags
     = render "shared/analytics/google"
+    = render "shared/analytics/google_4"
     /[if lt IE 7]
       <style media="screen" type="text/css">
       \#container {
diff --git a/app/views/layouts/minimal.html.haml b/app/views/layouts/minimal.html.haml
index e1483891d..3e54edf84 100644
--- a/app/views/layouts/minimal.html.haml
+++ b/app/views/layouts/minimal.html.haml
@@ -9,6 +9,7 @@
     = javascript_include_tag "application"
     = csrf_meta_tags
     = render "shared/analytics/google"
+    = render "shared/analytics/google_4"
     /[if lt IE 7]
       <style media="screen" type="text/css">
       \#container {
diff --git a/app/views/shared/analytics/_google_4.html.erb b/app/views/shared/analytics/_google_4.html.erb
new file mode 100644
index 000000000..b6efebb45
--- /dev/null
+++ b/app/views/shared/analytics/_google_4.html.erb
@@ -0,0 +1,11 @@
+<% if Rails.configuration.google_analytics_4_tracking_id.present? %>
+  <!-- Google tag (gtag.js) -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=<%= Rails.configuration.google_analytics_4_tracking_id %>"></script>
+  <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
+
+    gtag('config', '<%= Rails.configuration.google_analytics_4_tracking_id %>');
+  </script>
+<% end %>
diff --git a/config/application.rb b/config/application.rb
index 905017d4f..017ca8f70 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -115,6 +115,7 @@ class Application < Rails::Application
     config.recaptcha_minimum_score = ENV["RECAPTCHA_MINIMUM_SCORE"].presence
 
     config.google_analytics_tracking_id = ENV["GOOGLE_ANALYTICS_TRACKING_ID"]
+    config.google_analytics_4_tracking_id = ENV["GOOGLE_ANALYTICS_4_TRACKING_ID"]
 
     config.hcaptcha_site_key = ENV['HCAPTCHA_SITE_KEY']
     config.hcaptcha_secret = ENV['HCAPTCHA_SECRET']