From 3df3ba4ebcdf2567e461d1639dd6a802c367b625 Mon Sep 17 00:00:00 2001
From: Julian Krauser <jkrauser209@gmail.com>
Date: Sun, 3 Nov 2024 13:13:36 +0100
Subject: [PATCH] content text and dynamic zone components

---
 assets/app.css                                |  4 ++
 components/CollectionDetail.vue               | 47 +++++++++++++++++--
 components/ContentBuilder.vue                 |  3 +-
 components/dynamicZone/ColumnImageText.vue    | 13 ++++-
 components/dynamicZone/DualColumnText.vue     |  5 +-
 components/dynamicZone/FullImage.vue          |  9 +++-
 components/dynamicZone/FullText.vue           |  2 +-
 components/dynamicZone/Gallery.vue            | 12 ++++-
 components/field/Content.vue                  | 35 ++++++++++++++
 components/field/Text.vue                     | 21 +++++++++
 components/field/Type.vue                     | 15 ++++++
 components/shared/Hero.vue                    |  1 -
 layouts/landing.vue                           |  1 -
 types/collection/article.ts                   |  5 +-
 types/collection/baseCollection.ts            |  7 +++
 types/collection/event.ts                     |  3 +-
 types/collection/lookup.ts                    |  6 +--
 types/collection/operation.ts                 |  2 +-
 types/component/dynamicZoneColumnImageText.ts |  3 +-
 types/component/dynamicZoneDualColumnText.ts  |  5 +-
 types/component/dynamicZoneFullText.ts        |  3 +-
 types/field/content.ts                        | 24 ++++++++++
 22 files changed, 202 insertions(+), 24 deletions(-)
 create mode 100644 components/field/Content.vue
 create mode 100644 components/field/Text.vue
 create mode 100644 components/field/Type.vue
 create mode 100644 types/field/content.ts

