From 0b7f54144152b1a1d92b837a236f506e2a809e62 Mon Sep 17 00:00:00 2001 From: Manuel Brandstetter Date: Mon, 8 Jan 2024 12:11:23 +0100 Subject: [PATCH 1/4] Add legal notice page --- src/pages/[lang]/Legal/Impressum.astro | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/pages/[lang]/Legal/Impressum.astro diff --git a/src/pages/[lang]/Legal/Impressum.astro b/src/pages/[lang]/Legal/Impressum.astro new file mode 100644 index 0000000..7b032a2 --- /dev/null +++ b/src/pages/[lang]/Legal/Impressum.astro @@ -0,0 +1,20 @@ +--- +import type {GetStaticPaths} from "astro"; +import LegalLayout from "../../../layouts/LegalLayout.astro"; +import getTranslatedContent from "../../../utils/directus.ts"; +import "./Legal.scss"; + +const {lang} = Astro.params; +const content = await getTranslatedContent("Impressum", lang!); + +export const getStaticPaths = (() => { + return [ + {params: {lang: "en"}}, + {params: {lang: "de"}}, + ]; +}) satisfies GetStaticPaths; +--- + + +
+ From c4ef1368858882b799309166ed15b944bded96aa Mon Sep 17 00:00:00 2001 From: Manuel Brandstetter Date: Mon, 8 Jan 2024 12:38:52 +0100 Subject: [PATCH 2/4] Add legal notice to footer and legal layout --- src/components/Footer/Footer.astro | 3 +++ src/layouts/LegalLayout.astro | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/components/Footer/Footer.astro b/src/components/Footer/Footer.astro index 1e8f591..3b7f894 100644 --- a/src/components/Footer/Footer.astro +++ b/src/components/Footer/Footer.astro @@ -114,6 +114,9 @@ const content = await getTranslatedContent("Footer", lang!);
  • {content.terms}
    • +
  • + {content.legal_notice} +
    • {content.copyright} diff --git a/src/layouts/LegalLayout.astro b/src/layouts/LegalLayout.astro index 4fde60f..a746210 100644 --- a/src/layouts/LegalLayout.astro +++ b/src/layouts/LegalLayout.astro @@ -17,6 +17,10 @@ const navItems = [ href: `/${lang}/Legal/Terms`, name: "Terms & Conditions", }, + { + href: `/${lang}/Legal/Impressum`, + name: "Legal Notice", + }, ]; --- From cda3d0b432fc7d6a21eb8e1247e5c410516bf1da Mon Sep 17 00:00:00 2001 From: Manuel Brandstetter Date: Mon, 8 Jan 2024 13:29:22 +0100 Subject: [PATCH 3/4] Changes --- src/components/Footer/Footer.astro | 8 ++++---- src/layouts/LegalLayout.astro | 8 ++++---- src/pages/[lang]/{Legal => }/Legal.scss | 0 .../{Legal/Cookies.astro => cookie-policy.astro} | 4 ++-- .../{Legal/Privacy.astro => data-protection.astro} | 4 ++-- .../{Legal/Impressum.astro => legal-notice.astro} | 4 ++-- src/pages/[lang]/{Legal/Terms.astro => terms.astro} | 4 ++-- tsconfig.json | 11 +++++++++-- 8 files changed, 25 insertions(+), 18 deletions(-) rename src/pages/[lang]/{Legal => }/Legal.scss (100%) rename src/pages/[lang]/{Legal/Cookies.astro => cookie-policy.astro} (76%) rename src/pages/[lang]/{Legal/Privacy.astro => data-protection.astro} (77%) rename src/pages/[lang]/{Legal/Impressum.astro => legal-notice.astro} (75%) rename src/pages/[lang]/{Legal/Terms.astro => terms.astro} (78%) diff --git a/src/components/Footer/Footer.astro b/src/components/Footer/Footer.astro index 3b7f894..688c5c6 100644 --- a/src/components/Footer/Footer.astro +++ b/src/components/Footer/Footer.astro @@ -106,16 +106,16 @@ const content = await getTranslatedContent("Footer", lang!);
    {content.copyright} diff --git a/src/layouts/LegalLayout.astro b/src/layouts/LegalLayout.astro index a746210..14d2190 100644 --- a/src/layouts/LegalLayout.astro +++ b/src/layouts/LegalLayout.astro @@ -6,19 +6,19 @@ const {lang} = Astro.params; const navItems = [ { - href: `/${lang}/Legal/Privacy`, + href: `/${lang}/data-protection`, name: "Privacy Policy", }, { - href: `/${lang}/Legal/Cookies`, + href: `/${lang}/cookie-policy`, name: "Cookie Policy", }, { - href: `/${lang}/Legal/Terms`, + href: `/${lang}/terms`, name: "Terms & Conditions", }, { - href: `/${lang}/Legal/Impressum`, + href: `/${lang}/legal-notice`, name: "Legal Notice", }, ]; diff --git a/src/pages/[lang]/Legal/Legal.scss b/src/pages/[lang]/Legal.scss similarity index 100% rename from src/pages/[lang]/Legal/Legal.scss rename to src/pages/[lang]/Legal.scss diff --git a/src/pages/[lang]/Legal/Cookies.astro b/src/pages/[lang]/cookie-policy.astro similarity index 76% rename from src/pages/[lang]/Legal/Cookies.astro rename to src/pages/[lang]/cookie-policy.astro index 7f3050f..e81d21f 100644 --- a/src/pages/[lang]/Legal/Cookies.astro +++ b/src/pages/[lang]/cookie-policy.astro @@ -1,7 +1,7 @@ --- import type {GetStaticPaths} from "astro"; -import LegalLayout from "../../../layouts/LegalLayout.astro"; -import getTranslatedContent from "../../../utils/directus.ts"; +import LegalLayout from "@layouts/LegalLayout.astro"; +import getTranslatedContent from "@utils/directus.ts"; import "./Legal.scss"; const {lang} = Astro.params; diff --git a/src/pages/[lang]/Legal/Privacy.astro b/src/pages/[lang]/data-protection.astro similarity index 77% rename from src/pages/[lang]/Legal/Privacy.astro rename to src/pages/[lang]/data-protection.astro index e6dad7d..f97fb1e 100644 --- a/src/pages/[lang]/Legal/Privacy.astro +++ b/src/pages/[lang]/data-protection.astro @@ -1,7 +1,7 @@ --- import type {GetStaticPaths} from "astro"; -import LegalLayout from "../../../layouts/LegalLayout.astro"; -import getTranslatedContent from "../../../utils/directus.ts"; +import LegalLayout from "@layouts/LegalLayout.astro"; +import getTranslatedContent from "@utils/directus.ts"; import "./Legal.scss"; const {lang} = Astro.params; diff --git a/src/pages/[lang]/Legal/Impressum.astro b/src/pages/[lang]/legal-notice.astro similarity index 75% rename from src/pages/[lang]/Legal/Impressum.astro rename to src/pages/[lang]/legal-notice.astro index 7b032a2..6463fe7 100644 --- a/src/pages/[lang]/Legal/Impressum.astro +++ b/src/pages/[lang]/legal-notice.astro @@ -1,7 +1,7 @@ --- import type {GetStaticPaths} from "astro"; -import LegalLayout from "../../../layouts/LegalLayout.astro"; -import getTranslatedContent from "../../../utils/directus.ts"; +import LegalLayout from "@layouts/LegalLayout.astro"; +import getTranslatedContent from "@utils/directus.ts"; import "./Legal.scss"; const {lang} = Astro.params; diff --git a/src/pages/[lang]/Legal/Terms.astro b/src/pages/[lang]/terms.astro similarity index 78% rename from src/pages/[lang]/Legal/Terms.astro rename to src/pages/[lang]/terms.astro index 95720e8..51c1a43 100644 --- a/src/pages/[lang]/Legal/Terms.astro +++ b/src/pages/[lang]/terms.astro @@ -1,7 +1,7 @@ --- import type { GetStaticPaths } from "astro"; -import LegalLayout from "../../../layouts/LegalLayout.astro"; -import getTranslatedContent from "../../../utils/directus.ts"; +import LegalLayout from "@layouts/LegalLayout.astro"; +import getTranslatedContent from "@utils/directus.ts"; import "./Legal.scss"; const {lang} = Astro.params; diff --git a/tsconfig.json b/tsconfig.json index 032ad64..c7f60c7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,14 @@ { "extends": "astro/tsconfigs/strict", "compilerOptions": { + "baseUrl": ".", "jsx": "react-jsx", - "jsxImportSource": "react" + "jsxImportSource": "react", + "paths": { + "@assets/*": ["src/assets/*"], + "@components/*": ["src/components/*"], + "@utils/*": ["src/utils/*"], + "@layouts/*": ["src/layouts/*"], + } } -} \ No newline at end of file +} From e1ef4f33f38eaa464c27af988718c1beb1481d0a Mon Sep 17 00:00:00 2001 From: Manuel Brandstetter Date: Mon, 8 Jan 2024 13:44:20 +0100 Subject: [PATCH 4/4] Changes --- src/pages/[lang]/legal-notice.astro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/[lang]/legal-notice.astro b/src/pages/[lang]/legal-notice.astro index 6463fe7..dbe7727 100644 --- a/src/pages/[lang]/legal-notice.astro +++ b/src/pages/[lang]/legal-notice.astro @@ -5,7 +5,7 @@ import getTranslatedContent from "@utils/directus.ts"; import "./Legal.scss"; const {lang} = Astro.params; -const content = await getTranslatedContent("Impressum", lang!); +const content = await getTranslatedContent("Legal_Notice", lang!); export const getStaticPaths = (() => { return [ @@ -16,5 +16,5 @@ export const getStaticPaths = (() => { --- -
    +