feat: refactor static paths and photoswipe on blog page, move script to base layout

.pre-commit-config.yaml

@@ -0,0 +1,17 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v6.0.0
+    hooks:
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+      - id: check-merge-conflict
+      - id: check-json
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v4.0.0-alpha.11
+    hooks:
+      - id: prettier
+        types_or: [javascript, typescript, css, scss, html, json, yaml, markdown]
+        additional_dependencies:
+          - prettier
+          - prettier-plugin-astro
+          - prettier-plugin-tailwindcss

astro.config.mjs

@@ -24,8 +24,6 @@ export default defineConfig({
     }
   },
 
-  prefetch: true,
-
   integrations: [
     react(),
     sitemap(),

bun.lock

@@ -49,6 +49,7 @@
         "@tailwindcss/forms": "^0.5.11",
         "@tailwindcss/typography": "^0.5.19",
         "@types/markdown-it": "^14.1.2",
+        "@types/photoswipe": "^5.2.5",
         "eslint": "^10.0.3",
         "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-astro": "^1.6.0",
@@ -849,6 +850,8 @@
 
     "@types/parse-json": ["@types/parse-json@4.0.2", "", {}, "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw=="],
 
+    "@types/photoswipe": ["@types/photoswipe@5.2.5", "", { "dependencies": { "photoswipe": "*" } }, "sha512-1x8LpPy/a9cMdy8AgSQZOgVN4b1BEAGGLFjkg20RAUbv2vzovH8U2iSZmjlM6Gd6oY/BI+Thdph0kOlxEZHskQ=="],
+
     "@types/react": ["@types/react@19.2.14", "", { "dependencies": { "csstype": "3.2.3" } }, "sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w=="],
 
     "@types/react-dom": ["@types/react-dom@19.1.7", "", { "peerDependencies": { "@types/react": "19.2.14" } }, "sha512-i5ZzwYpqjmrKenzkoLM2Ibzt6mAsM7pxB6BCIouEVVmgiqaMj1TjaK7hnA36hbW5aZv20kx7Lw6hWzPWg0Rurw=="],

package.json

@@ -73,6 +73,7 @@
     "@tailwindcss/forms": "^0.5.11",
     "@tailwindcss/typography": "^0.5.19",
     "@types/markdown-it": "^14.1.2",
+    "@types/photoswipe": "^5.2.5",
     "eslint": "^10.0.3",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-astro": "^1.6.0",

src/components/Header.astro

@@ -95,5 +95,3 @@ const currentPath = pathname.slice(1);
     </div>
   </nav>
 </header>
-
-<script is:inline src="/vendor/preline/collapse2.1.0.min.js"></script>

src/components/buttons/ThemeToggleButton.astro

@@ -43,106 +43,93 @@
 </button>
 
 <script is:inline>
-  const applyTheme = () => {
+  (() => {
     const isDark =
       localStorage.theme === 'dark' ||
       (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches);
     document.documentElement.classList.toggle('dark', isDark);
-  };
-
-  applyTheme();
-
-  document.addEventListener('astro:after-swap', applyTheme);
+  })();
 </script>
 
 <script>
-  function setupThemeToggle() {
-    const themeToggles = document.querySelectorAll('[data-theme-toggle]');
-
-    // Create theme switch overlay element
-    if (!document.querySelector('.theme-switch-overlay')) {
-      const overlay = document.createElement('div');
-      overlay.className = 'theme-switch-overlay fixed inset-0 pointer-events-none z-50';
-      overlay.style.opacity = '0';
-      overlay.style.transition = 'opacity 0.15s ease-out';
-      document.body.appendChild(overlay);
-    }
-
-    themeToggles.forEach((toggle) => {
-      ['click', 'touchend'].forEach((eventType) => {
-        toggle.addEventListener(
-          eventType,
-          (e) => {
-            e.preventDefault();
-            e.stopPropagation();
-
-            // Get click/touch position for radial animation
-            let x, y;
-            if (e.type === 'touchend' && e.changedTouches && e.changedTouches[0]) {
-              const rect = toggle.getBoundingClientRect();
-              x = e.changedTouches[0].clientX - rect.left;
-              y = e.changedTouches[0].clientY - rect.top;
-            } else {
-              const rect = toggle.getBoundingClientRect();
-              x = e.clientX - rect.left;
-              y = e.clientY - rect.top;
-            }
-
-            document.documentElement.style.setProperty('--x', `${x}px`);
-            document.documentElement.style.setProperty('--y', `${y}px`);
-
-            const overlay = document.querySelector('.theme-switch-overlay');
-            const isDark = document.documentElement.classList.contains('dark');
-            const newTheme = isDark ? 'light' : 'dark';
-
-            // Show overlay during transition
-            if (overlay) {
-              overlay.style.backgroundColor =
-                newTheme === 'dark' ? 'rgba(24, 24, 27, 0.3)' : 'rgba(255, 255, 255, 0.3)';
-              overlay.style.opacity = '1';
-            }
-
-            document.documentElement.classList.add('theme-switching');
-
-            // Force a reflow to ensure all elements update
-            document.body.offsetHeight;
-
-            // Toggle dark mode with a slight delay to allow overlay to appear
-            setTimeout(() => {
-              if (isDark) {
-                document.documentElement.classList.remove('dark');
-              } else {
-                document.documentElement.classList.add('dark');
-              }
-
-              localStorage.setItem('theme', newTheme);
-              document.dispatchEvent(
-                new CustomEvent('themeChanged', {
-                  detail: { isDark: newTheme === 'dark' },
-                })
-              );
-
-              // Force another reflow to ensure all elements update
-              document.body.offsetHeight;
-
-              setTimeout(() => {
-                if (overlay) {
-                  overlay.style.opacity = '0';
-                }
-                document.documentElement.classList.remove('theme-switching');
-              }, 150);
-            }, 50);
-          },
-          { passive: false }
-        );
-      });
-    });
+  if (!document.querySelector('.theme-switch-overlay')) {
+    const overlay = document.createElement('div');
+    overlay.className = 'theme-switch-overlay fixed inset-0 pointer-events-none z-50';
+    overlay.style.opacity = '0';
+    overlay.style.transition = 'opacity 0.15s ease-out';
+    document.body.appendChild(overlay);
   }
+  ['click', 'touchend'].forEach((eventType) => {
+    document.addEventListener(
+      eventType,
+      (e) => {
+        const target = e.target as HTMLElement;
+        const toggle = target.closest('[data-theme-toggle]');
+        
+        if (!toggle) return;
 
-  // Run setup on load
-  document.addEventListener('astro:page-load', setupThemeToggle);
+        e.preventDefault();
+
+        let x, y;
+        const rect = toggle.getBoundingClientRect();
+        
+        if (eventType === 'touchend') {
+          const touchEvent = e as TouchEvent;
+          if (touchEvent.changedTouches && touchEvent.changedTouches[0]) {
+            x = touchEvent.changedTouches[0].clientX - rect.left;
+            y = touchEvent.changedTouches[0].clientY - rect.top;
+          }
+        } else {
+          const mouseEvent = e as MouseEvent;
+          x = mouseEvent.clientX - rect.left;
+          y = mouseEvent.clientY - rect.top;
+        }
+
+        document.documentElement.style.setProperty('--x', `${x}px`);
+        document.documentElement.style.setProperty('--y', `${y}px`);
+
+        const overlay = document.querySelector('.theme-switch-overlay') as HTMLElement;
+        const isDark = document.documentElement.classList.contains('dark');
+        const newTheme = isDark ? 'light' : 'dark';
+
+        if (overlay) {
+          overlay.style.backgroundColor =
+            newTheme === 'dark' ? 'rgba(24, 24, 27, 0.3)' : 'rgba(255, 255, 255, 0.3)';
+          overlay.style.opacity = '1';
+        }
+
+        document.documentElement.classList.add('theme-switching');
+
+        document.body.offsetHeight;
+
+        setTimeout(() => {
+          if (isDark) {
+            document.documentElement.classList.remove('dark');
+          } else {
+            document.documentElement.classList.add('dark');
+          }
+
+          localStorage.setItem('theme', newTheme);
+          document.dispatchEvent(
+            new CustomEvent('themeChanged', {
+              detail: { isDark: newTheme === 'dark' },
+            })
+          );
+
+          document.body.offsetHeight;
+
+          setTimeout(() => {
+            if (overlay) {
+              overlay.style.opacity = '0';
+            }
+            document.documentElement.classList.remove('theme-switching');
+          }, 150);
+        }, 50);
+      },
+      { passive: false }
+    );
+  });
 
-  // Also run on page visibility change to ensure theme is consistent
   document.addEventListener('visibilitychange', () => {
     if (document.visibilityState === 'visible') {
       const currentTheme = localStorage.getItem('theme');
@@ -154,7 +141,6 @@
     }
   });
 
-  // Listen for system preference changes
   window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', ({ matches }) => {
     if (!localStorage.getItem('theme')) {
       if (matches) {

src/components/cards/CategoryCard.astro

@@ -22,8 +22,8 @@ const { slug, title, description, logoLight, logoDark, count, publishDate } = As
     data-astro-prefetch
   >
     <div class="relative grow overflow-hidden">
-      <div class="absolute inset-1 flex flex-col p-3 md:p-4 lg:p-5">
-        <div class="flex flex-row items-center mb-4">
+      <div class="mask-fade-edges absolute inset-1 flex flex-col p-3 md:p-4 lg:p-5">
+        <div class="flex flex-row items-center mb-4 shrink-0">
           <div class="card-hover-icon-scale shrink-0 mr-3">
             <Logo
               srcLight={getDirectusImageURL(logoLight)}
@@ -35,12 +35,12 @@ const { slug, title, description, logoLight, logoDark, count, publishDate } = As
             {title}
           </h3>
         </div>
-        <div>
-          <p class="card-text-description mb-4">
+        <div class="overflow-hidden">
+          <p class="card-text-description line-clamp-3">
             {description}
           </p>
         </div>
-        <div class="card-text-description flex items-center justify-between text-xs mt-auto pt-1 md:pt-2">
+        <div class="card-text-description flex shrink-0 items-center justify-between text-xs mt-auto pt-1 md:pt-2">
           <span class="inline-flex items-center">
             <svg
               xmlns="http://www.w3.org/2000/svg"

src/components/sections/HeroSection.astro

@@ -82,7 +82,7 @@ const images = await Promise.all(imagesData.map(async (img) => ({
 </section>
 
 <script>
-  document.addEventListener('astro:page-load', () => {
+  function initHeroImage() {
     const container = document.getElementById('hero-image-container');
     if (container) {
       const images = container.querySelectorAll('.hero-image');
@@ -96,5 +96,13 @@ const images = await Promise.all(imagesData.map(async (img) => ({
         images[randomIndex].classList.add('flex');
       }
     }
-  });
+  }
+  if (document.readyState === 'loading') {
+    document.addEventListener('DOMContentLoaded', initHeroImage);
+  } else {
+    initHeroImage();
+  }
+  if ((window as any).swup) {
+    (window as any).swup.hooks.on('page:view', initHeroImage); 
+  }
 </script>

src/components/sections/RecentPostsSection.astro

@@ -18,7 +18,7 @@ const global = await directus.request(readSingleton('site_global'));
 const { posts, title, subTitle } = Astro.props;
 ---
 
-<section class="max-w-340 2xl:max-w-full px-4 sm:px-6 lg:px-8 py-10 lg:py-14 mx-auto mb-2 md:mb-8">
+<section class="max-w-340 2xl:max-w-full px-4 sm:px-6 lg:px-8 py-10 lg:py-14 mx-auto mb-2 md:mb-4">
   <div class="text-center max-w-2xl mx-auto mb-10 lg:mb-14">
     <h1 class="smooth-reveal card-text-header block">
       {title}

src/components/sections/SelectedPostsSection.astro

@@ -11,7 +11,7 @@ interface Props {
 const { posts } = Astro.props;
 ---
 
-<section class="smooth-reveal flex flex-col gap-4 md:mb-20">
+<section class="smooth-reveal-cards flex flex-col gap-4 md:mb-20">
   {posts.map((post, index) => index % 2 === 0 ? (
   <LargeBlogLeftCard post={post}/>
   ) : (

src/layouts/BaseLayout.astro

@@ -1,5 +1,4 @@
 ---
-import { ClientRouter } from 'astro:transitions';
 import { readSingleton } from '@directus/sdk';
 
 import BaseHead from '@components/BaseHead.astro';
@@ -39,8 +38,7 @@ const normalizeTitle = !title ? global.name : `${title} | ${global.name}`;
       structuredData={structuredData}
     />
 
-    <ClientRouter fallback="swap" />
-
+    <!-- Set Theme -->
     <script is:inline>
       const theme = (() => {
         if (typeof localStorage !== 'undefined' && localStorage.getItem('theme')) {
@@ -60,6 +58,12 @@ const normalizeTitle = !title ? global.name : `${title} | ${global.name}`;
       window.localStorage.setItem('theme', theme);
     </script>
 
+    <!-- Preline -->
+    <script
+      src="/vendor/preline/collapse2.1.0.min.js"
+      is:inline
+    />
+
     <!-- Rybbit Tracking Snippet -->
     <script
       src="https://rybbit.alexlebens.dev/api/script.js"
@@ -104,7 +108,94 @@ const normalizeTitle = !title ? global.name : `${title} | ${global.name}`;
     }
   };
   resetScroll();
-  document.addEventListener('astro:after-swap', resetScroll);
+
+  document.addEventListener('swup:page:view', () => {
+    resetScroll();
+    if (typeof (window as any).HSStaticMethods !== 'undefined') {
+      (window as any).HSStaticMethods.autoInit();
+    }
+    if (typeof (window as any).rybbit === 'function') {
+      (window as any).rybbit('trackPageview'); 
+    }
+  });
+</script>
+
+<script>
+  import PhotoSwipeLightbox from 'photoswipe/lightbox';
+  import PhotoSwipe from "photoswipe";
+
+  let lightbox: PhotoSwipeLightbox | null = null;
+
+  function initPhotoSwipe() {
+    const links = document.querySelectorAll<HTMLAnchorElement>('a.pswp-link');
+    
+    links.forEach((link) => {
+      const img = link.querySelector('img');
+      if (img) {
+        const applyDimensions = () => {
+          link.dataset.pswpWidth = (img.naturalWidth || 1920).toString();
+          link.dataset.pswpHeight = (img.naturalHeight || 1080).toString();
+        };
+        if (img.complete) {
+          applyDimensions();
+        } else {
+          img.addEventListener('load', applyDimensions);
+        }
+      }
+    });
+
+    if (lightbox) {
+      lightbox.destroy();
+    }
+
+    lightbox = new PhotoSwipeLightbox({
+      gallery: '.prose',
+      children: 'a.pswp-link',
+      pswpModule: PhotoSwipe,
+      allowPanToNext: true,
+    });
+    
+    lightbox.init();
+  }
+
+  initPhotoSwipe();
+  document.addEventListener('swup:page:view', initPhotoSwipe);
+</script>
+
+<script>
+  const animateContent = () => {
+    const smoothReveal = document.querySelectorAll('.smooth-reveal');
+    smoothReveal.forEach((el, index) => {
+      setTimeout(() => {
+        el.classList.add('animate-reveal');
+      }, 50 + index * 100);
+    });
+
+    const smoothReveal2 = document.querySelectorAll('.smooth-reveal-2');
+    smoothReveal2.forEach((el, index) => {
+      setTimeout(() => {
+        el.classList.add('animate-reveal');
+      }, 200 + index * 250);
+    });
+
+    const smoothRevealCards = document.querySelectorAll('.smooth-reveal-cards');
+    smoothRevealCards.forEach((el, index) => {
+      setTimeout(() => {
+        el.classList.add('animate-reveal');
+      }, 400 + index * 250);
+    });
+
+    const smoothRevealFade = document.querySelectorAll('.smooth-reveal-fade');
+    smoothRevealFade.forEach((el, index) => {
+      setTimeout(() => {
+        el.classList.add('animate-reveal-fade');
+      }, 100 + index * 250);
+    });
+  };
+
+  animateContent();
+
+  document.addEventListener('swup:page:view', animateContent);
 </script>
 
 <style>

src/pages/404.astro

@@ -86,24 +86,6 @@ const global = await directus.request(readSingleton('site_global'));
     const randomFact = funFacts[Math.floor(Math.random() * funFacts.length)];
     funFactElement.textContent = randomFact;
   }
-
-  // Add smooth reveal animations for content after loading
-  document.addEventListener('astro:page-load', () => {
-    const animateContent = () => {
-      // Animate group 1
-      const smoothReveal = document.querySelectorAll('.smooth-reveal');
-      smoothReveal.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal');
-          },
-          100 + index * 150
-        );
-      });
-    };
-
-    animateContent();
-  });
 </script>
 
 <style>

src/pages/about.astro

@@ -47,33 +47,3 @@ const global = await directus.request(readSingleton('site_global'));
   </section>
 
 </BaseLayout>
-
-<script>
-  // Add smooth reveal animations for content after loading
-  document.addEventListener('astro:page-load', () => {
-    const animateContent = () => {
-      const smoothReveal = document.querySelectorAll('.smooth-reveal');
-      smoothReveal.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal');
-          },
-          50 + index * 100
-        );
-      });
-
-      // Animate with just fade in with staggered delay
-      const smoothRevealFade = document.querySelectorAll('.smooth-reveal-fade');
-      smoothRevealFade.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal-fade');
-          },
-          100 + index * 250
-        );
-      });
-    };
-
-    animateContent();
-  });
-</script>

src/pages/all.astro

@@ -52,56 +52,3 @@ const posts = await directus.request(
   </section>
 
 </BaseLayout>
-
-<script>
-  // Add smooth reveal animations for content after loading
-  document.addEventListener('astro:page-load', () => {
-    const animateContent = () => {
-      // Animate group 1
-      const smoothReveal = document.querySelectorAll('.smooth-reveal');
-      smoothReveal.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal');
-          },
-          50 + index * 100
-        );
-      });
-
-      // Animate group 2
-      const smoothReveal2 = document.querySelectorAll('.smooth-reveal-2');
-      smoothReveal2.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal');
-          },
-          200 + index * 150
-        );
-      });
-
-      // Animate topic cards with staggered delay
-      const smoothRevealCards = document.querySelectorAll('.smooth-reveal-cards');
-      smoothRevealCards.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal');
-          },
-          500 + index * 100
-        );
-      });
-
-      // Animate with just fade in with staggered delay
-      const smoothRevealFade = document.querySelectorAll('.smooth-reveal-fade');
-      smoothRevealFade.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal-fade');
-          },
-          100 + index * 250
-        );
-      });
-    };
-
-    animateContent();
-  });
-</script>

