Initial changes

inovex · Mar 28, 2024 · 28b25f2 · 28b25f2
1 parent aa2c2e1
commit 28b25f2
Show file tree

Hide file tree

Showing 26 changed files with 159 additions and 128 deletions.
diff --git a/src/components/Footer/Footer.astro b/src/components/Footer/Footer.astro
@@ -9,7 +9,7 @@ import { Inovex } from "@icons/Inovex";
 import getTranslatedContent from "@utils/directus";
 import "./Footer.scss";
 
-const {lang} = Astro.params;
+const {lang} = Astro.props;
 const content = await getTranslatedContent("Footer", lang!);
 ---
 

diff --git a/src/components/Navbar/Navbar.astro b/src/components/Navbar/Navbar.astro
@@ -6,7 +6,7 @@ import getTranslatedContent from "@utils/directus";
 import UserMenu from "@components/UserMenu/UserMenu";
 import "./Navbar.scss";
 
-const {lang} = Astro.params;
+const {lang} = Astro.props;
 const content = await getTranslatedContent("Header", lang!);
 
 const userMenuLabels = {

diff --git a/src/components/UserMenu/UserMenu.tsx b/src/components/UserMenu/UserMenu.tsx
@@ -95,7 +95,7 @@ const UserMenu = ({
             </a>
           </li>
           <li>
-            <a href="/en">
+            <a href="/">
               <svg
                 width="32"
                 height="32"

diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
@@ -4,13 +4,14 @@ import Footer from "../components/Footer/Footer.astro";
 
 export interface Props {
   title: string;
+  lang: string;
 }
 
-const { title } = Astro.props;
+const { title, lang } = Astro.props;
 ---
 
 <!doctype html>
-<html lang="en">
+<html lang={lang}>
   <head>
     <meta charset="UTF-8" />
     <meta name="description" content="Open source online retrospective & collaboration tool - fast onboarding, jump right into a session with your team" />
@@ -24,11 +25,11 @@ const { title } = Astro.props;
   </head>
   <body>
     <div class="body_wrapper">
-      <Navbar />
+      <Navbar lang={lang} />
       <main>
         <slot />
       </main>
-      <Footer />
+      <Footer lang={lang} />
     </div>
   </body>
 </html>

diff --git a/src/pages/[lang]/cookie-policy.astro b/src/pages/[lang]/cookie-policy.astro
diff --git a/src/pages/[lang]/data-protection.astro b/src/pages/[lang]/data-protection.astro
diff --git a/src/pages/[lang]/legal-notice.astro b/src/pages/[lang]/legal-notice.astro
diff --git a/src/pages/[lang]/terms.astro b/src/pages/[lang]/terms.astro
diff --git a/src/pages/cookie-policy.astro b/src/pages/cookie-policy.astro
@@ -0,0 +1,11 @@
+---
+import LegalLayout from "@layouts/LegalLayout.astro";
+import getTranslatedContent from "@utils/directus.ts";
+import "@styles/Legal.scss";
+
+const content = await getTranslatedContent("Cookie_Policy", "en");
+---
+
+<LegalLayout>
+  <section set:html={content.Cookie_Policy} />
+</LegalLayout>
diff --git a/src/pages/data-protection.astro b/src/pages/data-protection.astro
@@ -0,0 +1,12 @@
+---
+import LegalLayout from "@layouts/LegalLayout.astro";
+import getTranslatedContent from "@utils/directus.ts";
+import "@styles/Legal.scss";
+
+const content = await getTranslatedContent("Privacy_Policy", "en");
+---
+
+<LegalLayout>
+  <section class="legal__content" set:html={content.Privacy_Policy} />
+</LegalLayout>
+
diff --git a/src/pages/de/cookie-policy.astro b/src/pages/de/cookie-policy.astro
@@ -0,0 +1,11 @@
+---
+import LegalLayout from "@layouts/LegalLayout.astro";
+import getTranslatedContent from "@utils/directus.ts";
+import "@styles/Legal.scss";
+
+const content = await getTranslatedContent("Cookie_Policy", "de");
+---
+
+<LegalLayout>
+  <section set:html={content.Cookie_Policy} />
+</LegalLayout>
diff --git a/src/pages/de/data-protection.astro b/src/pages/de/data-protection.astro
@@ -0,0 +1,12 @@
+---
+import LegalLayout from "@layouts/LegalLayout.astro";
+import getTranslatedContent from "@utils/directus.ts";
+import "@styles/Legal.scss";
+
+const content = await getTranslatedContent("Privacy_Policy", "de");
+---
+
+<LegalLayout>
+  <section class="legal__content" set:html={content.Privacy_Policy} />
+</LegalLayout>
+
diff --git a/src/pages/[lang]/index.astro → src/pages/de/index.astro b/src/pages/[lang]/index.astro → src/pages/de/index.astro
@@ -1,5 +1,4 @@
 ---
-import type { GetStaticPaths } from "astro";
 import Hero from "@views/Hero/Hero.astro";
 import Choices from "@views/Choices/Choices.astro";
 import Uniqueness from "@views/Uniqueness/Uniqueness.astro";
@@ -9,18 +8,15 @@ import TargetUser from "@views/TargetUser/TargetUser.astro";
 import Features from "@views/Features/Features.astro";
 import Feedback from "@views/Feedback/Feedback.astro";
 import AboutUs from "@views/AboutUs/AboutUs.astro";
-
-export const getStaticPaths = (() => {
-  return [{ params: { lang: "en" } }, { params: { lang: "de" } }];
-}) satisfies GetStaticPaths;
 ---
 
-<Layout title="scrumlr.io - Online collaboration">
-  <Hero />
-  <Choices />
-  <Uniqueness />
-  <Mobile />
-  <Features />
-  <Feedback />
-  <AboutUs />
+<Layout title="scrumlr.io - Online collaboration" lang="de" >
+  <Hero lang="de" />
+  <Choices lang="de" />
+  <Uniqueness lang="de" />
+  <Mobile lang="de" />
+  <Features lang="de" />
+  <TargetUser lang="de" />
+  <Feedback lang="de" />
+  <AboutUs lang="de" />
 </Layout>
diff --git a/src/pages/de/legal-notice.astro b/src/pages/de/legal-notice.astro
@@ -0,0 +1,11 @@
+---
+import LegalLayout from "@layouts/LegalLayout.astro";
+import getTranslatedContent from "@utils/directus.ts";
+import "@styles/Legal.scss";
+
+const content = await getTranslatedContent("Legal_Notice", "de");
+---
+
+<LegalLayout>
+  <section set:html={content.legal_notice} />
+</LegalLayout>
diff --git a/src/pages/de/terms.astro b/src/pages/de/terms.astro
@@ -0,0 +1,17 @@
+---
+import LegalLayout from "@layouts/LegalLayout.astro";
+import getTranslatedContent from "@utils/directus.ts";
+import "@styles/Legal.scss";
+
+const content = await getTranslatedContent("Terms_Conditions", "de");
+---
+
+<LegalLayout>
+  <section set:html={content.Terms_Conditions} />
+</LegalLayout>
+
+<style>
+  section {
+    text-wrap: wrap;
+  }
+</style>
diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -1,4 +1,22 @@
 ---
+import Hero from "@views/Hero/Hero.astro";
+import Choices from "@views/Choices/Choices.astro";
+import Uniqueness from "@views/Uniqueness/Uniqueness.astro";
+import Mobile from "@views/Mobile/Mobile.astro";
+import Layout from "@layouts/Layout.astro";
+import TargetUser from "@views/TargetUser/TargetUser.astro";
+import Features from "@views/Features/Features.astro";
+import Feedback from "@views/Feedback/Feedback.astro";
+import AboutUs from "@views/AboutUs/AboutUs.astro";
 ---
 
-<meta http-equiv="refresh" content="0;url=/en" />
+<Layout title="scrumlr.io - Online collaboration" lang="en" >
+  <Hero lang="en" />
+  <Choices lang="en" />
+  <Uniqueness lang="en" />
+  <Mobile lang="en" />
+  <Features lang="en" />
+  <TargetUser lang="en" />
+  <Feedback lang="en" />
+  <AboutUs lang="en" />
+</Layout>
diff --git a/src/pages/legal-notice.astro b/src/pages/legal-notice.astro
@@ -0,0 +1,11 @@
+---
+import LegalLayout from "@layouts/LegalLayout.astro";
+import getTranslatedContent from "@utils/directus.ts";
+import "@styles/Legal.scss";
+
+const content = await getTranslatedContent("Legal_Notice", "en");
+---
+
+<LegalLayout>
+  <section set:html={content.legal_notice} />
+</LegalLayout>
diff --git a/src/pages/terms.astro b/src/pages/terms.astro
@@ -0,0 +1,17 @@
+---
+import LegalLayout from "@layouts/LegalLayout.astro";
+import getTranslatedContent from "@utils/directus.ts";
+import "@styles/Legal.scss";
+
+const content = await getTranslatedContent("Terms_Conditions", "en");
+---
+
+<LegalLayout>
+  <section set:html={content.Terms_Conditions} />
+</LegalLayout>
+
+<style>
+  section {
+    text-wrap: wrap;
+  }
+</style>
diff --git a/src/views/AboutUs/AboutUs.astro b/src/views/AboutUs/AboutUs.astro
@@ -3,7 +3,7 @@ import { Link } from "../../components/Link/Link";
 import getTranslatedContent from "../../utils/directus";
 import "./AboutUs.scss";
 
-const {lang} = Astro.params;
+const {lang} = Astro.props;
 const content = await getTranslatedContent("AboutUs_Section", lang!);
 ---
 

diff --git a/src/views/Choices/Choices.astro b/src/views/Choices/Choices.astro
@@ -3,7 +3,7 @@ import VideoPlayer from "../../components/VideoPlayer";
 import getTranslatedContent from "../../utils/directus";
 import "./Choices.scss";
 
-const { lang } = Astro.params;
+const { lang } = Astro.props;
 const content = await getTranslatedContent("Choices_Section", lang!);
 ---
 

diff --git a/src/views/Features/Features.astro b/src/views/Features/Features.astro
@@ -9,7 +9,7 @@ import Features_dark_1 from "./images/Features_dark_1.tsx";
 import Features_dark_2 from "./images/Features_dark_2.tsx";
 import getTranslatedContent from "../../utils/directus";
 
-const {lang} = Astro.params;
+const {lang} = Astro.props;
 const content = await getTranslatedContent("Features_Section", lang!);
 ---
 

diff --git a/src/views/Feedback/Feedback.astro b/src/views/Feedback/Feedback.astro
@@ -2,7 +2,7 @@
 import FeedbackCarousel from "./FeedbackCarousel.tsx";
 import getTranslatedContent, { getContent } from "../../utils/directus";
 
-const { lang } = Astro.params;
+const { lang } = Astro.props;
 const content = await getTranslatedContent("Feedback_Section", lang!);
 const testimonials = (await getContent("testimonials")) as FeedbackItem[];
 

diff --git a/src/views/Hero/Hero.astro b/src/views/Hero/Hero.astro
@@ -4,7 +4,7 @@ import ArrowRight from "@icons/ArrowRight";
 import getTranslatedContent from "@utils/directus";
 import "./Hero.scss";
 
-const {lang} = Astro.params;
+const {lang} = Astro.props;
 const content = await getTranslatedContent("Hero_Section", lang!);
 ---
 

diff --git a/src/views/Mobile/Mobile.astro b/src/views/Mobile/Mobile.astro
@@ -2,7 +2,7 @@
 import "./Mobile.scss";
 import getTranslatedContent from "@utils/directus";
 
-const { lang } = Astro.params;
+const { lang } = Astro.props;
 const content = await getTranslatedContent("Mobile_Section", lang!);
 ---