Merge pull request 'feat/memorium-go' (#3) from feat/memorium-go into main

Reviewed-on: #3

astro.config.mjs

@@ -23,7 +23,6 @@ function setDefaultLayout() {
   };
 }
 
-// https://astro.build/config
 export default defineConfig({
   site: "https://max-richter.dev",
   trailingSlash: "never",

package.json

@@ -11,32 +11,32 @@
   },
   "dependencies": {
     "@astrojs/check": "^0.9.4",
-    "@astrojs/mdx": "^4.2.6",
+    "@astrojs/mdx": "^4.3.1",
-    "@astrojs/svelte": "^7.0.13",
+    "@astrojs/svelte": "^7.1.0",
     "@astrojs/tailwind": "^6.0.2",
-    "astro": "^5.7.13",
+    "astro": "^5.12.0",
     "astro-i18n-aut": "^0.7.3",
-    "exifreader": "^4.30.1",
+    "exifreader": "^4.31.1",
-    "svelte": "^5.28.6",
+    "svelte": "^5.36.10",
     "svelte-gestures": "^5.1.4",
-    "tailwindcss": "^4.1.6",
+    "tailwindcss": "^4.1.11",
     "thumbhash": "^0.1.1",
     "typescript": "^5.8.3"
   },
   "devDependencies": {
-    "@astrojs/sitemap": "^3.4.0",
+    "@astrojs/sitemap": "^3.4.1",
-    "@iconify-json/tabler": "^1.2.17",
+    "@iconify-json/tabler": "^1.2.19",
     "@types/markdown-it": "^14.1.2",
-    "@unocss/preset-icons": "^66.1.1",
+    "@unocss/preset-icons": "^66.3.3",
-    "@unocss/reset": "^66.1.1",
+    "@unocss/reset": "^66.3.3",
     "astro-font": "^1.1.0",
     "markdown-it": "^14.1.0",
     "ogl": "^1.0.11",
-    "prettier": "^3.5.3",
+    "prettier": "^3.6.2",
     "prettier-plugin-astro": "^0.14.1",
-    "sharp": "^0.34.1",
+    "sharp": "^0.34.3",
-    "unocss": "^66.1.1",
+    "unocss": "^66.3.3",
     "unplugin-icons": "^22.1.0",
-    "vite-plugin-glsl": "^1.4.1"
+    "vite-plugin-glsl": "^1.5.1"
   }
 }

pnpm-workspace.yaml

@@ -0,0 +1,4 @@
+onlyBuiltDependencies:
+  - esbuild
+  - exifreader
+  - sharp

src/components/Nav.astro

@@ -24,8 +24,8 @@ const paths = [
     text: t("nav.photos"),
   },
   {
-    link: translatePath("/videos"),
+    link: translatePath("/resources"),
-    text: t("nav.videos"),
+    text: t("nav.resources"),
   },
 ];
 ---

src/content/videos/_index.en.md

@@ -1,4 +1,4 @@
 ---
-title: Videos
+title: Resources
 menu: nav
 ---

src/helpers/image.ts

