From c9c7defd3466ca90c4b3d41435e26ac65e17b847 Mon Sep 17 00:00:00 2001 From: "Dusan Mijatovic (PC2020)" Date: Fri, 8 Nov 2024 16:43:42 +0100 Subject: [PATCH] feat: reduce with of custom pages to 1024px for easier readability --- frontend/components/layout/MarkdownPage.tsx | 18 ----- frontend/pages/cookies.tsx | 78 +++++++++++++-------- frontend/pages/news/[date]/[slug]/index.tsx | 2 +- frontend/pages/page/[slug].tsx | 35 ++++++--- 4 files changed, 77 insertions(+), 56 deletions(-) delete mode 100644 frontend/components/layout/MarkdownPage.tsx diff --git a/frontend/components/layout/MarkdownPage.tsx b/frontend/components/layout/MarkdownPage.tsx deleted file mode 100644 index f1768d9e2..000000000 --- a/frontend/components/layout/MarkdownPage.tsx +++ /dev/null @@ -1,18 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all) -// SPDX-FileCopyrightText: 2022 dv4all -// -// SPDX-License-Identifier: Apache-2.0 - -import MainContent from './MainContent' -import ReactMarkdownWithSettings from './ReactMarkdownWithSettings' - -export default function MarkdownPage({markdown}:{markdown:string}) { - return ( - - - - ) -} diff --git a/frontend/pages/cookies.tsx b/frontend/pages/cookies.tsx index 2b1d88c25..b7e8151f5 100644 --- a/frontend/pages/cookies.tsx +++ b/frontend/pages/cookies.tsx @@ -1,58 +1,78 @@ // SPDX-FileCopyrightText: 2022 Dusan Mijatovic (dv4all) // SPDX-FileCopyrightText: 2022 Matthias Rüster (GFZ) // SPDX-FileCopyrightText: 2022 dv4all +// SPDX-FileCopyrightText: 2024 Dusan Mijatovic (Netherlands eScience Center) +// SPDX-FileCopyrightText: 2024 Netherlands eScience Center // // SPDX-License-Identifier: Apache-2.0 -import Head from 'next/head' import {GetServerSidePropsContext} from 'next/types' import {app} from '~/config/app' -import DefaultLayout from '~/components/layout/DefaultLayout' +import AppHeader from '~/components/AppHeader' +import AppFooter from '~/components/AppFooter' import PageTitle from '~/components/layout/PageTitle' import MatomoTracking, {MatomoTrackingProps} from '~/components/cookies/MatomoTracking' import {getMatomoConsent} from '~/components/cookies/nodeCookies' +import PageMeta from '~/components/seo/PageMeta' +import OgMetaTags from '~/components/seo/OgMetaTags' +import PageBackground from '~/components/layout/PageBackground' +import MainContent from '~/components/layout/MainContent' const pageTitle = `Cookies | ${app.title}` +const description = ` + Cookies are small blocks of data created by our website and stored by your web browser on your computer. + Using cookies allows our website to store information between your visits. You have full control over + these cookies and can deactivate or restrict them by changing your web browser's cookie settings. + Any cookies already stored can be deleted at any time. This may limit the functionality of our website, + however. +` export default function Cookies({matomoId,matomoConsent}: MatomoTrackingProps) { + // console.group('Cookies') // console.log('matomoId...', matomoId) // console.log('matomoConsent...', matomoConsent) // console.groupEnd() - return ( - - - {pageTitle} - - - -

- Cookies are small blocks of data created by our website and stored by your web browser on your computer. - Using cookies allows our website to store information between your visits. You have full control over - these cookies and can deactivate or restrict them by changing your web browser's cookie settings. - Any cookies already stored can be deleted at any time. This may limit the functionality of our website, - however. -

+ return ( + <> + {/* Page Head meta tags */} + + + + + + -

Functional cookies

+

+ {description} +

-

- We use several functional cookies that are necessary for our website to function. - These are used to remember your privacy preferences and if you are logged in to the website. You can set your browser to block these cookies, - but some parts of the site will not work properly if you do so. -

+

Functional cookies

- { /* Matomo specific section */ } - +

+ We use several functional cookies that are necessary for our website to function. + These are used to remember your privacy preferences and if you are logged in to the website. You can set your browser to block these cookies, + but some parts of the site will not work properly if you do so. +

-
+ { /* Matomo specific section */ } + - + + + + ) } diff --git a/frontend/pages/news/[date]/[slug]/index.tsx b/frontend/pages/news/[date]/[slug]/index.tsx index 1f0d4a3f8..c7425b092 100644 --- a/frontend/pages/news/[date]/[slug]/index.tsx +++ b/frontend/pages/news/[date]/[slug]/index.tsx @@ -38,7 +38,7 @@ export default function NewsItemPage({newsItem}:{newsItem:NewsItem}) { - + {/* BREADCRUMBS and button */} - - {pageTitle} - - - - + {/* Page Head meta tags */} + + + + + + + + + ) }