src/pages/apps.astro

@@ -37,23 +37,3 @@ const global = await directus.request(readSingleton('site_global'));
   <ApplicationSection className="smooth-reveal-2" />
 
 </BaseLayout>
-
-<script>
-  // Add smooth reveal animations for content after loading
-  document.addEventListener('astro:page-load', () => {
-    const animateContent = () => {
-      // Animate group 1
-      const smoothReveal = document.querySelectorAll('.smooth-reveal');
-      smoothReveal.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal');
-          },
-          50 + index * 100
-        );
-      });
-    };
-
-    animateContent();
-  });
-</script>

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

@@ -1,11 +1,12 @@
 ---
-
 import { Image } from 'astro:assets';
 import { marked } from 'marked';
 import markedShiki from 'marked-shiki';
 import { createHighlighter } from 'shiki';
 import { readItems, readSingleton } from '@directus/sdk';
-import 'photoswipe/style.css';
+import "photoswipe/style.css";
+
+import type { Post } from '@/lib/directusTypes'
 
 import SocialShareButton from '@components/buttons/SocialShareButton.astro';
 import PostMetadataSnippet from '@/components/snippets/PostMetadataSnippet.astro';
@@ -13,39 +14,51 @@ import BaseLayout from '@layouts/BaseLayout.astro';
 import directus from '@lib/directus';
 import { getDirectusImageURL } from '@/support/url';
 
