feat: release 2.17.0

Reviewed-on: #354

.gitea/workflows/release-image-gitea.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 24.13.1
+          node-version: 24.14.0
           cache: pnpm
 
       - name: Install Dependencies

.gitea/workflows/release-image-harbor.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 24.13.1
+          node-version: 24.14.0
           cache: pnpm
 
       - name: Install Dependencies

.gitea/workflows/test-build.yaml

@@ -24,7 +24,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 24.13.1
+          node-version: 24.14.0
           cache: pnpm
 
       - name: Install Dependencies

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/node:24.13.1-alpine AS builder
+FROM docker.io/node:24.14.0-alpine AS builder
 
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
@@ -17,12 +17,12 @@ FROM build-deps AS build
 COPY . .
 RUN pnpm run build
 
-FROM dhi.io/node:24.13.1 AS runtime
+FROM dhi.io/node:24.14.0 AS runtime
 WORKDIR /app
 COPY --from=prod-deps /app/node_modules /app/node_modules
 COPY --from=build /app/dist /app/dist
 
-LABEL version="2.15.1"
+LABEL version="2.17.0"
 LABEL description="Astro based personal website"
 
 ENV HOST=0.0.0.0

README.md

@@ -2,6 +2,7 @@
 
 Personal site used for information about myself and blog.
 
+
 ## Development
 
 With dependencies installed, you can utilize the following npm scripts to manage your project's development lifecycle:
@@ -12,9 +13,13 @@ With dependencies installed, you can utilize the following npm scripts to manage
 
 For detailed help with Astro CLI commands, visit [Astro's documentation](https://docs.astro.build/en/reference/cli-reference/).
 
+
 ## Thanks
 
-Thanks https://github.com/godruoyi/gblog/tree/gblog-template, https://github.com/mearashadowfax/ScrewFast, 
+Based the site on: [gblog-template](https://github.com/godruoyi/gblog/tree/gblog-template) and [ScrewFast](https://github.com/mearashadowfax/ScrewFast)
+
+Using Icons from [Icons8](https://icons8.com/)
+
 
 ## License
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "site-profile",
   "type": "module",
-  "version": "2.15.1",
+  "version": "2.17.0",
   "homepage": "https://www.alexlebens.dev",
   "bugs": {
     "url": "https://gitea.alexlebens.dev/alexlebens/site-profile/issues",
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@astrojs/check": "^0.9.6",
-    "@astrojs/node": "^9.5.3",
+    "@astrojs/node": "^9.5.4",
     "@astrojs/partytown": "^2.1.4",
     "@astrojs/react": "^4.4.2",
     "@astrojs/rss": "^4.0.15",
@@ -37,44 +37,44 @@
     "@giscus/react": "^3.1.0",
     "@iconify-json/mdi": "^1.2.3",
     "@iconify-json/pajamas": "^1.2.15",
-    "@iconify-json/simple-icons": "^1.2.70",
+    "@iconify-json/simple-icons": "^1.2.71",
     "@playform/compress": "^0.2.1",
     "@swup/astro": "^1.8.0",
-    "@tailwindcss/postcss": "^4.1.18",
-    "@tailwindcss/vite": "^4.1.18",
+    "@tailwindcss/postcss": "^4.2.1",
+    "@tailwindcss/vite": "^4.2.1",
     "@types/react": "^19.2.14",
     "@types/unist": "^3.0.3",
-    "astro": "^5.17.2",
+    "astro": "^5.18.0",
     "astro-icon": "^1.1.5",
-    "marked": "^17.0.2",
+    "marked": "^17.0.3",
     "marked-shiki": "^1.2.1",
     "mdast-util-to-string": "^4.0.0",
-    "preline": "^4.0.1",
+    "preline": "^4.1.1",
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
     "reading-time": "^1.5.0",
     "sharp": "^0.34.5",
     "sharp-ico": "^0.1.5",
-    "shiki": "^3.22.0",
-    "tailwindcss": "^4.1.18",
+    "shiki": "^3.23.0",
+    "tailwindcss": "^4.2.1",
     "ultrahtml": "^1.6.0"
   },
   "devDependencies": {
     "@eslint-react/eslint-plugin": "^2.13.0",
     "@tailwindcss/forms": "^0.5.11",
     "@tailwindcss/typography": "^0.5.19",
-    "eslint": "^10.0.0",
+    "eslint": "^10.0.2",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-astro": "^1.6.0",
-    "eslint-plugin-format": "^2.0.0",
+    "eslint-plugin-format": "^2.0.1",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^7.0.1",
-    "eslint-plugin-react-refresh": "^0.5.0",
+    "eslint-plugin-react-refresh": "^0.5.2",
     "prettier": "^3.8.1",
     "prettier-plugin-astro": "^0.14.1",
     "prettier-plugin-tailwindcss": "^0.7.2",
     "timeago.js": "^4.0.2",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.55.0"
+    "typescript-eslint": "^8.56.1"
   }
 }

src/components/cards/CategoryCard.astro

@@ -1,13 +1,18 @@
 ---
+import Logo from '@components/images/Logo.astro';
+import { getDirectusImageURL } from '@/support/url';
+
 interface Props {
   slug: string;
   title: string;
   description: string;
+  logoLight: string;
+  logoDark?: string;
   count: number;
   publishDate: string;
 }
 
-const { slug, title, description, count, publishDate } = Astro.props;
+const { slug, title, description, logoLight, logoDark, count, publishDate } = Astro.props;
 ---
 
 <div class="smooth-reveal-cards group h-full">
@@ -18,10 +23,19 @@ const { slug, title, description, count, publishDate } = Astro.props;
   >
     <div class="relative grow overflow-hidden">
       <div class="absolute inset-1 flex flex-col p-3 md:p-4 lg:p-5">
-        <div class="overflow-hidden">
-          <h3 class="card-text-title-major card-hover-text-title whitespace-nowrap mb-4">
+        <div class="flex flex-row items-center mb-4">
+          <div class="card-hover-icon-scale shrink-0 mr-3">
+            <Logo
+              srcLight={getDirectusImageURL(logoLight)}
+              srcDark={getDirectusImageURL(logoDark!)}
+              alt={`Logo of ${title}`}
+            />
+          </div>
+          <h3 class="card-text-title-major card-hover-text-title whitespace-nowrap">
             {title}
           </h3>
+        </div>
+        <div>
           <p class="card-text-description mb-4">
             {description}
           </p>

src/components/sections/CategorySection.astro

@@ -1,8 +1,7 @@
 ---
-import { getCollection } from 'astro:content';
 import { readItems } from '@directus/sdk';
 
-import type { Post } from '@lib/directusTypes';
+import type { Post, Category } from '@lib/directusTypes';
 
 import CategoryCard from '@components/cards/CategoryCard.astro';
 import directus from '@lib/directus';
@@ -43,7 +42,7 @@ const postMap: Map<string, Post[]> = posts
     return acc;
   }, new Map<string, Post[]>());
 
