feat: release 2.14.1

Reviewed-on: #344

.gitea/workflows/renovate.yaml

@@ -25,8 +25,10 @@ jobs:
           RENOVATE_ENDPOINT: ${{ vars.INSTANCE_URL }}
           RENOVATE_REPOSITORIES: alexlebens/site-profile
           RENOVATE_GIT_AUTHOR: Renovate Bot <renovate-bot@alexlebens.net>
+          RENOVATE_REDIS_URL: ${{ vars.RENOVATE_REDIS_URL }}
           LOG_LEVEL: info
           RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }}
           RENOVATE_GIT_PRIVATE_KEY: ${{ secrets.RENOVATE_GIT_PRIVATE_KEY }}
           RENOVATE_GITHUB_COM_TOKEN: ${{ secrets.RENOVATE_GITHUB_COM_TOKEN }}
-          RENOVATE_REDIS_URL: ${{ vars.RENOVATE_REDIS_URL }}
+          RENOVATE_REGISTRY_ALIASES: '{"dhi.io": "dhi.io"}'
+          RENOVATE_HOST_RULES: '[{"matchHost":"dhi.io","hostType":"docker","username":"${{ secrets.RENOVATE_DHI_USER }}","password":"${{ secrets.RENOVATE_DHI_TOKEN }}"}]'

Dockerfile

@@ -22,13 +22,11 @@ WORKDIR /app
 COPY --from=prod-deps /app/node_modules /app/node_modules
 COPY --from=build /app/dist /app/dist
 
-ENV HOST=0.0.0.0
+LABEL version="2.14.1"
-ENV SITE_URL=https://www.alexlebens.dev
-ENV DIRECTUS_URL=https://directus.alexlebens.net
-ENV PORT=4321
-
-LABEL version="2.12.0"
 LABEL description="Astro based personal website"
 
+ENV HOST=0.0.0.0
+ENV PORT=4321
+
 EXPOSE $PORT
 CMD ["node", "./dist/server/entry.mjs"]

astro.config.mjs

@@ -9,17 +9,16 @@ import tailwindcss from '@tailwindcss/vite';
 import icon from 'astro-icon';
 import swup from '@swup/astro';
 
