From 04adf08b5c91806fff17f123c9fc959b1178386d Mon Sep 17 00:00:00 2001
From: Lightling <contact@lightling.xyz>
Date: Wed, 16 Oct 2024 18:05:51 -0400
Subject: [PATCH] update frontend to match new variant fields

---
 .../src/content/templates/gallery-list.d.ts   |  6 +++
 libs/types/src/content/templates/shared.d.ts  | 11 +----
 .../src/views/gallery/gallery-tile.vue        | 46 +++++++------------
 .../src/views/gallery/gallery-view.vue        |  6 +--
 .../frontend/src/views/shared/media-list.vue  |  2 +-
 5 files changed, 27 insertions(+), 44 deletions(-)

diff --git a/libs/types/src/content/templates/gallery-list.d.ts b/libs/types/src/content/templates/gallery-list.d.ts
index 1c77eb9..c86f5ee 100644
--- a/libs/types/src/content/templates/gallery-list.d.ts
+++ b/libs/types/src/content/templates/gallery-list.d.ts
@@ -21,6 +21,12 @@ export type GalleryEntrySharedProperties = {
  * It contains a URL to the media that the entry represents.
  */
 export type GalleryEntryWithoutVariants = {
+  alternativeText?: string
+  caption?: string
+  /**
+   * URL to the entry's thumbnail
+   */
+  thumbnailUrl?: string
   /**
    * URL to the entry
    */
diff --git a/libs/types/src/content/templates/shared.d.ts b/libs/types/src/content/templates/shared.d.ts
index a16ac28..940a5f3 100644
--- a/libs/types/src/content/templates/shared.d.ts
+++ b/libs/types/src/content/templates/shared.d.ts
@@ -86,20 +86,11 @@ export type MediaEntry = {
    * The title of the entry
    */
   title: string
-  /**
-   * Information regarding the thumbnail
-   */
-  thumbnail?: {
-    /**
-     * Sets the inline-styles for the thumbnail
-     */
-    style: CSSStyleDeclaration
-  }
   /**
    * any content warnings that apply to the entry,
    * which will be used to apply the `.warning` classname
    * to the DOM of a tile
    * and will be displayed with the tile
    */
-  warning?: string
+  warnings?: string
 }
diff --git a/projects/frontend/src/views/gallery/gallery-tile.vue b/projects/frontend/src/views/gallery/gallery-tile.vue
index cc51598..63a096e 100644
--- a/projects/frontend/src/views/gallery/gallery-tile.vue
+++ b/projects/frontend/src/views/gallery/gallery-tile.vue
@@ -1,8 +1,11 @@
 <script setup lang="ts">
-import { computed, onMounted, ref, toRaw } from 'vue'
+import {
+  computed,
+  onMounted,
+  ref,
+} from 'vue'
 import { marked } from 'marked'
-import type { 
-  GalleryEntry,
+import type {
   GalleryEntryWithVariants,
   GalleryEntryWithoutVariants,
 } from '@goldenwere/mackenzii-types'
@@ -12,42 +15,24 @@ const props = defineProps<{
   viewPath: string,
   hideWarnings: boolean,
   isInternal: boolean,
-  entry: Promise<GalleryEntry>
+  entry: Promise<GalleryEntryWithVariants>
 }>()
 
 defineEmits<{
   (e: 'click', value: { event: Event, id: string }): void
 }>()
 
-const resolved = ref({} as GalleryEntry)
-const hasVariants = computed(() => !!(resolved.value as GalleryEntryWithVariants).variants)
+const resolved = ref({} as GalleryEntryWithVariants)
+const defaultVariant = ref({} as GalleryEntryWithoutVariants)
 const description = computed(() => marked.parse(resolved.value.description || '') as string)
 const title = computed(() => marked.parse(resolved.value.title || props.id) as string)
-const warning = computed(() => resolved.value.warning)
-
-const thumbnail = computed(() => {
-  if (!!resolved.value.thumbnail) {
-    return toRaw(resolved.value.thumbnail.style)
-  } else if (hasVariants) {
-    const resolvedCast = resolved.value as GalleryEntryWithVariants
-    if (resolvedCast.defaultVariant) {
-      return {
-        'background-image': `url("${resolvedCast.variants[resolvedCast.defaultVariant].url}")`,
-        'background-position': 'center center',
-      }
-    } else {
-
-    }
-  } else {
-    return {
-      'background-image': `url("${(resolved.value as GalleryEntryWithoutVariants).url}")`,
-      'background-position': 'center center',
-    }
-  }
-})
+const warning = computed(() => resolved.value.warnings)
+const altText = computed(() => defaultVariant.value.alternativeText)
+const thumbnail = computed(() => defaultVariant.value.thumbnailUrl)
 
 onMounted(async () => {
   resolved.value = await props.entry
+  defaultVariant.value = resolved.value.variants[resolved.value.defaultVariant || 0]
 })
 </script>
 
@@ -58,8 +43,9 @@ include /src/templates/link.pug
     :class='{ warning: !!warning && !hideWarnings }'
   )
     +link
-      .thumbnail(
-        :style='thumbnail'
+      img.thumbnail(
+        :src='thumbnail'
+        :alt='altText'
       )
   .caption-wrapper
     p.title(
diff --git a/projects/frontend/src/views/gallery/gallery-view.vue b/projects/frontend/src/views/gallery/gallery-view.vue
index b72b203..2747694 100644
--- a/projects/frontend/src/views/gallery/gallery-view.vue
+++ b/projects/frontend/src/views/gallery/gallery-view.vue
@@ -37,8 +37,8 @@ const fields = computed(() => {
   if (!!resolved.value.date) {
     toReturn.date = resolved.value.date
   }
-  if (!!resolved.value.warning) {
-    toReturn.warning = resolved.value.warning
+  if (!!resolved.value.warnings) {
+    toReturn.warning = resolved.value.warnings
   }
   return toReturn
 })
@@ -112,7 +112,7 @@ onMounted(async () => {
             img(
               v-for='(variant, id) in variants'
               :class='{ active: id === currentSelection }'
-              :src='variant.url'
+              :src='variant.thumbnailUrl || variant.url'
               :title='variant.title || id'
               @click='onVariantSelected($event, id)'
             )
diff --git a/projects/frontend/src/views/shared/media-list.vue b/projects/frontend/src/views/shared/media-list.vue
index a39d211..8e88552 100644
--- a/projects/frontend/src/views/shared/media-list.vue
+++ b/projects/frontend/src/views/shared/media-list.vue
@@ -90,7 +90,7 @@ onMounted(async () => {
   entries.value = list.entries
   document.title = routeConfig.fullTitle
   ready.value = true
-  hasWarnings.value = !!(await Promise.all(Object.values(list.entries))).find(other => !!other.warning)
+  hasWarnings.value = !!(await Promise.all(Object.values(list.entries))).find(other => !!other.warnings)
 })
 </script>