feat: release 2.3.0

Reviewed-on: #317

Dockerfile

@@ -29,7 +29,7 @@ ENV SITE_URL=https://www.alexlebens.dev
 ENV DIRECTUS_URL=https://directus.alexlebens.dev
 ENV PORT=4321
 
-LABEL version="2.2.3"
+LABEL version="2.3.0"
 LABEL description="Astro based personal website"
 
 EXPOSE $PORT

README.md

@@ -2,23 +2,13 @@
 
 Personal site used for information about myself and blog.
 
-## Features
+## Development
-
-- 🐈 Simple And Beautiful
-- 🖥️️ Responsive And Light/Dark mode
-- 🐛 SiteMap & RSS Feed
-- 🐝 Category Support
-- 🐜 SEO and Responsiveness
-- 🪲 Markdown And MDX
-- 🏂🏾 Page Compression & Image Optimization
-
-### Development Commands
 
 With dependencies installed, you can utilize the following npm scripts to manage your project's development lifecycle:
 
-- `pnpm run dev`: Starts a local development server with hot reloading enabled.
+- `pnpm build`: Bundles your site into static files for production.
-- `pnpm run preview`: Serves your build output locally for preview before deployment.
+- `pnpm dev`: Starts a local development server with hot reloading enabled.
-- `pnpm run build`: Bundles your site into static files for production.
+- `pnpm preview`: Serves your build output locally for preview before deployment.
 
 For detailed help with Astro CLI commands, visit [Astro's documentation](https://docs.astro.build/en/reference/cli-reference/).
 

astro.config.mjs

@@ -1,6 +1,5 @@
-import { defineConfig, passthroughImageService, sharpImageService } from 'astro/config';
+import { defineConfig } from 'astro/config';
 
-import mdx from '@astrojs/mdx';
 import node from '@astrojs/node';
 import partytown from '@astrojs/partytown';
 import react from '@astrojs/react';
@@ -9,8 +8,6 @@ import sitemap from '@astrojs/sitemap';
 import tailwindcss from '@tailwindcss/vite';
 import icon from 'astro-icon';
 import swup from '@swup/astro';
-import rehypePrettyCode from 'rehype-pretty-code';
-import { transformerCopyButton } from '@rehype-pretty/transformers';
 
 const getSiteURL = () => {
   if (process.env.SITE_URL) {
@@ -31,7 +28,6 @@ export default defineConfig({
   prefetch: true,
 
   integrations: [
-    mdx(),
     partytown(),
     react(),
     sitemap(),
@@ -67,24 +63,6 @@ export default defineConfig({
 
   markdown: {
     syntaxHighlight: false,
-    rehypePlugins: [
-      [
-        rehypePrettyCode,
-        {
-          theme: {
-            light: 'github-light',
-            dark: 'github-dark-dimmed',
-          },
-          keepBackground: false,
-          transformers: [
-            transformerCopyButton({
-              visibility: 'always',
-              feedbackDuration: 2500,
-            }),
-          ],
-        },
-      ],
-    ],
   },
 
   plugins: {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "site-profile",
   "type": "module",
-  "version": "2.2.3",
+  "version": "2.3.0",
   "homepage": "https://www.alexlebens.dev",
   "bugs": {
     "url": "https://gitea.alexlebens.dev/alexlebens/site-profile/issues",
@@ -28,7 +28,6 @@
   },
   "dependencies": {
     "@astrojs/check": "^0.9.6",
-    "@astrojs/mdx": "^4.3.13",
     "@astrojs/node": "^9.5.2",
     "@astrojs/partytown": "^2.1.4",
     "@astrojs/react": "^4.4.2",
@@ -38,10 +37,9 @@
     "@giscus/react": "^3.1.0",
     "@iconify-json/mdi": "^1.2.3",
     "@iconify-json/pajamas": "^1.2.15",
-    "@iconify-json/simple-icons": "^1.2.68",
+    "@iconify-json/simple-icons": "^1.2.69",
     "@playform/compress": "^0.2.1",
-    "@rehype-pretty/transformers": "^0.13.2",
+    "@swup/astro": "^1.7.0",
-    "@swup/astro": "1.7.0",
     "@tailwindcss/postcss": "^4.1.18",
     "@tailwindcss/vite": "^4.1.18",
     "@types/react": "^19.2.10",
@@ -49,21 +47,22 @@
     "astro": "^5.17.1",
     "astro-compressor": "^1.2.0",
     "astro-icon": "^1.1.5",
+    "marked": "^17.0.1",
+    "marked-shiki": "^1.2.1",
     "mdast-util-to-string": "^4.0.0",
-    "motion": "^12.29.2",
+    "motion": "^12.31.0",
-    "preline": "^4.0.0",
+    "preline": "^4.0.1",
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
     "reading-time": "^1.5.0",
-    "rehype-pretty-code": "^0.14.1",
     "sharp": "^0.34.5",
     "sharp-ico": "^0.1.5",
-    "shiki": "^3.21.0",
+    "shiki": "^3.22.0",
     "tailwindcss": "^4.1.18",
     "ultrahtml": "^1.6.0"
   },
   "devDependencies": {
-    "@eslint-react/eslint-plugin": "^2.8.1",
+    "@eslint-react/eslint-plugin": "^2.9.4",
     "@tailwindcss/forms": "^0.5.11",
     "@tailwindcss/typography": "^0.5.19",
     "astro-icon": "^1.1.5",
@@ -73,12 +72,12 @@
     "eslint-plugin-format": "^1.3.1",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^7.0.1",
-    "eslint-plugin-react-refresh": "^0.4.26",
+    "eslint-plugin-react-refresh": "^0.5.0",
     "prettier": "^3.8.1",
     "prettier-plugin-astro": "^0.14.1",
     "prettier-plugin-tailwindcss": "^0.7.2",
     "timeago.js": "^4.0.2",
-    "typescript": "5.9.3",
+    "typescript": "^5.9.3",
-    "typescript-eslint": "8.54.0"
+    "typescript-eslint": "^8.54.0"
   }
 }

src/components/blog/BlogRecentArticles.astro

@@ -12,10 +12,10 @@ const { posts } = Astro.props;
 <section class="mx-auto mb-10 max-w-[85rem] px-4 py-8 sm:px-6 lg:px-8 2xl:max-w-full">
   <div class="text-left">
     <h2
-      id="selected-articel"
+      id="recent-articles"
-      class="smooth-reveal-2 mb-4 text-5xl font-extrabold tracking-tight text-balance text-neutral-800 dark:text-neutral-200"
+      class="smooth-reveal-2 mb-10 text-5xl font-extrabold tracking-tight text-balance text-neutral-800 dark:text-neutral-200"
     >
-      Older Articles
+      Recent Posts
     </h2>
   </div>
 

src/components/blog/BlogSelectedArticles.astro

@@ -10,12 +10,11 @@ interface Props {
 }
 
 const { posts } = Astro.props;
-const blogPosts = posts.slice(0, 5);
 ---
 
 <section class="smooth-reveal">
   {
-    blogPosts.map((b, index) =>
+    posts.map((b, index) =>
       index % 2 === 0 ? (
         <BlogLeftSection
           title={b.title}

src/components/ui/sections/Education.astro

@@ -35,16 +35,16 @@ const shadowClasses = 'shadow-xs hover:shadow-md dark:shadow-md dark:hover:shado
   </h3>
   <div class="ml-8">
     <h4 class="smooth-reveal-1 pt-5 text-2xl font-semibold text-neutral-800 dark:text-neutral-200">
-      University
+      College
     </h4>
     <ul class="space-y-4 py-3">
+      <div class="grid md:grid-cols-2 sm:grid-cols-1 gap-4">
         {
-        education.map(({ institution, area, url }) => {
+          education.map(({ institution, area, url, graduationDate}) => {
             return (
-            <div class="smooth-reveal-cards mt-4 grid grid-cols-3 gap-4 rounded-xl">
+              <div class="smooth-reveal-cards mt-4 rounded-xl">
-              <div>
                 <div
-                  class={`p-4 transition-all duration-300 md:p-5 ${shadowClasses} ${bgColorClasses} ${baseClasses} ${borderClasses}`}
+                  class={`p-4 md:p-6 transition-all duration-300 ${shadowClasses} ${bgColorClasses} ${baseClasses} ${borderClasses}`}
                 >
                   <h3 class="flex flex-row text-lg font-bold text-neutral-800 dark:text-neutral-200">
                     <Icon
@@ -54,7 +54,7 @@ const shadowClasses = 'shadow-xs hover:shadow-md dark:shadow-md dark:hover:shado
                     {institution}
                   </h3>
                   <p class="mt-2 ml-7 text-xs font-medium text-neutral-600 uppercase dark:text-neutral-400">
-                    {area}
+                    {area} - {new Date(graduationDate).getFullYear()}
                   </p>
                   <div class="ml-6 flex">
                     <a
@@ -72,10 +72,10 @@ const shadowClasses = 'shadow-xs hover:shadow-md dark:shadow-md dark:hover:shado
                   </div>
                 </div>
               </div>
-            </div>
             );
           })
         }
+      </div>
     </ul>
   </div>
 
@@ -86,12 +86,12 @@ const shadowClasses = 'shadow-xs hover:shadow-md dark:shadow-md dark:hover:shado
           Certificates
         </h4>
         <ul class="space-y-4 py-3">
+          <div class="grid md:grid-cols-2 sm:grid-cols-1 gap-4">
             {certificate.map(({ name, issuer, url }) => {
               return (
-              <div class="smooth-reveal-cards mt-4 grid grid-cols-3 gap-4 rounded-xl">
+                <div class="smooth-reveal-cards mt-4 rounded-xl">
-                <div>
                   <div
-                    class={`p-4 transition-all duration-300 md:p-5 ${shadowClasses} ${bgColorClasses} ${baseClasses} ${borderClasses}`}
+                    class={`p-4 md:p-6 transition-all duration-300 ${shadowClasses} ${bgColorClasses} ${baseClasses} ${borderClasses}`}
                   >
                     <h3 class="flex flex-row text-lg font-bold text-neutral-800 dark:text-neutral-200">
                       <Icon
@@ -119,9 +119,9 @@ const shadowClasses = 'shadow-xs hover:shadow-md dark:shadow-md dark:hover:shado
                     </div>
                   </div>
                 </div>
-              </div>
               );
             })}
+          </div>
         </ul>
       </div>
     )

src/components/ui/sections/Experience.astro

@@ -15,7 +15,7 @@ const experiences = await directus.request(
 ---
 
 <section 
-  class:list={['flex flex-col gap-4', Astro.props.className]}
+  class:list={['flex flex-col gap-8', Astro.props.className]}
 
 >
   <h3 class="relative smooth-reveal-1 flex w-full items-center gap-3 pb-10 text-5xl text-neutral-800 dark:text-neutral-200">Experience</h3>

src/components/ui/sections/HeroSection.astro

@@ -15,11 +15,14 @@ interface Props {
   secondaryBtnURL?: string;
   src?: any;
   alt?: string;
+  rounded?: boolean;
 }
+
+const roundedClasses = Astro.props.rounded ? "rounded-xl" : null;
 ---
 
 <section
-  class="mx-auto grid max-w-[85rem] 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"
+  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"
 >
   <div>
     <h1
@@ -48,7 +51,7 @@ interface Props {
           <Image
             src={src}
             alt={alt}
-            class="h-full w-[420px] scale-100 object-cover object-center"
+            class={`h-full w-[420px] scale-100 object-cover object-center ${roundedClasses}`}
             draggable="false"
             loading="eager"
             format="webp"

src/components/ui/sections/LatestPosts.astro

@@ -25,9 +25,6 @@ const recentPosts = posts
     >
       Latest Posts
     </h1>
-    <p class="smooth-reveal mt-1 text-pretty text-neutral-600 dark:text-neutral-300">
-      More recent posts.
-    </p>
   </div>
   <div class="grid gap-6 sm:grid-cols-2 lg:grid-cols-3">
     {recentPosts.map((b) => <BlogCard post={b} />)}

src/config.ts

@@ -2,37 +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 WorkInformation = [
-  {
-    name: 'Tech Startup',
-    position: 'Junior Web Developer',
-    location_type: 'On site',
-    location: 'Auckland, New Zealand',
-    url: 'https://techstartup.com',
-    startDate: '2024-01-01',
-    endDate: null,
-    summary:
-      'Developing and maintaining web applications using JavaScript, HTML, and CSS. Collaborating with the team to implement new features and fix bugs.',
-    highlights: ['Improved website performance by optimizing code'],
-    responsibilities: [
-      'Collaborated with senior developers to design and implement web applications using modern JavaScript frameworks.',
-      'Assisted in debugging and optimizing front-end code to ensure smooth user experiences.',
-      'Participated in code reviews and contributed to improving coding standards within the team.',
-    ],
-    achievements: [
-      'Developing and maintaining web applications using JavaScript, HTML, and CSS. Collaborating with the team to implement new features and fix bugs.',
-    ],
-    skills: ['React', 'Tailwind', 'GitHub'],
-  },
-];
-
 export const NavigationLinks: NavigationLink[] = [
   { name: 'Home', url: '/' },
   { name: 'Blog', url: '/blog/' },
@@ -43,6 +19,7 @@ export const NavigationLinks: NavigationLink[] = [
 export const FooterLinks: NavigationLink[] = [
   { name: 'RSS', url: '/rss.xml' },
   { name: 'Gitea', url: '/https://gitea.alexlebens.dev' },
+  { name: 'Docs', url: '/https://docs.alexlebens.dev' },
 ];
 
 export const SEO = {

src/lib/directusTypes.ts

@@ -2,6 +2,8 @@ export type Global = {
   name: string;
   about: string;
   about_description: string;
+  about_blog: string;
+  about_categories: string;
   initials: string;
   email: string;
   site_url: string;

src/pages/about.astro

@@ -11,13 +11,11 @@ import Education from '@components/ui/sections/Education.astro';
 import portraitImg from '@images/portrait.avif';
 
 const global = await directus.request(readSingleton('site_global'));
-
-const description = 'About me.';
 ---
 
 <BaseLayout
   title="About Me"
-  description={description}
+  description="About me."
   structuredData={{
     '@context': 'https://schema.org',
     '@type': 'WebPage',
@@ -25,7 +23,7 @@ const description = 'About me.';
     '@id': Astro.url.href,
     url: Astro.url.href,
     name: `About | ${global.name}`,
-    description: description,
+    description: 'About me.',
     isPartOf: {
       '@type': 'WebSite',
       url: global.site_url,
@@ -39,11 +37,12 @@ const description = 'About me.';
     subTitle={global.about}
     src={portraitImg}
     alt={global.portrait_alt}
+    rounded={true}
   />
 
-  <section class="mx-auto max-w-[85rem] px-4 py-10 sm:px-6 lg:px-8 lg:py-14">
+  <section class="mx-auto max-w-340 px-4 py-10 sm:px-6 lg:px-8 lg:py-14">
-    <main class="relative grid max-w-7xl gap-12 p-8 max-sm:py-16 md:grid-cols-6 md:p-16 xl:gap-24">
+    <main class="relative grid grid-cols-1 md:grid-cols-6 gap-12 p-8 md:p-16 xl:gap-24 max-w-7xl mx-auto">
-      <div class="space-y-12 md:col-span-8">
+      <div class="space-y-12 col-span-1 md:col-span-6">
         <Experience className="smooth-reveal-2" />
         <Education className="smooth-reveal-2 mt-30" />
         <Projects className="smooth-reveal-2 mt-30" />

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

@@ -4,6 +4,9 @@ import getReadingTime from 'reading-time';
 import { readItems, readSingleton } from '@directus/sdk';
 
 import directus from '@lib/directus';
+import { marked } from 'marked';
+import markedShiki from 'marked-shiki';
+import { createHighlighter } from 'shiki';
 import { getDirectusImageURL } from '@lib/directusFunctions';
 import BaseLayout from '@layouts/BaseLayout.astro';
 import Image from '@components/ui/images/Image.astro';
@@ -23,6 +26,24 @@ const category: CollectionEntry<'categories'> = (await getCollection('categories
   .filter((c) => c.slug === post.category)
   .pop() as CollectionEntry<'categories'>;
 const readingTime = getReadingTime(post.content);
+
+const highlighter = await createHighlighter({
+  themes: ['github-light', 'github-dark', 'monokai'],
+  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);
 ---
 
 <BaseLayout
@@ -126,7 +147,7 @@ const readingTime = getReadingTime(post.content);
           <article
             class="prose prose-blog sm:prose-lg dark:prose-invert max-w-none text-justify text-neutral-800 dark:text-neutral-200"
           >
-            <div set:html={post.content} />
+            <div set:html={content} />
           </article>
 
           <div

src/pages/blog/index.astro

@@ -5,8 +5,8 @@ import type { Post } from '@lib/directusTypes';
 
 import directus from '@lib/directus';
 import BaseLayout from '@layouts/BaseLayout.astro';
-import BlogRecentCard from '@components/blog/BlogRecentCard.astro';
+import BlogSelectedArticles from '@components/blog/BlogSelectedArticles.astro';
-import BlogFeaturedArticle from '@components/blog/BlogFeaturedArticle.astro';
+import BlogRecentArticles from '@components/blog/BlogRecentArticles.astro';
 import HeroSection from '@components/ui/sections/HeroSection.astro';
 import blogImg from '@images/autumn_tree.png';
 
@@ -18,15 +18,15 @@ const posts = await directus.request(
     sort: ['-published_date'],
   })
 );
-const selectedPosts: Post[] = posts.filter((p) => p.selected);
+const selectedPosts: Post[] = posts.filter((p) => p.selected).slice(0, 4);
-
+const recentPosts: Post[] = posts.filter(
-const description =
+  (p) => !selectedPosts.some((selected) => selected.slug === p.slug)
-  "Sharing what I've learned, one post at a time. I hope you find something useful.";
+).slice(0, 6);
 ---
 
 <BaseLayout
   title="Blog"
-  description={description}
+  description={global.about_blog}
   structuredData={{
     '@context': 'https://schema.org',
     '@type': 'WebPage',
@@ -34,7 +34,7 @@ const description =
     '@id': Astro.url.href,
     url: Astro.url.href,
     name: `Blog | ${global.name}`,
-    description: description,
+    description: global.about_blog,
     isPartOf: {
       '@type': 'WebSite',
       url: global.site_url,
@@ -43,10 +43,10 @@ const description =
     },
   }}
 >
-  <HeroSection title="Blog" subTitle={description} src={blogImg} alt={global.blog_image_alt} />
+  <HeroSection title="Blog" subTitle={global.about_blog} src={blogImg} alt={global.blog_image_alt} />
 
-  <BlogRecentCard posts={posts} />
+  <BlogSelectedArticles posts={selectedPosts} />
-  <BlogFeaturedArticle posts={selectedPosts} />
+  <BlogRecentArticles posts={recentPosts} />
 </BaseLayout>
 
 <script>

src/pages/categories/index.astro

@@ -73,14 +73,11 @@ const categories = (await getCollection('categories'))
       },
     };
   });
-
-const description =
-  'Here are some of the general categories that I am interested in, including homelabs, technology, and Minnesota.';
 ---
 
 <BaseLayout
   title="All Categories"
-  description={description}
+  description={global.about_categories}
   structuredData={{
     '@context': 'https://schema.org',
     '@type': 'WebPage',
@@ -88,7 +85,7 @@ const description =
     '@id': Astro.url.href,
     url: Astro.url.href,
     name: `All Categories | ${global.name}`,
-    description: description,
+    description: global.about_categories,
     isPartOf: {
       '@type': 'WebSite',
       url: global.site_url,
@@ -99,7 +96,7 @@ const description =
 >
   <HeroSection
     title="Categories"
-    subTitle={description}
+    subTitle={global.about_categories}
     src={categoryImg}
     alt={global.categories_image_alt}
   />

src/pages/index.astro

@@ -10,14 +10,11 @@ import HeroSectionAlt from '@components/ui/sections/HeroSectionAlt.astro';
 import homeImg from '@images/autumn_mountain.png';
 
 const global = await directus.request(readSingleton('site_global'));
-
-const description =
-  'Engineering the cloud by day, homelab by night, and exploring Minnesota in between.';
 ---
 
 <BaseLayout
   title="Home"
-  description={description}
+  description={global.about_description}
   structuredData={{
     '@context': 'https://schema.org',
     '@type': 'WebPage',
@@ -25,7 +22,7 @@ const description =
     '@id': Astro.url.href,
     url: Astro.url.href,
     name: `Home | ${global.name}`,
-    description: description,
+    description: global.about_description,
     isPartOf: {
       '@type': 'WebSite',
       url: global.site_url,
@@ -36,7 +33,7 @@ const description =
 >
   <HeroSection
     title={`Hello, I'm <span class="text-steel dark:text-steel">Alex Lebens</span>`}
-    subTitle={description}
+    subTitle={global.about_description}
     primaryBtn="About Me"
     primaryBtnURL="/about"
     src={homeImg}

src/pages/rss.xml.ts

@@ -1,8 +1,5 @@
-// copy from https://github.com/delucis/astro-blog-full-text-rss
+// From https://github.com/delucis/astro-blog-full-text-rss
-// see https://github.com/delucis/astro-blog-full-text-rss/blob/latest/src/pages/rss.xml.ts
-// get more context
 
-import { getContainerRenderer as getMDXRenderer } from '@astrojs/mdx';
 import rss, { type RSSFeedItem } from '@astrojs/rss';
 import type { APIContext } from 'astro';
 import { transform, walk } from 'ultrahtml';
@@ -14,13 +11,11 @@ import directus from '@lib/directus';
 const global = await directus.request(readSingleton('site_global'));
 
 export async function GET(context: APIContext) {
-  // Get the URL to prepend to relative site links. Based on `site` in `astro.config.mjs`.
   let baseUrl = context.site?.href || global.site_url;
   if (baseUrl.at(-1) === '/') {
     baseUrl = baseUrl.slice(0, -1);
   }
 
-  // Load the content collection entries to add to our RSS feed.
   const posts = await directus.request(
     readItems('posts', {
       filter: { published: { _eq: true } },
@@ -48,7 +43,6 @@ export async function GET(context: APIContext) {
     feedItems.push({ ...post, link: `/blog/${post.slug}/`, content });
   }
 
-  // Return our RSS feed XML response.
   return rss({
     title: global.name,
     description: global.about,

src/styles/global.css

@@ -7,7 +7,7 @@
 /* https://tailwindcss.com/docs/dark-mode */
 @custom-variant dark (&:where(.dark, .dark *));
 
-/* Add custom colors */
+/* Custom colors */
 @theme {
   --color-midnight: #0c354d;
   --color-turquoise: #0da797;
@@ -60,6 +60,30 @@
       color var(--theme-transition),
       border-color var(--theme-transition);
   }
+
+  /* Shiki syntax highlighting */
+  :root {
+    --shiki-fg: var(--shiki-light);
+    --shiki-bg: var(--color-neutral-200);
+  }
+
+  .dark {
+    --shiki-fg: var(--shiki-dark);
+    --shiki-bg: var(--color-neutral-800);
+  }
+
+  pre.shiki {
+    background-color: var(--shiki-bg) !important;
+    color: var(--shiki-fg) !important;
+  }
+
+  pre.shiki span {
+    color: var(--shiki-light);
+  }
+
+  .dark pre.shiki span {
+    color: var(--shiki-dark) !important;
+  }
 }
 
 /* Content reveal animations */