-const getSiteURL = () => {
+import { getSiteURL } from './src/support/url';
-  if (process.env.SITE_URL) {
-    return `https://${process.env.SITE_URL}`;
-  }
-  return 'http://localhost:4321';
-};
 
 export default defineConfig({
   site: getSiteURL(),
 
   image: {
+    remotePatterns: [
+      { protocol: 'https', hostname: '*.alexlebens.net' },
+      { protocol: 'https', hostname: '*.jsdelivr.net' },
+    ],
     service: {
       entrypoint: 'astro/assets/services/sharp',
     }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "site-profile",
   "type": "module",
-  "version": "2.12.0",
+  "version": "2.14.1",
   "homepage": "https://www.alexlebens.dev",
   "bugs": {
     "url": "https://gitea.alexlebens.dev/alexlebens/site-profile/issues",

src/components/Footer.astro

@@ -14,81 +14,67 @@ const currentYear = new Date().getFullYear();
 ---
 
 <footer
-  class="w-full overflow-hidden bg-stone-300/40 dark:bg-stone-800/20"
+  class="bg-background-accent w-full overflow-hidden"
   transition:animate="none"
 >
-  <div class="relative px-4 pt-16 pb-12 sm:px-6">
+  <div class="relative px-4 sm:px-6 pt-16 pb-12">
-    <div class="mx-auto max-w-340">
+    <div class="max-w-340 mx-auto">
-      <div class="grid grid-cols-1 gap-10 md:grid-cols-12">
+      <div class="grid grid-cols-1 md:grid-cols-12 gap-10">
         <!-- Brand section -->
         <div class="col-span-1 md:col-span-3">
           <a href="/" class="group inline-block">
             <div class="flex items-center">
-              <div class="mx-auto aspect-square overflow-hidden rounded-lg">
+              <div class="mx-auto aspect-square overflow-hidden">
-                <BrandLogo class="max-h-10 max-w-10 rounded-full" />
+                <BrandLogo class="rounded-lg max-h-10 max-w-10"/>
               </div>
-
+              <span class="text-header text-lg lg:text-2xl font-semibold leading-tight tracking-tight text-balance ml-3">
-              <span class="ml-3 text-xl font-bold text-neutral-800 dark:text-neutral-200">
                 {global.name}
               </span>
             </div>
           </a>
-
+          <p class="text-primary text-sm lg:text-base text-pretty leading-relaxed mt-4">
-          <p class="mt-4 text-sm leading-relaxed text-neutral-600 dark:text-neutral-400">
             {global.about}
           </p>
         </div>
         <!-- Left links -->
         <div class="col-span-1 md:col-span-2">
-          <h3
+          <h3 class="relative inline-block text-header after:bg-main text-sm uppercase font-semibold tracking-wider pb-2 after:absolute after:bottom-0 after:left-0 after:h-0.5 after:w-8 after:content-['']">
-            class="after:bg-steel dark:after:bg-bermuda relative inline-block pb-2 text-sm font-semibold tracking-wider text-neutral-800 uppercase after:absolute after:bottom-0 after:left-0 after:h-0.5 after:w-8 after:content-[''] dark:text-neutral-100"
+            Site
-          >
-            Blog
           </h3>
           <ul class="mt-4 space-y-3">
-            {
+            {NavigationLinks.map((link) => (
-              NavigationLinks.map((link) => (
             <li>
               <a
                 href={link.url}
-                    class="group flex items-center text-base text-neutral-600 transition-colors hover:text-neutral-800 dark:text-neutral-400 dark:hover:text-neutral-200"
+                class="inline-flex items-center text-secondary hover:text-secondary-hover text-base transition-all duration-300 overflow-hidden"
               >
-                    <span class="relative inline-block overflow-hidden">
+                {link.name}
-                      <span class="relative z-10">{link.name}</span>
-                    </span>
               </a>
             </li>
-              ))
+            ))}
-            }
           </ul>
         </div>
         <!-- Right links -->
         <div class="col-span-1 md:col-span-3">
-          <h3
+          <h3 class="relative inline-block text-header after:bg-main text-sm uppercase font-semibold tracking-wider pb-2 after:absolute after:bottom-0 after:left-0 after:h-0.5 after:w-8 after:content-['']">
-            class="after:bg-steel dark:after:bg-bermuda relative inline-block pb-2 text-sm font-semibold tracking-wider text-neutral-800 uppercase after:absolute after:bottom-0 after:left-0 after:h-0.5 after:w-8 after:content-[''] dark:text-neutral-100"
-          >
             Other
           </h3>
           <ul class="mt-4 space-y-3">
-            {
+           {FooterLinks.map((link) => (
-              FooterLinks.map((link) => (
             <li>
               <a
                 href={link.url}
-                    class="group flex items-center text-base text-neutral-600 transition-colors hover:text-neutral-800 dark:text-neutral-400 dark:hover:text-neutral-200"
+                class="inline-flex items-center text-secondary hover:text-secondary-hover text-base transition-all duration-300 overflow-hidden"
               >
-                    <span class="relative inline-block overflow-hidden">
+                {link.name}
-                      <span class="relative z-10">{link.name}</span>
-                    </span>
               </a>
             </li>
-              ))
+           ))}
-            }
           </ul>
         </div>
         <!-- Right image -->
-        <div class="col-span-3 mt-10 flex justify-center md:mt-0">
+        <div class="flex justify-center col-span-4 mt-10 md:mt-0">
-          <div class="-mt-10 hidden max-h-[460px] max-w-[220px] scale-80 md:block">
+          <div class="md:block max-h-115 max-w-55 -mt-10 scale-80 hidden">
             <Image
               src={footerImg}
               alt={global.footer_image_alt}
@@ -104,37 +90,36 @@ const currentYear = new Date().getFullYear();
         </div>
       </div>
       <!-- Bottom section -->
-      <div class="mt-12 border-t border-neutral-400/30 pt-8 dark:border-neutral-600/50">
+      <div class="border-t border-divider pt-8 mt-12">
-        <div class="flex flex-col items-center justify-between gap-4 md:flex-row">
+        <div class="flex flex-col md:flex-row items-center justify-between gap-4">
-          <p class="text-sm text-neutral-600 dark:text-neutral-400">
+          <p class="text-secondary text-sm">
             &copy; {currentYear} All rights reserved.
           </p>
-
           <div class="flex items-center">
-            <p class="text-xs text-neutral-500 dark:text-neutral-400">
+            <span class="text-secondary text-sm">
               Weather provided by
-            </p>
+            </span>
             <a
               href="https://open-meteo.com/"
               target="_blank"
               rel="noopener noreferrer"
-              class="group inline-flex items-center text-xs text-neutral-600 transition-colors hover:text-neutral-900 dark:text-neutral-400 dark:hover:text-neutral-100"
+              class="group inline-flex items-center text-secondary hover:text-secondary-hover text-sm transition-all duration-300"
             >
-              <span class="relative ml-1">
+              <span class="relative underline ml-1">
                 Open-Meteo.
               </span>
             </a>
-
+            <div class="ml-4"/>
-            <div class="ml-4"></div>
+            <span class="text-secondary text-sm">
-
+              Built with
-            <span class="text-xs text-neutral-500 dark:text-neutral-400">Built with </span>
+            </span>
             <a
               href="https://astro.build"
               target="_blank"
               rel="noopener noreferrer"
-              class="group inline-flex items-center text-xs text-neutral-600 transition-colors hover:text-neutral-900 dark:text-neutral-400 dark:hover:text-neutral-100"
+              class="group inline-flex items-center text-secondary hover:text-secondary-hover text-sm transition-all duration-300"
             >
-              <span class="relative ml-1">
+              <span class="relative underline ml-1">
                 Astro.
               </span>
             </a>

src/components/Header.astro

@@ -9,31 +9,31 @@ const currentPath = pathname.slice(1);
 
 <header
   id="nav"
-  class="sticky inset-x-0 top-4 z-50 flex w-full flex-wrap text-sm transition-none md:flex-nowrap md:justify-start"
+  class="fixed flex flex-wrap md:flex-nowrap md:justify-start inset-x-0 top-0 w-full z-50"
 >
+  <div class="bg-linear-to-b from-background from-65% to-transparent to-90% absolute top-0 bottom-0 left-0 w-full h-36 z-0"/>
   <nav
-    class="relative mx-2 w-full rounded-[36px] border border-neutral-100 bg-neutral-100 px-4 py-3 md:flex md:items-center md:justify-between md:px-6 lg:px-8 dark:border-neutral-700/40 dark:bg-neutral-800/80"
+    class="nav-base relative md:flex md:items-center md:justify-between rounded-[36px] w-full px-4 mx-2 py-3 mt-4"
     aria-label="Global"
   >
-    <div class="flex items-center justify-between">
+    <div class="flex items-center justify-between ml-0">
       <a
-        class="h-[42px] flex-none rounded-lg text-xl font-bold ring-neutral-500 outline-none focus-visible:ring dark:ring-neutral-200 dark:focus:outline-none"
+        class="flex-none rounded-full h-10.5"
         href="/"
         aria-label="Brand"
       >
-        <BrandLogo class="h-full w-auto rounded-full object-cover" />
+        <BrandLogo class="h-full w-auto rounded-full object-cover"/>
       </a>
-
+      <div class="md:hidden mr-auto ml-4">
-      <div class="ml-auto md:hidden">
         <button
           type="button"
-          class="hs-collapse-toggle flex h-8 w-8 items-center justify-center rounded-full text-sm font-bold text-neutral-600 transition duration-300 hover:bg-neutral-200 disabled:pointer-events-none disabled:opacity-50 dark:text-neutral-400 dark:hover:bg-neutral-700 dark:focus:outline-none"
+          class="hs-collapse-toggle flex items-center justify-center text-secondary text-sm font-bold hover:bg-neutral-200 dark:hover:bg-neutral-700 rounded-full transition duration-300 disabled:pointer-events-none disabled:opacity-50 h-8 w-8"
           data-hs-collapse="#navbar-collapse-with-animation"
           aria-controls="navbar-collapse-with-animation"
           aria-label="Toggle navigation"
         >
           <svg
-            class="hs-collapse-open:hidden h-5 w-5 shrink-0"
+            class="hs-collapse-open:hidden shrink-0 h-5 w-5"
             width="24"
             height="24"
             viewBox="0 0 24 24"
@@ -48,7 +48,7 @@ const currentPath = pathname.slice(1);
             <line x1="3" x2="21" y1="18" y2="18"></line>
           </svg>
           <svg
-            class="hs-collapse-open:block hidden h-5 w-5 shrink-0"
+            class="hs-collapse-open:block shrink-0 h-5 w-5 hidden"
             width="24"
             height="24"
             viewBox="0 0 24 24"
@@ -63,33 +63,33 @@ const currentPath = pathname.slice(1);
           </svg>
         </button>
       </div>
+      <div class="md:hidden ml-2 mr-2">
+        <span class="">
+          <ThemeToggleButton />
+        </span>
       </div>
-
+    </div>
+    <div class="flex md:flex-row items-center justify-between">
       <div
         id="navbar-collapse-with-animation"
-      class="hs-collapse hidden grow basis-full overflow-hidden transition-all duration-300 md:block md:overflow-visible"
+        class="hs-collapse grow basis-full md:block transition-all duration-300 ml-2 mb-2 md:mb-0 hidden overflow-hidden md:overflow-visible"
       >
-      <div
+        <div class="flex flex-col md:flex-row md:items-center md:justify-end gap-x-0 md:gap-x-4 lg:gap-x-7 gap-y-4 md:gap-y-0 md:ps-7 mr-2 mt-5 md:mt-0">
-        class="mt-5 flex flex-col gap-x-0 gap-y-4 md:mt-0 md:flex-row md:items-center md:justify-end md:gap-x-4 md:gap-y-0 md:ps-7 lg:gap-x-7"
+          {NavigationLinks.map((item) => {
-      >
-        {
-          NavigationLinks.map((item) => {
           const isActive = currentPath === (item.url === '/' ? '' : item.url.slice(1));
           return (
           <a
             href={item.url}
-                class={`text-sm font-medium ${
+            class={`text-sm font-medium ${isActive ? 'text-active' : 'text-secondary hover:text-secondary-hover'}`}
-                  isActive
-                    ? 'text-orange-500 dark:text-orange-300'
-                    : 'text-neutral-600 hover:text-neutral-900 dark:text-neutral-400 dark:hover:text-neutral-100'
-                }`}
           >
             {item.name}
           </a>
           );
-          })
+          })}
-        }
+        </div>
-        <span class="md:inline-block">
+      </div>
+      <div class="hidden md:flex ml-2">
+        <span class="">
           <ThemeToggleButton />
         </span>
       </div>

src/components/cards/BlogCard.astro

@@ -4,7 +4,8 @@ import { Icon } from 'astro-icon/components';
 import type { Post } from '@lib/directusTypes';
 
 import Image from '@components/ui/images/Image.astro';
-import { getDirectusImageURL } from '@lib/directusFunctions';
+import { formatDate } from '@support/time';
+import { getDirectusImageURL } from '@/support/url';
 
 interface Props {
   post: Post;
@@ -44,11 +45,7 @@ const { post } = Astro.props;
               class="translate-y-0.5 transition duration-300 group-hover:translate-x-1"
             />
             <p class="card-text-description text-sm ml-auto">
-              {new Date(post.published_date).toLocaleDateString('en-US', {
+              {formatDate(post.published_date)}
-                year: 'numeric',
-                month: 'short',
-                day: 'numeric',
-              })}
             </p>
           </div>
         </div>

src/components/cards/EducationCard.astro

@@ -2,7 +2,7 @@
 import { Icon } from 'astro-icon/components';
 
 import Logo from '@components/ui/logos/Logo.astro';
-import { getDirectusImageURL } from '@lib/directusFunctions';
+import { getDirectusImageURL } from '@/support/url';
 
 interface Props {
   topic: string;

src/components/cards/LargeBlogLeftCard.astro

@@ -2,7 +2,7 @@
 import { Icon } from 'astro-icon/components';
 
 import Image from '@components/ui/images/Image.astro';
-import { getDirectusImageURL } from '@lib/directusFunctions';
+import { getDirectusImageURL } from '@/support/url';
 
 interface Props {
   title: string;
@@ -15,15 +15,15 @@ interface Props {
 const { title, subTitle, url, img, imgAlt } = Astro.props;
 ---
 
-<div class="smooth-reveal group">
+<div class="smooth-reveal flex flex-col px-4 py-10 mx-auto">
   <a
-    class="card-base-hidden md:grid md:grid-cols-2 lg:grid lg:grid-cols-2 items-center gap-8 xl:gap-16 max-w-340 2xl:max-w-full px-4 sm:px-6 lg:px-8 py-10 sm:py-16 lg:py-14 mx-auto"
+    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"
     href={url}
     data-astro-prefetch
   >
     <div>
       <Image
-        class="rounded-xl w-full h-full sm:max-h-80 md:max-h-90 object-cover"
+        class="rounded-2xl rounded-b-none md:rounded-2xl w-full h-full sm:max-h-80 md:max-h-90 object-cover"
         src={getDirectusImageURL(img)}
         alt={imgAlt}
         draggable="false"
@@ -32,11 +32,11 @@ const { title, subTitle, url, img, imgAlt } = Astro.props;
         height="420"
       />
     </div>
-    <div>
+    <div class="bg-background-card md:bg-transparent group-hover:bg-neutral-100 md:group-hover:bg-transparent dark:group-hover:bg-neutral-800/90 md:dark:group-hover:bg-transparent rounded-b-2xl transition-all duration-300 p-6">
-      <h2 class="card-text-header mb-4">
+      <h2 class="card-text-header mb-2">
         {title}
       </h2>
-      <p class="card-text-title font-light text-pretty sm:text-lg max-w-prose mb-4">
+      <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">

src/components/cards/LargeBlogRightCard.astro

@@ -2,7 +2,7 @@
 import { Icon } from 'astro-icon/components';
 
 import Image from '@components/ui/images/Image.astro';
-import { getDirectusImageURL } from '@lib/directusFunctions';
+import { getDirectusImageURL } from '@/support/url';
 
 interface Props {
   title: string;
@@ -18,17 +18,17 @@ interface Props {
 const { title, subTitle, url, single, imgOne, imgOneAlt, imgTwo, imgTwoAlt } = Astro.props;
 ---
 
-<div class="smooth-reveal group">
+<div class="smooth-reveal flex flex-col px-5 py-10 mx-auto">
   <a
-    class="card-base-hidden items-center lg:grid lg:grid-cols-2 gap-16 max-w-340 2xl:max-w-full px-4 py-10 sm:px-6 lg:px-8 lg:py-14 mx-auto"
+    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"
     href={url}
     data-astro-prefetch
   >
-    <div>
+    <div class="bg-background-card md:bg-transparent group-hover:bg-neutral-100 md:group-hover:bg-transparent dark:group-hover:bg-neutral-800/90 md:dark:group-hover:bg-transparent rounded-b-2xl transition-all duration-300 p-6">
-      <h2 class="card-text-header mb-4">
+      <h2 class="card-text-header mb-2">
         {title}
       </h2>
-      <p class="card-text-title font-light text-pretty sm:text-lg max-w-prose mb-4">
+      <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">
@@ -46,7 +46,7 @@ const { title, subTitle, url, single, imgOne, imgOneAlt, imgTwo, imgTwoAlt } = A
     {single ? (
     <div>
       <Image
-        class="rounded-xl w-full"
+        class="rounded-2xl rounded-b-none md:rounded-2xl w-full"
         src={getDirectusImageURL(imgOne)}
         alt={imgOneAlt}
         format="webp"

src/components/sections/ExperienceSection.astro

@@ -18,7 +18,7 @@ const experiences = ((await directus.request(
   <h3 class="smooth-reveal card-text-header flex relative items-center w-full gap-3 pb-10">
     Experience
   </h3>
-  <ul class="ml-8 w-full flex flex-col">
+  <ul class="flex flex-col w-full ml-8 pr-8">
     {experiences.map((experience: Experience) => {
     const startYear = new Date(experience.startDate).getFullYear();
     const endYear = experience.endDate != null ? new Date(experience.endDate).getFullYear() : 'Present';
@@ -36,7 +36,7 @@ const experiences = ((await directus.request(
           </time>
         </header>
         <div class="relative flex flex-col sm:col-span-12 pb-6">
-          <div class="absolute bg-stone-400 -translate-x-[1.71rem] rounded-full h-2 w-2 mt-4"/>
+          <div class="absolute bg-accent -translate-x-[1.71rem] rounded-full h-2 w-2 mt-3"/>
           <h3>
             <div
               class="inline-flex items-center text-2xl leading-tight font-semibold"
@@ -78,7 +78,7 @@ const experiences = ((await directus.request(
             </div>
             )}
             {(experience.responsibilities || experience.achievements) &&  (
-            <div class="relative flex flex-col gap-4 max-sm:h-auto! md:after:absolute md:after:bottom-0 md:after:h-12 md:after:w-full md:after:bg-linear-to-t md:after:from-neutral-200 dark:md:after:from-stone-700 md:after:content-[''] " :class="expanded ? 'after:hidden' : ''" x-show="expanded" x-collapse.min.50px>
+            <div class="relative flex flex-col gap-4 after:absolute after:bottom-0 after:h-12 after:w-full after:bg-linear-to-t after:from-neutral-200 dark:after:from-stone-700 after:content-[''] " :class="expanded ? 'after:hidden' : ''" x-show="expanded" x-collapse.min.50px>
               {experience.responsibilities && (
               <div class="flex flex-col gap-1">
                 <h4 class="text-header font-semibold">
@@ -129,7 +129,7 @@ const experiences = ((await directus.request(
             </button>
 
             <ul
-              class="flex print:hidden flex-wrap gap-2"
+              class="flex print:hidden flex-wrap gap-2 mt-2"
               aria-label="Technologies used"
             >
               {experience.skills && experience.skills.map(skill => {

src/components/sections/HeroSection.astro

@@ -17,7 +17,7 @@ interface Props {
 
 const { title, subTitle, primaryBtn, primaryBtnURL, secondaryBtn, secondaryBtnURL, src, alt } = Astro.props;
 
-const roundedClasses = Astro.props.rounded ? "rounded-xl" : null;
+const roundedClasses = Astro.props.rounded ? "rounded-2xl" : null;
 ---
 
 <section class="mx-auto grid max-w-340 gap-4 px-4 py-14 sm:px-6 md:grid-cols-2 md:items-center md:gap-8 lg:px-8 2xl:max-w-full">

src/components/sections/SelectedPostsSection.astro

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

src/config.ts

@@ -2,13 +2,13 @@ import { readSingleton } from '@directus/sdk';
 
 import directus from '@lib/directus';
 
-const global = await directus.request(readSingleton('site_global'));
-
 export interface NavigationLink {
   name: string;
   url: string;
 }
 
+const global = await directus.request(readSingleton('site_global'));
+
 export const NavigationLinks: NavigationLink[] = [
   { name: 'Home', url: '/' },
   { name: 'Blog', url: '/blog/' },

src/layouts/BaseLayout.astro

@@ -2,10 +2,10 @@
 import { ClientRouter } from 'astro:transitions';
 import { readSingleton } from '@directus/sdk';
 
-import directus from '@lib/directus';
 import BaseHead from '@components/BaseHead.astro';
 import Footer from '@components/Footer.astro';
 import Header from '@components/Header.astro';
+import directus from '@lib/directus';
 
 import '@styles/global.css';
 
@@ -20,12 +20,16 @@ interface Props {
 const { title, description = 'Alex Lebens', ogImage, lang = 'en', structuredData } = Astro.props;
 
 const global = await directus.request(readSingleton('site_global'));
+
 const normalizeTitle = !title ? global.name : `${title} | ${global.name}`;
 ---
 
 <html lang={lang}>
   <head>
-    <title>{normalizeTitle}</title>
+    <title>
+      {normalizeTitle}
+    </title>
+
     <BaseHead
       title={normalizeTitle}
       description={description}
@@ -34,7 +38,9 @@ const normalizeTitle = !title ? global.name : `${title} | ${global.name}`;
       ogDescription={description}
       structuredData={structuredData}
     />
+
     <ClientRouter fallback="swap" />
+
     <script is:inline>
       const theme = (() => {
         if (typeof localStorage !== 'undefined' && localStorage.getItem('theme')) {
@@ -53,30 +59,35 @@ const normalizeTitle = !title ? global.name : `${title} | ${global.name}`;
       }
       window.localStorage.setItem('theme', theme);
     </script>
+
     <!-- Rybbit Tracking Snippet -->
     <script
       src="https://rybbit.alexlebens.dev/api/script.js"
       data-site-id={global.rybbit_site_id}
       defer
-    ></script>
+    />
+
   </head>
-  <body class="bg-stone-200 selection:bg-yellow-400 selection:text-neutral-700 dark:bg-stone-700">
+  
-    <div class="mx-auto w-full max-w-(--breakpoint-2xl) grow px-4 sm:px-6 lg:px-8">
+  <body class="bg-background selection:bg-yellow-400">
+    <!-- Disabled texture background for now
+    <div class="fixed inset-0 -z-10">
+      <div class="bg-grid-pattern absolute inset-0 mask-[radial-gradient(white,transparent_85%)] bg-position-[center_top_-1px]"/>
+    </div>
+    -->
+
+    <div class="grow w-full max-w-(--breakpoint-2xl) px-4 sm:px-6 lg:px-8 py-20 mx-auto">
+      
       <Header />
+
       <main class="min-h-screen">
         <slot />
       </main>
+
     </div>
+
     <Footer />
-    <style>
+
-      .scrollbar-hide::-webkit-scrollbar {
-        display: none;
-      }
-      .scrollbar-hide {
-        -ms-overflow-style: none;
-        scrollbar-width: none;
-      }
-    </style>
   </body>
 </html>
 

src/lib/directus.ts

@@ -12,7 +12,7 @@ import type {
   Skill,
 } from '@lib/directusTypes';
 
-import { getDirectusURL } from '@lib/directusFunctions';
+import { getDirectusURL } from '@/support/url';
 
 type Schema = {
   site_global: Global;

src/pages/404.astro

@@ -1,10 +1,10 @@
 ---
 import { readSingleton } from '@directus/sdk';
 
-import directus from '@lib/directus';
-import BaseLayout from '@layouts/BaseLayout.astro';
 import GoBackButton from '@/components/buttons/GoBackButton.astro';
 import GoHomeButton from '@/components/buttons/GoHomeButton.astro';
+import BaseLayout from '@layouts/BaseLayout.astro';
+import directus from '@lib/directus';
 
 const global = await directus.request(readSingleton('site_global'));
 ---
@@ -29,39 +29,36 @@ const global = await directus.request(readSingleton('site_global'));
   }}
 >
 
-  <section class="mt-20 grid place-content-center">
+  <section class="grid place-content-center mt-20">
-    <div class="mx-auto max-w-7xl px-4 py-8 lg:px-6 lg:py-16">
+    <div class="max-w-7xl px-4 lg:px-6 py-8 lg:py-16 mx-auto">
-      <div class="mx-auto max-w-screen-sm text-center">
+      <div class="text-center max-w-screen-sm mx-auto">
         <div class="glitch-wrapper smooth-reveal">
           <h1
-            class="glitch text-9xl leading-none font-bold text-neutral-900 sm:text-[12rem] dark:text-neutral-100"
+            class="glitch text-header text-9xl font-bold leading-none sm:text-[12rem]"
             data-text="404"
           >
             Not Found
           </h1>
         </div>
-
+        <h1 class="smooth-reveal text-yellow-500 dark:text-yellow-400 text-4xl md:text-5xl font-bold leading-tight tracking-tight text-balance mt-30">
-        <h1
+          Page Not Found:
-          class="text-dark smooth-reveal mb-4 text-7xl font-extrabold text-yellow-500 lg:text-9xl dark:text-yellow-400"
-        >
-          {`Page Not Found - ${global.name}`}
         </h1>
-        <div
+        <h1 class="smooth-reveal card-text-header mt-8 mb-30">
-          class="smooth-reveal mx-auto mt-16 max-w-md rounded-xl bg-neutral-100 p-6 shadow-xs dark:border-neutral-700/50 dark:bg-stone-800"
+          {Astro.url.pathname.replace('/', '')}
-        >
+        </h1>
-          <h3
+        <div class="smooth-reveal card-base max-w-md p-6 mx-auto mt-16">
-            class="text-sm font-medium tracking-wider text-neutral-500 uppercase dark:text-neutral-400"
+          <h3 class="card-text-title text-sm tracking-wider uppercase">
-          >
             Did you know?
           </h3>
-          <p class="mt-2 text-sm text-neutral-600 dark:text-neutral-300" id="fun-fact">
+          <p
+            id="fun-fact"
+            class="text-secondary text-sm mt-4 mb-2"
+          >
             The 404 error code originated when CERN's web server displayed room 404 (their server
             room) as the error message when a file wasn't found.
           </p>
         </div>
-        <div
+        <div class="smooth-reveal flex flex-col sm:flex-row items-center justify-center gap-4 mt-10">
-          class="smooth-reveal mt-10 flex flex-col items-center justify-center gap-4 sm:flex-row"
-        >
           <GoBackButton/>
           <GoHomeButton url={global.site_url} />
         </div>

src/pages/about.astro

@@ -1,13 +1,13 @@
 ---
 import { readSingleton } from '@directus/sdk';
 
-import directus from '@lib/directus';
-import BaseLayout from '@layouts/BaseLayout.astro';
 import HeroSection from '@components/sections/HeroSection.astro';
 import ExperienceSection from '@components/sections/ExperienceSection.astro';
 import EducationSection from '@components/sections/EducationSection.astro';
 import ProjectSection from '@components/sections/ProjectSection.astro';
 import SkillsSliderSection from '@components/sections/SkillsSliderSection.astro';
+import BaseLayout from '@layouts/BaseLayout.astro';
+import directus from '@lib/directus';
 
 import portraitImg from '@images/portrait.avif';
 
@@ -42,7 +42,7 @@ const global = await directus.request(readSingleton('site_global'));
     rounded={true}
   />
 
-  <section class="mx-auto max-w-7xl px-4 py-10 sm:px-6 lg:px-8 lg:py-14">
+  <section class="max-w-7xl px-4 sm:px-6 lg:px-8 py-10 lg:py-14 mx-auto">
     <div class="flex flex-col gap-y-24 md:gap-y-32">
       <ExperienceSection className="smooth-reveal" />
       <EducationSection className="smooth-reveal" />

src/pages/apps.astro

@@ -1,10 +1,10 @@
 ---
 import { readSingleton } from '@directus/sdk';
 
-import directus from '@lib/directus';
-import BaseLayout from '@layouts/BaseLayout.astro';
 import HeroSection from '@components/sections/HeroSection.astro';
 import ApplicationSection from '@components/sections/ApplicationSection.astro';
+import BaseLayout from '@layouts/BaseLayout.astro';
+import directus from '@lib/directus';
 
 import applicationImg from '@images/cedar_tree.png';
 

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

@@ -10,8 +10,8 @@ import Image from '@components/ui/images/Image.astro';
 import SocialShareButton from '@components/buttons/SocialShareButton.astro';
 import BaseLayout from '@layouts/BaseLayout.astro';
 import directus from '@lib/directus';
-import { getDirectusImageURL } from '@lib/directusFunctions';
+import { formatDate } from '@support/time';
-import { formatDateTime } from '@support/time';
+import { getDirectusImageURL } from '@/support/url';
 
 const post = Astro.props;
 
@@ -31,7 +31,7 @@ const category: CollectionEntry<'categories'> = (await getCollection('categories
 const readingTime = getReadingTime(post.content);
 
 const highlighter = await createHighlighter({
-  themes: ['github-light', 'github-dark', 'monokai'],
+  themes: ['github-light', 'github-dark'],
   langs: ['typescript', 'python', 'css', 'html', 'yaml', 'bash', 'json'],
 });
 
@@ -68,9 +68,7 @@ const content = marked.parse(post.content);
       name: global.name,
       description: global.about,
     },
-    image: [
+    image: [],
-      // post.data.banner,
-    ],
     headline: post.title,
     datePublished: post.published_date,
     dateModified: post.updated_date,
@@ -84,11 +82,11 @@ const content = marked.parse(post.content);
   }}
 >
 
-  <section class="mx-auto max-w-6xl px-4 pt-8 pb-12 sm:px-6 lg:px-8 lg:pt-12">
+  <section class="max-w-6xl px-4 sm:px-6 lg:px-8 pt-8 lg:pt-12 pb-12 mx-auto">
     <div class="smooth-reveal relative w-full">
-      <div class="mt-4 rounded-2xl shadow-none sm:mt-0 sm:shadow-sm">
+      <div class="sm:shadow-xs sm:dark:shadow-md rounded-2xl mt-4 sm:mt-0">
         <Image
-          class="max-h-[600px] w-full rounded-t-2xl object-cover"
+          class="rounded-2xl sm:rounded-b-none w-full max-h-150 object-cover"
           src={getDirectusImageURL(post.image)}
           alt={post.image_alt}
           draggable="false"
@@ -96,81 +94,54 @@ const content = marked.parse(post.content);
           loading="lazy"
           inferSize={true}
         />
-        <div
+        <div class="sm:bg-background-card rounded-b-2xl px-0 sm:px-6 md:px-10 lg:px-14 py-6">
-          class="rounded-b-2xl px-0 py-6 sm:bg-neutral-100 sm:px-6 md:px-10 lg:px-14 sm:dark:bg-neutral-900/30"
+          <div class="text-center sm:text-left mt-4">
-        >
+            <h2 class="card-text-header block">
-          <div class="mb-16">
-            <h2
-              class="mb-6 block text-3xl font-bold tracking-tight text-balance text-neutral-800 md:text-4xl lg:text-5xl dark:text-neutral-300"
-            >
               {post.title}
             </h2>
-            <ol class="mt-8 flex items-center whitespace-nowrap">
+            <ol class="flex items-center justify-center sm:justify-start whitespace-nowrap gap-2 sm:gap-0 mt-6 sm:mt-4">
               <li class="inline-flex items-center">
                 <a
-                  class="flex items-center text-sm text-neutral-500 transition-all duration-300 hover:text-neutral-700 dark:text-neutral-400 dark:hover:text-neutral-200"
+                  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}
                 </a>
-                <svg
+                <span class="shrink-0 text-secondary text-sm mx-2 sm:mx-4">
-                  class="mx-2 size-5 flex-shrink-0 text-neutral-500 dark:text-neutral-500"
+                  /
-                  width="16"
+                </span>
-                  height="16"
-                  viewBox="0 0 16 16"
-                  fill="none"
-                  xmlns="http://www.w3.org/2000/svg"
-                  aria-hidden="true"
-                >
-                  <path d="M6 13L10 3" stroke="currentColor" stroke-linecap="round"></path>
-                </svg>
               </li>
-              <li
+              <li class="inline-flex items-center">
-                class="inline-flex items-center text-sm text-neutral-500 transition-all duration-300 hover:text-neutral-700 dark:text-neutral-400 dark:hover:text-neutral-200"
+                <span class="shrink-0 text-secondary text-sm">
-              >
+                  {formatDate(post.published_date)}
-                {formatDateTime(post.published_date)}
+                </span>
-                <svg
+                <span class="shrink-0 text-secondary text-sm mx-2 sm:mx-4">
-                  class="mx-2 size-5 flex-shrink-0 text-neutral-500 dark:text-neutral-500"
+                  /
-                  width="16"
+                </span>
-                  height="16"
-                  viewBox="0 0 16 16"
-                  fill="none"
-                  xmlns="http://www.w3.org/2000/svg"
-                  aria-hidden="true"
-                >
-                  <path d="M6 13L10 3" stroke="currentColor" stroke-linecap="round"></path>
-                </svg>
               </li>
-              <li
+              <li class="inline-flex items-center">
-                class="inline-flex items-center text-sm text-neutral-500 transition-all duration-300 hover:text-neutral-700 dark:text-neutral-400 dark:hover:text-neutral-200"
+                <span class="shrink-0 text-secondary text-sm">
-                aria-current="page"
-              >
                   {readingTime.minutes.toPrecision(1)} minutes to read
+                </span>
               </li>
             </ol>
           </div>
+          <div class="border-t border-divider mt-10 mb-10"/>
 
-          <article
+          <article class="text-header prose prose-blog sm:prose-lg dark:prose-invert max-w-none">
-            class="prose prose-blog sm:prose-lg dark:prose-invert max-w-none text-neutral-800 dark:text-neutral-200"
-          >
             <div set:html={content} />
           </article>
 
-          <div
+          <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">
-            class="mx-auto mt-10 grid max-w-screen-lg gap-y-5 sm:flex sm:items-center sm:justify-between sm:gap-y-0 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) => (
-            <div class="flex flex-wrap gap-x-2 gap-y-1 sm:flex-nowrap sm:items-center sm:gap-y-0">
+              <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">
-              {
-                post.tags.map((tag: string) => (
-                  <span class="bg-steel/30 dark:bg-bermuda/60 inline-flex items-center gap-x-1.5 rounded-lg px-3 py-1.5 text-xs font-medium text-neutral-700 outline-none focus:outline-none focus-visible:ring focus-visible:outline-none dark:text-neutral-200">
                 {tag}
               </span>
-                ))
+              ))}
-              }
             </div>
-            <SocialShareButton
+            <SocialShareButton pageTitle={post.title}/>
-              pageTitle={post.title}
-            />
           </div>
         </div>
       </div>

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

@@ -4,11 +4,13 @@ import { readItems, readSingleton } from '@directus/sdk';
 
 import type { Post } from '@lib/directusTypes';
 
-import BlogCard from '@components/cards/BlogCard.astro';
 import HeaderSection from '@components/sections/HeaderSection.astro';
+import BlogCard from '@components/cards/BlogCard.astro';
 import BaseLayout from '@layouts/BaseLayout.astro';
 import directus from '@lib/directus';
 
+const { category } = Astro.props;
+
 export async function getStaticPaths() {
   const categories = await getCollection('categories');
   return categories.map((category) => ({
@@ -17,8 +19,6 @@ export async function getStaticPaths() {
   }));
 }
 
-const { category } = Astro.props;
-
 const global = await directus.request(readSingleton('site_global'));
 const posts = await directus.request(
   readItems('posts', {
@@ -62,8 +62,8 @@ const categoriesPosts = posts
     btnURL="/categories"
   />
 
-  <section class="max-w-340 2xl:max-w-full mx-auto mt-10 mb-10 px-4 py-8 sm:px-6 lg:px-8">
+  <section class="max-w-340 2xl:max-w-full mb-10 px-4 sm:px-6 lg:px-8 py-8 mx-auto mt-10">
-    <div class="grid grid-cols-1 gap-6 sm:grid-cols-2 lg:grid-cols-3">
+    <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6">
       {categoriesPosts.map((b) => 
       <BlogCard post={b} />
       )}

src/pages/categories/index.astro

@@ -1,10 +1,10 @@
 ---
 import { readSingleton } from '@directus/sdk';
 
-import directus from '@lib/directus';
-import BaseLayout from '@layouts/BaseLayout.astro';
 import HeroSection from '@components/sections/HeroSection.astro';
 import CategorySection from '@components/sections/CategorySection.astro';
+import BaseLayout from '@layouts/BaseLayout.astro';
+import directus from '@lib/directus';
 
 import categoryImg from '@images/autumn_bench.png';
 

src/pages/index.astro

@@ -3,13 +3,13 @@ import { readSingleton, readItems } from '@directus/sdk';
 
 import type { Post } from '@lib/directusTypes';
 
-import directus from '@lib/directus';
-import BaseLayout from '@layouts/BaseLayout.astro';
 import HeroSection from '@components/sections/HeroSection.astro';
 import FeatureSection from '@components/sections/FeatureSection.astro';
 import WeatherSection from '@components/sections/WeatherSection.astro';
 import RecentPostsSection from '@components/sections/RecentPostsSection.astro';
 import GiteaSection from '@components/sections/GiteaSection.astro';
+import BaseLayout from '@layouts/BaseLayout.astro';
+import directus from '@lib/directus';
 
 import homeImg from '@images/autumn_mountain.png';
 

src/pages/robots.txt.ts

@@ -1,31 +1,14 @@
 // https://docs.astro.build/en/guides/integrations-guide/sitemap/#usage
 import type { APIRoute } from 'astro';
 
-const robotsTxt = `
+const getRobotsTxt = (sitemapURL: URL) => `\
-User-agent: Googlebot
-Disallow:
-Allow: /
-Crawl-delay: 10
-
-User-agent: Yandex
-Disallow:
-Allow: /
-Crawl-delay: 2
-
-User-agent: archive.org_bot
-Disallow:
-Allow: /
-Crawl-delay: 2
-
 User-agent: *
 Allow: /
 
-Sitemap: ${new URL('sitemap-index.xml', import.meta.env.SITE).href}`.trim();
+Sitemap: ${sitemapURL.href}
+`;
 
-export const GET: APIRoute = () => {
+export const GET: APIRoute = ({ site }) => {
-  return new Response(robotsTxt, {
+  const sitemapURL = new URL('sitemap-index.xml', site);
-    headers: {
+  return new Response(getRobotsTxt(sitemapURL));
-      'Content-Type': 'text/plain; charset=utf-8',
-    },
-  });
 };

src/styles/global.css

@@ -9,8 +9,8 @@
 /* https://tailwindcss.com/docs/dark-mode */
 @custom-variant dark (&:where(.dark, .dark *));
 
-/* Custom colors */
 @theme {
+  /* Custom colors */
   --color-midnight: #0c354d;
   --color-ocean: #134e70;
 
@@ -26,13 +26,24 @@
   --color-gitea-primary: #609926;
   --color-gitea-secondary: #4c7a33;
 
+  /* Theme colors */
   --color-main: light-dark(var(--color-steel), var(--color-bermuda));
   --color-accent: light-dark(var(--color-bronze), var(--color-desert));
+  --color-active: light-dark(var(--color-orange-500), var(--color-orange-300));
 
+  /* Text colors */
   --color-header: light-dark(var(--color-neutral-800), var(--color-neutral-200));
   --color-primary: light-dark(var(--color-neutral-600), var(--color-neutral-200));
   --color-primary-hover: light-dark(var(--color-neutral-800), var(--color-neutral-400));
   --color-secondary: light-dark(var(--color-neutral-500), var(--color-neutral-400));
+  --color-secondary-hover: light-dark(var(--color-neutral-800), var(--color-neutral-200));
+
+  /* Object colors */
+  --color-background: light-dark(var(--color-neutral-200), var(--color-stone-700));
+  --color-background-accent: light-dark(color-mix(in srgb, var(--color-stone-300) 40%, transparent), color-mix(in srgb, var(--color-stone-800) 20%, transparent));
+  --color-background-card: light-dark(color-mix(in srgb, var(--color-neutral-100) 80%, transparent), color-mix(in srgb, var(--color-neutral-800) 60%, transparent));
+
+  --color-divider: light-dark(color-mix(in srgb, var(--color-neutral-400) 50%, transparent), color-mix(in srgb, var(--color-neutral-500) 50%, transparent));
 }
 
 @layer base {

src/styles/utilities.css

@@ -43,7 +43,7 @@
 @utility button-bg-neutral {
   @apply transition-all duration-300
          border border-neutral-100 dark:border-stone-500/20
-         bg-neutral-100/80 hover:bg-neutral-100 dark:bg-neutral-800/60 dark:hover:bg-neutral-800/90
+         bg-background-card hover:bg-neutral-100 dark:hover:bg-neutral-800/90
 }
 
 @utility button-bg-gitea {
@@ -56,13 +56,13 @@
   @apply transition-all duration-300
          rounded-xl
          border border-neutral-100 dark:border-stone-500/20
-         bg-neutral-100/80 hover:bg-neutral-100 dark:bg-neutral-800/60 dark:hover:bg-neutral-800/90
+         bg-background-card hover:bg-neutral-100 dark:hover:bg-neutral-800/90
          shadow-xs hover:shadow-md dark:shadow-md dark:hover:shadow-lg
 }
 
 @utility card-base-hidden {
   @apply transition-all duration-300
-         rounded-xl
+         rounded-2xl
          border border-transparent
          hover:bg-neutral-400/20 dark:hover:bg-neutral-800/40
 }
@@ -113,6 +113,11 @@
          group-hover:text-main
 }
 
+@utility card-hover-text-neutral {
+  @apply transition-all duration-300
+         group-hover:text-primary-hover
+}
+
 @utility card-hover-text-gitea {
   @apply transition-all duration-300
          group-hover:text-gitea-primary
@@ -121,3 +126,10 @@
 @utility card-text-description {
   @apply text-secondary
 }
+
+/* Misc */
+@utility nav-base {
+  @apply border border-neutral-100 dark:border-stone-500/20
+         bg-neutral-100 dark:bg-neutral-800
+         shadow-xs dark:shadow-md
+}

src/support/time.ts

@@ -17,21 +17,6 @@ const TimeAgoConfiguration: string[][] = [
   ['%s years ago', 'in %s years'],
 ];
 
-function formatDate(date: Date): string {
-  const year = new Date(date).getFullYear();
-  const month = String(new Date(date).getMonth() + 1).padStart(2, '0');
-  const day = String(new Date(date).getDate()).padStart(2, '0');
-
-  return `${year}-${month}-${day}`;
-}
-
-function formatDateTime(date: Date): string {
-  const hours = String(new Date(date).getHours()).padStart(2, '0');
-  const minutes = String(new Date(date).getMinutes()).padStart(2, '0');
-
-  return `${formatDate(date)} ${hours}:${minutes}`;
-}
-
 function timeago(date?: Date): string {
   if (!date) {
     return 'today';
@@ -46,4 +31,12 @@ function timeago(date?: Date): string {
   return format(date, 'timeago');
 }
 
-export { formatDate, timeago, formatDateTime };
+function formatDate(date: Date): string {
+  return new Date(date).toLocaleDateString('en-US', {
+    year: 'numeric',
+    month: 'short',
+    day: 'numeric',
+  })
+}
+
+export { formatDate, timeago };

src/support/url.ts

@@ -1,12 +1,13 @@
 const getDirectusURL = () => {
-  if (process.env.DIRECTUS_URL) {
-    return `https://${process.env.DIRECTUS_URL}`;
-  }
   return 'https://directus.alexlebens.net';
 };
 
+const getSiteURL = () => {
+  return 'https://www.alexlebens.dev';
+};
+
 async function getDirectusImageURL(image: string) {
   return `${getDirectusURL()}/assets/${image}`;
 }
 
-export { getDirectusURL, getDirectusImageURL };
+export { getDirectusURL, getSiteURL, getDirectusImageURL };