From b1d05bb60c9a27d43be3acc8ae4d6353412a5dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Nicou=C3=A9?= Date: Sun, 16 Mar 2025 17:45:28 +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 47d34bd..7d77700 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 529f46e127a95b30fa9b5bb297750b392c65bb96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Nicou=C3=A9?= Date: Sun, 16 Mar 2025 17:47:04 +0100 Subject: [PATCH 2/4] Remove analytics tab --- site/blueprints/site.yml | 11 ++++++++--- site/blueprints/tabs/site_analytics.yml | 21 --------------------- site/blueprints/tabs/site_content.yml | 12 ------------ 3 files changed, 8 insertions(+), 36 deletions(-) delete mode 100644 site/blueprints/tabs/site_analytics.yml delete mode 100644 site/blueprints/tabs/site_content.yml diff --git a/site/blueprints/site.yml b/site/blueprints/site.yml index b7b6729..abad4a7 100644 --- a/site/blueprints/site.yml +++ b/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 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 diff --git a/site/blueprints/tabs/site_content.yml b/site/blueprints/tabs/site_content.yml deleted file mode 100644 index 88d36f8..0000000 --- a/site/blueprints/tabs/site_content.yml +++ /dev/null @@ -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 From fa4f9e954d855b70ea08919fb5e50be69ef461be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Nicou=C3=A9?= Date: Sun, 16 Mar 2025 18:11:52 +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 7d77700..d97ada4 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 af0ddaf..ee89627 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": "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" } From c7dbf3db418b10622c06363e87eca86ca380696c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20Nicou=C3=A9?= Date: Sun, 16 Mar 2025 18:30:36 +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 60d3c00..5fa78ee 100644 --- a/site/templates/base.twig +++ b/site/templates/base.twig @@ -14,22 +14,16 @@ {# JavaScript #} {% block scripts %} - + {% endblock %} - {# Matomo #} -