Skip to content

Commit

Permalink
fix(ui): event tag color to blue & cookie text to nl
Browse files Browse the repository at this point in the history
  • Loading branch information
RaneHyv committed Feb 13, 2024
1 parent 04b45bf commit 1dbe8b6
Show file tree
Hide file tree
Showing 11 changed files with 254 additions and 31 deletions.
Binary file removed frontend/public/android-chrome-192x192.png
Binary file not shown.
Binary file removed frontend/public/android-chrome-512x512.png
Binary file not shown.
Binary file removed frontend/public/apple-touch-icon.png
Binary file not shown.
Binary file removed frontend/public/favicon-16x16.png
Binary file not shown.
Binary file removed frontend/public/favicon-32x32.png
Binary file not shown.
14 changes: 0 additions & 14 deletions frontend/public/icon.svg

This file was deleted.

10 changes: 2 additions & 8 deletions frontend/public/site.webmanifest
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,8 @@
"short_name": "",
"icons": [
{
"src": "/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
"src": "/favicon.ico",
"sizes": "32x32 16x16"
}
],
"theme_color": "#ffffff",
Expand Down
27 changes: 23 additions & 4 deletions frontend/src/config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import installBlocks from './components/blocks';
import ListingView from './components/theme/View/ListingView';
import MultipleContentView from './components/theme/View/MultipleContentView';
import modifiedPanelConfig from './cookieOptions';

import TagManager from 'react-gtm-module';

Expand Down Expand Up @@ -56,14 +57,18 @@ export default function applyConfig(config) {
};

