From 827ef80bf91e2dd317ce10bffc41367e6f37f9cb Mon Sep 17 00:00:00 2001
From: NoeliaEle <88032788+NoeliaEle@users.noreply.github.com>
Date: Fri, 12 Apr 2024 19:50:36 +0200
Subject: [PATCH 1/6] run contentful codegen

---
 @types/generated/contentful.d.ts | 62 ++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/@types/generated/contentful.d.ts b/@types/generated/contentful.d.ts
index b2b92035..22b74dcb 100644
--- a/@types/generated/contentful.d.ts
+++ b/@types/generated/contentful.d.ts
@@ -776,6 +776,64 @@ export interface ITeamSection extends Entry<ITeamSectionFields> {
   };
 }
 
+export interface ITestimonialsFields {
+  /** image */
+  image?: Asset | undefined;
+
+  /** link */
+  link?: string | undefined;
+
+  /** testimonialText */
+  testimonialText?: string | undefined;
+
+  /** author */
+  author?: string | undefined;
+}
+
+export interface ITestimonials extends Entry<ITestimonialsFields> {
+  sys: {
+    id: string;
+    type: string;
+    createdAt: string;
+    updatedAt: string;
+    locale: string;
+    contentType: {
+      sys: {
+        id: "testimonials";
+        linkType: "ContentType";
+        type: "Link";
+      };
+    };
+  };
+}
+
+export interface ITestimonialSectionFields {
+  /** Title */
+  title: string;
+
+  /** Testimonials */
+  testimonials: ITestimonials[];
+}
+
+/** Here you can find the testimonials grouped */
+
+export interface ITestimonialSection extends Entry<ITestimonialSectionFields> {
+  sys: {
+    id: string;
+    type: string;
+    createdAt: string;
+    updatedAt: string;
+    locale: string;
+    contentType: {
+      sys: {
+        id: "testimonialSection";
+        linkType: "ContentType";
+        type: "Link";
+      };
+    };
+  };
+}
+
 export interface ITrackingGaFields {
   /** Title */
   title: string;
@@ -899,6 +957,8 @@ export type CONTENT_TYPE =
   | "supporter"
   | "tag"
   | "teamSection"
+  | "testimonials"
+  | "testimonialSection"
   | "trackingGa"
   | "twoImages"
   | "videoPlayer";
@@ -927,6 +987,8 @@ export type IEntry =
   | ISupporter
   | ITag
   | ITeamSection
+  | ITestimonials
+  | ITestimonialSection
   | ITrackingGa
   | ITwoImages
   | IVideoPlayer;

From d1db1e7e1a0316ea8e51ba0bf92bcdf85d1d6294 Mon Sep 17 00:00:00 2001
From: NoeliaEle <88032788+NoeliaEle@users.noreply.github.com>
Date: Fri, 12 Apr 2024 20:16:38 +0200
Subject: [PATCH 2/6] Add video alignment prop on video content item

---
 @types/generated/contentful.d.ts             |  3 +++
 app/components/ContentBlocks.tsx             |  3 ++-
 app/components/ContentBlocks/VideoPlayer.tsx | 18 +++++++++++++++---
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/@types/generated/contentful.d.ts b/@types/generated/contentful.d.ts
index 22b74dcb..9d9074c4 100644
--- a/@types/generated/contentful.d.ts
+++ b/@types/generated/contentful.d.ts
@@ -912,6 +912,9 @@ export interface IVideoPlayerFields {
 
   /** Show only on german page */
   showOnlyOnGermanPage?: boolean | undefined;
+
+  /** video alignment */
+  videoAlignment?: boolean | undefined;
 }
 
 /** Component to display videos */
diff --git a/app/components/ContentBlocks.tsx b/app/components/ContentBlocks.tsx
index e721a39c..bc4bcb83 100644
--- a/app/components/ContentBlocks.tsx
+++ b/app/components/ContentBlocks.tsx
@@ -123,7 +123,7 @@ export default function ContentBlocks({ content, locale }: ContentBlockProps) {
         }
 
         if (id === "videoPlayer") {
-          const { videoId, content, showOnlyOnGermanPage } =
+          const { videoId, content, showOnlyOnGermanPage, videoAlignment } =
             item.fields as IVideoPlayerFields;
           if (
             !showOnlyOnGermanPage ||
@@ -134,6 +134,7 @@ export default function ContentBlocks({ content, locale }: ContentBlockProps) {
                 key={item.sys.id}
                 videoId={videoId}
                 content={content}
+                videoAlignment={videoAlignment}
               />
             );
           }
diff --git a/app/components/ContentBlocks/VideoPlayer.tsx b/app/components/ContentBlocks/VideoPlayer.tsx
index f4bc978a..46412d29 100644
--- a/app/components/ContentBlocks/VideoPlayer.tsx
+++ b/app/components/ContentBlocks/VideoPlayer.tsx
@@ -1,13 +1,25 @@
 import type { IVideoPlayerFields } from "../../../@types/generated/contentful";
 import ContentfulRichText from "../ContentfulRichText";
 
-export default function VideoPlayer({ videoId, content }: IVideoPlayerFields) {
+export default function VideoPlayer({
+  videoId,
+  content,
+  videoAlignment,
+}: IVideoPlayerFields) {
   return (
     <section className="my-1 grid w-screen max-w-full grid-cols-1 lg:grid-cols-2">
-      <div className=" flex-grid self-center py-8 px-4 lg:row-start-1 lg:ml-auto lg:max-w-[70ch] lg:px-12 lg:pt-24 lg:pb-12">
+      <div
+        className={`flex self-center py-8 px-4 lg:row-start-1 ${
+          videoAlignment ? "lg:mr-auto" : "lg:ml-auto"
+        } lg:max-w-[70ch] lg:px-12 lg:pt-24 lg:pb-12 `}
+      >
         {content && <ContentfulRichText content={content} />}
       </div>
-      <div className="row-start-2 h-auto w-full lg:col-start-2 lg:row-start-1 lg:max-h-max lg:p-4">
+      <div
+        className={`row-start-2 h-auto w-full ${
+          videoAlignment ? "lg:col-start-1" : "lg:col-start-2"
+        } lg:row-start-1 lg:max-h-max lg:p-4 `}
+      >
         <iframe
           title="video"
           loading="lazy"

From 6cd98781789aef84ac5ddee187f848ae35138061 Mon Sep 17 00:00:00 2001
From: NoeliaEle <88032788+NoeliaEle@users.noreply.github.com>
Date: Fri, 12 Apr 2024 20:33:33 +0200
Subject: [PATCH 3/6] display only video if no content is received

---
 app/components/ContentBlocks/VideoPlayer.tsx | 34 +++++++++++++-------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/app/components/ContentBlocks/VideoPlayer.tsx b/app/components/ContentBlocks/VideoPlayer.tsx
index 46412d29..e19b6e17 100644
--- a/app/components/ContentBlocks/VideoPlayer.tsx
+++ b/app/components/ContentBlocks/VideoPlayer.tsx
@@ -7,18 +7,30 @@ export default function VideoPlayer({
   videoAlignment,
 }: IVideoPlayerFields) {
   return (
-    <section className="my-1 grid w-screen max-w-full grid-cols-1 lg:grid-cols-2">
+    <section
+      className={`my-1 w-screen grid-cols-1 ${
+        content ? "grid lg:grid-cols-2" : "max-w-4xl mx-auto"
+      }`}
+    >
+      {/* case with text : single video case */}
+      {content && (
+        <div
+          className={`flex self-center py-8 px-4 lg:row-start-1 lg:max-w-[70ch] lg:px-12 lg:pt-24 lg:pb-12 ${
+            videoAlignment ? "lg:mr-auto lg:col-start-2" : "lg:ml-auto"
+          } `}
+        >
+          <ContentfulRichText content={content} />
+        </div>
+      )}
       <div
-        className={`flex self-center py-8 px-4 lg:row-start-1 ${
-          videoAlignment ? "lg:mr-auto" : "lg:ml-auto"
-        } lg:max-w-[70ch] lg:px-12 lg:pt-24 lg:pb-12 `}
-      >
-        {content && <ContentfulRichText content={content} />}
-      </div>
-      <div
-        className={`row-start-2 h-auto w-full ${
-          videoAlignment ? "lg:col-start-1" : "lg:col-start-2"
-        } lg:row-start-1 lg:max-h-max lg:p-4 `}
+        className={`lg:p-4 ${
+          content
+            ? "row-start-2 lg:row-start-1 h-auto w-full lg:max-h-max " &&
+              videoAlignment
+              ? "lg:col-start-1 "
+              : "lg:col-start-2 "
+            : "mx-auto"
+        }`}
       >
         <iframe
           title="video"

From f100ccb4e22773a3e63084a39cb0d93e160afc07 Mon Sep 17 00:00:00 2001
From: NoeliaEle <88032788+NoeliaEle@users.noreply.github.com>
Date: Fri, 12 Apr 2024 20:36:01 +0200
Subject: [PATCH 4/6] remove comment

---
 app/components/ContentBlocks/VideoPlayer.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/components/ContentBlocks/VideoPlayer.tsx b/app/components/ContentBlocks/VideoPlayer.tsx
index e19b6e17..03a0031f 100644
--- a/app/components/ContentBlocks/VideoPlayer.tsx
+++ b/app/components/ContentBlocks/VideoPlayer.tsx
@@ -12,7 +12,6 @@ export default function VideoPlayer({
         content ? "grid lg:grid-cols-2" : "max-w-4xl mx-auto"
       }`}
     >
-      {/* case with text : single video case */}
       {content && (
         <div
           className={`flex self-center py-8 px-4 lg:row-start-1 lg:max-w-[70ch] lg:px-12 lg:pt-24 lg:pb-12 ${

From 67163aa28b7f5641397fc4d12295983f7902f7f5 Mon Sep 17 00:00:00 2001
From: NoeliaEle <88032788+NoeliaEle@users.noreply.github.com>
Date: Fri, 12 Apr 2024 21:38:06 +0200
Subject: [PATCH 5/6] Add basic banner UI

---
 @types/generated/contentful.d.ts        | 30 +++++++++++++++++++++++++
 app/components/ContentBlocks.tsx        | 13 +++++++++++
 app/components/ContentBlocks/Banner.tsx | 12 ++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 app/components/ContentBlocks/Banner.tsx

diff --git a/@types/generated/contentful.d.ts b/@types/generated/contentful.d.ts
index 9d9074c4..650afc85 100644
--- a/@types/generated/contentful.d.ts
+++ b/@types/generated/contentful.d.ts
@@ -3,6 +3,33 @@
 import { Asset, Entry } from "contentful";
 import { Document } from "@contentful/rich-text-types";
 
+export interface IBannerFields {
+  /** text in banner */
+  textInBanner: Document;
+
+  /** action */
+  action?: string | undefined;
+}
+
+/** A banner to display timely-relevant information */
+
+export interface IBanner extends Entry<IBannerFields> {
+  sys: {
+    id: string;
+    type: string;
+    createdAt: string;
+    updatedAt: string;
+    locale: string;
+    contentType: {
+      sys: {
+        id: "banner";
+        linkType: "ContentType";
+        type: "Link";
+      };
+    };
+  };
+}
+
 export interface IBlogpostFields {
   /** Titel */
   title?: string | undefined;
@@ -634,6 +661,7 @@ export interface IPageFields {
     | ITrackingGa
     | IBlogPreview
     | ITeamSection
+    | IBanner
   )[];
 
   /** seo */
@@ -937,6 +965,7 @@ export interface IVideoPlayer extends Entry<IVideoPlayerFields> {
 }
 
 export type CONTENT_TYPE =
+  | "banner"
   | "blogpost"
   | "BlogPreview"
   | "centeredContent"
@@ -967,6 +996,7 @@ export type CONTENT_TYPE =
   | "videoPlayer";
 
 export type IEntry =
+  | IBanner
   | IBlogpost
   | IBlogPreview
   | ICenteredContent
diff --git a/app/components/ContentBlocks.tsx b/app/components/ContentBlocks.tsx
index bc4bcb83..4686dfc6 100644
--- a/app/components/ContentBlocks.tsx
+++ b/app/components/ContentBlocks.tsx
@@ -1,4 +1,5 @@
 import type {
+  IBannerFields,
   IBlogpostFields,
   ICenteredContentFields,
   IContentImageBgFields,
@@ -13,6 +14,7 @@ import type {
   IVideoPlayerFields,
   LOCALE_CODE,
 } from "../../@types/generated/contentful";
+import Banner from "./ContentBlocks/Banner";
 import ContentBlockBlogPreview from "./ContentBlocks/BlogPreview";
 import ContentBlockCentered from "./ContentBlocks/Centered";
 import ContentBlockImageCollection from "./ContentBlocks/ContentBlockImageCollection";
@@ -183,6 +185,17 @@ export default function ContentBlocks({ content, locale }: ContentBlockProps) {
           );
         }
 
+        if (id === "banner") {
+          const { textInBanner, action } = item.fields as IBannerFields;
+          return (
+            <Banner
+              key={item.sys.id}
+              textInBanner={textInBanner}
+              action={action}
+            />
+          );
+        }
+
         if (id === "coachList") {
           return null;
         } else {
diff --git a/app/components/ContentBlocks/Banner.tsx b/app/components/ContentBlocks/Banner.tsx
new file mode 100644
index 00000000..50298621
--- /dev/null
+++ b/app/components/ContentBlocks/Banner.tsx
@@ -0,0 +1,12 @@
+import type { IBannerFields } from "../../../@types/generated/contentful";
+import ContentfulRichText from "../ContentfulRichText";
+
+export default function Banner({ textInBanner, action }: IBannerFields) {
+  return (
+    <section className="flex items-center justify-center fixed bottom-0 w-full py-2 px-4 bg-gradient-to-b from-vsp-600 to-vsp-300 z-10 text-center">
+      <a href={action}>
+        <ContentfulRichText content={textInBanner}></ContentfulRichText>
+      </a>
+    </section>
+  );
+}

From 8ceacb96102880f5ed65576d4427a1ffeb2c346a Mon Sep 17 00:00:00 2001
From: NoeliaEle <88032788+NoeliaEle@users.noreply.github.com>
Date: Fri, 10 May 2024 21:12:03 +0200
Subject: [PATCH 6/6] adjust color of banner

---
 app/components/ContentBlocks/Banner.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/components/ContentBlocks/Banner.tsx b/app/components/ContentBlocks/Banner.tsx
index 50298621..b174bf3e 100644
--- a/app/components/ContentBlocks/Banner.tsx
+++ b/app/components/ContentBlocks/Banner.tsx
@@ -3,7 +3,7 @@ import ContentfulRichText from "../ContentfulRichText";
 
 export default function Banner({ textInBanner, action }: IBannerFields) {
   return (
-    <section className="flex items-center justify-center fixed bottom-0 w-full py-2 px-4 bg-gradient-to-b from-vsp-600 to-vsp-300 z-10 text-center">
+    <section className="flex items-center justify-center fixed bottom-0 w-full py-2 px-4 bg-gradient-to-b to-orange-400 from-orange-500 shadow-[rgba(0,0,15,0.5)_5px_5px_5px_6px] z-10 text-center">
       <a href={action}>
         <ContentfulRichText content={textInBanner}></ContentfulRichText>
       </a>