From 58b74bb8016e715f677f5ecb562de9b28563e22d Mon Sep 17 00:00:00 2001
From: Max Richter <jim-x@web.de>
Date: Wed, 3 Apr 2024 18:07:54 +0200
Subject: [PATCH] feat: some shit

---
 .github/workflows/default.yaml                |  6 ++
 astro.config.mjs                              |  1 -
 src/components/HeroCard.astro                 |  4 +-
 src/components/ImageGallery.svelte            |  2 +-
 src/components/LanguagePicker.astro           |  2 +-
 src/components/Max.astro                      |  2 +-
 src/components/Nav.astro                      |  4 +-
 src/components/SmallCard.astro                |  6 +-
 src/components/arrows/ArrowA.astro            |  2 +-
 src/components/arrows/ArrowB.astro            |  2 +-
 .../projects/plantarium/_components/leaves.ts |  1 +
 src/helpers/exif.ts                           |  3 +
 src/helpers/normalizeWheel.ts                 |  1 +
 src/i18n/utils.ts                             | 15 ++---
 src/layouts/Post.astro                        |  2 +-
 src/pages/index.astro                         |  4 +-
 src/pages/projects/index.astro                |  2 +-
 src/pages/tag/[tag].astro                     | 58 +++++++++----------
 src/pages/tag/index.astro                     |  8 +--
 19 files changed, 62 insertions(+), 63 deletions(-)

diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml
index f37284a..5205f8a 100644
--- a/.github/workflows/default.yaml
+++ b/.github/workflows/default.yaml
@@ -37,11 +37,17 @@ jobs:
           key: ${{ runner.os }}-lfs-${{ env.LFS_CACHE_ID }}
           restore-keys: |
 
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
       - name: 📦 Install PNPM
         uses: pnpm/action-setup@v3
         id: pnpm-install
         with:
           version: 8
+          node_version: 20
           run_install: false
 
       - name: Get pnpm store directory
diff --git a/astro.config.mjs b/astro.config.mjs
index 8a66160..205252a 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -2,7 +2,6 @@ import { defineConfig } from 'astro/config';
 import { i18n, filterSitemapByDefaultLocale } from "astro-i18n-aut/integration";
 import sitemap from "@astrojs/sitemap";
 import mdx from '@astrojs/mdx';
-import tailwind from '@astrojs/tailwind';
 import glsl from 'vite-plugin-glsl';
 
 import svelte from "@astrojs/svelte";
diff --git a/src/components/HeroCard.astro b/src/components/HeroCard.astro
index b97b040..7fd7a99 100644
--- a/src/components/HeroCard.astro
+++ b/src/components/HeroCard.astro
@@ -24,8 +24,8 @@ const {
   slug,
 } = Astro.props.post;
 
-const translatePath = useTranslatedPath(Astro);
-const t = useTranslations(Astro);
+const translatePath = useTranslatedPath(Astro.url);
+const t = useTranslations(Astro.url);
 
 const imagePath = `../content/${collection}/${slug.split("/")[0]}/${headerImg}`;
 
diff --git a/src/components/ImageGallery.svelte b/src/components/ImageGallery.svelte
index 244205b..fc02e40 100644
--- a/src/components/ImageGallery.svelte
+++ b/src/components/ImageGallery.svelte
@@ -6,7 +6,7 @@
   let progress = [];
   let currentIndex = -1;
   const maxZoom = 5;
-  import { swipe } from "svelte-gestures";
+  // import { swipe } from "svelte-gestures";
 
   const mod = (a: number, b: number) => ((a % b) + b) % b;
 
diff --git a/src/components/LanguagePicker.astro b/src/components/LanguagePicker.astro
index e9c40dc..ba0ef3e 100644
--- a/src/components/LanguagePicker.astro
+++ b/src/components/LanguagePicker.astro
@@ -16,7 +16,7 @@ function translatePath(lang: string) {
   return `/${[lang, ...split].join("/")}`;
 }
 
-const t = useTranslations(Astro);
+const t = useTranslations(Astro.url);
 ---
 
 <ul>
diff --git a/src/components/Max.astro b/src/components/Max.astro
index f15d76e..c6c1e50 100644
--- a/src/components/Max.astro
+++ b/src/components/Max.astro
@@ -6,7 +6,7 @@ import { Card } from "./card";
 
 import { useTranslations } from "@i18n/utils";
 
-const t = useTranslations(Astro);
+const t = useTranslations(Astro.url);
 ---
 
 <Card
diff --git a/src/components/Nav.astro b/src/components/Nav.astro
index f5c9e29..2dce42d 100644
--- a/src/components/Nav.astro
+++ b/src/components/Nav.astro
@@ -7,8 +7,8 @@ function isActive(path: string) {
   return Astro.url.pathname === path ? "active" : "";
 }
 
