Compare commits

...

4 commits

Author SHA1 Message Date
Paul Nicoué
c7dbf3db41 Replace Matomo tracking script with Umami 2025-03-16 18:30:36 +01:00
Paul Nicoué
fa4f9e954d Remove Kirby Matomo plugin 2025-03-16 18:11:52 +01:00
Paul Nicoué
529f46e127 Remove analytics tab 2025-03-16 17:47:04 +01:00
Paul Nicoué
b1d05bb60c Enforce PHP version 2025-03-16 17:45:28 +01:00
6 changed files with 23 additions and 97 deletions

View file

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

50
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "09877ff8a7587fbdc2433bf5549bf025", "content-hash": "985a8ce155a077a628d8c3b6a967518f",
"packages": [ "packages": [
{ {
"name": "claviska/simpleimage", "name": "claviska/simpleimage",
@ -747,51 +747,6 @@
}, },
"time": "2024-09-11T13:17:53+00:00" "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", "name": "symfony/deprecation-contracts",
"version": "v3.5.1", "version": "v3.5.1",
@ -1471,5 +1426,8 @@
"php": ">=8.1.0 <8.4.0" "php": ">=8.1.0 <8.4.0"
}, },
"platform-dev": {}, "platform-dev": {},
"platform-overrides": {
"php": "8.3"
},
"plugin-api-version": "2.6.0" "plugin-api-version": "2.6.0"
} }

View file

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

View file

@ -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

View file

@ -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

View file

@ -14,22 +14,16 @@
{# JavaScript #} {# JavaScript #}
{% block scripts %} {% block scripts %}
<script src="build/app.js" defer></script> <script src="build/app.js"
defer>
</script>
{% endblock %} {% endblock %}
{# Matomo #} {# Umami #}
<script> <script src="https://umami.paulnicoue.com/script.js"
var _paq = window._paq = window._paq || []; data-website-id="4bfdf124-4682-487b-943f-dcc1bd549edb"
_paq.push(['disableCookies']); data-domains="xiaowang.fr"
_paq.push(['trackPageView']); defer>
_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);
})();
</script> </script>
</head> </head>