@@ -41,6 +42,8 @@ const { i18n } = declareComponentKeys<
| "legalFrameworkText"
| "cookiesTitle"
| "cookiesText"
+ | "trackingTitle"
+ | "trackingText"
| "copyrightTitle"
| "copyrightText"
| "publisherInformationTitle"
diff --git a/src/i18n/resources/en.tsx b/src/i18n/resources/en.tsx
index 1fa95cb..4080359 100644
--- a/src/i18n/resources/en.tsx
+++ b/src/i18n/resources/en.tsx
@@ -227,6 +227,8 @@ export const translations: Translations<"en"> = {
"cookiesTitle": "Cookie Management",
"cookiesText":
"This portal does not use any cookies that require user consent. Therefore, you do not need to accept their use before continuing your browsing.",
+ "trackingTitle": "Audience Tracking",
+ "trackingText": "The Insee ensures the measurement of the audience on this site using the Matomo solution. This traffic tracking tool is recommended by the CNIL (National Commission on Informatics and Liberty, France) and has been configured to comply with its recommendations. It is particularly protective of your personal data. This data is only accessible to Insee and is not shared with any external company (including Matomo). Your IP is anonymized, and your information is deleted after 13 months. As configured on this site, audience tracking does not require prior consent, but you can choose to disable it by unchecking the box below.",
"copyrightTitle": "Copyright",
"copyrightText":
"Any reproduction of trademarks and logos displayed on this site for purposes other than strictly private is strictly prohibited.",
diff --git a/src/i18n/resources/fr.tsx b/src/i18n/resources/fr.tsx
index c70c370..156c629 100644
--- a/src/i18n/resources/fr.tsx
+++ b/src/i18n/resources/fr.tsx
@@ -227,6 +227,8 @@ export const translations: Translations<"fr"> = {
"cookiesTitle": "Gestion des cookies",
"cookiesText":
"Ce portail n’utilise aucun cookie nécessitant un consentement des usagers. C’est pourquoi vous n’avez pas à accepter leur utilisation avant de poursuivre votre navigation.",
+ "trackingTitle": "Suivi d'audience",
+ "trackingText": "L’Insee assure la mesure de l’audience sur ce site à l’aide de la solution Matomo. Cet outil de suivi de trafic est recommandé par la Cnil (Commission Nationale de l'Informatique et des Libertés, France) et a été configuré pour respecter les préconisations de celle-ci. Il est particulièrement protecteur de vos données personnelles. Celles-ci ne sont accessibles que par l’Insee et ne sont pas transmises à une entreprise extérieure (y compris Matomo). Votre IP est anonymisée et vos informations supprimées après 13 mois. Tel que configuré sur ce site, le suivi d’audience ne requiert pas de consentement a priori, mais vous pouvez choisir de le désactiver en décochant la case ci-dessous.",
"copyrightTitle": "Copyright",
"copyrightText":
"Toute reproduction pour un usage autre que strictement privé des marques et logos affichés sur le présent site est rigoureusement interdite.",
From 755771e5851419f0ebf486edb9e2565a38816d17 Mon Sep 17 00:00:00 2001
From: Eric Thuaud <58465319+EricThuaud@users.noreply.github.com>
Date: Tue, 5 Nov 2024 13:02:27 +0100
Subject: [PATCH 05/10] feat - add matomo monitoring
---
index.html | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/index.html b/index.html
index 31e5013..b55be59 100644
--- a/index.html
+++ b/index.html
@@ -25,17 +25,12 @@
From eab23663e55c566107d73c12d2274512cb6b3fcf Mon Sep 17 00:00:00 2001
From: Eric Thuaud <58465319+EricThuaud@users.noreply.github.com>
Date: Tue, 5 Nov 2024 13:25:59 +0100
Subject: [PATCH 06/10] feat - add matomo monitoring
---
index.html | 2 ++
1 file changed, 2 insertions(+)
diff --git a/index.html b/index.html
index b55be59..8869a30 100644
--- a/index.html
+++ b/index.html
@@ -29,8 +29,10 @@
var _paq = window._paq || [];
_mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
_paq.push(['HeatmapSessionRecording::disable']);
+ (function() {
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.async=true; g.src='https://cdn.matomo.cloud/insee.matomo.cloud/container_sfvdV4BF.js'; s.parentNode.insertBefore(g,s);
+ })();
From f635824eb1b45632777417507f45cc3e26de4b18 Mon Sep 17 00:00:00 2001
From: Eric Thuaud <58465319+EricThuaud@users.noreply.github.com>
Date: Wed, 6 Nov 2024 07:21:59 +0100
Subject: [PATCH 07/10] feat - variabilize cloud url
---
.env | 3 ++-
index.html | 2 +-
src/vite-env.d.ts | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.env b/.env
index e911fef..1045ed4 100644
--- a/.env
+++ b/.env
@@ -3,4 +3,5 @@ VITE_OIDC_ISSUER=https://localhost:3000
VITE_OIDC_CLIENT_ID=myclient
VITE_AUTH_TYPE=oidc
VITE_PORTAIL_URL=https://localhost:3000
-VITE_APP_URL=https://localhost:3000
\ No newline at end of file
+VITE_APP_URL=https://localhost:3000
+VITE_TRACKING_URL=https://localhost:3000
\ No newline at end of file
diff --git a/index.html b/index.html
index 8869a30..6ac374b 100644
--- a/index.html
+++ b/index.html
@@ -31,7 +31,7 @@
_paq.push(['HeatmapSessionRecording::disable']);
(function() {
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
- g.async=true; g.src='https://cdn.matomo.cloud/insee.matomo.cloud/container_sfvdV4BF.js'; s.parentNode.insertBefore(g,s);
+ g.async=true; g.src=import.meta.env.VITE_TRACKING_URL; s.parentNode.insertBefore(g,s);
})();
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
index 4a4441f..84e1d87 100644
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@@ -9,6 +9,7 @@ type ImportMetaEnv = {
VITE_AUTH_TYPE: string
VITE_PORTAIL_URL: string
VITE_APP_URL: string
+ VITE_TRACKING_URL: string
BASE_URL: string
MODE: string
DEV: boolean
From 2a2d5ff46a4bd4651c75ad3d27887edc07c2573f Mon Sep 17 00:00:00 2001
From: Eric Thuaud <58465319+EricThuaud@users.noreply.github.com>
Date: Wed, 6 Nov 2024 13:20:43 +0100
Subject: [PATCH 08/10] feat - improve matomo
---
index.html | 2 +-
src/components/LegalInformation.tsx | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/index.html b/index.html
index 6ac374b..8869a30 100644
--- a/index.html
+++ b/index.html
@@ -31,7 +31,7 @@
_paq.push(['HeatmapSessionRecording::disable']);
(function() {
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
- g.async=true; g.src=import.meta.env.VITE_TRACKING_URL; s.parentNode.insertBefore(g,s);
+ g.async=true; g.src='https://cdn.matomo.cloud/insee.matomo.cloud/container_sfvdV4BF.js'; s.parentNode.insertBefore(g,s);
})();
diff --git a/src/components/LegalInformation.tsx b/src/components/LegalInformation.tsx
index 59ce47f..73aa367 100644
--- a/src/components/LegalInformation.tsx
+++ b/src/components/LegalInformation.tsx
@@ -21,6 +21,8 @@ export function LegalInformation() {
+
+