@@ -53,10 +53,15 @@ const allowedExif = [
 ];
 
 export async function getExifData(image: ImageMetadata) {
+  if (image.format === "svg") return undefined; // SVGs don't have EXIF data")
   const sharp = await getSharp();
   if (!sharp) return;
+  const imagePath = (image as ImageMetadata & { fsPath: string }).fsPath;
   try {
-    const tags = await ExifReader.load((image as ImageMetadata & { fsPath: string }).fsPath, { async: true });
+
+    const buffer = await sharp(imagePath).toBuffer();
+
+    const tags = await ExifReader.load(buffer, { async: true });
 
     const out: Record<string, any> = {};
     let hasExif = false;
@@ -70,7 +75,7 @@ export async function getExifData(image: ImageMetadata) {
     return hasExif ? out : undefined;
   } catch (error) {
 
-    console.log("Error reading EXIF data", error);
+    console.log(`Error reading EXIF data from ${imagePath}`, error);
     return undefined
   }
 

src/helpers/memorium.ts

@@ -0,0 +1,10 @@
+export async function listResource(id: string): Promise<any[]> {
+  try {
+    const response = await fetch(
+      `http://localhost:8080/resources?name=${id}`,
+    );
+    return await response.json();
+  } catch (error) {
+    return []
+  }
+}

src/i18n/ui.ts

@@ -20,7 +20,7 @@ export const ui = {
     'home.subtitle': 'Trained Media Designer, Blender Nerd, Developer and Hardware Tinkerer.',
     'nav.blog': 'Blog',
     'nav.projects': 'Projects',
-    'nav.videos': 'Videos',
+    'nav.resources': 'Resources',
     'nav.photos': 'Photos',
     'toc.title': 'Table of Contents',
     "resume": "Resume",
@@ -38,7 +38,7 @@ export const ui = {
     'home.subtitle': 'Ausgebildeter Mediengestalter, Blender Nerd, Entwickler und Hardware Bastler.',
     'nav.blog': 'Blog',
     'nav.projects': 'Projekte',
-    'nav.videos': 'Videos',
+    'nav.resources': 'Resources',
     'nav.photos': 'Fotos',
     "resume": "Lebenslauf",
     'toc.title': 'Inhaltsverzeichnis',

src/layouts/Post.astro

@@ -16,11 +16,10 @@ const { frontmatter, headings } = Astro.props;
 const t = useTranslations(Astro.url);
 const { title, url, date: dateString, links, toc, cover } = frontmatter;
 const collection = url?.split("/")[2];
-const date = new Date(dateString);
-const path = useTranslatedPath(Astro.url);
-
 //@ts-ignore
 const backlinkContent = t(`nav.${collection}`).toLowerCase();
+const date = new Date(dateString);
+const path = useTranslatedPath(Astro.url);
 ---
 
 <Layout title={title} image={cover}>

src/pages/resources/index.astro

@@ -0,0 +1,64 @@
+---
+import Layout from "@layouts/Layout.astro";
+import HeroCard from "@components/HeroCard.astro";
+
+const collection = "resources";
+
+const wiki = {
+  id: "wiki",
+  collection,
+  body: "My knowledge base",
+  data: {
+    title: "Wiki",
+    icon: "🧠",
+  },
+};
+
+const articles = {
+  id: "articles",
+  collection,
+  body: "Articles saved",
+  data: {
+    title: "Articles",
+    icon: "📰",
+  },
+};
+
+const recipes = {
+  id: "recipes",
+  collection,
+  body: "Recipes",
+  data: {
+    title: "Recipes",
+    icon: "🍲",
+  },
+};
+
+const movies = {
+  id: "movies",
+  collection,
+  body: "Movies",
+  data: {
+    title: "Movies",
+    icon: "🎥",
+  },
+};
+
+const series = {
+  id: "series",
+  collection,
+  body: "Series",
+  data: {
+    title: "Series",
+    icon: "📺",
+  },
+};
+---
+
+<Layout title="Max Richter">
+  <HeroCard post={wiki} />
+  <HeroCard post={recipes} />
+  <HeroCard post={articles} />
+  <HeroCard post={movies} />
+  <HeroCard post={series} />
+</Layout>

src/pages/resources/movies/[movieName].astro

@@ -0,0 +1,38 @@
+---
+import Layout from "@layouts/Layout.astro";
+import * as memorium from "@helpers/memorium";
+
+export async function getStaticPaths() {
+  const movieReviews = await memorium.listResource("Media/movies/*");
+
+  const paths = movieReviews.map((review: any) => {
+    return {
+      params: {
+        movieName: review.identifier
+          .replace("Media/movies/", "")
+          .replace(/\.md$/, ""),
+      },
+    };
+  });
+  return paths;
+}
+
+const reviews = await memorium.listResource(
+  //@ts-ignore
+  `Media/movies/${Astro.params.movieName}.md`,
+);
+
+if (reviews.length === 0) {
+  return new Response(null, {
+    status: 404,
+    statusText: "Not found",
+  });
+}
+const review = reviews[0];
+---
+
+<Layout title="Max Richter">
+  <h1>{review.itemReviewed?.name}</h1>
+  <p>{review.reviewBody}</p>
+  <!-- <pre><code>{JSON.stringify(review, null, 2)}</code></pre> -->
+</Layout>

src/pages/resources/movies/index.astro

@@ -0,0 +1,27 @@
+---
+import Layout from "@layouts/Layout.astro";
+import HeroCard from "@components/HeroCard.astro";
+import * as memorium from "@helpers/memorium";
+
+const movieReviews = await memorium.listResource("Media/movies/*");
+---
+
+<Layout title="Max Richter">
+  {
+    movieReviews.map((review: any) => (
+      <HeroCard
+        post={{
+          collection: "resources/movies",
+          id: review.identifier
+            .replace("Media/movies/", "")
+            .replace(/\.md$/, ""),
+          data: {
+            title: review.itemReviewed.name,
+            description: review.reviewBody,
+          },
+          body: review.reviewBody,
+        }}
+      />
+    ))
+  }
+</Layout>

src/pages/resources/recipes/[recipeName].astro

@@ -0,0 +1,71 @@
+---
+import Layout from "@layouts/Layout.astro";
+import { useTranslatedPath } from "@i18n/utils";
+import markdownToText from "@helpers/markdownToText";
+import * as memorium from "@helpers/memorium";
+
+const path = useTranslatedPath(Astro.url);
+
+const collection = "resources/recipes";
+
+export async function getStaticPaths() {
+
+    const recipes = await memorium.listResource("Recipes/*");
+
+    const paths = recipes.map((recipe: any) => {
+      return {
+        params: {
+          recipeName: recipe.identifier
+            .replace("Recipes/", "")
+            .replace(/\.md$/, ""),
+        },
+      };
+    });
+
+    return paths;
+}
+
+
+const recipes = await memorium.listResource(
+  //@ts-ignore
+  `Recipes/${Astro.params.recipeName}.md`,
+);
+if (recipes.length === 0) {
+  return new Response(null, {
+    status: 404,
+    statusText: "Not found",
+  });
+}
+const recipe = recipes[0];
+---
+
+<Layout title="Max Richter">
+  <div class="top-info flex items-center place-content-between m-y-2">
+    <a class="flex items-center gap-1 opacity-50" href={path("/" + collection)}>
+      <span class="i-tabler-arrow-left"></span> back
+    </a>
+    <div class="date opacity-50">
+      {
+        recipe.date?.toLocaleString("en-US", {
+          month: "long",
+          day: "numeric",
+          year: "numeric",
+        })
+      }
+    </div>
+  </div>
+
+  <h1>{recipe.name}</h1>
+
+  <h3>Ingredients</h3>
+  <ol>
+    {
+      recipe.recipeIngredient?.map((ingredient: any) => (
+        <li>{markdownToText(ingredient)}</li>
+      ))
+    }
+  </ol>
+
+  <h3>Instructions</h3>
+  <p>{recipe.recipeInstructions}</p>
+</Layout>

src/pages/resources/recipes/index.astro

@@ -0,0 +1,23 @@
+---
+import Layout from "@layouts/Layout.astro";
+import HeroCard from "@components/HeroCard.astro";
+import * as memorium from "@helpers/memorium";
+
+const recipes = await memorium.listResource("Recipes/*");
+---
+
+<Layout title="Max Richter">
+  {
+    recipes.map((recipe: any) => (
+      <HeroCard
+        post={{
+          collection: "resources/recipes",
+          id: recipe.identifier.replace("Recipes/", "").replace(/\.md$/, ""),
+          data: {
+            title: recipe.name,
+          },
+        }}
+      />
+    ))
+  }
+</Layout>

src/pages/resources/series/[seriesName].astro

@@ -0,0 +1,58 @@
+---
+import Layout from "@layouts/Layout.astro";
+import { useTranslatedPath } from "@i18n/utils";
+import * as memorium from "@helpers/memorium";
+
+const collection = "resources/series";
+
+const path = useTranslatedPath(Astro.url);
+
+export async function getStaticPaths() {
+  const seriesReviews = await memorium.listResource("Media/series/*");
+
+  const paths = seriesReviews.map((review: any) => {
+    return {
+      params: {
+        seriesName: review.identifier
+          .replace("Media/series/", "")
+          .replace(/\.md$/, ""),
+      },
+    };
+  });
+
+  return paths;
+}
+
+
+const reviews = await memorium.listResource(
+  //@ts-ignore
+  `Media/series/${Astro.params.seriesName}.md`,
+);
+if (reviews.length === 0) {
+  return new Response(null, {
+    status: 404,
+    statusText: "Not found",
+  });
+}
+const review = reviews[0];
+---
+
+<Layout title="Max Richter">
+  <div class="top-info flex items-center place-content-between m-y-2">
+    <a class="flex items-center gap-1 opacity-50" href={path("/" + collection)}>
+      <span class="i-tabler-arrow-left"></span> back
+    </a>
+    <div class="date opacity-50">
+      {
+        review.date?.toLocaleString("en-US", {
+          month: "long",
+          day: "numeric",
+          year: "numeric",
+        })
+      }
+    </div>
+  </div>
+
+  <h1>{review.itemReviewed?.name}</h1>
+  <p>{review.reviewBody}</p>
+</Layout>

src/pages/resources/series/index.astro

@@ -0,0 +1,27 @@
+---
+import Layout from "@layouts/Layout.astro";
+import HeroCard from "@components/HeroCard.astro";
+import * as memorium from "@helpers/memorium";
+
+const seriesReviewes = await memorium.listResource("Media/series/*");
+---
+
+<Layout title="Max Richter">
+  {
+    seriesReviewes.map((review: any) => (
+      <HeroCard
+        post={{
+          collection: "resources/series",
+          id: review.identifier
+            .replace("Media/series/", "")
+            .replace(/\.md$/, ""),
+          data: {
+            title: review.itemReviewed.name,
+            description: review.reviewBody,
+          },
+          body: review.reviewBody,
+        }}
+      />
+    ))
+  }
+</Layout>