-const post = Astro.props;
-
 export async function getStaticPaths() {
   const posts = await directus.request(readItems('posts', {
     fields: ['*', { category: ['*'] }],
   }));
-  return posts.map((post) => ({
+  const globalData = await directus.request(readSingleton('site_global'));
+  const highlighter = await createHighlighter({
+    themes: ['github-light', 'github-dark'],
+    langs: ['typescript', 'python', 'css', 'html', 'yaml', 'bash', 'json'],
+  });
+  const renderer = {
+    image({ href, title, text }: { href: string; title: string | null; text: string }) {
+      return `
+        <a 
+          href="${href}" 
+          class="pswp-link" 
+          data-pswp-src="${href}" 
+          target="_blank"
+        >
+          <img src="${href}" alt="${text}" title="${title || ''}" loading="lazy" />
+        </a>
+      `;
+    },
+  };
+  marked.use({ renderer });
+  marked.use(markedShiki({
+    highlight(code, lang) {
+      return highlighter.codeToHtml(code, {
+        lang: lang || 'plaintext',
+        themes: { light: 'github-light', dark: 'github-dark' },
+        defaultColor: false,
+      });
+    }
+  }));
+
+  return posts.map((post: Post) => ({
     params: { slug: post.slug },
-    props: post,
+    props: {
+      post,
+      global: globalData,
+      content: marked.parse(post.content || ''),
+    },
   }));
 }
 
-const global = await directus.request(readSingleton('site_global'));
-
-const highlighter = await createHighlighter({
-  themes: ['github-light', 'github-dark'],
-  langs: ['typescript', 'python', 'css', 'html', 'yaml', 'bash', 'json'],
-});
-
-marked.use(markedShiki({
-  highlight(code, lang) {
-    return highlighter.codeToHtml(code, {
-      lang: lang || 'plaintext',
-      themes: {
-        light: 'github-light',
-        dark: 'github-dark',
-      },
-      defaultColor: false,
-    });
-  }
-}));
-
-const content = marked.parse(post.content || '');
+const { post, global, content } = Astro.props;
 ---
 
 <BaseLayout
@@ -65,7 +78,7 @@ const content = marked.parse(post.content || '');
       name: global.name,
       description: global.about,
     },
-    image: [],
+    image: [getDirectusImageURL(post.image)],
     headline: post.title,
     datePublished: post.published_date,
     dateModified: post.updated_date,
@@ -85,7 +98,7 @@ const content = marked.parse(post.content || '');
         <Image
           class="rounded-2xl sm:rounded-b-none w-full max-h-150 object-cover"
           src={getDirectusImageURL(post.image)}
-          alt={post.image_alt}
+          alt={post.image_alt || post.title}
           draggable="false"
           format="webp"
           loading="lazy"
@@ -110,13 +123,15 @@ const content = marked.parse(post.content || '');
           </article>
 
           <div class="grid sm:flex sm:items-center sm:justify-between gap-y-5 sm:gap-y-0 max-w-5xl mx-auto mt-10 md:mt-14">
-            <div class="flex flex-wrap sm:flex-nowrap sm:items-center gap-x-2 gap-y-1 sm:gap-y-0">
-              {post.tags.map((tag: string) => (
-              <span class="inline-flex items-center button-base bg-cobalt dark:bg-turquoise text-neutral-100 text-xs font-bold rounded-lg gap-x-1.5 px-3 py-1.5">
-                {tag}
-              </span>
-              ))}
-            </div>
+            {post.tags && post.tags.length > 0 && (
+              <div class="flex flex-wrap sm:flex-nowrap sm:items-center gap-x-2 gap-y-1 sm:gap-y-0">
+                {post.tags.map((tag: string) => (
+                <span class="inline-flex items-center button-base bg-cobalt dark:bg-turquoise text-neutral-100 text-xs font-bold rounded-lg gap-x-1.5 px-3 py-1.5">
+                  {tag}
+                </span>
+                ))}
+              </div>
+            )}
             <SocialShareButton pageTitle={post.title}/>
           </div>
         </div>
@@ -139,56 +154,3 @@ const content = marked.parse(post.content || '');
   </style>
 
 </BaseLayout>
-
-<script>
-  import PhotoSwipeLightbox from 'photoswipe/lightbox';
-  const prose = document.querySelector('.prose');
-  if (prose) {
-    const images = prose.querySelectorAll('img');
-    images.forEach((img) => {
-      if (img.closest('a')) return;
-      const link = document.createElement('a');
-      link.href = img.src;
-      link.dataset.pswpSrc = img.src;
-      link.dataset.pswpWidth = img.naturalWidth.toString();
-      link.dataset.pswpHeight = img.naturalHeight.toString();
-      link.target = '_blank';
-      link.classList.add('pswp-link');
-
-      img.parentNode?.insertBefore(link, img);
-      link.appendChild(img);
-
-      if (!img.complete) {
-        img.onload = () => {
-          link.dataset.pswpWidth = img.naturalWidth.toString();
-          link.dataset.pswpHeight = img.naturalHeight.toString();
-        };
-      }
-    });
-
-    const lightbox = new PhotoSwipeLightbox({
-      gallery: prose,
-      children: 'a.pswp-link',
-      pswpModule: () => import('photoswipe'),
-    });
-
-    lightbox.init();
-  }
-
-  // Add smooth reveal animations for content after loading
-  document.addEventListener('astro:page-load', () => {
-    const animateContent = () => {
-      const smoothReveal = document.querySelectorAll('.smooth-reveal');
-      smoothReveal.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal');
-          },
-          100 + index * 100
-        );
-      });
-    };
-
-    animateContent();
-  });
-</script>