diff --git a/assets/app.css b/assets/app.css
index 73ade63..ee5c876 100644
--- a/assets/app.css
+++ b/assets/app.css
@@ -42,3 +42,7 @@ a[primary-sublink].active {
 [darkgray] {
   @apply bg-darkgray text-white;
 }
+
+h1 {
+  @apply text-xl;
+}
diff --git a/components/CollectionDetail.vue b/components/CollectionDetail.vue
index a609ccf..84e8760 100644
--- a/components/CollectionDetail.vue
+++ b/components/CollectionDetail.vue
@@ -1,17 +1,56 @@
 <template>
-  <div class="min-h-[calc(100vh-9rem)] container mx-auto py-12">
-    {{ data }}
+  <div class="min-h-[calc(100vh-9rem)] h-fit container mx-auto py-12">
+    <h1>{{ data?.title }}</h1>
+    <p>
+      {{
+        new Date(data?.date ?? "").toLocaleString("de-DE", {
+          day: "2-digit",
+          month: "long",
+          year: "numeric",
+          minute: "2-digit",
+          hour: "2-digit",
+        })
+      }}
+    </p>
+    <br />
+    <p>{{ data?.description }}</p>
+    <br />
+    <NuxtPicture
+      v-if="data?.image"
+      loading="lazy"
+      class="w-fit h-[50vh] max-w-full object-cover object-center"
+      :src="baseUrl + data.image.url"
+      :imgAttrs="{ class: 'w-fit h-[50vh] max-w-full object-cover object-center' }"
+    />
+    <br v-if="data?.image" />
+    <div v-if="data?.content">
+      <p>Bericht:</p>
+      <FieldContent :data="data.content" />
+    </div>
+    <br />
+    <div v-if="data?.attachment">
+      <p>Anhang:</p>
+      <div class="flex flex-row flex-wrap gap-2 w-full min-h-fit">
+        <NuxtPicture
+          v-for="img in data.attachment"
+          loading="lazy"
+          class="w-fit h-48 object-cover object-center"
+          :src="baseUrl + img.url"
+          :imgAttrs="{ class: 'w-fit h-48 object-cover object-center' }"
+        />
+      </div>
+    </div>
   </div>
 </template>
 
 <script setup lang="ts">
 import type { PropType } from "vue";
-import type SharedHero from "../types/component/sharedHero";
-import type { ComponentTypes } from "../types/component/baseComponent";
 import type Article from "../types/collection/article";
 import type Operation from "../types/collection/operation";
 import type Event from "../types/collection/event";
 
+const baseUrl = useStrapiUrl().replace("/api", "");
+
 defineProps({
   data: Object as PropType<Article | Operation | Event>,
 });
diff --git a/components/ContentBuilder.vue b/components/ContentBuilder.vue
index 3ad73aa..c1333c0 100644
--- a/components/ContentBuilder.vue
+++ b/components/ContentBuilder.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="min-h-[calc(100vh-9rem)] w-full">
     <SharedHero v-if="hero" :data="hero" />
-    <div class="container mx-auto py-12 min-h-[50vh]">
+    <div class="container mx-auto py-12 min-h-[50vh] flex flex-col gap-2">
       <div v-for="item in content" class="contents">
         <DynamicZoneColumnImageText v-if="item.__component == 'dynamic-zone.column-image-text'" :data="item" />
         <DynamicZoneDualColumnText v-else-if="item.__component == 'dynamic-zone.dual-column-text'" :data="item" />
@@ -10,6 +10,7 @@
         <DynamicZoneFullText v-else-if="item.__component == 'dynamic-zone.full-text'" :data="item" />
         <DynamicZoneGallery v-else-if="item.__component == 'dynamic-zone.gallery'" :data="item" />
         <SharedList v-else-if="item.__component == 'shared.list'" :data="item" />
+        <br />
       </div>
     </div>
   </div>
diff --git a/components/dynamicZone/ColumnImageText.vue b/components/dynamicZone/ColumnImageText.vue
index 07da2b8..ecec308 100644
--- a/components/dynamicZone/ColumnImageText.vue
+++ b/components/dynamicZone/ColumnImageText.vue
@@ -1,11 +1,22 @@
 <template>
-  <p>{{ data }}</p>
+  <div class="flex flex-row gap-4">
+    <NuxtPicture
+      loading="lazy"
+      class="w-1/2 min-w-[50%] h-fit object-cover object-center"
+      :class="data?.image_left ? 'order-0' : 'order-1'"
+      :src="baseUrl + data?.image.url"
+      :imgAttrs="{ class: 'w-full h-fit object-cover object-center' }"
+    />
+    <FieldContent :data="data?.text" />
+  </div>
 </template>
 
 <script setup lang="ts">
 import type { PropType } from "vue";
 import type DynamicZoneColumnImageText from "../../types/component/dynamicZoneColumnImageText";
 
+const baseUrl = useStrapiUrl().replace("/api", "");
+
 defineProps({
   data: Object as PropType<DynamicZoneColumnImageText>,
 });
diff --git a/components/dynamicZone/DualColumnText.vue b/components/dynamicZone/DualColumnText.vue
index 3a35d8b..ec3873b 100644
--- a/components/dynamicZone/DualColumnText.vue
+++ b/components/dynamicZone/DualColumnText.vue
@@ -1,5 +1,8 @@
 <template>
-  <p>{{ data }}</p>
+  <div class="flex flex-row gap-4">
+    <FieldContent :data="data?.left_side" />
+    <FieldContent :data="data?.right_side" />
+  </div>
 </template>
 
 <script setup lang="ts">
diff --git a/components/dynamicZone/FullImage.vue b/components/dynamicZone/FullImage.vue
index a1a1f35..34432ab 100644
--- a/components/dynamicZone/FullImage.vue
+++ b/components/dynamicZone/FullImage.vue
@@ -1,11 +1,18 @@
 <template>
-  <p>{{ data }}</p>
+  <NuxtPicture
+    loading="lazy"
+    class="w-1/2 min-w-[50%] h-fit object-cover object-center mx-auto"
+    :src="baseUrl + data?.image.url"
+    :imgAttrs="{ class: 'w-full h-fit object-cover object-center' }"
+  />
 </template>
 
 <script setup lang="ts">
 import type { PropType } from "vue";
 import type DynamicZoneFullImage from "../../types/component/dynamicZoneFullImage";
 
+const baseUrl = useStrapiUrl().replace("/api", "");
+
 defineProps({
   data: Object as PropType<DynamicZoneFullImage>,
 });
diff --git a/components/dynamicZone/FullText.vue b/components/dynamicZone/FullText.vue
index 10ab0af..29c05b9 100644
--- a/components/dynamicZone/FullText.vue
+++ b/components/dynamicZone/FullText.vue
@@ -1,5 +1,5 @@
 <template>
-  <p>{{ data }}</p>
+  <FieldContent :data="data?.text" />
 </template>
 
 <script setup lang="ts">
diff --git a/components/dynamicZone/Gallery.vue b/components/dynamicZone/Gallery.vue
index 402462c..9af03cb 100644
--- a/components/dynamicZone/Gallery.vue
+++ b/components/dynamicZone/Gallery.vue
@@ -1,11 +1,21 @@
 <template>
-  <p>{{ data }}</p>
+  <div class="flex flex-row flex-wrap gap-2 w-full min-h-fit">
+    <NuxtPicture
+      v-for="img in data?.images"
+      loading="lazy"
+      class="w-fit h-48 object-cover object-center"
+      :src="baseUrl + img.url"
+      :imgAttrs="{ class: 'w-fit h-48 object-cover object-center' }"
+    />
+  </div>
 </template>
 
 <script setup lang="ts">
 import type { PropType } from "vue";
 import type DynamicZoneGallery from "../../types/component/dynamicZoneGallery";
 
+const baseUrl = useStrapiUrl().replace("/api", "");
+
 defineProps({
   data: Object as PropType<DynamicZoneGallery>,
 });
diff --git a/components/field/Content.vue b/components/field/Content.vue
new file mode 100644
index 0000000..c5d5c6a
--- /dev/null
+++ b/components/field/Content.vue
@@ -0,0 +1,35 @@
+<template>
+  <div class="w-full h-fit flex flex-col gap-2">
+    <div v-for="item in data" :key="item.type" class="contents">
+      <h1 v-if="item.type == 'heading'" class="w-full">
+        <FieldType v-for="child in item.children" :data="child" />
+      </h1>
+      <p v-else-if="item.type == 'paragraph'" class="w-full">
+        <FieldType v-for="child in item.children" :data="child" />
+      </p>
+      <div v-else-if="item.type == 'quote'" class="w-full p-3">
+        <p class="p-3 bg-gray-200 border-l-2 border-gray-500">
+          <FieldType v-for="child in item.children" :data="child" />
+        </p>
+      </div>
+      <ol
+        v-else-if="item.type == 'list'"
+        class="w-full"
+        :class="item.format == 'unordered' ? 'list-disc' : 'list-decimal'"
+      >
+        <li v-for="list in item.children" class="ml-6">
+          <FieldType v-for="child in list.children" :data="child" />
+        </li>
+      </ol>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import type { PropType } from "vue";
+import type ContentField from "../../types/field/content";
+
+defineProps({
+  data: Object as PropType<ContentField>,
+});
+</script>
diff --git a/components/field/Text.vue b/components/field/Text.vue
new file mode 100644
index 0000000..de5bb3c
--- /dev/null
+++ b/components/field/Text.vue
@@ -0,0 +1,21 @@
+<template>
+  <span
+    v-for="text in data"
+    :key="text.text"
+    :class="[
+      text.bold ? 'font-bold' : '',
+      text.strikethrough ? 'line-through' : '',
+      text.underline ? 'underline' : '',
+      text.italic ? 'italic' : '',
+    ]"
+    >{{ text.text }}</span
+  >
+</template>
+
+<script setup lang="ts">
+import type { TextField } from "../../types/field/content";
+
+defineProps({
+  data: Array<TextField>,
+});
+</script>
diff --git a/components/field/Type.vue b/components/field/Type.vue
new file mode 100644
index 0000000..d4f011b
--- /dev/null
+++ b/components/field/Type.vue
@@ -0,0 +1,15 @@
+<template>
+  <FieldText v-if="data?.type == 'text'" :data="[data]" />
+  <NuxtLink v-else :href="data?.url" class="text-primary">
+    <FieldText :data="data?.children" />
+  </NuxtLink>
+</template>
+
+<script setup lang="ts">
+import type { PropType } from "vue";
+import type { TypeField } from "../../types/field/content";
+
+defineProps({
+  data: Object as PropType<TypeField>,
+});
+</script>
diff --git a/components/shared/Hero.vue b/components/shared/Hero.vue
index 1920ede..68fd67b 100644
--- a/components/shared/Hero.vue
+++ b/components/shared/Hero.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="flex flex-col w-full max-h-72 h-72 overflow-hidden">
     <NuxtPicture
