feat: add plausible analytics & rm GTM

fivehanz · Sep 13, 2024 · cb62bc8 · cb62bc8
1 parent 75c53c9
commit cb62bc8
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 37 deletions.
diff --git a/base/migrations/0004_delete_googletagmanagersettings.py b/base/migrations/0004_delete_googletagmanagersettings.py
@@ -0,0 +1,16 @@
+# Generated by Django 5.0.7 on 2024-09-13 17:16
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0003_googletagmanagersettings'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='GoogleTagManagerSettings',
+        ),
+    ]
diff --git a/base/models.py b/base/models.py
@@ -47,23 +47,23 @@ class NavigationSettings(BaseGenericSetting):
     ]
 
 
-@register_setting
-class GoogleTagManagerSettings(BaseSiteSetting):
-    """ google tag manager id settings """
-
-    class Meta:
-        verbose_name = "Google Tag Manager"
-
-    google_tag_manager_id = models.CharField(
-        verbose_name="Google Tag Manager ID",
-        max_length=255,
-        blank=True,
-        help_text='Begins with "GTM-"',
-    )
-
-    panels = [
-        FieldPanel("google_tag_manager_id"),
-    ]
+# @register_setting
+# class GoogleTagManagerSettings(BaseSiteSetting):
+#     """ google tag manager id settings """
+
+#     class Meta:
+#         verbose_name = "Google Tag Manager"
+
+#     google_tag_manager_id = models.CharField(
+#         verbose_name="Google Tag Manager ID",
+#         max_length=255,
+#         blank=True,
+#         help_text='Begins with "GTM-"',
+#     )
+
+#     panels = [
+#         FieldPanel("google_tag_manager_id"),
+#     ]
 
 
 class FormField(AbstractFormField):

diff --git a/hanz/settings/base.py b/hanz/settings/base.py
@@ -45,6 +45,7 @@
     "wagtail.search",
     "wagtail.admin",
     "wagtail",
+    "plausible.contrib.wagtail",
     "modelcluster",
     "taggit",
     "django.contrib.admin",

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -25,6 +25,7 @@ django-anymail = "<12,>=11.0"
 wagtail-storages = "<2,>=1.1"
 celery = "^5.4.0"
 django-celery-beat = "^2.6.0"
+django-plausible = "^0.5.0"
 
 
 [tool.poetry.group.dev.dependencies]

diff --git a/templates/base.html b/templates/base.html
@@ -6,7 +6,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    
+
     <!-- SEO -->
     {% include "wagtailseo/meta.html" %}
 
@@ -36,7 +36,7 @@
     {% compress css file tailwind %}
       <link rel="stylesheet" href="{% static 'css/output.css' %}">
     {% endcompress %}
-    
+
     {% block extra_css %}
       {# Override this in templates to add extra stylesheets #}
     {% endblock %}
@@ -45,22 +45,6 @@
     {% compress js file htmx %}
       <script defer src="{% static 'js/htmx.min.js' %}"></script>
     {% endcompress %}
-
-    <!-- Google Tag Manager -->
-    {% block tracking %}
-      {% if settings.base.GoogleTagManagerSettings.google_tag_manager_id %}
-        {% compress js inline gtm %}
-          <script>
-            (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-            new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-            j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-            'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-            })(window,document,'script','dataLayer','{{ settings.base.GoogleTagManagerSettings.google_tag_manager_id }}');
-          </script>
-        {% endcompress %}
-      {% endif %}
-    {% endblock %}
-    <!-- end Google Tag Manager -->
   </head>
 
   <body class="bg-white dark:bg-gray-800 max-w-screen-xl mx-auto {% block body_class %}{% endblock %}" {% block body_attributes %}{% endblock %}>
@@ -97,7 +81,7 @@
     <!--   }) -->
     </script>
     {% endcompress %}
-    
+
     {% block extra_js %}
       {# Override this in templates to add extra javascript #}
     {% endblock %}