src/pages/blog/index.astro

@@ -57,56 +57,3 @@ const recentPosts: Post[] = posts.filter(
   />
 
 </BaseLayout>
-
-<script>
-  // Add smooth reveal animations for content after loading
-  document.addEventListener('astro:page-load', () => {
-    const animateContent = () => {
-      // Animate group 1
-      const smoothReveal = document.querySelectorAll('.smooth-reveal');
-      smoothReveal.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal');
-          },
-          200 + index * 300
-        );
-      });
-
-      // Animate group 2
-      const smoothReveal2 = document.querySelectorAll('.smooth-reveal-2');
-      smoothReveal2.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal');
-          },
-          500 + index * 100
-        );
-      });
-
-      // Animate topic cards with staggered delay
-      const smoothRevealCards = document.querySelectorAll('.smooth-reveal-cards');
-      smoothRevealCards.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal');
-          },
-          1000 + index * 250
-        );
-      });
-
-      // Animate with just fade in with staggered delay
-      const smoothRevealFade = document.querySelectorAll('.smooth-reveal-fade');
-      smoothRevealFade.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal-fade');
-          },
-          100 + index * 250
-        );
-      });
-    };
-
-    animateContent();
-  });
-</script>

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

@@ -75,56 +75,3 @@ const categoriesPosts = posts
   </section>
 
 </BaseLayout>