-const t = useTranslations(Astro);
-const translatePath = useTranslatedPath(Astro);
+const t = useTranslations(Astro.url);
+const translatePath = useTranslatedPath(Astro.url);
 
 const paths = [
   {
diff --git a/src/components/SmallCard.astro b/src/components/SmallCard.astro
index 5f078f8..5f69a13 100644
--- a/src/components/SmallCard.astro
+++ b/src/components/SmallCard.astro
@@ -5,9 +5,9 @@ interface Props {
   post: {
     data: {
       title: string;
-      description: string;
-      icon: string;
-      tags: string[];
+      description?: string;
+      icon?: string;
+      tags?: string[];
     };
     collection: string;
     body: string;
diff --git a/src/components/arrows/ArrowA.astro b/src/components/arrows/ArrowA.astro
index 49320b1..75204fb 100644
--- a/src/components/arrows/ArrowA.astro
+++ b/src/components/arrows/ArrowA.astro
@@ -1,6 +1,6 @@
 ---
 import { useTranslations } from "@i18n/utils";
-const t = useTranslations(Astro);
+const t = useTranslations(Astro.url);
 ---
 
 <div class="arrow flex items-center gap-2">
diff --git a/src/components/arrows/ArrowB.astro b/src/components/arrows/ArrowB.astro
index ad8040e..16cf642 100644
--- a/src/components/arrows/ArrowB.astro
+++ b/src/components/arrows/ArrowB.astro
@@ -1,6 +1,6 @@
 ---
 import { useTranslations } from "@i18n/utils";
-const t = useTranslations(Astro);
+const t = useTranslations(Astro.url);
 ---
 
 <div class="arrow flex items-center gap-2">
diff --git a/src/content/projects/plantarium/_components/leaves.ts b/src/content/projects/plantarium/_components/leaves.ts
index 27da6bb..0fba6be 100644
--- a/src/content/projects/plantarium/_components/leaves.ts
+++ b/src/content/projects/plantarium/_components/leaves.ts
@@ -50,6 +50,7 @@ export function createLeaves({ canvas, num = 20, alpha = false, minZ = -1, maxZ
 
     const model = await GLTFLoader.load(gl, "/models/leaf.glb");
 
+    // @ts-ignore
     const data = model.nodes[0].children[0].geometry.attributes;
 
     let offset = new Float32Array(num * 3);
diff --git a/src/helpers/exif.ts b/src/helpers/exif.ts
index 453463a..9f5b9eb 100644
--- a/src/helpers/exif.ts
+++ b/src/helpers/exif.ts
@@ -1,3 +1,6 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+
 let debug = true;
 
 let EXIF = {};
diff --git a/src/helpers/normalizeWheel.ts b/src/helpers/normalizeWheel.ts
index 85b65b5..5bdd30e 100644
--- a/src/helpers/normalizeWheel.ts
+++ b/src/helpers/normalizeWheel.ts
@@ -1,3 +1,4 @@
+//@ts-nocheck
 
 // Reasonable defaults
 var PIXEL_STEP = 10;
diff --git a/src/i18n/utils.ts b/src/i18n/utils.ts
index f5c4c1c..9708579 100644
--- a/src/i18n/utils.ts
+++ b/src/i18n/utils.ts
@@ -1,18 +1,15 @@
 import { defaultLocale, getLocale } from 'astro-i18n-aut';
 import { ui, defaultLang, showDefaultLang } from './ui';
-import type { AstroGlobal } from 'astro';
 
-
-export function useTranslatedPath(astro: AstroGlobal) {
-  const locale = getLocale(astro.url);
+export function useTranslatedPath(url: URL) {
+  const locale = getLocale(url);
   return function translatePath(path: string, l: string = locale) {
     return !showDefaultLang && l === defaultLang ? path : `/${l}${path}`.replace(/\/$/g, '');
   }
-
 }
 
-export function useTranslations(astro: AstroGlobal) {
-  const lang = getLocale(astro.url);
+export function useTranslations(url: URL) {
+  const lang = getLocale(url);
   return function t(key: keyof typeof ui[typeof defaultLang]) {
     return ui[lang as keyof typeof ui][key] || ui[defaultLang][key];
   }
@@ -25,11 +22,11 @@ export function parseSlug(id: string) {
   return [splitPath.join("/"), lang]
 }
 
-export function filterCollection<T extends { id: string }>(collection: T[], locale: string): T[] {
+export function filterCollection<T extends { id: string, data: { date: Date } }>(collection: T[], locale: string): T[] {
   return collection.filter(post => {
     const [_, lang] = parseSlug(post?.id);
     return lang === locale;
   }).sort((a, b) => {
-    return a.data.date > b.data.date ? -1 : 1;
+    return (a?.data?.date > b?.data?.date) ? -1 : 1;
   });
 }
diff --git a/src/layouts/Post.astro b/src/layouts/Post.astro
index 5823920..49bc7ca 100644
--- a/src/layouts/Post.astro
+++ b/src/layouts/Post.astro
@@ -10,7 +10,7 @@ type CustomProps = {
 type Props = CollectionEntry<"blog">["data"] & CustomProps;
 
 const { title, date, _layout, backlink = "/blog" } = Astro.props;
-const path = useTranslatedPath(Astro);
+const path = useTranslatedPath(Astro.url);
 ---
 
 <Layout title={title}>
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 333478e..4afeeef 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -19,8 +19,8 @@ const projects = filterCollection(
   getLocale(Astro.url),
 );
 
-const t = useTranslations(Astro);
-const tp = useTranslatedPath(Astro);
+const t = useTranslations(Astro.url);
+const tp = useTranslatedPath(Astro.url);
 
 const featuredProject = projects.find((project) => project.data?.featured);
 const otherProjects = projects
diff --git a/src/pages/projects/index.astro b/src/pages/projects/index.astro
index 90f379b..de3eea4 100644
--- a/src/pages/projects/index.astro
+++ b/src/pages/projects/index.astro
@@ -8,7 +8,7 @@ import HeroCard from "@components/HeroCard.astro";
 const locale = getLocale(Astro.url);
 const pages = await getCollection("projects");
 const posts = filterCollection(pages, locale)
-  .sort((a, b) => b.data.date - a.data.date)
+  .sort((a, b) => (b.data.date > a.data.date ? 1 : -1))
   .sort((a) => (a.data.featured ? -1 : 1));
 ---
 
diff --git a/src/pages/tag/[tag].astro b/src/pages/tag/[tag].astro
index 920c18d..f3aca84 100644
--- a/src/pages/tag/[tag].astro
+++ b/src/pages/tag/[tag].astro
@@ -3,28 +3,24 @@ import Layout from "@layouts/Layout.astro";
 import { getCollection } from "astro:content";
 import { useTranslatedPath } from "@i18n/utils";
 
-const collections = ["blog", "photos", "projects"];
+const collections = ["blog", "photos", "projects"] as const;
 
-const tp = useTranslatedPath(Astro);
+const tp = useTranslatedPath(Astro.url);
 
 export async function getStaticPaths() {
-const collections = ["blog", "photos", "projects"];
-const posts = await Promise.all(
-  collections.map((collection) => {
-    return getCollection(collection, {
-      fields: ["slug", "title", "date", "tags"],
+  const collections = ["blog", "photos", "projects"] as const;
+  const posts = await Promise.all(
+    collections.map((collection) => getCollection(collection)),
+  );
+
+  const tags = new Set();
+
+  posts.flat().forEach((post) => {
+    if (!post.data?.tags) return;
+    post.data.tags.forEach((tag: string) => {
+      tags.add(tag.toLowerCase());
     });
-  }),
-);
-
-const tags = new Set();
-
-posts.flat().forEach((post) => {
-  if (!post.data?.tags) return;
-  post.data.tags.forEach((tag) => {
-    tags.add(tag.toLowerCase());
   });
-});
 
   return [...tags.values()].map((tag) => {
     return {
@@ -37,22 +33,17 @@ posts.flat().forEach((post) => {
 
 const { tag } = Astro.params;
 
-
-const allPosts = (await Promise.all(
-  collections.map((collection) => {
-    return getCollection(collection, {
-      fields: ["slug", "title", "date", "tags"],
-    });
-  }),
-)).flat();
-
-
+const allPosts = (
+  await Promise.all(
+    collections.map((collection) => {
+      return getCollection(collection);
+    }),
+  )
+).flat();
 
 const posts = allPosts.filter((post) => {
-  return post.data?.tags?.find(t => t.toLowerCase() === tag);
+  return post.data?.tags?.find((t) => t.toLowerCase() === tag);
 });
-
-
 ---
 
 <Layout title="Max Richter">
@@ -62,10 +53,13 @@ const posts = allPosts.filter((post) => {
     <div class="flex flex-col gap-2">
       {
         posts.map((post) => {
-          return <a href={tp("/"+post.collection+"/" + post.slug)}>{post.slug}</a>;
+          return (
+            <a href={tp("/" + post.collection + "/" + post.slug)}>
+              {post.slug}
+            </a>
+          );
         })
       }
     </div>
   </article>
 </Layout>
-
diff --git a/src/pages/tag/index.astro b/src/pages/tag/index.astro
index 872f227..6387a18 100644
--- a/src/pages/tag/index.astro
+++ b/src/pages/tag/index.astro
@@ -3,15 +3,13 @@ import Layout from "@layouts/Layout.astro";
 import { getCollection } from "astro:content";
 import { useTranslatedPath } from "@i18n/utils";
 
-const tp = useTranslatedPath(Astro);
+const tp = useTranslatedPath(Astro.url);
 
-const collections = ["blog", "photos", "projects"];
+const collections = ["blog", "photos", "projects"] as const;
 
 const posts = await Promise.all(
   collections.map((collection) => {
-    return getCollection(collection, {
-      fields: ["slug", "title", "date", "tags"],
-    });
+    return getCollection(collection);
   }),
 );