Fixed up Google Analytics 4 (gtag)

paulmwatson · paulmwatson · commit ecf84d5e2ee7 · 2024-01-24T10:48:39.000+02:00
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -25,6 +25,7 @@ services:
       - GOOGLE_RECAPTCHA_SECRET_KEY
       - ENVIRONMENT=development
       - SENTRY_DSN=https://36d69cae4d76e0452f3fbdbb5019a279@o242378.ingest.sentry.io/5246237
+      - GOOGLE_ANALYTICS_ID=G-T25P07Y7G2
     ports:
       - "8000:8000"
     command: bin/wait-for-deps.sh python manage.py runserver 0.0.0.0:8000
diff --git a/pombola/admin_additions/templates/admin/base_site.html b/pombola/admin_additions/templates/admin/base_site.html
@@ -47,6 +47,7 @@
     //]]>
     </script>
 
+    {% if settings.GOOGLE_ANALYTICS_ACCOUNT %}
     <script type="text/javascript">
       (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),
@@ -56,6 +57,7 @@
       ga('create', '{{ settings.GOOGLE_ANALYTICS_ACCOUNT }}');
       ga('send', 'pageview');
     </script>
+    {% endif %}
 
     {% include 'autocomplete_light/static.html' %}
 
diff --git a/pombola/core/context_processors.py b/pombola/core/context_processors.py
@@ -8,6 +8,7 @@ def add_settings( request ):
         'settings': {
             'STAGING':                      settings.STAGING,
             'GOOGLE_ANALYTICS_ACCOUNT':     settings.GOOGLE_ANALYTICS_ACCOUNT,
+            'GOOGLE_ANALYTICS_ID':          settings.GOOGLE_ANALYTICS_ID,
             'POLLDADDY_WIDGET_ID':          settings.POLLDADDY_WIDGET_ID,
             'DISQUS_SHORTNAME':             settings.DISQUS_SHORTNAME,
             'DISQUS_USE_IDENTIFIERS':       settings.DISQUS_USE_IDENTIFIERS,
diff --git a/pombola/settings/base.py b/pombola/settings/base.py
@@ -346,6 +346,7 @@
 # misc settings
 HTTPLIB2_CACHE_DIR = os.path.join(data_dir, "httplib2_cache")
 GOOGLE_ANALYTICS_ACCOUNT = os.environ.get("GOOGLE_ANALYTICS_ACCOUNT", None)
+GOOGLE_ANALYTICS_ID = os.environ.get("GOOGLE_ANALYTICS_ID", None)
 GOOGLE_SITE_VERIFICATION = os.environ.get("GOOGLE_SITE_VERIFICATION", None)
 
 # Markitup settings
diff --git a/pombola/settings/south_africa.py b/pombola/settings/south_africa.py
@@ -44,6 +44,3 @@
         },
     'TIMEOUT': 60*60*24,
 }
-
-
-GOOGLE_ANALYTICS_ID = 'G-RK0Z57HMF6'
diff --git a/pombola/templates/default_base.html b/pombola/templates/default_base.html
@@ -1,6 +1,17 @@
 <!DOCTYPE html>
 <html lang="{% block html_lang %}en{% endblock %}" class="no-js">
     <head>
+        {% if settings.GOOGLE_ANALYTICS_ID %}
+        <!-- Google tag (gtag.js) -->
+        <script async src="https://www.googletagmanager.com/gtag/js?id={{ settings.GOOGLE_ANALYTICS_ID }}"></script>
+        <script>
+            window.dataLayer = window.dataLayer || [];
+            function gtag(){dataLayer.push(arguments);}
+            gtag('js', new Date());
+
+            gtag('config', '{{ settings.GOOGLE_ANALYTICS_ID }}');
+        </script>
+        {% endif %}
 {% comment %}
 
   The Google Analytics documentation says that the experiment
@@ -81,14 +92,6 @@
         {% block extra_headers %}{% endblock %}
 
     </head>
-    <script async src="https://www.googletagmanager.com/gtag/js?id={{ settings.GOOGLE_ANALYTICS_ID }}"></script>
-    <script>
-    window.dataLayer = window.dataLayer || [];
-    function gtag(){dataLayer.push(arguments);}
-    gtag('js', new Date());
-
-    gtag('config', '{{ settings.GOOGLE_ANALYTICS_ID }}');
-    </script>
     <body {% block body_attributes %}{% endblock %}>
 
         {% block header %}

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,3 @@`
`44`	`44`	`},`
`45`	`45`	`'TIMEOUT': 606024,`
`46`	`46`	`}`
`47`		`-`
`48`		`-`
`49`		`-GOOGLE_ANALYTICS_ID = 'G-RK0Z57HMF6'`