fix: optimized image type

Author: MrGreenTea

src/data/index.ts

@@ -60,9 +60,8 @@ export type YearlyEvent = {
   for_all: boolean;
   future?: string;
   //TODO: this should probably also be an ImageWithAlt
-  image: {
+  image: GetImageResult & {
     alt: string;
-    src: GetImageResult;
   };
   month: string;
   short_description: string;

src/data/real/events.ts

@@ -120,7 +120,7 @@ export async function getAllYearlyEvents(): Promise<YearlyEvent[]> {
       for_all: true,
       image: {
         alt: 'Eine Gruppe Menschen sitzt in einer Reihe.',
-        src: await getYearlyEventImage(EventImage1),
+        ...(await getYearlyEventImage(EventImage1)),
       },
       month: 'September',
       short_description:
@@ -133,7 +133,7 @@ export async function getAllYearlyEvents(): Promise<YearlyEvent[]> {
       for_all: true,
       image: {
         alt: 'Menschen sitzen an einem Holztisch und spielen ein Kartenspiel im Garten.',
-        src: await getYearlyEventImage(EventImage2),
+        ...(await getYearlyEventImage(EventImage2)),
       },
       month: 'Dezember',
       short_description:
@@ -146,7 +146,7 @@ export async function getAllYearlyEvents(): Promise<YearlyEvent[]> {
       for_all: false,
       image: {
         alt: 'Ein großer Kuschelhaufen liegt vor einer Frau die Ukulele spielt.',
-        src: await getYearlyEventImage(EventImage3),
+        ...(await getYearlyEventImage(EventImage3)),
       },
       month: 'April',
       short_description:

src/data/test/events.ts

@@ -93,7 +93,7 @@ export async function getAllYearlyEvents(): Promise<YearlyEvent[]> {
     {
       day: '1',
       for_all: true,
-      image: { alt: 'Test Event Image 1', src: await getImage({ src: EventImage1 }) },
+      image: { alt: 'Test Event Image 1', ...(await getImage({ src: EventImage1 })) },
       month: 'Januar',
       short_description: 'Das ist ein Test Event. Komm nicht vorbei, weil es ist nicht real.',
       slug: 'event-1',
@@ -102,7 +102,7 @@ export async function getAllYearlyEvents(): Promise<YearlyEvent[]> {
     {
       day: '31',
       for_all: true,
-      image: { alt: 'Test Event Image 2', src: await getImage({ src: EventImage2 }) },
+      image: { alt: 'Test Event Image 2', ...(await getImage({ src: EventImage2 })) },
       month: 'Oktober',
       short_description:
         'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed pretium, felis sed luctus tempor',
@@ -112,7 +112,7 @@ export async function getAllYearlyEvents(): Promise<YearlyEvent[]> {
     {
       day: '24',
       for_all: false,
-      image: { alt: 'Test Event Image 3', src: await getImage({ src: EventImage3 }) },
+      image: { alt: 'Test Event Image 3', ...(await getImage({ src: EventImage3 })) },
       month: 'Mai',
       short_description: 'Noch ein Test Event, aber nur für Mitglieder !!!1!!11!111elf1',
       slug: 'event-3',