feat: enable cache

Reviewed-on: #369

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

@@ -26,7 +26,18 @@ jobs:
           cache: pnpm
 
       - name: Install Dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
+
+      - name: Cache Astro Build Cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            node_modules/.cache
+            .astro/cache
+          key: ${{ runner.os }}-astro-cache-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-astro-cache-${{ hashFiles('**/pnpm-lock.yaml') }}-
+            ${{ runner.os }}-astro-cache-
 
       - name: Lint Code
         run: pnpm lint
@@ -42,14 +53,14 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Login to Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ${{ vars.REPOSITORY_HOST }}
           username: ${{ gitea.actor }}
           password: ${{ secrets.REPOSITORY_TOKEN }}
 
       - name: Login to Docker
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ${{ vars.DH_REGISTRY }}
           username: ${{ secrets.DH_USERNAME }}
@@ -62,7 +73,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
         with:
           driver: kubernetes
           driver-opts: |
@@ -77,7 +88,7 @@ jobs:
 
       - name: Extract Metadata
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           tags: |
             type=ref,event=branch
@@ -101,7 +112,7 @@ jobs:
           fi
 
       - name: Build and Push Image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .
           push: true
@@ -113,6 +124,8 @@ jobs:
             COMMIT_SHA=${{ steps.version.outputs.commit }}
             IS_RELEASE=${{ steps.version.outputs.is_release }}
           file: ./Dockerfile
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: ntfy Success
         uses: niniyas/ntfy-action@master

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

@@ -26,7 +26,18 @@ jobs:
           cache: pnpm
 
       - name: Install Dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
+
+      - name: Cache Astro Build Cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            node_modules/.cache
+            .astro/cache
+          key: ${{ runner.os }}-astro-cache-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-astro-cache-${{ hashFiles('**/pnpm-lock.yaml') }}-
+            ${{ runner.os }}-astro-cache-
 
       - name: Lint Code
         run: pnpm lint
@@ -42,14 +53,14 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Login to Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ${{ vars.REGISTRY_HOST }}
           username: ${{ vars.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_SECRET }}
 
       - name: Login to Docker
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ${{ vars.DH_REGISTRY }}
           username: ${{ secrets.DH_USERNAME }}
@@ -62,7 +73,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
         with:
           driver: kubernetes
           driver-opts: |
@@ -77,7 +88,7 @@ jobs:
 
       - name: Extract Metadata
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           tags: |
             type=ref,event=branch
@@ -101,7 +112,7 @@ jobs:
           fi
 
       - name: Build and Push Image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .
           push: true
@@ -113,6 +124,8 @@ jobs:
             COMMIT_SHA=${{ steps.version.outputs.commit }}
             IS_RELEASE=${{ steps.version.outputs.is_release }}
           file: ./Dockerfile
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       - name: ntfy Success
         uses: niniyas/ntfy-action@master

.gitea/workflows/test-build.yaml

@@ -28,7 +28,18 @@ jobs:
           cache: pnpm
 
       - name: Install Dependencies
-        run: pnpm install
+        run: pnpm install --frozen-lockfile
+
+      - name: Cache Astro Build Cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            node_modules/.cache
+            .astro/cache
+          key: ${{ runner.os }}-astro-cache-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-astro-cache-${{ hashFiles('**/pnpm-lock.yaml') }}-
+            ${{ runner.os }}-astro-cache-
 
       - name: Lint Code
         run: pnpm lint

Dockerfile

@@ -22,7 +22,7 @@ WORKDIR /app
 COPY --from=prod-deps /app/node_modules /app/node_modules
 COPY --from=build /app/dist /app/dist
 
-LABEL version="2.19.0"
+LABEL version="2.24.0"
 LABEL description="Astro based personal website"
 
 ENV HOST=0.0.0.0

package.json