config.settings['volto-gdpr-privacy'].defaultPanelConfig = {
...config.settings['volto-gdpr-privacy'].defaultPanelConfig,
last_updated: '2022-12-10T00:07:00+00:00',
...modifiedPanelConfig,
text: {
en: {
title: 'This site uses cookies',
description:
'For this website we use cookies for anonymous analytics gathering and show external content. You can also enable third parties independently.',
},
nl: {
title: 'Deze site gebruikt cookies',
description:
'Voor deze website gebruiken we cookies voor anonieme statistieken en het tonen van externe content. U kunt ook onafhankelijk derden inschakelen.',
},
},
technical: {
text: {
Expand All @@ -72,6 +77,11 @@ export default function applyConfig(config) {
description:
'This website uses cookies for visitor analytics and login functionality. No personal identifiable information is collected or exchanged with third parties.',
},
nl: {
title: 'Noodzakelijke cookies',
description:
'Deze website gebruikt cookies voor bezoekersstatistieken en login functionaliteit. Er wordt geen persoonlijke informatie verzameld of gedeeld met derden.',
},
},
choices: [],
},
Expand All @@ -82,10 +92,14 @@ export default function applyConfig(config) {
description:
'To show rich content from other websites we use integrations from third parties. These might set cookies and collect personal data that can be used for profiling purposes across websites. You can disable individual services below.',
},
nl: {
title: 'Derde partij integraties',
description:
'Om rijke content van andere websites te tonen gebruiken we integraties van derden. Deze kunnen cookies instellen en persoonlijke data verzamelen die gebruikt kan worden voor profilering over websites heen. U kunt individuele services hieronder uitschakelen.',
},
},
choices: [
...config.settings['volto-gdpr-privacy'].defaultPanelConfig.profiling
.choices,
...modifiedPanelConfig.profiling.choices,
{
config_key: 'GTAG',
text: {
Expand All @@ -94,6 +108,11 @@ export default function applyConfig(config) {
description:
'Google Tag Manager is a tag management system that allows you to manage and deploy marketing tags (snippets of code or tracking pixels) on your website. Google Tag Manager does not collect any personal data.',
},
nl: {
title: 'Google Tag Manager',
description:
'Google Tag Manager is een tag management systeem dat u in staat stelt om marketing tags (stukjes code of tracking pixels) te beheren en implementeren op uw website. Google Tag Manager verzamelt geen persoonlijke data.',
},
},
},
],
Expand Down
228 changes: 228 additions & 0 deletions frontend/src/cookieOptions.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,228 @@
const modifiedPanelConfig = {
last_updated: '2024-01-11T10:36:28+00:00', //it is used to know whether to resubmit the banner to the user if the choices have changed.
// focusTrapEnabled: false,
text: {
//Text that is shown when the banner appears
it: {
title: 'Usiamo i cookies',
description:
"Questo sito utilizza i cookie tecnici di navigazione e di sessione per garantire un miglior servizio di navigazione del sito, e cookie analitici per raccogliere informazioni sull'uso del sito da parte degli utenti. Utilizza anche cookie di profilazione dell'utente per fini statistici. I cookie di profilazione puoi decidere se abilitarli o meno cliccando sul pulsante 'Cambia le impostazioni'. Per saperne di più su come disabilitare i cookie oppure abilitarne solo alcuni, consulta la nostra <a href='/privacy-policy' target='_blank'>Cookie Policy.</a>",
},
en: {
title: 'We use cookies',
description:
"This site uses technical navigation and session cookies to ensure a better site navigation service, and analytical cookies to collect information on the use of the site by users. It also uses user profiling cookies for statistical and remarketing purposes. For profiling cookies you can decide whether to enable them or not by clicking on the 'Change settings' button. To find out more, on how to disable cookies or enable only some of them, consult our <a href='/privacy-policy' target='_blank'>Cookie Policy</a>.",
},
fr: {
title: 'We use cookies',
description:
"Ce site utilise des cookies techniques de navigation et de session pour assurer un meilleur service de navigation sur le site, et des cookies analytiques pour collecter des informations sur l'utilisation du site par les utilisateurs. Il utilise également des cookies de profilage des utilisateurs à des fins statistiques et de remarketing. Pour les cookies de profilage, vous pouvez décider de les activer ou non en cliquant sur le bouton « Modifier les paramètres ». Pour en savoir plus, sur la façon de désactiver les cookies ou d'en activer seulement certains, consultez notre <a href='/privacy-policy' target='_blank'>Politique des cookies</a>.",
},
nl: {
title: 'We gebruiken cookies',
description:
"Deze site maakt gebruik van technische navigatie- en sessiecookies om een betere navigatieservice op de site te garanderen, en analytische cookies om informatie te verzamelen over het gebruik van de site door gebruikers. Het maakt ook gebruik van gebruikersprofielcookies voor statistische en remarketingdoeleinden. Voor profielcookies kunt u beslissen of u ze al dan niet wilt inschakelen door op de knop 'Instellingen wijzigen' te klikken. Voor meer informatie over het uitschakelen van cookies of het inschakelen van slechts enkele ervan, raadpleegt u ons <a href='/privacy-policy' target='_blank'>Cookiebeleid</a>.",
},
},

//technical cookies configurations
technical: {
//main title and text for the technical cookies column in banner-cookies-settings
text: {
it: {
title: 'Cookie tecnici',
description:
'Il sito utilizza cookie tecnici per analizzare il traffico da e verso il sito. I cookies tecnici consento anche di fornire un migliore servizio di navigazione sul sito, e raccolgono informazioni di navigazione a questo scopo.',
},
en: {
title: 'Technical cookies',
description:
'The site uses technical cookies to analyze traffic to and from the site. Technical cookies also allow us to provide a better navigation service on the site, and collect navigation information for this purpose.',
},
fr: {
title: 'Cookies techniques',
description:
'Le site utilise des cookies techniques pour analyser le trafic vers et depuis le site. Les cookies techniques nous permettent également de fournir un meilleur service de navigation sur le site, et de collecter des informations de navigation à cette fin.',
},
nl: {
title: 'Technische cookies',
description:
'De site maakt gebruik van technische cookies om het verkeer van en naar de site te analyseren. Technische cookies stellen ons ook in staat om een betere navigatieservice op de site te bieden en navigatiegegevens te verzamelen voor dit doel.',
},
},

//technical cookies
choices: [
{
config_key: 'GANALYTICS', //reference to config.gdprPrivacyConfig keys
text: {
it: {
title: 'Google Analytics',
description:
"I cookie di Google Analytics sono usati per analizzare la navigazione sul sito al fine di migliorarla e fornire all'utente un'esperienza di navigazione migliore possibile.",
},
en: {
title: 'Google Analytics',
description:
'Google Analytics cookies are used to analyze navigation on the site in order to improve it and provide the user with the best possible browsing experience.',
},
fr: {
title: 'Google Analytics',
description:
"Les cookies de Google Analytics sont utilisés pour analyser la navigation sur le site afin de l'améliorer et offrir à l'utilisateur la meilleure expérience de navigation possible.",
},
nl: {
title: 'Google Analytics',
description:
'Google Analytics-cookies worden gebruikt om de navigatie op de site te analyseren om deze te verbeteren en de gebruiker de best mogelijke browse-ervaring te bieden.',
},
},
},
],
},

//profiling cookies configuration
profiling: {
text: {
it: {
title: 'Cookie di profilazione',
description:
"Il sito utilizza cookie di profilazione per analizzare il comportamento e le scelte degli utenti al fine di proporre contenuti mirati corrispondenti al profilo dell'utente",
},
en: {
title: 'Profiling cookies',
description:
"The site uses profiling cookies to analyze user behavior and choices in order to propose targeted content corresponding to the user's profile",
},
fr: {
title: 'Cookies de profilage',
description:
"Le site utilise des cookies de profilage pour analyser le comportement et les choix de l'utilisateur afin de proposer un contenu ciblé correspondant au profil de l'utilisateur",
},
nl: {
title: 'Profielcookies',
description:
'De site maakt gebruik van profileringcookies om het gedrag en de keuzes van de gebruiker te analyseren om gerichte inhoud voor te stellen die overeenkomt met het profiel van de gebruiker',
},
},

choices: [
{
config_key: 'YOUTUBE',
referenceUrls: ['youtube.com', 'youtube-nocookie.com', 'youtu.be'],
text: {
it: {
title: 'Youtube',
description:
"I cookie di profilazione di Youtube permettono di mostrarti le pubblicità che potrebbero interessarti di più, fare analisi di accesso alla pagina e sul comportamento dell'utente, facilitare l'accesso ai servizi di Google.",
//text to show in conditional embed if that cookies are not enabled
conditional_embed_text:
'Per vedere il video, accetta i cookie di Youtube.',
},
en: {
title: 'Youtube',
description:
'Youtube profiling cookies allow you to show advertisements that may interest you the most, analyze page access and user behavior, facilitate access to Google services. ',
//text to show in conditional embed if that cookies are not enabled
conditional_embed_text:
'To view the video, please accept Youtube cookies.',
},
fr: {
title: 'Youtube',
description:
"Les cookies de profilage Youtube vous permettent d'afficher les publicités susceptibles de vous intéresser le plus, d'analyser l'accès aux pages et le comportement des utilisateurs, de faciliter l'accès aux services Google.",
//text to show in conditional embed if that cookies are not enabled
conditional_embed_text:
'Pour voir la vidéo, veuillez accepter les cookies Youtube.',
},
nl: {
title: 'Youtube',
description:
'Profileringcookies van Youtube stellen u in staat om de advertenties te tonen die u het meest interesseren, de toegang tot de pagina en het gedrag van de gebruiker te analyseren, de toegang tot Google-services te vergemakkelijken.',
//text to show in conditional embed if that cookies are not enabled
conditional_embed_text:
'Om de video te bekijken, accepteert u de cookies van Youtube.',
},
},
},
{
config_key: 'VIMEO',
referenceUrls: ['vimeo.com'],
text: {
it: {
title: 'Vimeo',
description:
"I cookie di profilazione di Vimeo permettono di fare analisi di accesso alla pagina e sul comportamento dell'utente, e di mostrarti le pubblicità che potrebbero interessarti di più.",
//text to show in conditional embed if that cookies are not enabled
conditional_embed_text:
'Per vedere il video, accetta i cookie di Vimeo.',
},
en: {
title: 'Vimeo',
description:
'Vimeo profiling cookies allow you to analyze page access and user behavior, and to show you the advertisements that may interest you the most.',
//text to show in conditional embed if that cookies are not enabled
conditional_embed_text:
'To view the video, please accept Vimeo cookies.',
},
fr: {
title: 'Vimeo',
description:
"Les cookies de profilage Vimeo vous permettent d'analyser l'accès aux pages et le comportement des utilisateurs, et de vous montrer les publicités qui pourraient vous intéresser le plus.",
//text to show in conditional embed if that cookies are not enabled
conditional_embed_text:
'Pour voir la vidéo, veuillez accepter les cookies Vimeo.',
},
nl: {
title: 'Vimeo',
description:
'Profileringcookies van Vimeo stellen u in staat om de toegang tot de pagina en het gedrag van de gebruiker te analyseren, en om de advertenties te tonen die u het meest interesseren.',
//text to show in conditional embed if that cookies are not enabled
conditional_embed_text:
'Om de video te bekijken, accepteert u de cookies van Vimeo.',
},
},
},
{
config_key: 'GOOGLEMAPS',
referenceUrls: ['google.com/maps'],
text: {
it: {
title: 'Google Maps',
description:
"I cookie di profilazione di Google permettono di fare analisi di accesso alla pagina e sul comportamento dell'utente, e di mostrarti le pubblicità che potrebbero interessarti di più.",
//text to show in conditional embed if that cookies are not enabled
conditional_embed_text:
'Per vedere la mappa, accetta i cookie di Google Maps.',
},
en: {
title: 'Google Maps',
description:
'Google profiling cookies allow you to analyze page access and user behavior, and to show you the advertisements that may interest you the most.',
//text to show in conditional embed if that cookies are not enabled
conditional_embed_text:
'To view map, please accept Google Maps cookies.',
},
fr: {
title: 'Google Maps',
description:
"Les cookies de profilage Google vous permettent d'analyser l'accès aux pages et le comportement des utilisateurs, et de vous montrer les publicités qui pourraient vous intéresser le plus.",
//text to show in conditional embed if that cookies are not enabled
conditional_embed_text:
'Pour afficher la carte, veuillez accepter les cookies de Google Maps.',
},
nl: {
title: 'Google Maps',
description:
'Profileringcookies van Google stellen u in staat om de toegang tot de pagina en het gedrag van de gebruiker te analyseren, en om de advertenties te tonen die u het meest interesseren.',
//text to show in conditional embed if that cookies are not enabled
conditional_embed_text:
'Om de kaart te bekijken, accepteert u de cookies van Google Maps.',
},
},
},
],
},
};

export default modifiedPanelConfig;
Loading

0 comments on commit 1dbe8b6

Please sign in to comment.