Replace Matomo tracking script with Umami

composer.json

@@ -13,7 +13,6 @@
     "require": {
         "php": ">=8.1.0 <8.4.0",
         "getkirby/cms": "^3.10.0",
-        "sylvainjule/matomo": "^2.0.0",
         "kirbyzone/sitemapper": "^1.2.1",
         "mullema/k3-image-clip": "^3.2",
         "wearejust/kirby-twig": "^5.0"
@@ -28,6 +27,9 @@
         "optimize-autoloader": true,
         "allow-plugins": {
             "getkirby/composer-installer": true
+        },
+        "platform": {
+            "php": "8.3"
         }
     }
 }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "09877ff8a7587fbdc2433bf5549bf025",
+    "content-hash": "985a8ce155a077a628d8c3b6a967518f",
     "packages": [
         {
             "name": "claviska/simpleimage",
@@ -747,51 +747,6 @@
             },
             "time": "2024-09-11T13:17:53+00:00"
         },
-        {
-            "name": "sylvainjule/matomo",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sylvainjule/kirby-matomo.git",
-                "reference": "ce5da6b1427da225efe3ebc05c3a1a4d6b7781c2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sylvainjule/kirby-matomo/zipball/ce5da6b1427da225efe3ebc05c3a1a4d6b7781c2",
-                "reference": "ce5da6b1427da225efe3ebc05c3a1a4d6b7781c2",
-                "shasum": ""
-            },
-            "require": {
-                "getkirby/composer-installer": "^1.1"
-            },
-            "type": "kirby-plugin",
-            "extra": {
-                "installer-name": "matomo"
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Sylvain Julé",
-                    "email": "contact@sylvain-jule.fr"
-                },
-                {
-                    "name": "Sören Engels"
-                },
-                {
-                    "name": "Philipp Trenz",
-                    "email": "mail@philipptrenz.de"
-                }
-            ],
-            "description": "Matomo helpers, panel area and sections for Kirby",
-            "support": {
-                "issues": "https://github.com/sylvainjule/kirby-matomo/issues",
-                "source": "https://github.com/sylvainjule/kirby-matomo/tree/2.0.1"
-            },
-            "time": "2024-05-04T17:36:22+00:00"
-        },
         {
             "name": "symfony/deprecation-contracts",
             "version": "v3.5.1",
@@ -1471,5 +1426,8 @@
         "php": ">=8.1.0 <8.4.0"
     },
     "platform-dev": {},
+    "platform-overrides": {
+        "php": "8.3"
+    },
     "plugin-api-version": "2.6.0"
 }

site/blueprints/site.yml

@@ -1,6 +1,11 @@
 title:
     en: Website
     fr: Site web
-tabs:
-    content: tabs/site_content
-    analytics: tabs/site_analytics
+columns:
+    - width: 1/4
+        sticky: true
+        sections:
+            pages: sections/site_content_pages
+    - width: 3/4
+        sections:
+            galleries: sections/site_content_galleries

site/blueprints/tabs/site_analytics.yml

@@ -1,21 +0,0 @@
-label:
-    en: Analytics
-    fr: Audience
-icon: chart
-columns:
-    - width: 1/4
-        sticky: true
-        sections:
-            sidebar:
-                type: matomo-sidebar
-                link: false
-    - width: 3/4
-        sections:
-            main:
-                type: matomo-main
-                periods:
-                    - year
-                    - month
-                    - week
-                defaults:
-                    period: week

site/blueprints/tabs/site_content.yml

@@ -1,12 +0,0 @@
-label:
-    en: Website
-    fr: Site web
-icon: home
-columns:
-    - width: 1/4
-        sticky: true
-        sections:
-            pages: sections/site_content_pages
-    - width: 3/4
-        sections:
-            galleries: sections/site_content_galleries

site/templates/base.twig

@@ -14,22 +14,16 @@
 
     {# JavaScript #}
     {% block scripts %}
-        <script src="build/app.js" defer></script>
+        <script src="build/app.js"
+                defer>
+        </script>
     {% endblock %}
 
-    {# Matomo #}
-    <script>
-        var _paq = window._paq = window._paq || [];
-        _paq.push(['disableCookies']);
-        _paq.push(['trackPageView']);
-        _paq.push(['enableLinkTracking']);
-        (function() {
-            var u="//matomo.paulnicoue.com/";
-            _paq.push(['setTrackerUrl', u+'matomo.php']);
-            _paq.push(['setSiteId', '2']);
-            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-            g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-        })();
+    {# Umami #}
+    <script src="https://umami.paulnicoue.com/script.js"
+            data-website-id="4bfdf124-4682-487b-943f-dcc1bd549edb"
+            data-domains="xiaowang.fr"
+            defer>
     </script>
 
 </head>