Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add button to reconfigure cookie consent #835

Merged
merged 39 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
0b00846
feat: add cookie consent
Oct 30, 2024
c07d055
feat: move youtube consent into cookie consent using iframe manager
Oct 30, 2024
acb22b9
chore: move translations into i18n
Oct 30, 2024
4a156e3
feat: move leadinfo into cookie consent
Oct 30, 2024
432a6dd
fix: import statement for css is now correct so prod build should work
Oct 31, 2024
7d544bb
fix: don't expect imagemanager to be defined so the static build can …
Oct 31, 2024
6d6f173
fix: reset im before reinitializing
Oct 31, 2024
eeb5e9f
fix: contact link works now as expected
Nov 7, 2024
3615a2f
fix: reload cookie banner on language change
Nov 7, 2024
c37e7c1
chore: add description of youtube cookies
Nov 7, 2024
03f94d3
chore: style im like satalytes components
Nov 7, 2024
2622632
chore: make buttons responsive
Nov 7, 2024
b554c9c
chore: unpin cookie consent version
Nov 13, 2024
b6f4462
fix: open german contact page when language is set to german
Nov 13, 2024
1972643
fix: open external links in new tab
Nov 13, 2024
92f7fb3
chore: refactor use effect
Nov 13, 2024
86907d1
feat: improve mobile button style
Nov 13, 2024
63737b4
chore: updated lockfile
Nov 13, 2024
0d5b11d
fix: remove warnings that divs are in paragraphs by making everything…
Nov 13, 2024
9dacffa
Merge branch 'main' into feat/add-cookie-consent
virus-rpi Nov 13, 2024
bc81103
fix: use correct css for buttons and text in iframemanager style
Nov 14, 2024
fda6ee3
chore: better text for a11y
Nov 14, 2024
61d51ff
chore: better way to fix warning
Nov 14, 2024
8a885b5
chore: update legal text for more clarity
Nov 14, 2024
921593d
chore: import useEffect directly
Nov 20, 2024
88ec470
fix: add 24px margin on the bottom of the yt embed
Nov 20, 2024
e2d3608
chore: simplify fix in custom components
virus-rpi Nov 20, 2024
e793de7
Merge remote-tracking branch 'origin/feat/add-cookie-consent' into fe…
Nov 20, 2024
47c842e
feat: better mobile styles
Nov 20, 2024
424299e
feat: add button to reconfigure cookie consent
virus-rpi Nov 21, 2024
a0e7442
chore: simplify button
virus-rpi Nov 21, 2024
0eb8072
feat: improve style
virus-rpi Nov 27, 2024
f201503
feat: add icon
virus-rpi Nov 27, 2024
8800497
fix: update YouTube embed button texts and improve styling
virus-rpi Nov 27, 2024
be91fcc
Merge branch 'feat/add-cookie-consent' into feat/revoke-cookie-consent
virus-rpi Nov 27, 2024
dd7767d
Merge branch 'main' into feat/revoke-cookie-consent
virus-rpi Nov 28, 2024
5f16e76
feat: update cookie consent notice for improved clarity and user control
virus-rpi Nov 28, 2024
73e4341
chore: use px instead of rem
virus-rpi Nov 28, 2024
ab955bc
Merge branch 'main' into feat/revoke-cookie-consent
virus-rpi Nov 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/assets/locales/de/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,7 @@
"image.attribution": "Foto von ",
"iframemanager.youtube.notice": "Dieser Inhalt wird von einer externen Quelle gehostet. Durch das Laden des Inhalts akzeptieren Sie die <a rel=\"noreferrer noopener\" href=\"https://www.youtube.com/t/terms\" target=\"_blank\">Nutzungsbedingungen</a> von youtube.com und stimmen einer möglichen Übertragung Ihrer Daten in Drittländer zu.",
"iframemanager.youtube.load-button": "Inhalt laden",
"iframemanager.youtube.load-all-button": "Inhalt immer laden"
"iframemanager.youtube.load-all-button": "Inhalt immer laden",
"dataprivacy.reopen-cookie-consent": "Cookie-Einstellungen erneut öffnen",
"dataprivacy.cookie-consent-notice": "Wir respektieren Ihre Privatsphäre und möchten Ihnen volle Kontrolle über die Daten geben, die wir auf dieser Website verarbeiten. Über den untenstehenden Button können Sie unsere Cookie-Einstellungen öffnen und detailliert auswählen, welche Cookies Sie aktivieren oder deaktivieren möchten. Dort finden Sie auch eine genaue Auflistung aller von uns verwendeten Cookies sowie Informationen darüber, welche Daten gesammelt werden und zu welchem Zweck."
}
4 changes: 3 additions & 1 deletion src/assets/locales/en/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,7 @@
"image.attribution": "Photo by ",
"iframemanager.youtube.notice": "This content is hosted by a third party. By showing the external content you accept the <a rel=\"noreferrer noopener\" href=\"https://www.youtube.com/t/terms\" target=\"_blank\">terms and conditions</a> of youtube.com and agree to a possible transfer of your data to third countries.",
"iframemanager.youtube.load-button": "Load video",
"iframemanager.youtube.load-all-button": "Load & don't ask again"
"iframemanager.youtube.load-all-button": "Load & don't ask again",
"dataprivacy.reopen-cookie-consent": "Reopen cookie consent preferences",
"dataprivacy.cookie-consent-notice": "We respect your privacy and want to give you full control over the data we process on this website. By clicking the button below, you can open our cookie settings and make detailed selections about which cookies you want to enable or disable. You’ll also find a comprehensive list of all the cookies we use, along with information about the data collected and its purposes."
}
16 changes: 16 additions & 0 deletions src/pages/data-privacy.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,34 @@ import { Layout } from '../components/layout/layout';
import { ContentBlockContainer } from '../components/layout/content-block-container';
import { ContentfulRichText } from '../components/content/rich-text/rich-text';
import { ContentfulPage, ContentfulRichTextType } from '../types';
import { Button } from '../components/ui/buttons/button';
import { useTranslation } from 'react-i18next';
import Callout from '../components/ui/callout/callout';
import styled from 'styled-components';

interface DataPrivacyPageQueryProps {
contentfulPage: ContentfulPage;
locales: LocalesQueryProps;
}

const StyledText = styled.p`
margin: 0;
margin-bottom: 1rem;
virus-rpi marked this conversation as resolved.
Show resolved Hide resolved
`;

const DataPrivacyPage = ({
data,
}: PageProps<DataPrivacyPageQueryProps>): JSX.Element => {
const { t } = useTranslation();
return (
<Layout light={true}>
<ContentBlockContainer>
<Callout illustration="selfOrganization_066">
<StyledText>{t('dataprivacy.cookie-consent-notice')}</StyledText>
<Button type="button" data-cc="show-preferencesModal">
{t('dataprivacy.reopen-cookie-consent')}
</Button>
</Callout>
<ContentfulRichText
data={data.contentfulPage.content as ContentfulRichTextType}
/>
Expand Down