From 146043869353365eee2709976aa2453019ba8257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20Nicou=C3=A9?= <contact@paulnicoue.com>
Date: Sun, 16 Mar 2025 17:45:51 +0100
Subject: [PATCH 1/4] Enforce PHP version

---
 composer.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 691188c..34ade3d 100644
--- a/composer.json
+++ b/composer.json
@@ -28,6 +28,9 @@
         "optimize-autoloader": true,
         "allow-plugins": {
             "getkirby/composer-installer": true
-        }
+        },
+        "platform": {
+            "php": "8.3"
+        },
     }
 }

From 2f56aef61b7aa0b3f409258eaace5baa34f4cf4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20Nicou=C3=A9?= <contact@paulnicoue.com>
Date: Sun, 16 Mar 2025 17:46:50 +0100
Subject: [PATCH 2/4] Remove analytics tab

---
 site/blueprints/site.yml                |  1 -
 site/blueprints/tabs/site_analytics.yml | 21 ---------------------
 2 files changed, 22 deletions(-)
 delete mode 100644 site/blueprints/tabs/site_analytics.yml

diff --git a/site/blueprints/site.yml b/site/blueprints/site.yml
index 180b66e..71afc42 100644
--- a/site/blueprints/site.yml
+++ b/site/blueprints/site.yml
@@ -4,4 +4,3 @@ title:
 tabs:
     content: tabs/site_content
     seo: tabs/site_seo
-    analytics: tabs/site_analytics
diff --git a/site/blueprints/tabs/site_analytics.yml b/site/blueprints/tabs/site_analytics.yml
deleted file mode 100644
index bafefb7..0000000
--- a/site/blueprints/tabs/site_analytics.yml
+++ /dev/null
@@ -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

From b0bed72a17a57291874c099653b4b5df3e6b7fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20Nicou=C3=A9?= <contact@paulnicoue.com>
Date: Sun, 16 Mar 2025 18:11:56 +0100
Subject: [PATCH 3/4] Remove Kirby Matomo plugin

---
 composer.json |  3 +--
 composer.lock | 50 ++++----------------------------------------------
 2 files changed, 5 insertions(+), 48 deletions(-)

diff --git a/composer.json b/composer.json
index 34ade3d..47dde13 100644
--- a/composer.json
+++ b/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"
@@ -31,6 +30,6 @@
         },
         "platform": {
             "php": "8.3"
-        },
+        }
     }
 }
diff --git a/composer.lock b/composer.lock
index e09b924..3793cbd 100644
--- a/composer.lock
+++ b/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": "4d30b2c251476acb970dea1ecb02e8fb",
+    "content-hash": "cbae6775c72f7f216b3cadb214a0fee3",
     "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"
 }

From 02a9ab387c8ef7b23c7b3f52d3b43754b2d0636b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20Nicou=C3=A9?= <contact@paulnicoue.com>
Date: Sun, 16 Mar 2025 18:29:56 +0100
Subject: [PATCH 4/4] Replace Matomo tracking script with Umami

---
 site/templates/base.twig | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/site/templates/base.twig b/site/templates/base.twig
index b259f56..ce7fa57 100644
--- a/site/templates/base.twig
+++ b/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', '3']);
-            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="836d3151-0470-4a49-a511-75851d501e09"
+            data-domains="julienmonnerie.com"
+            defer>
     </script>