-
-<script>
-  // Add smooth reveal animations for content after loading
-  document.addEventListener('astro:page-load', () => {
-    const animateContent = () => {
-      // Animate group 1
-      const smoothReveal = document.querySelectorAll('.smooth-reveal');
-      smoothReveal.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal');
-          },
-          50 + index * 100
-        );
-      });
-
-      // Animate group 2
-      const smoothReveal2 = document.querySelectorAll('.smooth-reveal-2');
-      smoothReveal2.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal');
-          },
-          200 + index * 150
-        );
-      });
-
-      // Animate topic cards with staggered delay
-      const smoothRevealCards = document.querySelectorAll('.smooth-reveal-cards');
-      smoothRevealCards.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal');
-          },
-          500 + index * 100
-        );
-      });
-
-      // Animate with just fade in with staggered delay
-      const smoothRevealFade = document.querySelectorAll('.smooth-reveal-fade');
-      smoothRevealFade.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal-fade');
-          },
-          100 + index * 250
-        );
-      });
-    };
-
-    animateContent();
-  });
-</script>

src/pages/categories/index.astro

@@ -37,56 +37,3 @@ const global = await directus.request(readSingleton('site_global'));
   <CategorySection />
 
 </BaseLayout>
-
-<script>
-  // Add smooth reveal animations for content after loading
-  document.addEventListener('astro:page-load', () => {
-    const animateContent = () => {
-      // Animate group 1
-      const smoothReveal = document.querySelectorAll('.smooth-reveal');
-      smoothReveal.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal');
-          },
-          50 + index * 100
-        );
-      });
-
-      // Animate group 2
-      const smoothReveal2 = document.querySelectorAll('.smooth-reveal-2');
-      smoothReveal2.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal');
-          },
-          200 + index * 150
-        );
-      });
-
-      // Animate topic cards with staggered delay
-      const smoothRevealCards = document.querySelectorAll('.smooth-reveal-cards');
-      smoothRevealCards.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal');
-          },
-          500 + index * 100
-        );
-      });
-
-      // Animate with just fade in with staggered delay
-      const smoothRevealFade = document.querySelectorAll('.smooth-reveal-fade');
-      smoothRevealFade.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal-fade');
-          },
-          100 + index * 250
-        );
-      });
-    };
-
-    animateContent();
-  });
-</script>

