Remove astro image (#146)

src/components/photo.astro

@@ -0,0 +1,24 @@
+---
+import { Image } from '@astrojs/image/components';
+
+import type { Photo } from '@/types/common';
+
+export interface Props {
+  src: Photo;
+  alt: string;
+  class?: string;
+}
+
+const { src, alt } = Astro.props;
+const className = Astro.props.class ?? '';
+
+const isRemoteImage = typeof src === 'string';
+---
+
+{
+  isRemoteImage ? (
+    <img class={className} src={src} alt={alt} />
+  ) : (
+    <Image class={className} format="webp" fit={'cover'} src={src} alt={alt} />
+  )
+}

src/data/sections/favorites.ts

@@ -15,7 +15,7 @@ const favoritesData: FavoritesSection = {
         url: 'https://www.goodreads.com/book/show/4099.The_Pragmatic_Programmer',
       },
       {
-        cover: import('@/assets/favorites/books/book-2.jpeg'),
+        cover: 'https://m.media-amazon.com/images/I/61aFldsgAmL._SY344_BO1,204,203,200_QL70_ML2_.jpg',
         title: 'Domain-Driven Design: Tackling Complexity in the Heart of Software',
         author: 'Eric Evans',
         url: 'https://www.goodreads.com/book/show/179133.Domain_Driven_Design',

src/sections/favorites/book-tile.astro

@@ -1,6 +1,5 @@
 ---
-import { Image } from '@astrojs/image/components';
-
+import Photo from '@/components/photo.astro';
 import Typography from '@/components/typography.astro';
 import type { Book } from '@/types/favorites-section';
 
@@ -14,15 +13,7 @@ const {
 ---
 
 <a href={url} class="flex w-full max-w-[200px] flex-col gap-3 transition duration-300 hover:translate-y-2">
-  <Image
-    class="rounded-lg shadow-md aspect-[3/4] object-cover"
-    format="webp"
-    fit={'cover'}
-    aspectRatio={3 / 4}
-    quality={100}
-    src={cover}
-    alt={title}
-  />
+  <Photo src={cover} alt={title} class="aspect-[3/4] rounded-lg object-cover shadow-md'" />
   <div class="w-full gap-1">
     <Typography variant="tile-title">
       {title}

src/sections/favorites/media-tile.astro

@@ -1,6 +1,5 @@
 ---
-import { Image } from '@astrojs/image/components';
-
+import Photo from '@/components/photo.astro';
 import Typography from '@/components/typography.astro';
 import type { Media } from '@/types/favorites-section';
 
@@ -14,15 +13,7 @@ const {
 ---
 
 <a href={url} class="flex w-full max-w-[120px] flex-col gap-3 transition duration-300 hover:translate-y-2">
-  <Image
-    class="rounded-lg shadow-md aspect-square object-cover"
-    fit="cover"
-    format="webp"
-    aspectRatio={1}
-    quality={100}
-    src={image}
-    alt={title}
-  />
+  <Photo class="rounded-lg shadow-md aspect-square object-cover" src={image} alt={title} />
   <div class="gap-1">
     <Typography variant="tile-title">
       {title}

src/sections/favorites/person-tile.astro

@@ -1,6 +1,5 @@
 ---
-import { Image } from '@astrojs/image/components';
-
+import Photo from '@/components/photo.astro';
 import Typography from '@/components/typography.astro';
 import type { Person } from '@/types/favorites-section';
 
@@ -14,15 +13,7 @@ const {
 ---
 
 <a href={url} class="flex w-full max-w-[120px] flex-col gap-3 transition duration-300 hover:translate-y-2">
-  <Image
-    class="rounded-lg shadow-md transition duration-300 aspect-square object-cover"
-    format="webp"
-    fit="cover"
-    quality={100}
-    aspectRatio={1}
-    src={image}
-    alt={name}
-  />
+  <Photo class="rounded-lg shadow-md transition duration-300 aspect-square object-cover" src={image} alt={name} />
   <Typography variant="tile-title">
     {name}
   </Typography>

src/sections/favorites/video-tile.astro

@@ -1,6 +1,5 @@
 ---
-import { Image } from '@astrojs/image/components';
-
+import Photo from '@/components/photo.astro';
 import Typography from '@/components/typography.astro';
 import type { Video } from '@/types/favorites-section';
 
@@ -17,14 +16,7 @@ const thumbnail = `https://img.youtube.com/vi/${id}/0.jpg`;
 ---
 
 <a href={url} class="flex w-full max-w-[240px] flex-col gap-3 transition duration-300 hover:translate-y-2">
-  <Image
-    class="rounded-lg shadow-md aspect-video object-cover"
-    format="webp"
-    width={240}
-    height={180}
-    src={thumbnail}
-    alt={title}
-  />
+  <Photo class="rounded-lg shadow-md aspect-video object-cover" src={thumbnail} alt={title} />
   <Typography variant="tile-title">
     {title}
   </Typography>

src/sections/main/main-section.astro

@@ -1,8 +1,7 @@
 ---
-import { Image } from '@astrojs/image/components';
-
 import Button from '@/components/button.astro';
 import IconButton from '@/components/icon-button.astro';
+import Photo from '@/components/photo.astro';
 import SectionCard from '@/components/section-card.astro';
 import TagsList from '@/components/tags-list.astro';
 import Typography from '@/components/typography.astro';
@@ -28,13 +27,7 @@ const section: SectionKey = 'main';
 <SectionCard section={section}>
   <div class="flex flex-col items-start gap-6 sm:flex-row">
     <div class="flex items-center gap-4 sm:flex-col">
-      <Image
-        src={image}
-        alt={fullName}
-        class="w-24 h-24 sm:w-36 sm:h-36 md:w-52 md:h-52 rounded-lg max-w-none"
-        format="webp"
-        aspectRatio={1}
-      />
+      <Photo src={image} alt={fullName} class="w-24 h-24 sm:w-36 sm:h-36 md:w-52 md:h-52 rounded-lg max-w-none" />
       <Button href={url} download={downloadedFileName}>{label}</Button>
     </div>
     <div class="flex w-full flex-col gap-5">

src/sections/portfolio/project-timeline-item.astro

@@ -1,8 +1,7 @@
 ---
-import { Image } from '@astrojs/image/components';
-
 import IconButton from '@/components/icon-button.astro';
 import LabelledValue from '@/components/labelled-value.astro';
+import Photo from '@/components/photo.astro';
 import TagsList from '@/components/tags-list.astro';
 import Timestamp from '@/components/timestamp.astro';
 import Typography from '@/components/typography.astro';
@@ -16,24 +15,13 @@ export interface Props {
 const { project, i18n } = Astro.props;
 const { description, details, endDate, name, socials, startDate, tags, image } = project;
 
-// Alt has to destructured separately, because otherwise eslint complains about
-// the missing alt attribute on the Image component.
-const { alt, ...sharedImageProps } = {
-  src: image,
-  aspectRatio: 1,
-  alt: `Thumbnail for ${name} project`,
-  format: 'webp',
-} as const;
+const alt = `Thumbnail for ${name} project`;
 ---
 
 <div class="flex flex-col gap-6">
   <div class="flex flex-col gap-4">
     <div class="flex gap-6">
-      <Image
-        class="rounded-lg object-cover max-w-[120px] overflow-hidden sm:block hidden"
-        {...sharedImageProps}
-        alt={alt}
-      />
+      <Photo class="rounded-lg object-cover max-w-[120px] overflow-hidden sm:block hidden" src={image} alt={alt} />
       <div class="flex w-full flex-col gap-4">
         <div class="flex justify-between">
           <div>
@@ -53,7 +41,7 @@ const { alt, ...sharedImageProps } = {
             }
           </div>
         </div>
-        <Image class="rounded-lg object-cover max-w-[120px] sm:hidden" {...sharedImageProps} alt={alt} />
+        <Photo class="rounded-lg object-cover max-w-[120px] sm:hidden" src={image} alt={alt} />
         <div class="inline-grid w-full xl:grid-cols-[auto_auto]">
           {
             details.map(({ label: detailLabel, value: detailValue }) => (

src/sections/testimonials/testimonial.astro

@@ -1,7 +1,6 @@
 ---
-import { Image } from '@astrojs/image/components';
-
 import IconButton from '@/components/icon-button.astro';
+import Photo from '@/components/photo.astro';
 import Typography from '@/components/typography.astro';
 import type { Testimonial } from '@/types/testimonials-section';
 
@@ -17,7 +16,7 @@ const {
 <div class="flex w-full flex-col gap-4">
   <div class="flex justify-between">
     <div class="flex flex-col gap-4 sm:flex-row">
-      <Image src={image} alt={author} format="webp" class="w-14 h-14 rounded-lg" />
+      <Photo src={image} alt={author} class="w-14 h-14 rounded-lg" />
       <div>
         <Typography variant="item-title">{author}</Typography>
         <Typography variant="item-subtitle">{relation}</Typography>

src/types/common.ts

@@ -1,6 +1,6 @@
 import type { IconName } from './icon';
 
-export type LocalImage = Promise<{ default: ImageMetadata }>;
+export type Photo = Promise<{ default: ImageMetadata }> | string;
 
 export interface Detail {
   label: string;

src/types/favorites-section.ts

@@ -1,28 +1,28 @@
-import type { LocalImage, SectionConfig } from './common';
+import type { Photo, SectionConfig } from './common';
 
 export interface Book {
   title: string;
-  cover: LocalImage;
+  cover: Photo;
   author: string;
   url?: string;
 }
 
 export interface Person {
   name: string;
-  image: LocalImage;
+  image: Photo;
   url?: string;
 }
 
 export interface Video {
   title: string;
-  thumbnail: LocalImage;
+  thumbnail: Photo;
   url: string;
 }
 
 export interface Media {
   title: string;
   type: string;
-  image: LocalImage;
+  image: Photo;
   url: string;
 }
 

src/types/main-section.ts

@@ -1,7 +1,7 @@
-import type { Detail, LocalImage, SectionConfig, Social, Tag } from './common';
+import type { Detail, Photo, SectionConfig, Social, Tag } from './common';
 
 export interface MainSection {
-  image: LocalImage;
+  image: Photo;
   fullName: string;
   role: string;
   details: Detail[];

src/types/portfolio-section.ts

@@ -1,8 +1,8 @@
-import type { Detail, LocalImage, SectionConfig, Social, Tag } from './common';
+import type { Detail, Photo, SectionConfig, Social, Tag } from './common';
 
 export interface Project {
   name: string;
-  image?: LocalImage;
+  image: Photo;
   startDate: Date;
   endDate: Date | null;
   details: Detail[];

src/types/testimonials-section.ts

@@ -1,7 +1,7 @@
-import type { LocalImage, SectionConfig, Social } from './common';
+import type { Photo, SectionConfig, Social } from './common';
 
 export interface Testimonial {
-  image: LocalImage;
+  image: Photo;
   author: string;
   relation: string;
   content: string;