-const categories = (await getCollection('categories'))
+const categories = (await directus.request(readItems('categories')))
   .sort((a, b) => {
     const aCount = postMap.get(a.slug)?.length ?? 0;
     const bCount = postMap.get(b.slug)?.length ?? 0;
@@ -52,11 +51,12 @@ const categories = (await getCollection('categories'))
   .map((c, index) => {
     const posts = postMap.get(c.slug);
     const pattern = layoutPattern[index % layoutPattern.length];
-    const smColSpan = Math.min(pattern.col, 2);
-    const mdColSpan = Math.min(pattern.col, 4);
+    const smColSpan = Math.min(pattern.col, 1);
+    const mdColSpan = Math.min(pattern.col, 2);
+    const lgColSpan = Math.min(pattern.col, 4);
     const rowSpan = pattern.row;
     const rowSpanClass = rowSpan > 1 ? `row-span-${rowSpan}` : 'row-span-1';
-    const gridItemClass = `col-span-${smColSpan} md:col-span-${mdColSpan} ${rowSpanClass}`;
+    const gridItemClass = `col-span-${smColSpan} md:col-span-${mdColSpan} lg:col-span-${lgColSpan} ${rowSpanClass}`;
     return {
       ...c,
       posts,
@@ -64,6 +64,7 @@ const categories = (await getCollection('categories'))
       layoutPattern: {
         smCol: smColSpan,
         mdCol: mdColSpan,
+        lgCol: lgColSpan,
         row: rowSpan,
         index,
       },
@@ -72,7 +73,7 @@ const categories = (await getCollection('categories'))
 ---
 
 <section class="mx-auto px-4 py-10 sm:px-6 lg:px-8 lg:py-14 lg:pt-10 2xl:max-w-full">
-  <div class="grid grid-flow-row-dense grid-cols-2 md:grid-cols-4 gap-4">
+  <div class="grid grid-flow-row-dense grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-4">
     {categories.map((category) => {
     return (
     <div
@@ -81,8 +82,10 @@ const categories = (await getCollection('categories'))
     >
       <CategoryCard
         slug={category.slug}
-        title={category.data.title}
-        description={category.data.description}
+        title={category.title}
+        description={category.description}
+        logoLight={category.logoLight}
+        logoDark={category.logoDark}
         count={postMap.get(category.slug)?.length ?? 0}
         publishDate={timeago(postMap.get(category.slug)?.[0]?.published_date)}
       />

src/components/sections/HeaderSection.astro

@@ -1,23 +1,39 @@
 ---
 import GoLinkPrimaryButton from '@components/buttons/GoLinkPrimaryButton.astro';
+import Logo from '@components/images/Logo.astro';
+import { getDirectusImageURL } from '@/support/url';
 
 interface Props {
   title: string;
   subTitle: string;
+  logoExists?: boolean;
+  logoLight?: string;
+  logoDark?: string;
   btnExists?: boolean;
   btnTitle?: string;
   btnURL?: string;
 }
 
-const { title, subTitle, btnExists, btnTitle, btnURL } = Astro.props;
+const { title, subTitle, logoExists, logoLight, logoDark, btnExists, btnTitle, btnURL } = Astro.props;
 ---
 
 <section class="mx-auto mt-10 px-4 sm:px-6 lg:px-8 lg:pt-10 2xl:max-w-full">
   <div class="flex-wrap md:flex md:items-center md:justify-between">
     <div class="w-full md:w-auto">
-      <h1 class="smooth-reveal card-text-header block lg:text-6xl">
+      <div class="smooth-reveal flex flex-row items-center mb-4">
+        {logoExists ? (
+        <div class="shrink-0 mr-5">
+          <Logo
+            srcLight={getDirectusImageURL(logoLight!)}
+            srcDark={getDirectusImageURL(logoDark!)}
+            alt={`Logo of ${title}`}
+          />
+        </div>
+        ) : null}
+        <h1 class="card-text-header block lg:text-6xl">
           {title}
         </h1>
+      </div>
       <p class="smooth-reveal card-text-header-description mt-4">
         {subTitle}
       </p>

src/content/categories/books.md

@@ -1,4 +0,0 @@
----
-title: 'Books 📖'
-description: 'Books I have read or listened to'
----

src/content/categories/cloud.md

@@ -1,4 +0,0 @@
----
-title: 'Cloud ☁️'
-description: "Its just someone else's server"
----

src/content/categories/homelab.md

@@ -1,4 +0,0 @@
----
-title: 'Homelab 🏠'
-description: 'What happens when rack servers find a home'
----

src/content/categories/kubernetes.md

@@ -1,4 +0,0 @@
----
-title: 'Kubernetes ☸️'
-description: 'The container orchestration system'
----

src/content/categories/life.md

@@ -1,4 +0,0 @@
----
-title: 'Life 🏃🏻'
-description: 'Just random musings on everyday stuff'
----

src/content/categories/minnesota.md

@@ -1,4 +0,0 @@
----
-title: 'Minnesota 🌳'
-description: 'Land of 10,000 Lakes'
----

src/content/categories/postgresql.md

@@ -1,4 +0,0 @@
----
-title: 'PostgreSQL'
-description: 'PostgreSQL is an open-source relational database management system (RDBMS)'
----

src/content/categories/python.md

@@ -1,4 +0,0 @@
----
-title: 'Python 🐍'
-description: 'Generally my go to language'
----

src/content/categories/tool.md

@@ -1,4 +0,0 @@
----
-title: 'Tool 🪜'
-description: 'Usually just the software kind'
----

src/content/categories/whatis.md

@@ -1,4 +0,0 @@
----
-title: 'What Is?'
-description: 'A series on discovery'
----

src/content/config.ts

@@ -1,12 +0,0 @@
-import { defineCollection, z } from 'astro:content';
-
-const categoryCollection = defineCollection({
-  type: 'content',
-  schema: () =>
-    z.object({
-      title: z.string(),
-      description: z.string(),
-    }),
-});
-
-export const collections = { categories: categoryCollection };

src/layouts/BaseLayout.astro

@@ -120,7 +120,7 @@ const normalizeTitle = !title ? global.name : `${title} | ${global.name}`;
       to bottom,
       transparent 0px,
       transparent 16px,
-      black 80px,
+      black 60px,
       black 100%
     );
 

src/lib/directus.ts

@@ -4,6 +4,7 @@ import type {
   Global,
   Weather,
   Post,
+  Category,
   Application,
   Experience,
   Education,
@@ -18,6 +19,7 @@ type Schema = {
   site_global: Global;
   site_weather: Weather;
   posts: Post[];
+  categories: Category[];
   site_applications: Application;
   site_experience: Experience;
   site_education: Education;

src/lib/directusTypes.ts

@@ -49,6 +49,14 @@ export type Post = {
   updated_date: Date;
 };
 
+export type Category = {
+  slug: string;
+  title: string;
+  description: string;
+  logoLight: string;
+  logoDark: string;
+};
+
 export type Application = {
   id: string;
   name: string;

src/pages/blog/[...slug].astro

@@ -1,5 +1,5 @@
 ---
-import { type CollectionEntry, getCollection } from 'astro:content';
+
 import { Image } from 'astro:assets';
 import getReadingTime from 'reading-time';
 import { marked } from 'marked';
@@ -8,6 +8,7 @@ import { createHighlighter } from 'shiki';
 import { readItems, readSingleton } from '@directus/sdk';
 
 import SocialShareButton from '@components/buttons/SocialShareButton.astro';
+import Logo from '@components/images/Logo.astro';
 import BaseLayout from '@layouts/BaseLayout.astro';
 import directus from '@lib/directus';
 import { formatDate } from '@support/time';
@@ -24,11 +25,14 @@ export async function getStaticPaths() {
 }
 
 const global = await directus.request(readSingleton('site_global'));
-const category: CollectionEntry<'categories'> = (await getCollection('categories'))
-  .filter((c) => c.slug === post.category)
-  .pop() as CollectionEntry<'categories'>;
+const [category] = post.category ? await directus.request(
+  readItems('categories', {
+    filter: { slug: { _eq: post.category },},
+    limit: 1,
+  }))
+  : [];
 
-const readingTime = getReadingTime(post.content);
+const readingTime = getReadingTime(post.content || '');
 
 const highlighter = await createHighlighter({
   themes: ['github-light', 'github-dark'],
@@ -48,7 +52,7 @@ marked.use(markedShiki({
   }
 }));
 
-const content = marked.parse(post.content);
+const content = marked.parse(post.content || '');
 ---
 
 <BaseLayout
@@ -100,18 +104,31 @@ const content = marked.parse(post.content);
               {post.title}
             </h2>
             <ol class="flex items-center justify-center sm:justify-start whitespace-nowrap gap-2 sm:gap-0 mt-6 sm:mt-4">
+              {category && (
               <li class="inline-flex items-center">
                 <a
                   class="inline-flex items-center text-secondary hover:text-secondary-hover text-sm transition-all duration-300"
                   href=`/categories/${category.slug}`
                   data-astro-prefetch
                 >
-                  {category?.data?.title}
+                  <div class="flex flex-row items-center shrink-0">
+                    <div class="mr-2">
+                      <Logo
+                        srcLight={getDirectusImageURL(category.logoLight)}
+                        srcDark={getDirectusImageURL(category.logoDark)}
+                        alt={`Logo of ${category.title}`}
+                        width = 18,
+                        height = 18,
+                      />
+                    </div>
+                    {category.title}
+                  </div>
                 </a>
                 <span class="shrink-0 text-secondary text-sm mx-2 sm:mx-4">
                   /
                 </span>
               </li>
+              )}
               <li class="inline-flex items-center">
                 <span class="shrink-0 text-secondary text-sm">
                   {formatDate(post.published_date)}

src/pages/categories/[...slug].astro

@@ -1,5 +1,4 @@
 ---
-import { getCollection } from 'astro:content';
 import { readItems, readSingleton } from '@directus/sdk';
 
 import type { Post } from '@lib/directusTypes';
@@ -9,13 +8,13 @@ import BlogCard from '@components/cards/BlogCard.astro';
 import BaseLayout from '@layouts/BaseLayout.astro';
 import directus from '@lib/directus';
 
-const { category } = Astro.props;
+const category = Astro.props;
 
 export async function getStaticPaths() {
-  const categories = await getCollection('categories');
+  const categories = await directus.request(readItems('categories'));
   return categories.map((category) => ({
     params: { slug: category.slug },
-    props: { category },
+    props: category,
   }));
 }
 
@@ -36,16 +35,16 @@ const categoriesPosts = posts
 ---
 
 <BaseLayout
-  title={category.data.title}
-  description={category.data.description}
+  title={category.title}
+  description={category.description}
   structuredData={{
     '@context': 'https://schema.org',
     '@type': 'WebPage',
     inLanguage: 'en-US',
     '@id': Astro.url.href,
     url: Astro.url.href,
-    name: `${category.data.title} | ${global.name}`,
-    description: category.data.description,
+    name: `${category.title} | ${global.name}`,
+    description: category.description,
     isPartOf: {
       url: `${global.site_url}/categories`,
       name: global.name,
@@ -55,8 +54,11 @@ const categoriesPosts = posts
 >
 
   <HeaderSection
-    title={category.data.title}
-    subTitle={category.data.description}
+    title=`${category.title}`
+    subTitle={category.description}
+    logoExists
+    logoLight={category.logoLight}
+    logoDark={category.logoDark}
     btnExists
     btnTitle="Back to Categories"
     btnURL="/categories"

src/styles/global.css

@@ -1,5 +1,4 @@
 @import 'tailwindcss';
-@import 'preline/variants.css';
 @import './utilities.css';
 
 @plugin '@tailwindcss/typography';