src/pages/index.astro

@@ -11,10 +11,6 @@ import GiteaSection from '@components/sections/GiteaSection.astro';
 import BaseLayout from '@layouts/BaseLayout.astro';
 import directus from '@lib/directus';
 
-// Weather section server island does not seem to load under Astro 6, setting the whole page for server
-// side rendering for now.
-export const prerender = false
-
 const global = await directus.request(readSingleton('site_global'));
 const weather = await directus.request(readSingleton('site_weather'));
 const posts = await directus.request(
@@ -80,62 +76,3 @@ const recentPosts = posts
   />
 
 </BaseLayout>
-
-<script>
-  // Add smooth reveal animations for content after loading
-  document.addEventListener('astro:page-load', () => {
-    const animateContent = () => {
-      // Animate group 1
-      const smoothReveal = document.querySelectorAll('.smooth-reveal');
-      smoothReveal.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal');
-          },
-          50 + index * 100
-        );
-      });
-
-      // Animate group 2
-      const smoothReveal2 = document.querySelectorAll('.smooth-reveal-2');
-      smoothReveal2.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal');
-          },
-          200 + index * 250
-        );
-      });
-
-      // Animate topic cards with staggered delay
-      const smoothRevealCards = document.querySelectorAll('.smooth-reveal-cards');
-      smoothRevealCards.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal');
-          },
-          400 + index * 250
-        );
-      });
-
-      // Animate with just fade in with staggered delay
-      const smoothRevealFade = document.querySelectorAll('.smooth-reveal-fade');
-      smoothRevealFade.forEach((el, index) => {
-        setTimeout(
-          () => {
-            el.classList.add('animate-reveal-fade');
-          },
-          100 + index * 250
-        );
-      });
-    };
-
-    animateContent();
-
-    const observer = new MutationObserver(() => {
-      animateContent();
-    });
-
-    observer.observe(document.body, { childList: true, subtree: true });
-  });
-</script>