@@ -1,7 +1,7 @@
 {
   "name": "site-profile",
   "type": "module",
-  "version": "2.19.0",
+  "version": "2.24.0",
   "homepage": "https://www.alexlebens.dev",
   "bugs": {
     "url": "https://gitea.alexlebens.dev/alexlebens/site-profile/issues",
@@ -33,7 +33,7 @@
     "@astrojs/react": "^4.4.2",
     "@astrojs/rss": "^4.0.15",
     "@astrojs/sitemap": "^3.7.0",
-    "@directus/sdk": "^21.1.0",
+    "@directus/sdk": "^21.2.0",
     "@giscus/react": "^3.1.0",
     "@iconify-json/mdi": "^1.2.3",
     "@iconify-json/pajamas": "^1.2.15",
@@ -46,7 +46,7 @@
     "@types/unist": "^3.0.3",
     "astro": "^5.18.0",
     "astro-icon": "^1.1.5",
-    "marked": "^17.0.3",
+    "marked": "^17.0.4",
     "marked-shiki": "^1.2.1",
     "mdast-util-to-string": "^4.0.0",
     "preline": "^4.1.2",
@@ -63,7 +63,7 @@
     "@eslint-react/eslint-plugin": "^2.13.0",
     "@tailwindcss/forms": "^0.5.11",
     "@tailwindcss/typography": "^0.5.19",
-    "eslint": "^10.0.2",
+    "eslint": "^10.0.3",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-astro": "^1.6.0",
     "eslint-plugin-format": "^2.0.1",

src/components/Header.astro

@@ -12,7 +12,7 @@ const currentPath = pathname.slice(1);
   class="fixed flex flex-wrap md:flex-nowrap md:justify-start inset-x-0 top-0 w-full z-50"
 >
   <nav
-    class="nav-base relative md:flex md:items-center md:justify-between rounded-[36px] w-full px-4 mx-2 py-3 mt-4"
+    class="nav-base relative md:flex md:items-center md:justify-between rounded-[36px] transition-all duration-300 w-full px-4 py-3 mx-2 md:mx-8 mt-4"
     aria-label="Global"
   >
     <div class="flex items-center justify-between ml-0">

src/components/cards/LargeBlogLeftCard.astro

@@ -2,28 +2,30 @@
 import { Icon } from 'astro-icon/components';
 import { Image } from 'astro:assets';
 
+import { formatDate } from '@support/time';
 import { getDirectusImageURL } from '@/support/url';
 
 interface Props {
   title: string;
   subTitle: string;
   url: string;
+  pubDate: Date,
   img: string;
   imgAlt: string;
 }
 
-const { title, subTitle, url, img, imgAlt } = Astro.props;
+const { title, subTitle, url, pubDate, img, imgAlt } = Astro.props;
 ---
 
-<div class="smooth-reveal flex flex-col px-4 py-10 mx-auto">
+<div class="smooth-reveal flex flex-col px-4 py-10 mx-auto w-full">
   <a
-    class="md:card-base-hidden group items-center md:grid md:grid-cols-2 lg:grid lg:grid-cols-2 gap-8 xl:gap-16 max-w-340 2xl:max-w-full md:px-8 md:py-8"
+    class="md:card-base-hidden group items-center md:grid md:grid-cols-2 lg:grid lg:grid-cols-2 gap-8 xl:gap-16 w-full md:px-8 md:py-8"
     href={url}
     data-astro-prefetch
   >
     <div>
       <Image
-        class="rounded-2xl rounded-b-none md:rounded-2xl w-full h-full sm:max-h-80 md:max-h-90 object-cover"
+        class="rounded-2xl rounded-b-none md:rounded-2xl md:shadow-2xl w-full h-full sm:max-h-80 md:max-h-90 object-cover"
         src={getDirectusImageURL(img)}
         alt={imgAlt}
         draggable="false"
@@ -40,17 +42,21 @@ const { title, subTitle, url, img, imgAlt } = Astro.props;
       <p class="card-text-title font-light text-pretty sm:text-lg max-w-prose mb-8">
         {subTitle}
       </p>
-      <div class="button-base button-bg-teal inline-flex rounded-lg gap-x-2">
+      <div class="flex items-center justify-between w-full">
-        <div class="button-text-title flex relative items-center text-center">
+        <div class="button-base button-bg-teal inline-flex rounded-lg gap-x-2">
-          <span class="mr-2">
+          <div class="button-text-title flex relative items-center text-center">
-            Read More
+            <span class="mr-2">
-          </span>
+              Read More
-          <Icon
+            </span>
-            name="mdi:keyboard-arrow-right"
+            <Icon
-            class="button-hover-arrow"
+              name="mdi:keyboard-arrow-right"
-          />
+              class="button-hover-arrow"
+            />
+          </div>
         </div>
+        <span class="card-text-description text-sm ml-auto">
+          {formatDate(pubDate)}
+        </span>
       </div>
-    </div>
   </a>
 </div>

src/components/cards/LargeBlogRightCard.astro

@@ -2,25 +2,26 @@
 import { Icon } from 'astro-icon/components';
 import { Image } from 'astro:assets';
 
+import { formatDate } from '@support/time';
 import { getDirectusImageURL } from '@/support/url';
 
 interface Props {
   title: string;
   subTitle: string;
   url: string;
-  single?: boolean;
+  pubDate: Date;
-  imgOne: any;
+  imgOne: string;
-  imgOneAlt: any;
+  imgOneAlt: string;
-  imgTwo?: any;
+  imgTwo?: string;
-  imgTwoAlt?: any;
+  imgTwoAlt?: string;
 }
 
-const { title, subTitle, url, single, imgOne, imgOneAlt, imgTwo, imgTwoAlt } = Astro.props;
+const { title, subTitle, url, pubDate, imgOne, imgOneAlt, imgTwo, imgTwoAlt } = Astro.props;
 ---
 
-<div class="smooth-reveal flex flex-col px-5 py-10 mx-auto">
+<div class="smooth-reveal flex flex-col px-4 py-10 mx-auto w-full">
   <a
-    class="md:card-base-hidden group flex flex-col-reverse md:items-center md:grid md:grid-cols-2 lg:grid lg:grid-cols-2 md:gap-8 xl:gap-16 max-w-340 2xl:max-w-full md:px-8 md:py-8"
+    class="md:card-base-hidden group flex flex-col-reverse md:grid md:items-center md:grid-cols-2 lg:grid lg:grid-cols-2 md:gap-8 xl:gap-16 w-full md:px-8 md:py-8"
     href={url}
     data-astro-prefetch
   >
@@ -31,25 +32,30 @@ const { title, subTitle, url, single, imgOne, imgOneAlt, imgTwo, imgTwoAlt } = A
       <p class="card-text-title font-light text-pretty sm:text-lg max-w-prose mb-8">
         {subTitle}
       </p>
-      <div class="button-base button-bg-teal inline-flex rounded-lg gap-x-2">
+      <div class="flex items-center justify-between w-full">
-        <div class="button-text-title flex relative items-center text-center">
+        <div class="button-base button-bg-teal inline-flex rounded-lg gap-x-2">
-          <span class="mr-2">
+          <div class="button-text-title flex relative items-center text-center">
-            Read More
+            <span class="mr-2">
-          </span>
+              Read More
-          <Icon
+            </span>
-            name="mdi:keyboard-arrow-right"
+            <Icon
-            class="button-hover-arrow"
+              name="mdi:keyboard-arrow-right"
-          />
+              class="button-hover-arrow"
+            />
+          </div>
         </div>
+        <span class="card-text-description text-sm ml-auto">
+          {formatDate(pubDate)}
+        </span>
       </div>
     </div>
-    {single ? (
+    {!imgTwo ? (
     <div>
       <Image
-        class="rounded-2xl rounded-b-none md:rounded-2xl w-full"
+        class="rounded-2xl rounded-b-none md:rounded-2xl md:shadow-2xl w-full h-full sm:max-h-80 md:max-h-90 object-cover"
         src={getDirectusImageURL(imgOne)}
         alt={imgOneAlt}
-        format="webp"
+        draggable="false"
         loading="lazy"
         width="850"
         height="420"
@@ -57,30 +63,42 @@ const { title, subTitle, url, single, imgOne, imgOneAlt, imgTwo, imgTwoAlt } = A
       />
     </div>
     ) : (
-    <div class="grid grid-cols-2 gap-4">
+    <>
-      <Image
+      <div class="md:hidden">
-        class="rounded-xl w-full"
+        <Image
-        src={getDirectusImageURL(imgOne)}
+          class="rounded-2xl rounded-b-none shadow-2xl w-full h-full sm:max-h-80 object-cover"
-        alt={imgOneAlt}
+          src={getDirectusImageURL(imgOne)}
-        draggable="false"
+          alt={imgOneAlt}
-        format="webp"
+          draggable="false"
-        loading="lazy"
+          loading="lazy"
-        width="400"
+          width="850"
-        height="230"
+          height="420"
-        inferSize={true}
+          inferSize={true}
-      />
+        />
-      <Image
+      </div>
-        class="rounded-xl w-full mt-4 lg:mt-10"
+      <div class="hidden md:flex md:items-start">
-        src={getDirectusImageURL(imgTwo)}
+        <Image
-        alt={imgTwoAlt}
+          class="rounded-xl z-10 shadow-2xl w-3/5 h-full object-cover"
-        draggable="false"
+          src={getDirectusImageURL(imgOne)}
-        format="webp"
+          alt={imgOneAlt}
-        loading="lazy"
+          draggable="false"
-        width="400"
+          loading="lazy"
-        height="230"
+          width="600"
-        inferSize={true}
+          height="310"
-      />
+          inferSize={true}
-    </div>
+        />
+        <Image
+          class="rounded-xl shadow-2xl w-3/5 h-full -ml-16 mt-12 object-cover"
+          src={getDirectusImageURL(imgTwo)}
+          alt={imgTwoAlt}
+          draggable="false"
+          loading="lazy"
+          width="600"
+          height="310"
+          inferSize={true}
+        />
+      </div>
+    </>
     )}
   </a>
 </div>

src/components/sections/CategorySection.astro

@@ -10,7 +10,7 @@ import { timeago } from '@support/time';
 const posts = await directus.request(
   readItems('posts', {
     filter: { published: { _eq: true } },
-    fields: ['*'],
+    fields: ['*', 'category.slug'],
     sort: ['-published_date'],
   })
 );
@@ -31,13 +31,16 @@ const layoutPattern = [
 const postMap: Map<string, Post[]> = posts
   .sort((a: Post, b: Post) => b.published_date.valueOf() - a.published_date.valueOf())
   .reduce((acc, obj) => {
-    let posts = acc.get(obj.category);
+    const categorySlug = obj.category?.slug;
+    if (!categorySlug) return acc;
+
+    let posts = acc.get(categorySlug);
     if (!posts) {
       posts = [];
     }
     posts.push(obj);
 
-    acc.set(obj.category, posts);
+    acc.set(categorySlug, posts);
 
     return acc;
   }, new Map<string, Post[]>());

src/components/sections/RecentPostsSection.astro

@@ -23,7 +23,11 @@ const { posts, title, subTitle } = Astro.props;
       </span>
     </div>
   </div>
-  <div class="grid gap-6 sm:grid-cols-2 lg:grid-cols-3">
+  <div class="columns-1 sm:columns-2 lg:columns-3 gap-6">
-    {posts.map((b) => <BlogCard post={b} />)}
+    {posts.map((b) => (
+      <div class="break-inside-avoid mb-6">
+        <BlogCard post={b} />
+      </div>
+    ))}
   </div>
 </section>

src/components/sections/SelectedPostsSection.astro

@@ -11,12 +11,13 @@ interface Props {
 const { posts } = Astro.props;
 ---
 
-<section class="smooth-reveal flex flex-col gap-4">
+<section class="smooth-reveal flex flex-col gap-4 md:mb-20">
   {posts.map((post, index) => index % 2 === 0 ? (
   <LargeBlogLeftCard
     title={post.title}
     subTitle={post.description}
     url={`/blog/${post.slug}`}
+    pubDate={post.published_date}
     img={post.image}
     imgAlt={post.image_alt}
   />
@@ -25,7 +26,7 @@ const { posts } = Astro.props;
     title={post.title}
     subTitle={post.description}
     url={`/blog/${post.slug}`}
-    single={!post.image_second}
+    pubDate={post.published_date}
     imgOne={post.image}
     imgOneAlt={post.image_alt}
     imgTwo={post?.image_second}

src/layouts/BaseLayout.astro

@@ -68,67 +68,66 @@ const normalizeTitle = !title ? global.name : `${title} | ${global.name}`;
     />
   </head>
 
-  <body class="bg-background selection:bg-yellow-400 m-0 p-0 overflow-x-hidden">
+  <body class="bg-background selection:bg-yellow-400 m-0 p-0 overflow-hidden">
 
     <!-- Sliding backgrounds -->
     <div class="bg"/>
     <div class="bg bg2"/>
     <div class="bg bg3"/>
 
-    <!-- Layout -->
+    <!-- Fixed header -->
-    <div class="grow w-full max-w-(--breakpoint-2xl) px-4 sm:px-6 lg:px-8 py-20 mx-auto">
+    <Header />
 
-      <Header />
+    <!-- Main body -->
+    <div id="reset-scroll" class="mask-container w-screen h-screen overflow-y-auto overflow-x-hidden">
+      <main>
 
-      <main class="has-js scroll-fade-container min-h-screen">
+        <!-- Content -->
-        <slot />
+        <div class="grow w-full max-w-(--breakpoint-2xl) px-4 sm:px-6 lg:px-8 py-20 mx-auto">
+          <slot />
+        </div>
+
+        <!-- Footer -->
+        <Footer />
+        
       </main>
-
     </div>
 
-    <Footer />
-
   </body>
 </html>
 
 <script>
-  document.addEventListener('astro:page-load', () => {
+  const resetScroll = () => {
-    const onScroll = () => {
+    const scrollContainer = document.getElementById('reset-scroll');
-      document.documentElement.style.setProperty('--scroll-offset', `${window.scrollY}px`);
+    if (scrollContainer) {
-      document.documentElement.classList.add('has-js');
+      scrollContainer.scrollTop = 0;
-    };
+    }
-
+  };
-    window.removeEventListener('scroll', onScroll);
+  resetScroll();
-    window.addEventListener('scroll', onScroll, { passive: true });
+  document.addEventListener('astro:after-swap', resetScroll);
-
-    onScroll();
-  });
 </script>
 
 <style>
   /* Fade away content below header when scrolling */
-  .has-js .scroll-fade-container {
+  .mask-container {
     -webkit-mask-image: linear-gradient(
       to bottom,
       transparent 0px,
-      transparent 16px,
+      transparent 90px,
-      black 80px,
+      black 140px,
       black 100%
     );
 
     mask-image: linear-gradient(
       to bottom,
       transparent 0px,
-      transparent 16px,
+      transparent 90px,
-      black 60px,
+      black 140px,
       black 100%
     );
 
     -webkit-mask-size: 100vw 100vh;
     -webkit-mask-repeat: no-repeat;
-
-    -webkit-mask-position-y: var(--scroll-offset);
-    mask-position-y: var(--scroll-offset);
   }
 
   /* Background that creates the "glimmer" effect */
@@ -149,9 +148,9 @@ const normalizeTitle = !title ? global.name : `${title} | ${global.name}`;
   }
 
   :global(.dark) .bg {
-    --bg-primary: #332f2e;
+    --bg-primary: #3b3836;
-    --bg-secondary: #44403c;
+    --bg-secondary: #332f2e;
-    --bg-tertiary: #57534e;
+    --bg-tertiary: #44403c;
   }
 
   .bg2 {

src/lib/directusTypes.ts

@@ -37,7 +37,7 @@ export type Post = {
   title: string;
   description: string;
   tags: string[];
-  category: string;
+  category: Category;
   selected: boolean;
   published: boolean;
   content: string;

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

@@ -17,7 +17,9 @@ import { getDirectusImageURL } from '@/support/url';
 const post = Astro.props;
 
 export async function getStaticPaths() {
-  const posts = await directus.request(readItems('posts'));
+  const posts = await directus.request(readItems('posts', {
+    fields: ['*', 'category.*'],
+  }));
   return posts.map((post) => ({
     params: { slug: post.slug },
     props: post,
@@ -25,12 +27,7 @@ export async function getStaticPaths() {
 }
 
 const global = await directus.request(readSingleton('site_global'));
-const [category] = post.category ? await directus.request(
+const category = post.category;
-  readItems('categories', {
-    filter: { slug: { _eq: post.category },},
-    limit: 1,
-  }))
-  : [];
 
 const readingTime = getReadingTime(post.content || '');
 

src/pages/blog/index.astro

@@ -20,7 +20,7 @@ const posts = await directus.request(
   })
 );
 
-const selectedPosts: Post[] = posts.filter((p) => p.selected).slice(0, 3);
+const selectedPosts: Post[] = posts.filter((p) => p.selected).slice(0, 4);
 const recentPosts: Post[] = posts.filter(
   (p) => !selectedPosts.some((selected) => selected.slug === p.slug)
   ).slice(0, 9);

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

@@ -22,7 +22,7 @@ const global = await directus.request(readSingleton('site_global'));
 const posts = await directus.request(
   readItems('posts', {
     filter: { published: { _eq: true } },
-    fields: ['*'],
+    fields: ['*', 'category.slug'],
     sort: ['-published_date'],
   })
 );
@@ -30,7 +30,7 @@ const posts = await directus.request(
 const categoriesPosts = posts
   .sort((a: Post, b: Post) => b.published_date.valueOf() - a.published_date.valueOf())
   .filter((b) => {
-    return b.category === category.slug;
+    return b.category?.slug === category.slug;
   });
 ---