-      preload
       loading="lazy"
       class="w-full h-60 object-cover object-center"
       :src="baseUrl + data?.banner.url"
diff --git a/layouts/landing.vue b/layouts/landing.vue
index 4c11b68..7584565 100644
--- a/layouts/landing.vue
+++ b/layouts/landing.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="relative h-[calc(100vh-6rem)] max-h-[calc(100vh-6rem)] w-full overflow-hidden">
     <NuxtPicture
-      preload
       loading="lazy"
       class="w-full h-full object-cover object-center"
       :src="baseUrl + backdrop.url"
diff --git a/types/collection/article.ts b/types/collection/article.ts
index 3f59a6f..404cb40 100644
--- a/types/collection/article.ts
+++ b/types/collection/article.ts
@@ -1,5 +1,4 @@
+import type BaseImage from "../component/baseImage";
 import type BaseCollection from "./baseCollection";
 
-export default interface Article extends BaseCollection {
-  content: Array<{ type: string; children: Array<{ type: string; text: string }>; level?: number }>;
-}
+export default interface Article extends BaseCollection {}
diff --git a/types/collection/baseCollection.ts b/types/collection/baseCollection.ts
index a4408d8..b4c6aa4 100644
--- a/types/collection/baseCollection.ts
+++ b/types/collection/baseCollection.ts
@@ -1,3 +1,6 @@
+import type BaseImage from "../component/baseImage";
+import type ContentField from "../field/content";
+
 export default interface BaseCollection {
   id: number;
   documentId: string;
@@ -9,4 +12,8 @@ export default interface BaseCollection {
   updatedAt: string;
   publishedAt: string;
   locale: string;
+
+  content: ContentField | undefined;
+  image: BaseImage | undefined;
+  attachment: Array<BaseImage>;
 }
diff --git a/types/collection/event.ts b/types/collection/event.ts
index 6206029..5c22645 100644
--- a/types/collection/event.ts
+++ b/types/collection/event.ts
@@ -1,5 +1,6 @@
 import type BaseCollection from "./baseCollection";
 
 export default interface Event extends BaseCollection {
-  content: Array<{ type: string; children: Array<{ type: string; text: string }>; level?: number }>;
+  image: undefined;
+  content: undefined;
 }
diff --git a/types/collection/lookup.ts b/types/collection/lookup.ts
index 8501cf8..8cf0934 100644
--- a/types/collection/lookup.ts
+++ b/types/collection/lookup.ts
@@ -3,7 +3,7 @@ export default interface Lookup {
   documentId: string;
   collection: string;
   reference: string;
-  createdAt: Date;
-  updatedAt: Date;
-  publishedAt: Date;
+  createdAt: string;
+  updatedAt: string;
+  publishedAt: string;
 }
diff --git a/types/collection/operation.ts b/types/collection/operation.ts
index db197d9..5750de3 100644
--- a/types/collection/operation.ts
+++ b/types/collection/operation.ts
@@ -1,5 +1,5 @@
 import type BaseCollection from "./baseCollection";
 
 export default interface Operation extends BaseCollection {
-  content: Array<{ type: string; children: Array<{ type: string; text: string }>; level?: number }>;
+  image: undefined;
 }
diff --git a/types/component/dynamicZoneColumnImageText.ts b/types/component/dynamicZoneColumnImageText.ts
index 644ad5b..5c960bf 100644
--- a/types/component/dynamicZoneColumnImageText.ts
+++ b/types/component/dynamicZoneColumnImageText.ts
@@ -1,9 +1,10 @@
+import type ContentField from "../field/content";
 import type BaseComponent from "./baseComponent";
 import type BaseImage from "./baseImage";
 
 export default interface DynamicZoneColumnImageText extends BaseComponent {
   __component: "dynamic-zone.column-image-text";
-  text: Array<{ type: string; children: Array<{ type: string; text: string }> }>;
+  text: ContentField;
   image_left: boolean;
   image: BaseImage;
 }
diff --git a/types/component/dynamicZoneDualColumnText.ts b/types/component/dynamicZoneDualColumnText.ts
index 406718a..383f196 100644
--- a/types/component/dynamicZoneDualColumnText.ts
+++ b/types/component/dynamicZoneDualColumnText.ts
@@ -1,7 +1,8 @@
+import type ContentField from "../field/content";
 import type BaseComponent from "./baseComponent";
 
 export default interface DynamicZoneDualColumnText extends BaseComponent {
   __component: "dynamic-zone.dual-column-text";
-  left_side: Array<{ type: string; children: Array<{ type: string; text: string }> }>;
-  right_side: Array<{ type: string; children: Array<{ type: string; text: string }> }>;
+  left_side: ContentField;
+  right_side: ContentField;
 }
diff --git a/types/component/dynamicZoneFullText.ts b/types/component/dynamicZoneFullText.ts
index c4586a6..f516610 100644
--- a/types/component/dynamicZoneFullText.ts
+++ b/types/component/dynamicZoneFullText.ts
@@ -1,6 +1,7 @@
+import type ContentField from "../field/content";
 import type BaseComponent from "./baseComponent";
 
 export default interface DynamicZoneFullText extends BaseComponent {
   __component: "dynamic-zone.full-text";
-  text: Array<{ type: string; children: Array<{ type: string; text: string }> }>;
+  text: ContentField;
 }
diff --git a/types/field/content.ts b/types/field/content.ts
new file mode 100644
index 0000000..11273a2
--- /dev/null
+++ b/types/field/content.ts
@@ -0,0 +1,24 @@
+export default interface ContentField
+  extends Array<
+    | {
+        type: "paragraph" | "heading" | "quote";
+        children: Array<TypeField>;
+        level?: number;
+      }
+    | {
+        type: "list";
+        format: "unordered" | "ordered";
+        children: Array<{ type: "list-item"; children: Array<TypeField> }>;
+      }
+  > {}
+
+export type TypeField = TextField | { type: "link"; url: string; children: Array<TextField> };
+
+export type TextField = {
+  type: "text";
+  text: string;
+  strikethrough?: boolean;
+  underline?: boolean;
+  italic?: boolean;
+  bold?: boolean;
+};