src/styles/utilities.css

@@ -138,3 +138,15 @@
          bg-neutral-100 dark:bg-neutral-800
          shadow-xs dark:shadow-md
 }
+
+@utility mask-fade-edges {
+  -webkit-mask-image: 
+    linear-gradient(to right, transparent, black var(--fade-dist, 1rem), black calc(100% - var(--fade-dist, 1rem)), transparent),
+    linear-gradient(to bottom, transparent, black var(--fade-dist, 1rem), black calc(100% - var(--fade-dist, 1rem)), transparent);
+  mask-image: 
+    linear-gradient(to right, transparent, black var(--fade-dist, 1rem), black calc(100% - var(--fade-dist, 1rem)), transparent),
+    linear-gradient(to bottom, transparent, black var(--fade-dist, 1rem), black calc(100% - var(--fade-dist, 1rem)), transparent);
+
+  -webkit-mask-composite: source-in;
+  mask-composite: intersect;
+}

src/support/animation.ts

@@ -1,50 +0,0 @@
-// Add smooth reveal animations for content after loading
-document.addEventListener('astro:page-load', () => {
-  const animateContent = () => {
-    // Animate group 1
-    const smoothReveal = document.querySelectorAll('.smooth-reveal');
-    smoothReveal.forEach((el, index) => {
-      setTimeout(
-        () => {
-          el.classList.add('animate-reveal');
-        },
-        50 + index * 100
-      );
-    });
-
-    // Animate group 2
-    const smoothReveal2 = document.querySelectorAll('.smooth-reveal-2');
-    smoothReveal2.forEach((el, index) => {
-      setTimeout(
-        () => {
-          el.classList.add('animate-reveal');
-        },
-        200 + index * 250
-      );
-    });
-
-    // Animate topic cards with staggered delay
-    const smoothRevealCards = document.querySelectorAll('.smooth-reveal-cards');
-    smoothRevealCards.forEach((el, index) => {
-      setTimeout(
-        () => {
-          el.classList.add('animate-reveal');
-        },
-        400 + index * 250
-      );
-    });
-
-    // Animate with just fade in with staggered delay
-    const smoothRevealFade = document.querySelectorAll('.smooth-reveal-fade');
-    smoothRevealFade.forEach((el, index) => {
-      setTimeout(
-        () => {
-          el.classList.add('animate-reveal-fade');
-        },
-        100 + index * 250
-      );
-    });
-  };
-
-  animateContent();
-});

tsconfig.json

@@ -4,20 +4,21 @@
   "exclude": ["dist"],
   "compilerOptions": {
     "strictNullChecks": true,
-    "baseUrl": "src",
+    "baseUrl": ".",
     "jsx": "react-jsx",
+    "jsxImportSource": "react",
     "types": ["astro/client"],
     "paths": {
-      "@/*": ["*"],
+      "@/*": ["src/*"],
       "@src/*": ["src/*"],
-      "@lib/*": ["lib/*"],
-      "@components/*": ["components/*"],
-      "@content/*": ["content/*"],
-      "@layouts/*": ["layouts/*"],
-      "@styles/*": ["styles/*"],
-      "@pages/*": ["pages/*"],
-      "@support/*": ["support/*"],
-      "@images/*": ["images/*"]
+      "@lib/*": ["src/lib/*"],
+      "@components/*": ["src/components/*"],
+      "@content/*": ["src/content/*"],
+      "@layouts/*": ["src/layouts/*"],
+      "@styles/*": ["src/styles/*"],
+      "@pages/*": ["src/pages/*"],
+      "@support/*": ["src/support/*"],
+      "@images/*": ["src/images/*"]
     }
   }
 }