blog slug scroll

package.json

@@ -31,7 +31,11 @@
     "@fortawesome/react-fontawesome": "^3.3.1",
     "@gsap/react": "^2.1.2",
     "@hookform/resolvers": "^5.4.0",
+    "@mdx-js/mdx": "^3.1.1",
+    "@mdx-js/react": "^3.1.1",
+    "@mdx-js/loader": "^3.1.1",
     "@neondatabase/serverless": "^1.1.0",
+    "@next/mdx": "^16.2.9",
     "@radix-ui/react-accordion": "^1.2.12",
     "@radix-ui/react-alert-dialog": "^1.1.15",
     "@radix-ui/react-aspect-ratio": "^1.1.8",
@@ -67,6 +71,7 @@
     "@trpc/next": "^11.17.0",
     "@trpc/react-query": "^11.17.0",
     "@trpc/server": "^11.17.0",
+    "@types/mdx": "^2.0.14",
     "@uiw/react-md-editor": "^4.1.1",
     "@uploadthing/react": "^7.3.3",
     "@vercel/speed-insights": "^2.0.0",
@@ -94,7 +99,6 @@
     "react-day-picker": "^10.0.1",
     "react-dom": "^19.2.6",
     "react-hook-form": "^7.77.0",
-    "react-markdown": "^10.1.0",
     "react-resizable-panels": "^4.11.2",
     "recharts": "3.8.1",
     "rehype-highlight": "^7.0.2",
@@ -103,6 +107,7 @@
     "server-only": "^0.0.1",
     "shadcn": "^4.10.0",
     "sonner": "^2.0.7",
+    "superjson": "^2.2.6",
     "tailwind-merge": "^3.6.0",
     "tailwindcss-motion": "^1.1.1",
     "type-fest": "^5.7.0",

src/app/_components/Animated/AnimateIn.tsx

@@ -1,3 +1,4 @@
+"use client"
 import { useRef, type HTMLAttributes, type ReactNode } from "react";
 import { SplitText } from "gsap/SplitText";
 import gsap from 'gsap'
@@ -11,6 +12,7 @@ const AnimateTextIn = ({
   speed = 1,
   scrollOnly = false,
   once = false,
+  debugId,
   className
 }: {
   children: ReactNode,
@@ -18,6 +20,7 @@ const AnimateTextIn = ({
   position?: gsap.Position,
   scrollOnly?: boolean,
   once?: boolean,
+  debugId?: string,
   speed?: number,
   className?: HTMLAttributes<HTMLDivElement>['className']
 }) => {
@@ -26,7 +29,7 @@ const AnimateTextIn = ({
     position,
     scrollOnly,
     once,
-    debugId: `text-${position}`,
+    debugId: debugId ?? `text-${position}`,
     makeReveal: (node) => {
       // The wrapper starts at opacity 0 (so there's no flash of unsplit text);
       // reveal the wrapper and let the per-character tween do the animation.

src/app/_components/Animated/AnimatePopUp.tsx

@@ -9,6 +9,7 @@ const AnimatePopUp = ({
   ease='elastic',
   scrollOnly=false,
   once=false,
+  debugId,
 }:{
     children:ReactNode
     position:gsap.Position,
@@ -17,9 +18,10 @@ const AnimatePopUp = ({
     ease?:gsap.EaseString|gsap.EaseFunction,
     scrollOnly?:boolean,
     once?:boolean,
+    debugId?:string,
   }) => {
   return (
-    <AnimatedDiv children={children} position={position} scrollOnly={scrollOnly} once={once} className={cn(className,'h-0 translate-y-[50] overflow-hidden')} height='auto' y={0} overflow='' ease={ease} duration={duration} />
+    <AnimatedDiv children={children} position={position} scrollOnly={scrollOnly} once={once} debugId={debugId} className={cn(className,'h-0 translate-y-[50] overflow-hidden')} height='auto' y={0} overflow='' ease={ease} duration={duration} />
   )
 }
 

src/app/_components/Animated/AnimatedDiv.tsx

@@ -1,3 +1,4 @@
+"use client"
 import gsap from "gsap";
 import { type HTMLAttributes, type ReactNode, useRef } from "react";
 import { useReveal } from "./useReveal";

src/app/_components/Animated/useReveal.ts

@@ -3,7 +3,7 @@
 import { useGSAP } from "@gsap/react"
 import { ScrollTrigger } from "gsap/all"
 import type { RefObject } from "react"
-import { GSAP_DEBUG, useGsapContext } from "~/app/_providers/GsapProvicer"
+import { GSAP_DEBUG, nearestScroller, useGsapContext } from "~/app/_providers/GsapProvicer"
 
 export type UseRevealOptions = {
   position: gsap.Position
@@ -39,9 +39,12 @@ export function useReveal(
   const ctx = useGsapContext()
   useGSAP(() => {
     const el = ref.current
-    if (!el || !ctx) return
+    if (!el || !ctx) {
+      if (GSAP_DEBUG) console.log("[cv-debug][useReveal:skip]", { debugId, hasEl: !!el, hasCtx: !!ctx })
+      return
+    }
 
-    const scroller = ctx.getScroller()
+    const scroller = nearestScroller(el)
     const scrollerEl = scroller instanceof Element ? scroller : undefined
 
     const rect = el.getBoundingClientRect()
@@ -53,6 +56,28 @@ export function useReveal(
       bottom = r.top + r.height
     }
     const isInView = rect.bottom > top && rect.top < bottom
+    if (GSAP_DEBUG) {
+      const scrollerRect = scrollerEl?.getBoundingClientRect()
+      console.log("[cv-debug][useReveal:register]", {
+        debugId,
+        position,
+        scrollOnly,
+        once,
+        isInView,
+        rect: { top: rect.top, bottom: rect.bottom, height: rect.height },
+        viewport: { top, bottom },
+        scroller:
+          scroller === window
+            ? "window"
+            : {
+                slot: scrollerEl?.getAttribute("data-slot"),
+                className: scrollerEl?.className,
+                clientHeight: scrollerEl?.clientHeight,
+                scrollHeight: scrollerEl?.scrollHeight,
+                rect: scrollerRect ? { top: scrollerRect.top, bottom: scrollerRect.bottom, height: scrollerRect.height } : undefined,
+              },
+      })
+    }
 
     const reveal = makeReveal(el)
     // A reveal that animates height (pop-ups) shifts every trigger below it.
@@ -83,19 +108,26 @@ export function useReveal(
     if (isInView && !scrollOnly) {
       // The shared timeline only decides *when* the entrance starts; the reveal
       // plays independently so the ScrollTrigger can take it over afterwards.
+      if (GSAP_DEBUG) console.log("[cv-debug][useReveal:schedule]", { debugId, position })
       ctx.schedule(() => reveal.play(), position)
       // `once` elements keep their revealed state — no scroll trigger at all.
-      if (!once) ctx.onReady(addReplayTrigger)
+      if (!once) {
+        if (GSAP_DEBUG) console.log("[cv-debug][useReveal:onReady]", { debugId })
+        ctx.onReady(addReplayTrigger)
+      }
     } else if (isInView) {
       // scrollOnly + already on screen: no enter crossing will fire, so reveal
       // now. Keep a trigger for scroll-out unless this is a `once` element.
+      if (GSAP_DEBUG) console.log("[cv-debug][useReveal:play-now]", { debugId, position })
       reveal.play()
       if (!once) addReplayTrigger()
     } else if (once) {
       // Off-screen: reveal when first reached, then self-destruct so it never
       // reverses.
+      if (GSAP_DEBUG) console.log("[cv-debug][useReveal:scroll-once]", { debugId, position })
       ScrollTrigger.create({ ...baseTrigger, once: true, onEnter: () => reveal.play() })
     } else {
+      if (GSAP_DEBUG) console.log("[cv-debug][useReveal:scroll-trigger-only]", { debugId, position })
       addReplayTrigger()
     }
   }, { dependencies: [] })

src/app/_components/Form/Components/FormScaffold.tsx

@@ -15,7 +15,7 @@ export default function FormScaffold<T extends FieldValues,>(params: {
 }) {
   const { form, onSubmit, title, id, className, children } = params
   return (
-    <Card.Card className={className ? className : "w-5/6 lg:w-1/2"}>
+    <Card.Card className={className ? className : "w-full"}>
       <Card.CardHeader>
         <Card.CardTitle>
           <DependentText bool={id ? true : false} true={`Update ${title}`} false={`Create ${title}`} />

src/app/_components/Form/Fields/MdeFormField.tsx

@@ -8,6 +8,7 @@ import type { Control, FieldValues, Path } from "react-hook-form";
 import { FormControl, FormField, FormItem, FormLabel } from "~/components/ui/form";
 import { Button } from "~/components/ui/button";
 import { cn } from "~/lib/utils";
+import { ClientMdx } from "~/components/ClientMdx";
 import {
   InternalLinkTextarea,
   type AutocompleteTriggerConfig,
@@ -81,7 +82,7 @@ export default function MdeFormField<T extends FieldValues>(params: {
                   ),
                   preview: params.renderPreview
                     ? (source) => params.renderPreview?.(source) ?? <></>
-                    : undefined,
+                    : (source) => <ClientMdx source={source} fallback={source} />,
                 }}
               />
             </FormControl>

src/app/_providers/GsapProvicer.tsx

@@ -20,6 +20,25 @@ ScrollTrigger.config({ ignoreMobileResize: true })
 // element and mount the GSDevTools timeline scrubber. Handy for seeing exactly
 // where each card's enter/exit lines sit relative to the viewport.
 export const GSAP_DEBUG = false
+
+export function nearestScroller(el: Element): Element | Window {
+  let node: Element | null = el.parentElement
+  while (node) {
+    if (node.getAttribute('data-slot') === 'scroll-area-viewport') {
+      const viewport = node as HTMLElement
+      const rect = viewport.getBoundingClientRect()
+      const hasUsableBox = rect.width > 0 && rect.height > 0
+      const canScroll =
+        viewport.scrollHeight > viewport.clientHeight ||
+        viewport.scrollWidth > viewport.clientWidth
+
+      if (hasUsableBox && canScroll) return viewport
+    }
+    node = node.parentElement
+  }
+  return window
+}
+
 const GsapContext = createContext<{
   // Add a real animation (with its own duration) to the entrance timeline.
   addAnimation: (
@@ -47,14 +66,24 @@ export function useGsapContext() {
 export const useTimeLine = (dep:any,all?:boolean) => {
   const gsapContext = useGsapContext()
     useEffect(() => {
+      if (GSAP_DEBUG) {
+        console.log("[cv-debug][useTimeLine:effect]", {
+          hasDep: !!dep,
+          isArray: dep instanceof Array,
+          length: dep instanceof Array ? dep.length : undefined,
+          all,
+        })
+      }
       if (dep instanceof Array && all) {
         let acc = true;
         let allDepsSatisfied = dep.reduce((p,c) => c !== undefined && p ,acc )
         if (allDepsSatisfied) {
+          if (GSAP_DEBUG) console.log("[cv-debug][useTimeLine:resume-all]")
           gsapContext?.resumeTimeline()
         }
       } else {
         if (dep) {
+          if (GSAP_DEBUG) console.log("[cv-debug][useTimeLine:resume]")
           gsapContext?.resumeTimeline()
         }
       }
@@ -100,30 +129,75 @@ export default function GsapProvider({ children }: { children: ReactNode }) {
       devToolsCreated.current = true
       GSDevTools.create({ animation: tl.current })
     }
-    return () => { console.log("gsap cleanup") }
+    return () => { if (GSAP_DEBUG) console.log("gsap cleanup") }
   })
 
-  const addAnimation = useCallback((animation: gsap.core.TimelineChild, position: gsap.Position) => {
-    tl.current?.add(animation, position);
-  },[])
-  const schedule = useCallback((fn: () => void, position: gsap.Position) => {
-    tl.current?.add(fn, position)
-  },[])
-
   // Handoff: fire registered callbacks once, when the entrance finishes.
   const readyFired = useRef(false)
   const readyCbs = useRef<Array<() => void>>([])
   const fireReady = useCallback(() => {
     if (readyFired.current) return
+    if (GSAP_DEBUG) {
+      console.log("[cv-debug][gsap:ready]", {
+        callbacks: readyCbs.current.length,
+        duration: tl.current?.duration(),
+        progress: tl.current?.progress(),
+      })
+    }
     readyFired.current = true
     readyCbs.current.forEach((cb) => cb())
     readyCbs.current = []
   },[])
   const onReady = useCallback((cb: () => void) => {
+    if (GSAP_DEBUG) console.log("[cv-debug][gsap:onReady]", { readyFired: readyFired.current })
     if (readyFired.current) cb()
     else readyCbs.current.push(cb)
   },[])
 
+  const addAnimation = useCallback((animation: gsap.core.TimelineChild, position: gsap.Position) => {
+    // Content can mount in waves (e.g. nested queries resolving after the
+    // entrance already played). Parking a tween in a finished, paused timeline
+    // would freeze it at its from-state, so once the entrance is done let the
+    // (live) tween play on its own instead.
+    if (GSAP_DEBUG) {
+      console.log("[cv-debug][gsap:addAnimation]", {
+        position,
+        readyFired: readyFired.current,
+        durationBefore: tl.current?.duration(),
+      })
+    }
+    if (readyFired.current) return
+    tl.current?.add(animation, position);
+    if (GSAP_DEBUG) {
+      console.log("[cv-debug][gsap:addAnimation:done]", {
+        position,
+        durationAfter: tl.current?.duration(),
+        children: tl.current?.getChildren(false, true, true).length,
+      })
+    }
+  },[])
+  const schedule = useCallback((fn: () => void, position: gsap.Position) => {
+    // Same late-arrival case: a callback added past the playhead never fires, so
+    // run the reveal immediately once the entrance has finished.
+    if (GSAP_DEBUG) {
+      console.log("[cv-debug][gsap:schedule]", {
+        position,
+        readyFired: readyFired.current,
+        durationBefore: tl.current?.duration(),
+        childrenBefore: tl.current?.getChildren(false, true, true).length,
+      })
+    }
+    if (readyFired.current) { fn(); return }
+    tl.current?.add(fn, position)
+    if (GSAP_DEBUG) {
+      console.log("[cv-debug][gsap:schedule:done]", {
+        position,
+        durationAfter: tl.current?.duration(),
+        childrenAfter: tl.current?.getChildren(false, true, true).length,
+      })
+    }
+  },[])
+
   // Throttle ScrollTrigger.refresh() to once per frame so the ResizeObserver
   // can fire freely while content height animates.
   const refreshQueued = useRef(false)
@@ -140,6 +214,12 @@ export default function GsapProvider({ children }: { children: ReactNode }) {
   const resizeObserver = useRef<ResizeObserver | null>(null)
 
   const resetTimeline = useCallback(() => {
+    if (GSAP_DEBUG) {
+      console.log("[cv-debug][gsap:reset]", {
+        duration: tl.current?.duration(),
+        progress: tl.current?.progress(),
+      })
+    }
     tl.current?.kill()
     tl.current?.revert()
     ScrollTrigger.getAll().forEach(st => st.kill())
@@ -153,7 +233,19 @@ export default function GsapProvider({ children }: { children: ReactNode }) {
 
   const resumeTimeline = useCallback(() => {
     const t = tl.current
-    if (!t) return
+    if (!t) {
+      if (GSAP_DEBUG) console.log("[cv-debug][gsap:resume:skip-no-timeline]")
+      return
+    }
+    if (GSAP_DEBUG) {
+      console.log("[cv-debug][gsap:resume:start]", {
+        duration: t.duration(),
+        progress: t.progress(),
+        paused: t.paused(),
+        readyFired: readyFired.current,
+        children: t.getChildren(false, true, true).length,
+      })
+    }
     // When the orchestrated entrance finishes, hand off to scroll control and
     // realign triggers against the now-settled layout.
     t.eventCallback("onComplete", () => { fireReady(); ScrollTrigger.refresh() })
@@ -177,6 +269,13 @@ export default function GsapProvider({ children }: { children: ReactNode }) {
     }
 
     t.resume()
+    if (GSAP_DEBUG) {
+      console.log("[cv-debug][gsap:resume:after]", {
+        duration: t.duration(),
+        progress: t.progress(),
+        paused: t.paused(),
+      })
+    }
   },[getScroller, fireReady, scheduleRefresh])
 
   // Fonts/markdown/images loading also change content height after the triggers

src/app/_trpc/ServerClient.ts

@@ -1,22 +1,3 @@
-import { httpBatchLink } from "@trpc/client";
 import { trpcRouter } from "~/server/routers/_app";
 
-function getBaseUrl() {
+export const servTrpc = trpcRouter.createCaller({});
-  if (typeof window !== 'undefined')
-    // browser should use relative path
-    return '';
-  if (process.env.VERCEL_URL)
-    // reference for vercel.com
-    return `https://${process.env.VERCEL_URL}`;
-  if (process.env.RENDER_INTERNAL_HOSTNAME)
-    // reference for render.com
-    return `http://${process.env.RENDER_INTERNAL_HOSTNAME}:${process.env.PORT}`;
-  // assume localhost
-  return `http://localhost:${process.env.PORT ?? 3000}`;
-};
-
-export const servTrpc = trpcRouter.createCaller({
-  links: [
-    httpBatchLink({url: `${getBaseUrl()}/api/trpc`}),
-  ],
-});

src/app/_trpc/TrpcProvider.tsx

@@ -3,6 +3,7 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { ReactQueryStreamedHydration } from '@tanstack/react-query-next-experimental'
 import { httpBatchLink } from "@trpc/client";
 import React, { useState } from "react"
+import superjson from "superjson";
 import { trpc } from "./Client";
 import getBaseUrl from "~/app/_trpc/GetBaseUrl";
 let clientQueryClient: QueryClient | undefined = undefined;
@@ -33,6 +34,7 @@ export default function TrpcProvider({ children }: { children: React.ReactNode }
       links: [
         httpBatchLink({
           url: `${baseUrl}/api/trpc`,
+          transformer: superjson,
         }),
       ],
     })

src/app/admin/_components/MdxComponentReference.tsx

@@ -0,0 +1,98 @@
+import { ChevronsUpDown } from "lucide-react";
+import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "~/components/ui/accordion";
+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "~/components/ui/collapsible";
+
+const examples = [
+  {
+    name: "Lead",
+    description: "Intro paragraph with larger muted text.",
+    code: `<Lead>
+Short opening summary.
+</Lead>`,
+  },
+  {
+    name: "Callout",
+    description: "Highlighted note, tip, or warning block.",
+    code: `<Callout title="Heads up" variant="note">
+Important context for readers.
+</Callout>
+
+<Callout title="Tip" variant="tip">
+A practical recommendation.
+</Callout>
+
+<Callout title="Careful" variant="warning">
+A caveat or tradeoff.
+</Callout>`,
+  },
+  {
+    name: "ButtonLink",
+    description: "Button-styled internal or external link.",
+    code: `<ButtonLink href="/projects">
+View projects
+</ButtonLink>
+
+<ButtonLink href="https://example.com" variant="outline">
+External resource
+</ButtonLink>`,
+  },
+  {
+    name: "Figure",
+    description: "Image with optional caption.",
+    code: `<Figure
+  src="https://example.com/image.jpg"
+  alt="Describe the image"
+  caption="Optional caption"
+/>`,
+  },
+  {
+    name: "PullQuote",
+    description: "Large emphasized quote or takeaway.",
+    code: `<PullQuote>
+A highlighted quote or strong takeaway.
+</PullQuote>`,
+  },
+  {
+    name: "TagList",
+    description: "Inline list of tag badges.",
+    code: `<TagList tags={["nextjs", "mdx", "uploadthing"]} />`,
+  },
+  {
+    name: "Badge",
+    description: "Small inline label.",
+    code: `<Badge variant="outline">Next.js</Badge>`,
+  },
+];
+
+export default function MdxComponentReference() {
+  return (
+    <Collapsible className="rounded-lg border">
+      <CollapsibleTrigger className="flex w-full items-center justify-between gap-2 p-4 text-left">
+        <h2 className="text-base font-semibold">MDX Components</h2>
+        <ChevronsUpDown className="size-4 shrink-0 text-muted-foreground" />
+      </CollapsibleTrigger>
+      <CollapsibleContent className="px-4 pb-4">
+        <p className="text-muted-foreground text-sm">
+          Components available inside MDX content. Type <code className="rounded bg-muted px-1">[[</code> for internal links or <code className="rounded bg-muted px-1">&lt;</code> for component snippets.
+        </p>
+        <Accordion type="single" collapsible className="mt-3">
+          {examples.map((example) => (
+            <AccordionItem key={example.name} value={example.name}>
+              <AccordionTrigger>
+                <span>
+                  <span className="block">{example.name}</span>
+                  <span className="text-muted-foreground block text-xs font-normal">{example.description}</span>
+                </span>
+              </AccordionTrigger>
+              <AccordionContent>
+                <pre className="bg-muted overflow-x-auto rounded-md p-3 text-xs">
+                  <code>{example.code}</code>
+                </pre>
+              </AccordionContent>
+            </AccordionItem>
+          ))}
+        </Accordion>
+      </CollapsibleContent>
+    </Collapsible>
+  );
+}

src/app/admin/_components/MdxEditorPreview.tsx

@@ -4,9 +4,9 @@ import { useEffect, useState } from 'react'
 import { MDXRemote } from 'next-mdx-remote'
 import { serialize } from 'next-mdx-remote/serialize'
 import type { MDXRemoteSerializeResult } from 'next-mdx-remote'
-import { mdxComponents } from '~/app/blog/_components/mdx-components'
+import { mdxComponents } from '~/components/mdx-components'
 
-export default function BlogMdxEditorPreview(params: { source: string }) {
+export default function MdxEditorPreview(params: { source: string }) {
   const [compiled, setCompiled] = useState<MDXRemoteSerializeResult | null>(null)
   const [error, setError] = useState<string | null>(null)
 

src/app/admin/_components/useMdxEditorFieldProps.tsx

@@ -0,0 +1,143 @@
+'use client'
+
+import { trpc } from '~/app/_trpc/Client'
+import type { RouterOutputs } from '~/server/routers/_app'
+import {
+  AUTOCOMPLETE_CURSOR_MARKER,
+  linkSuggestionsToAutocomplete,
+  type AutocompleteTriggerConfig,
+  type InternalLinkSuggestion,
+  type MdeAutocompleteSuggestion,
+} from '~/app/_components/Form/Fields/InternalLinkTextarea'
+import MdxEditorPreview from './MdxEditorPreview'
+
+function internalLinkSuggestions(params: {
+  posts?: RouterOutputs['blog']['list'],
+  projects?: RouterOutputs['projectv2']['listWithStack'],
+}): InternalLinkSuggestion[] {
+  const postLinks = params.posts?.map((post) => ({
+    label: post.title,
+    href: `/blog/${post.slug}`,
+    group: 'Blog',
+  })) ?? []
+
+  const projectLinks = params.projects?.map((project) => ({
+    label: project.title,
+    href: `/projects#${project.id}`,
+    group: 'Project',
+  })) ?? []
+
+  return [...postLinks, ...projectLinks]
+}
+
+const mdxAutocompleteSuggestions: MdeAutocompleteSuggestion[] = [
+  {
+    label: 'Lead',
+    value: `<Lead>\n${AUTOCOMPLETE_CURSOR_MARKER}\n</Lead>`,
+    detail: 'Intro paragraph with larger muted text.',
+    group: 'Component',
+    trigger: '<',
+  },
+  {
+    label: 'Callout note',
+    value: `<Callout title="Heads up" variant="note">\n${AUTOCOMPLETE_CURSOR_MARKER}\n</Callout>`,
+    detail: 'Highlighted note block.',
+    group: 'Component',
+    trigger: '<',
+  },
+  {
+    label: 'Callout tip',
+    value: `<Callout title="Tip" variant="tip">\n${AUTOCOMPLETE_CURSOR_MARKER}\n</Callout>`,
+    detail: 'Highlighted tip block.',
+    group: 'Component',
+    trigger: '<',
+  },
+  {
+    label: 'Callout warning',
+    value: `<Callout title="Careful" variant="warning">\n${AUTOCOMPLETE_CURSOR_MARKER}\n</Callout>`,
+    detail: 'Highlighted warning block.',
+    group: 'Component',
+    trigger: '<',
+  },
+  {
+    label: 'ButtonLink',
+    value: `<ButtonLink href="${AUTOCOMPLETE_CURSOR_MARKER}">\nView projects\n</ButtonLink>`,
+    detail: 'Button-styled internal or external link.',
+    group: 'Component',
+    trigger: '<',
+  },
+  {
+    label: 'Figure',
+    value: `<Figure\n  src="${AUTOCOMPLETE_CURSOR_MARKER}"\n  alt="Describe the image"\n  caption="Optional caption"\n/>`,
+    detail: 'Image with optional caption.',
+    group: 'Component',
+    trigger: '<',
+  },
+  {
+    label: 'PullQuote',
+    value: `<PullQuote>\n${AUTOCOMPLETE_CURSOR_MARKER}\n</PullQuote>`,
+    detail: 'Large emphasized quote.',
+    group: 'Component',
+    trigger: '<',
+  },
+  {
+    label: 'TagList',
+    value: `<TagList tags={[${AUTOCOMPLETE_CURSOR_MARKER}]} />`,
+    detail: 'Inline list of tag badges.',
+    group: 'Component',
+    trigger: '<',
+  },
+  {
+    label: 'Badge',
+    value: `<Badge variant="outline">${AUTOCOMPLETE_CURSOR_MARKER}</Badge>`,
+    detail: 'Small inline label.',
+    group: 'Component',
+    trigger: '<',
+  },
+  {
+    label: 'Image',
+    value: `![Image](${AUTOCOMPLETE_CURSOR_MARKER})`,
+    detail: 'Markdown image',
+    group: 'Markdown',
+    trigger: '!',
+  },
+]
+
+const mdxTriggerConfigs: AutocompleteTriggerConfig[] = [
+  {
+    trigger: '[[',
+    label: 'Internal links',
+    isQueryValid: (query) => !query.includes(']'),
+  },
+  {
+    trigger: '<',
+    label: 'MDX components',
+    isQueryValid: (query) => !/[\s>]/.test(query),
+  },
+  {
+    trigger: '!',
+    label: 'Markdown',
+    isQueryValid: (query) => !/[\s\)]/.test(query),
+  },
+]
+
+/**
+ * Shared props for an MDX-aware `MdeFormField`: internal-link + component
+ * autocomplete, trigger configs, and a live MDX preview. Used by every admin
+ * form that edits MDX content (blog, project, cv entry).
+ */
+export function useMdxEditorFieldProps() {
+  const posts = trpc.blog.list.useQuery(undefined, { refetchInterval: 5000 })
+  const projects = trpc.projectv2.listWithStack.useQuery()
+
+  const autocompleteSuggestions = [
+    ...linkSuggestionsToAutocomplete(internalLinkSuggestions({ posts: posts.data, projects: projects.data })),
+    ...mdxAutocompleteSuggestions,
+  ]
+
+  return {
+    autocompleteSuggestions,
+    triggerConfigs: mdxTriggerConfigs,
+    renderPreview: (source: string) => <MdxEditorPreview source={source} />,
+  }
+}

src/app/admin/blog/_components/CreateUpdateForm.tsx

@@ -10,15 +10,8 @@ import { TextInputFormField, MdeFormField } from '~/app/_components/Form/Fields'
 import { usePathname, useRouter } from 'next/navigation'
 import { useTheme } from 'next-themes'
 import type { RouterOutputs } from '~/server/routers/_app'
-import MdxComponentReference from './MdxComponentReference'
+import MdxComponentReference from '~/app/admin/_components/MdxComponentReference'
-import BlogMdxEditorPreview from './BlogMdxEditorPreview'
+import { useMdxEditorFieldProps } from '~/app/admin/_components/useMdxEditorFieldProps'
-import {
-  AUTOCOMPLETE_CURSOR_MARKER,
-  linkSuggestionsToAutocomplete,
-  type AutocompleteTriggerConfig,
-  type InternalLinkSuggestion,
-  type MdeAutocompleteSuggestion,
-} from '~/app/_components/Form/Fields/InternalLinkTextarea'
 
 type BlogPost = RouterOutputs['blog']['bySlug']
 
@@ -35,116 +28,6 @@ function parseTags(value: string | undefined): string[] {
   return value?.split(',').map((tag) => tag.trim()).filter(Boolean) ?? []
 }
 
-function internalLinkSuggestions(params: {
-  posts?: RouterOutputs['blog']['list'],
-  projects?: RouterOutputs['projectv2']['listWithStack'],
-}): InternalLinkSuggestion[] {
-  const postLinks = params.posts?.map((post) => ({
-    label: post.title,
-    href: `/blog/${post.slug}`,
-    group: 'Blog',
-  })) ?? []
-
-  const projectLinks = params.projects?.map((project) => ({
-    label: project.title,
-    href: `/projects#${project.id}`,
-    group: 'Project',
-  })) ?? []
-
-  return [...postLinks, ...projectLinks]
-}
-
-const blogAutocompleteSuggestions: MdeAutocompleteSuggestion[] = [
-  {
-    label: 'Lead',
-    value: `<Lead>\n${AUTOCOMPLETE_CURSOR_MARKER}\n</Lead>`,
-    detail: 'Intro paragraph with larger muted text.',
-    group: 'Component',
-    trigger: '<',
-  },
-  {
-    label: 'Callout note',
-    value: `<Callout title="Heads up" variant="note">\n${AUTOCOMPLETE_CURSOR_MARKER}\n</Callout>`,
-    detail: 'Highlighted note block.',
-    group: 'Component',
-    trigger: '<',
-  },
-  {
-    label: 'Callout tip',
-    value: `<Callout title="Tip" variant="tip">\n${AUTOCOMPLETE_CURSOR_MARKER}\n</Callout>`,
-    detail: 'Highlighted tip block.',
-    group: 'Component',
-    trigger: '<',
-  },
-  {
-    label: 'Callout warning',
-    value: `<Callout title="Careful" variant="warning">\n${AUTOCOMPLETE_CURSOR_MARKER}\n</Callout>`,
-    detail: 'Highlighted warning block.',
-    group: 'Component',
-    trigger: '<',
-  },
-  {
-    label: 'ButtonLink',
-    value: `<ButtonLink href="${AUTOCOMPLETE_CURSOR_MARKER}">\nView projects\n</ButtonLink>`,
-    detail: 'Button-styled internal or external link.',
-    group: 'Component',
-    trigger: '<',
-  },
-  {
-    label: 'Figure',
-    value: `<Figure\n  src="${AUTOCOMPLETE_CURSOR_MARKER}"\n  alt="Describe the image"\n  caption="Optional caption"\n/>`,
-    detail: 'Image with optional caption.',
-    group: 'Component',
-    trigger: '<',
-  },
-  {
-    label: 'PullQuote',
-    value: `<PullQuote>\n${AUTOCOMPLETE_CURSOR_MARKER}\n</PullQuote>`,
-    detail: 'Large emphasized quote.',
-    group: 'Component',
-    trigger: '<',
-  },
-  {
-    label: 'TagList',
-    value: `<TagList tags={[${AUTOCOMPLETE_CURSOR_MARKER}]} />`,
-    detail: 'Inline list of tag badges.',
-    group: 'Component',
-    trigger: '<',
-  },
-  {
-    label: 'Badge',
-    value: `<Badge variant="outline">${AUTOCOMPLETE_CURSOR_MARKER}</Badge>`,
-    detail: 'Small inline label.',
-    group: 'Component',
-    trigger: '<',
-  },
-  {
-    label: 'Image',
-    value: `![Image](${AUTOCOMPLETE_CURSOR_MARKER})`,
-    detail: 'Markdown image',
-    group: 'Markdown',
-    trigger: '!',
-  },
-]
-
-const blogTriggerConfigs: AutocompleteTriggerConfig[] = [
-  {
-    trigger: '[[',
-    label: 'Internal links',
-    isQueryValid: (query) => !query.includes(']'),
-  },
-  {
-    trigger: '<',
-    label: 'MDX components',
-    isQueryValid: (query) => !/[\s>]/.test(query),
-  },
-  {
-    trigger: '!',
-    label: 'Markdown',
-    isQueryValid: (query) => !/[\s\)]/.test(query),
-  },
-]
-
 export default function CreateUpdateBlogForm(params: { className?: string, entity?: BlogPost }) {
   const [slug, setSlug] = useState<string | undefined>(params.entity?.slug)
   const [originalSlug, setOriginalSlug] = useState<string | undefined>(params.entity?.slug)
@@ -162,12 +45,7 @@ export default function CreateUpdateBlogForm(params: { className?: string, entit
   })
   const path = usePathname()
   const router = useRouter()
-  const posts = trpc.blog.list.useQuery(undefined, { refetchInterval: 5000 })
+  const mdxEditorProps = useMdxEditorFieldProps()
-  const projects = trpc.projectv2.listWithStack.useQuery()
-  const autocompleteSuggestions = [
-    ...linkSuggestionsToAutocomplete(internalLinkSuggestions({ posts: posts.data, projects: projects.data })),
-    ...blogAutocompleteSuggestions,
-  ]
 
   const createMutation = trpc.blog.insert.useMutation({
     onSuccess: (data) => {
@@ -226,9 +104,7 @@ export default function CreateUpdateBlogForm(params: { className?: string, entit
             name='content'
             label='Content'
             dataColorMode={(theme as 'dark' | 'light') ?? 'dark'}
-            autocompleteSuggestions={autocompleteSuggestions}
+            {...mdxEditorProps}
-            triggerConfigs={blogTriggerConfigs}
-            renderPreview={(source) => <BlogMdxEditorPreview source={source} />}
           />
         </FormScaffold>
       </div>

src/app/admin/blog/_components/MdxComponentReference.tsx

@@ -1,91 +0,0 @@
-import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "~/components/ui/accordion";
-
-const examples = [
-  {
-    name: "Lead",
-    description: "Intro paragraph with larger muted text.",
-    code: `<Lead>
-Short opening summary for the post.
-</Lead>`,
-  },
-  {
-    name: "Callout",
-    description: "Highlighted note, tip, or warning block.",
-    code: `<Callout title="Heads up" variant="note">
-Important context for readers.
-</Callout>
-
-<Callout title="Tip" variant="tip">
-A practical recommendation.
-</Callout>
-
-<Callout title="Careful" variant="warning">
-A caveat or tradeoff.
-</Callout>`,
-  },
-  {
-    name: "ButtonLink",
-    description: "Button-styled internal or external link.",
-    code: `<ButtonLink href="/projects">
-View projects
-</ButtonLink>
-
-<ButtonLink href="https://example.com" variant="outline">
-External resource
-</ButtonLink>`,
-  },
-  {
-    name: "Figure",
-    description: "Image with optional caption.",
-    code: `<Figure
-  src="https://example.com/image.jpg"
-  alt="Describe the image"
-  caption="Optional caption"
-/>`,
-  },
-  {
-    name: "PullQuote",
-    description: "Large emphasized quote or takeaway.",
-    code: `<PullQuote>
-A highlighted quote or strong takeaway.
-</PullQuote>`,
-  },
-  {
-    name: "TagList",
-    description: "Inline list of tag badges inside the post body.",
-    code: `<TagList tags={["nextjs", "mdx", "uploadthing"]} />`,
-  },
-  {
-    name: "Badge",
-    description: "Small inline label.",
-    code: `<Badge variant="outline">Next.js</Badge>`,
-  },
-];
-
-export default function MdxComponentReference() {
-  return (
-    <section className="rounded-lg border p-4">
-      <h2 className="text-base font-semibold">MDX Components</h2>
-      <p className="text-muted-foreground mt-1 text-sm">
-        Components available inside blog post content. Type <code className="rounded bg-muted px-1">[[</code> for internal links or <code className="rounded bg-muted px-1">&lt;</code> for component snippets.
-      </p>
-      <Accordion type="single" collapsible className="mt-3">
-        {examples.map((example) => (
-          <AccordionItem key={example.name} value={example.name}>
-            <AccordionTrigger>
-              <span>
-                <span className="block">{example.name}</span>
-                <span className="text-muted-foreground block text-xs font-normal">{example.description}</span>
-              </span>
-            </AccordionTrigger>
-            <AccordionContent>
-              <pre className="bg-muted overflow-x-auto rounded-md p-3 text-xs">
-                <code>{example.code}</code>
-              </pre>
-            </AccordionContent>
-          </AccordionItem>
-        ))}
-      </Accordion>
-    </section>
-  );
-}

src/app/admin/cv/entry/_components/CreateUpdateForm.tsx

@@ -14,6 +14,8 @@ import { useState } from 'react';
 import { SelectFormField, TextInputFormField, MdeFormField, CalenderFormField, BooleanFormField } from '~/app/_components/Form/Fields'
 import { usePathname, useRouter } from 'next/navigation';
 import {FormMutationContextProvider, type FormCreateMutationInterface} from '~/app/_components/Form/Components/MutationProvider';
+import MdxComponentReference from '~/app/admin/_components/MdxComponentReference';
+import { useMdxEditorFieldProps } from '~/app/admin/_components/useMdxEditorFieldProps';
 export default function CreateUpdateCvEntryForm(params: { className?: string, entity?: IterableElement<RouterOutputs['entry']['select']>, isUpdate?: boolean }) {
   const [id, setId] = useState<string | undefined>(params.entity ? params.entity.id : undefined)
   const { theme } = useTheme()
@@ -34,6 +36,7 @@ export default function CreateUpdateCvEntryForm(params: { className?: string, en
   })
   let path = usePathname()
   let router = useRouter()
+  const mdxEditorProps = useMdxEditorFieldProps()
   const createMutation = trpc.entry.insert.useMutation({ onSuccess: makeOnSuccess('create', form, setId) })
   const updateMutation = trpc.entry.update.useMutation({ onSuccess: makeOnSuccess('update', form) })
   const deleteMutation = trpc.entry.delete.useMutation({ onSuccess: makeOnSuccess('delete', form, undefined, path, router) })
@@ -51,6 +54,8 @@ export default function CreateUpdateCvEntryForm(params: { className?: string, en
       updateMutation:updateMutation,
       deleteMutation:deleteMutation
     }}>
+    <div className='flex flex-col gap-4'>
+    <MdxComponentReference />
     <FormScaffold
       form={form}
       onSubmit={onSubmit}
@@ -70,11 +75,12 @@ export default function CreateUpdateCvEntryForm(params: { className?: string, en
         }
       </SelectFormField>
       <TextInputFormField control={form.control} name='title' label='Title' />
-      <MdeFormField control={form.control} name='description' label='Description' dataColorMode={(theme as "dark" | "light") ? (theme as "dark" | "light") : "dark"} />
+      <MdeFormField control={form.control} name='description' label='Description' dataColorMode={(theme as "dark" | "light") ? (theme as "dark" | "light") : "dark"} {...mdxEditorProps} />
       <CalenderFormField control={form.control} name='fromTime' label='From Date' />
       <CalenderFormField control={form.control} name='toTime' label='To Date' />
       <BooleanFormField control={form.control} name='hideDates' label='Hide Dates' />
     </FormScaffold>
+    </div>
     </FormMutationContextProvider>
   )
 }

src/app/admin/project/_components/CreateUpdateProjectForm.tsx

@@ -14,6 +14,8 @@ import { usePathname, useRouter } from 'next/navigation';
 import { useTheme } from 'next-themes';
 import { makeUseRelationShipWithNameIndex } from '~/lib/hooks';
 import { FormMutationContextProvider } from '~/app/_components/Form/Components/MutationProvider';
+import MdxComponentReference from '~/app/admin/_components/MdxComponentReference';
+import { useMdxEditorFieldProps } from '~/app/admin/_components/useMdxEditorFieldProps';
 export default function CreateUpdateProjectForm(params: { className?: string, entity?: IterableElement<RouterOutputs['project']['select']> }) {
   const [id, setId] = useState<string | undefined>(params.entity ? params.entity.id : undefined)
   const { theme } = useTheme()
@@ -35,6 +37,7 @@ export default function CreateUpdateProjectForm(params: { className?: string, en
   })
   let path = usePathname()
   let router = useRouter()
+  const mdxEditorProps = useMdxEditorFieldProps()
   const createMutation = trpc.project.insert.useMutation({ onSuccess: makeOnSuccess('create', form, setId) })
   const updateMutation = trpc.project.update.useMutation({ onSuccess: makeOnSuccess('update', form) })
   const deleteMutation = trpc.project.delete.useMutation({ onSuccess: makeOnSuccess('delete', form, undefined, path, router) })
@@ -50,6 +53,8 @@ export default function CreateUpdateProjectForm(params: { className?: string, en
         updateMutation: updateMutation,
         deleteMutation: deleteMutation
       }}>
+      <div className='flex flex-col gap-4'>
+      <MdxComponentReference />
       <FormScaffold
         form={form}
         onSubmit={onSubmit}
@@ -69,7 +74,7 @@ export default function CreateUpdateProjectForm(params: { className?: string, en
           }
         </SelectFormField>
         <TextInputFormField control={form.control} name='title' label='Title' />
-        <MdeFormField control={form.control} name='description' label='Description' dataColorMode={(theme as "dark" | "light") ?? "dark"} />
+        <MdeFormField control={form.control} name='description' label='Description' dataColorMode={(theme as "dark" | "light") ?? "dark"} {...mdxEditorProps} />
         <SelectFormField control={form.control} name='sourceType' label='Source Type' defaultValue={'open'} placeholder='open'  >
           <SelectItem value="open"> open </SelectItem>
           <SelectItem value="closed"> closed </SelectItem>
@@ -82,6 +87,7 @@ export default function CreateUpdateProjectForm(params: { className?: string, en
         <TextInputFormField control={form.control} label='Release Link' name='releaseLink' />
         <IntInputFormField control={form.control} label='Order Position' name='orderPos'/>
       </FormScaffold>
+      </div>
     </FormMutationContextProvider>
   )
 }

src/app/blog/[slug]/page.tsx

@@ -1,9 +1,10 @@
 import { notFound } from "next/navigation";
 import { MDXRemote } from "next-mdx-remote/rsc";
 import { TRPCError } from "@trpc/server";
+import matter from "gray-matter";
 import { servTrpc } from "~/app/_trpc/ServerClient";
 import { Badge } from "~/components/ui/badge";
-import { mdxComponents } from "../_components/mdx-components";
+import { mdxComponents } from "~/components/mdx-components";
 
 type Props = {
   params: Promise<{ slug: string }>;
@@ -12,37 +13,47 @@ type Props = {
 export default async function BlogPostPage({ params }: Props) {
   const { slug } = await params;
 
-  let post: Awaited<ReturnType<typeof servTrpc.blog.bySlug>>;
+  let post: Awaited<ReturnType<typeof servTrpc.blog.metadataBySlug>>;
   try {
-    post = await servTrpc.blog.bySlug(slug);
+    post = await servTrpc.blog.metadataBySlug(slug);
   } catch (e) {
     if (e instanceof TRPCError && e.code === "NOT_FOUND") notFound();
     throw e;
   }
 
+  const response = await fetch(post.fileUrl, { next: { revalidate: 3600 } });
+  if (!response.ok) notFound();
+
+  const parsed = matter(await response.text());
+  const tags = Array.isArray(parsed.data.tags)
+    ? parsed.data.tags.map((tag) => String(tag).trim()).filter(Boolean)
+    : post.tags;
+  const title = typeof parsed.data.title === "string" ? parsed.data.title : post.title;
+  const date = typeof parsed.data.date === "string" ? parsed.data.date : post.date;
+
   return (
-    <main className="mx-auto max-w-2xl px-4 py-12">
+    <main className="mx-auto h-full max-w-2xl overflow-y-auto px-4 py-12">
       <header className="mb-8">
-        <h1 className="text-3xl font-bold">{post.title}</h1>
+        <h1 className="text-3xl font-bold">{title}</h1>
-        {post.date && (
+        {date && (
           <time className="text-muted-foreground text-sm">
-            {new Date(post.date).toLocaleDateString("en-US", {
+            {new Date(date).toLocaleDateString("en-US", {
               year: "numeric",
               month: "long",
               day: "numeric",
             })}
           </time>
         )}
-        {post.tags.length > 0 && (
+        {tags.length > 0 && (
           <div className="mt-3 flex flex-wrap gap-1.5">
-            {post.tags.map((tag) => (
+            {tags.map((tag) => (
               <Badge key={tag} variant="outline">{tag}</Badge>
             ))}
           </div>
         )}
       </header>
       <article className="prose dark:prose-invert max-w-none">
-        <MDXRemote source={post.content} components={mdxComponents} />
+        <MDXRemote source={parsed.content} components={mdxComponents} />
       </article>
     </main>
   );

src/app/blog/page.tsx

@@ -6,7 +6,7 @@ export default async function BlogPage() {
   const posts = await servTrpc.blog.list();
 
   return (
-    <main className="mx-auto max-w-2xl px-4 py-12">
+    <main className="mx-auto h-full max-w-2xl overflow-y-auto px-4 py-12">
       <h1 className="mb-8 text-3xl font-bold">Blog</h1>
       {posts.length === 0 ? (
         <p className="text-muted-foreground">No posts yet.</p>

src/app/chat/_components/AssistantMessage.tsx

@@ -1,6 +1,5 @@
 import type { UIMessage } from "ai";
-import Markdown from "react-markdown";
+import { ClientMdx } from "~/components/ClientMdx";
-import { cn } from "~/lib/utils";
 
 export const AssistantMessage = (props: { message: UIMessage }) => {
   let message = props.message;
@@ -16,9 +15,7 @@ export const AssistantMessage = (props: { message: UIMessage }) => {
         {message.parts.map((part, i) => {
           if (part.type === 'text') {
             return (
-              <Markdown key={crypto.randomUUID()}>
+              <ClientMdx key={i} source={part.text} fallback={part.text} />
-                {part.text}
-              </Markdown>
             )
           }
           if (part.type === 'tool-scheduleMeeting') {

src/app/chat/_components/ChatInterface.tsx

@@ -1,5 +1,5 @@
 'use client'
-import { useState, useEffect } from 'react'
+import { useState, useEffect, useRef } from 'react'
 import { useChat } from '@ai-sdk/react'
 import { DefaultChatTransport, type UIMessage } from 'ai'
 import { Button } from '~/components/ui/button'
@@ -83,14 +83,21 @@ function AuthenticatedChatInterface({ dbMessages, sessionId }: ChatInterfaceProp
 		sendMessage({ text })
 	}
 	const gsapContext = useGsapContext()
+	const didInitialScroll = useRef(false)
 	useEffect(() => {
-		let scroller = gsapContext?.getScroller()
+		const scroller = gsapContext?.getScroller()
-		if (scroller instanceof Window) {
+		if (!scroller || scroller instanceof Window) {
-			return;
+			return
 		}
-		console.log(scroller?.scrollHeight)
+		// Jump instantly on first open so the chat starts pinned to the bottom;
-		scroller?.scrollTo({ behavior: 'smooth', top: scroller.scrollHeight })
+		// animate subsequent updates. Defer a frame so the messages have laid out
-	}, [messages])
+		// (and any streaming content has grown) before we measure scrollHeight.
+		const behavior: ScrollBehavior = didInitialScroll.current ? 'smooth' : 'auto'
+		didInitialScroll.current = true
+		requestAnimationFrame(() => {
+			scroller.scrollTo({ behavior, top: scroller.scrollHeight })
+		})
+	}, [messages, status])
 	return (
 		<div className="flex flex-col h-full">
 			{messages &&
@@ -114,7 +121,7 @@ function AuthenticatedChatInterface({ dbMessages, sessionId }: ChatInterfaceProp
 				</div>
 			)}
 
-			<div className="p-4 border-t flex flex-row gap-2">
+			<div className="p-4 border-t flex flex-row gap-2 shrink-0">
 				<Textarea
 					name='message'
 					value={input}

src/app/chat/_components/Messages.tsx

@@ -6,7 +6,7 @@ import { ScrollArea } from '~/components/ui/scroll-area';
 import { memo } from 'react';
 const Messages = memo(({messages,status}: { messages: UIMessage[],status:ChatStatus}) => {
   return (
-    <ScrollArea data-scroller-priority='1' className="w-full h-[90%] max-w-4xl mx-auto">
+    <ScrollArea data-scroller-priority='1' className="w-full flex-1 min-h-0 max-w-4xl mx-auto">
       {messages.map((message, i) => (
         <Card.AnimatedCard scrollOnly={true} key={i}>
           <Card.CardContent>

src/app/chat/page.tsx

@@ -9,11 +9,11 @@ export default function ChatPage() {
 	const {messages,session,isLoading,error} = useMessages()
 	useTimeLine(messages)
 	return (
-		<div className="flex flex-col px-10 lg:px-0 w-full h-full max-w-4xl mx-auto pt-10">
+		<div className="flex flex-col px-10 lg:px-0 w-full h-full max-w-4xl mx-auto pt-10 pb-4">
 					<AnimatedPageTitle position={0}>
 						<span>Talk To My </span> <span> AI-Assistant</span>
 					</AnimatedPageTitle>
-					<div className='flex items-center h-[80%] w-full my-auto w-full'>
+					<div className='flex flex-1 min-h-0 w-full'>
 					{!isLoading &&
 					<ChatInterface sessionId={session?.id} dbMessages={messages ?? []}/>
 					}

src/app/cv/_components/CvCategory.tsx

@@ -1,35 +1,36 @@
-'use client'
+import type { ReactNode } from "react"
-import { trpc } from "~/app/_trpc/Client"
 import CvEntry from "./CvEntry"
-import type { servTrpc } from "~/app/_trpc/ServerClient"
-import type { inferProcedureOutput } from "@trpc/server"
 import type { RouterOutputs } from "~/server/routers/_app"
 import { cn } from "~/lib/utils"
-import { Card, CardContent, CardHeader, CardTitle } from "~/components/ui/card"
+import { AnimatedCard, CardContent, CardHeader, CardTitle } from "~/components/ui/card"
 import type { ArrayElement } from "type-fest"
-import AnimatePopUp from "~/app/_components/Animated/AnimatePopUp";
+import AnimateTextIn from "~/app/_components/Animated/AnimateIn"
+import AnimatePopUp from "~/app/_components/Animated/AnimatePopUp"
 import { ScrollArea } from "~/components/ui/scroll-area";
+
+export type CvCategoryData = ArrayElement<RouterOutputs['categoryv2']['listAllWithEntries']>
+
 type CvCategoryProps = {
-  initialData: ArrayElement<RouterOutputs['categoryv2']['listByLayoutPosition']>,
+  category: CvCategoryData,
-  layout: "row"|"col",
+  layout: "row" | "col",
-  children?: React.ReactElement<Parameters<typeof CvEntry>>
+  position?: number,
+  descriptions: Record<string, ReactNode>,
 }
-export default function CvCategory(props:CvCategoryProps)  {
+export default function CvCategory({ category, layout, position = 0, descriptions }: CvCategoryProps) {
-  const category = trpc.categoryv2.getById.useQuery(props.initialData? props.initialData.id : "");
+  const entries = category.cvEntry
-  const entries = trpc.entryv2.byCategoryAndToDateDescending.useQuery(category.data?.id || "")
   return (
-			<Card className={cn(props.layout == "row" ? "w-full" : "","gsapan", "h-screen")}>
+    <AnimatedCard position={position} className={cn(layout == "row" ? "w-full" : "", "h-screen")}>
       <CardHeader>
-					<CardTitle>
+        <AnimateTextIn once position={position + 0.2} animation="slide" debugId={`cv-category-title:${category.name}:${position + 0.2}`}>
-						{category.data?.name}
+          <CardTitle>{category.name}</CardTitle>
-					</CardTitle>
+        </AnimateTextIn>
       </CardHeader>
-				{(entries.data?.length ? entries.data?.length : 0 ) > 0 ?
+      {entries.length > 0 ?
-					<CardContent className={cn(props.layout == "row" ? "flex flex-row flex-wrap justify-center lg:justify-between" : "flex flex-col","gap-4","overflow-scroll")}>
+        <CardContent className={cn(layout == "row" ? "flex flex-row flex-wrap justify-center lg:justify-between" : "flex flex-col", "gap-4", "overflow-scroll")}>
           <ScrollArea>
-						{entries.data?.map((entry,i) => (
+            {entries.map((entry, i) => (
-							<AnimatePopUp position={i}key={entry.id}>
+              <AnimatePopUp position={position + 0.4 + i * 0.2} debugId={`cv-entry-wrapper:${category.name}:${entry.title}:${position + 0.4 + i * 0.2}`} key={entry.id}>
-							<CvEntry className={props.layout == "row" ? "w-full lg:w-fit" : undefined}  initialData={entry}/>
+                <CvEntry position={position + 0.4 + i * 0.2} entry={entry} description={descriptions[entry.id]} className={layout == "row" ? "w-full lg:w-fit" : undefined} />
               </AnimatePopUp>
             ))}
           </ScrollArea>
@@ -37,6 +38,6 @@ export default function CvCategory(props:CvCategoryProps)  {
         :
         <></>
       }
-			</Card>
+    </AnimatedCard>
   )
 }

src/app/cv/_components/CvEntry.tsx

@@ -1,68 +1,52 @@
-import { trpc } from "~/app/_trpc/Client"
+import type { ReactNode } from "react"
 import { Card, CardContent, CardFooter, CardHeader, CardTitle } from "~/components/ui/card"
-import { Skeleton } from "~/components/ui/skeleton"
+import { cn } from "~/lib/utils"
-import { cn, type Defined } from "~/lib/utils"
-import Markdown from 'react-markdown'
 import { format } from 'date-fns'
-import rehypeHighlight from 'rehype-highlight'
-import rehypeRaw from 'rehype-raw'
-import type { RouterOutputs } from "~/server/routers/_app"
 import type { ArrayElement } from "type-fest"
-export default function CvEntry(params: {
+import AnimateTextIn from "~/app/_components/Animated/AnimateIn"
-	initialData: ArrayElement<Defined<RouterOutputs['categoryv2']['getById']>['cvEntry']>,
+import AnimatedDiv from "~/app/_components/Animated/AnimatedDiv"
-	className?: string
+import type { CvCategoryData } from "./CvCategory"
+
+export type CvEntryData = ArrayElement<CvCategoryData['cvEntry']>
+
+export default function CvEntry({ entry, description, className, position = 0 }: {
+	entry: CvEntryData,
+	description?: ReactNode,
+	className?: string,
+	position?: number
 }) {
-	const query = trpc.entryv2.getById.useQuery(params.initialData.id);
-	const { data, isError, error } = query
 	return (
-		<>
+		<Card className={className ? cn("w-fit", className) : "w-fit"}>
-			{
+			{entry.title ?
-				data ?
-					<>
-						<Card className={params.className ? cn("w-fit", params.className) : "w-fit"}>
-							{
-								data.title ?
 				<CardHeader>
-										<CardTitle> {data.title} </CardTitle>
+					<AnimateTextIn position={position} animation="slide" debugId={`cv-entry-title:${entry.title}:${position}`}>
+						<CardTitle> {entry.title} </CardTitle>
+					</AnimateTextIn>
 				</CardHeader> :
 				<></>
 			}
-							{
+			{entry.description ?
-								data.description ?
 				<CardContent className="text-sm lg:text-base">
+					{/* Fade the description in place instead of collapsing its height:
+					    the outer entry pop-up (CvCategory) measures height:auto when it
+					    plays, so the description must stay laid out at full height or the
+					    entry reveals too short. */}
+					<AnimatedDiv once position={position + 0.2} className="opacity-0" opacity={1} duration={0.5} debugId={`cv-entry-description:${entry.title}:${position + 0.2}`}>
 						<article className="prose prose-zinc dark:prose-invert max-w-none">
-											<Markdown rehypePlugins={[rehypeHighlight, rehypeRaw]}>{data.description}</Markdown>
+							{description ?? entry.description}
 						</article>
+					</AnimatedDiv>
 				</CardContent> :
 				<></>
 			}
-							{
+			{!entry.hideDates ?
-								!data.hideDates ?
 				<CardFooter className="text-sm">
-										{`von ${format((new Date()).setTime(Date.parse(data.fromTime)), 'M. yyyy')} bis zum ${format((new Date()).setTime(Date.parse(data.toTime)), 'M. yyyy')}`}
+					<AnimateTextIn position={position + 0.4} debugId={`cv-entry-dates:${entry.title}:${position + 0.4}`}>
+						{`von ${format(new Date(entry.fromTime), 'M. yyyy')} bis zum ${format(new Date(entry.toTime), 'M. yyyy')}`}
+					</AnimateTextIn>
 				</CardFooter> :
 				<></>
 			}
 		</Card>
-					</> :
-					<>
-						<Card>
-							<CardHeader>
-								<div className="flex flex-row">
-									<CardTitle> <Skeleton className="h-2rem w-5rem" /> </CardTitle>
-									<span className="ml-auto text-sm"> <Skeleton className="h-1rem w-3rem" /> - <Skeleton className="h-1rem w-3rem" /> </span>
-								</div>
-							</CardHeader>
-							<CardContent>
-								<div>
-									<Skeleton className="h-4 w-60" />
-									<Skeleton className="h-4 w-50" />
-									<Skeleton className="h-4 w-50" />
-								</div>
-							</CardContent>
-						</Card>
-					</>
-			}
-		</>
 	)
 }

src/app/cv/_components/Page.tsx

@@ -0,0 +1,59 @@
+'use client'
+import type { ReactNode } from "react";
+import { Sidebar, SidebarContent, SidebarProvider } from "~/components/ui/sidebar";
+import type { RouterOutputs } from "~/server/routers/_app"
+import SidebarTriggerDisappearsOnMobile from "./SidebarTriggerDisappearsOnMobile";
+import CvCategory from "./CvCategory";
+import { useTimeLine } from "~/app/_providers/GsapProvicer";
+export default function CvPage(props: {
+  cv: RouterOutputs['categoryv2']['listAllWithEntries'],
+  descriptions: Record<string, ReactNode>,
+}) {
+  useTimeLine(props.cv)
+  const { descriptions } = props
+  const byPosition = (pos: "sidebar" | "header" | "col1" | "col2") =>
+    props.cv?.filter((c) => c.layoutPosition === pos) ?? []
+  const sidebarCategories = byPosition("sidebar")
+  const headerCategories = byPosition("header")
+  const col1Categories = byPosition("col1")
+  const col2Categories = byPosition("col2")
+  return (
+    <>
+      <SidebarProvider>
+        {sidebarCategories.length > 0 &&
+          <>
+            <SidebarTriggerDisappearsOnMobile />
+            <Sidebar>
+              <SidebarContent className="p-2 lg:pt-[3.2rem]">
+                {sidebarCategories.map((cat, i) => (
+                  <CvCategory layout="col" position={i} category={cat} descriptions={descriptions} key={cat.id} />
+                ))}
+              </SidebarContent>
+            </Sidebar>
+          </>
+        }
+        <div className="h-full w-full flex flex-wrap flex-row p-4 pt-8 ">
+          <div id="mainwrap" className="flex w-full flex-col gap-4 lg:px-[15vw]">
+            <div id="header" className="flex  w-full h-fit flex-row gap-4 flex-wrap">
+              {headerCategories.map((cat, i) => (
+                <CvCategory layout="row" position={i} category={cat} descriptions={descriptions} key={cat.id} />
+              ))}
+            </div>
+            <div id="colwrapper" className="flex flex-col lg:flex-row w-full h-3/4 gap-4">
+              <div id="col1" className={`flex flex-col w-full ${col1Categories.length > 0 ? "lg:w-1/2" : ""} h-full gap-4`}>
+                {col1Categories.map((cat, i) => (
+                  <CvCategory layout="col" position={i} category={cat} descriptions={descriptions} key={cat.id} />
+                ))}
+              </div>
+              <div id="col2" className={`flex flex-col w-full ${col2Categories.length > 0 ? "lg:w-1/2" : ""} h-full gap-4`}>
+                {col2Categories.map((cat, i) => (
+                  <CvCategory layout="col" position={i} category={cat} descriptions={descriptions} key={cat.id} />
+                ))}
+              </div>
+            </div>
+          </div>
+        </div>
+      </SidebarProvider>
+    </>
+  )
+}

src/app/cv/page.tsx

@@ -1,97 +1,42 @@
-'use client'
+import { Suspense, type ReactNode } from "react";
-import { useGSAP } from "@gsap/react";
+import { MDXRemote } from "next-mdx-remote/rsc";
-import { useGsapContext,useTimeLine } from "../_providers/GsapProvicer";
+import rehypeHighlight from "rehype-highlight";
-import { trpc } from "../_trpc/Client";
+import remarkGfm from "remark-gfm";
-import { useRef } from "react";
+import { servTrpc as trpc } from "../_trpc/ServerClient";
-import { SidebarContent, SidebarProvider, Sidebar } from "~/components/ui/sidebar";
+import { mdxComponents } from "~/components/mdx-components";
-import SidebarTriggerDisappearsOnMobile from "./_components/SidebarTriggerDisappearsOnMobile";
+import Page from "./_components/Page";
-import CvCategory from "./_components/CvCategory";
+
-import gsap from 'gsap'
+export default async function CvPage() {
-export default function CvPage() {
+  const cv = await trpc.categoryv2.listAllWithEntries();
-  const sidebarCategories = trpc.categoryv2.listByLayoutPosition.useQuery("sidebar");
+
-  const col1Categories = trpc.categoryv2.listByLayoutPosition.useQuery("col1");
+  // Render the MDX descriptions on the server so they exist at first paint.
-  const headerCategories = trpc.categoryv2.listByLayoutPosition.useQuery("header");
+  // The client tree (which runs the GSAP entrance via useTimeLine) only places
-  const col2Categories = trpc.categoryv2.listByLayoutPosition.useQuery("col2");
+  // these already-rendered nodes — it never invokes the MDX renderer itself, so
-  const gsapContext = useGsapContext()
+  // the 'use client' boundary stays intact and the animations no longer play
-  const container = useRef<HTMLDivElement>(null)
+  // against an un-rendered fallback.
-  enum Direction {
+  const descriptions: Record<string, ReactNode> = {};
-    Left = 1,
+  for (const category of cv ?? []) {
-    Up,
+    for (const entry of category.cvEntry) {
-    Right,
+      if (!entry.description?.trim()) continue;
-    Down
+      descriptions[entry.id] = (
-  }
+        <MDXRemote
-  const nextGsapConf = (direction: Direction) => {
+          source={entry.description}
-    switch (direction) {
+          components={mdxComponents}
-      case Direction.Left:
+          options={{
-        return { x: -100, opacity: 0, duration: 0.5 }
+            mdxOptions: {
-      case Direction.Up:
+              format: "md",
-        return { y: -100, opacity: 0, duration: 0.5 }
+              remarkPlugins: [remarkGfm],
-      case Direction.Right:
+              rehypePlugins: [rehypeHighlight],
-        return { x: 100, opacity: 0, duration: 0.5 }
+            },
-      case Direction.Down:
+          }}
-        return { y: 100, opacity: 0, duration: 0.5 }
+        />
+      );
     }
   }
-  useTimeLine(col2Categories)
+
-  useGSAP(() => {
-    const items = gsap?.utils.toArray<GSAPTweenTarget>('.gsapan');
-    let dir = Direction.Left;
-    items?.forEach(item => {
-      gsapContext?.addAnimation(gsap.from(item, nextGsapConf(dir)),0)
-      if (dir == Direction.Down) {
-        dir = Direction.Left
-      } else {
-        dir = dir + 1
-      }
-    })
-  }, { scope: container, dependencies: [headerCategories.data, sidebarCategories.data], revertOnUpdate: true })
   return (
-    <>
+    <Suspense>
-      <SidebarProvider ref={container}>
+      <Page cv={cv} descriptions={descriptions} />
-        {sidebarCategories.data &&
+    </Suspense>
-          <>
-            <SidebarTriggerDisappearsOnMobile />
-            <Sidebar className="gsapan ">
-              <SidebarContent className="p-2 lg:pt-[3.2rem]">
-                {sidebarCategories.data?.map((cat) => {
-                  if (cat !== undefined) {
-                    return (
-                      <CvCategory layout="col" initialData={cat} key={cat.id} />
-                    )
-                  }
-                })}
-              </SidebarContent>
-            </Sidebar>
-          </> 
-        }
-        <div className="h-full w-full flex flex-wrap flex-row p-4 pt-8 ">
-          <div id="mainwrap" className="flex w-full flex-col gap-4 lg:px-[15vw]">
-            <div id="header" className="flex  w-full h-fit flex-row gap-4 flex-wrap">
-              {headerCategories.data?.map((cat) => {
-                return (
-                  <CvCategory layout="row" initialData={cat} key={cat.id} />
-                )
-              })}
-            </div>
-            <div id="colwrapper" className="flex flex-col lg:flex-row w-full h-3/4 gap-4">
-              <div id="col1" className={`flex flex-col w-full ${col1Categories.data?.length ? col1Categories.data?.length : 0 > 0 ? "lg:w-1/2" : ""} h-full gap-4`}>
-                {col1Categories.data?.map((cat) => {
-                  return (
-                    <CvCategory layout="col" initialData={cat} key={cat.id} />
-                  )
-                })}
-              </div>
-              <div id="col2" className={`flex flex-col w-full ${col2Categories.data?.length ? col2Categories.data?.length : 0 > 0 ? "lg:w-1/2" : ""} h-full gap-4`}>
-                {col2Categories.data?.map((cat) => {
-                  return (
-                    <CvCategory layout="col" initialData={cat} key={cat.id} />
-                  )
-                })}
-              </div>
-            </div>
-          </div>
-        </div>
-      </SidebarProvider>
-    </>
   )
 }

src/app/layout.tsx

@@ -12,6 +12,7 @@ import TrpcProvider from "./_trpc/TrpcProvider";
 import ThemeProvider from './_providers/ThemeProvider'
 import GsapProvider from "./_providers/GsapProvicer";
 import {MessagesProvider} from "./_providers/MessagesProvider";
+import { MusicPlayerProvider } from "./music/_components/MusicPlayerProvider";
 import { CodeHighlightStyle } from "./_components/CodeHighlightSyle";
 import { cn } from "~/lib/utils";
 import AnimatedBackGroundContainer from "./_components/Animated/AnimatedBackGroundContainer";
@@ -49,14 +50,16 @@ export default async function RootLayout({
 						<body className="flex flex-col bg-background text-foreground">
 							<ThemeProvider>
 							<MessagesProvider>
+								<MusicPlayerProvider>
 								<AnimatedBackGroundContainer followSpeed={0.003} particleCount={100} orbitRadius={2000}>
 									<TopNav />
-									<main className="absolute lg:top-10 h-screen lg:h-[calc(100vh-var(--spacing)*10)] w-screen">
+									<main className="absolute lg:top-10 h-[100dvh] lg:h-[calc(100vh-var(--spacing)*10)] w-screen">
 										{children}
 									</main>
 									{modal}
 								</AnimatedBackGroundContainer>
 								<ChatFAB />
+								</MusicPlayerProvider>
 								</MessagesProvider>
 							</ThemeProvider>
 						</body>

src/app/music/_components/AudioPlayer.tsx

@@ -6,6 +6,7 @@ import type WaveSurfer from "wavesurfer.js";
 import { Download, Loader2, Pause, Play } from "lucide-react";
 import { Button } from "~/components/ui/button";
 import { toast } from "sonner";
+import { useMusicPlayer } from "./MusicPlayerProvider";
 
 function formatTime(seconds: number) {
 	if (!Number.isFinite(seconds)) return "0:00";
@@ -28,32 +29,46 @@ function waveColors() {
 	};
 }
 
+/**
+ * Per-track waveform. Playback itself is owned by the shared MusicPlayer engine
+ * (so it keeps running across navigation); this wavesurfer instance is only a
+ * visual + seek surface that mirrors the engine when its track is active.
+ */
 export default function AudioPlayer(props: {
-	/** Streaming-friendly source the player actually plays. */
+	id: string;
 	src: string;
-	/** Original high-quality file offered via the download button. */
 	downloadUrl: string;
 	downloadName: string;
 }) {
 	const containerRef = useRef<HTMLDivElement>(null);
 	const wsRef = useRef<WaveSurfer | null>(null);
-	const [playing, setPlaying] = useState(false);
-	const [current, setCurrent] = useState(0);
-	const [duration, setDuration] = useState(0);
 	const [ready, setReady] = useState(false);
+	const [duration, setDuration] = useState(0);
 	const [downloading, setDownloading] = useState(false);
 	const { resolvedTheme } = useTheme();
 
+	const { currentId, isPlaying, currentTime, toggle, seek, subscribeTime } = useMusicPlayer();
+	const isActive = currentId === props.id;
+
+	// Reach live values from the once-created wavesurfer callbacks.
+	const isActiveRef = useRef(isActive);
+	isActiveRef.current = isActive;
+	const currentTimeRef = useRef(currentTime);
+	currentTimeRef.current = currentTime;
+	const toggleRef = useRef(toggle);
+	toggleRef.current = toggle;
+	const seekRef = useRef(seek);
+	seekRef.current = seek;
+
 	useEffect(() => {
 		let ws: WaveSurfer | null = null;
 		let cancelled = false;
 		setReady(false);
-		setCurrent(0);
 
 		(async () => {
 			const WaveSurferClass = (await import("wavesurfer.js")).default;
 			if (cancelled || !containerRef.current) return;
-			ws = WaveSurferClass.create({
+			const instance = WaveSurferClass.create({
 				container: containerRef.current,
 				url: props.src,
 				height: 44,
@@ -64,15 +79,20 @@ export default function AudioPlayer(props: {
 				cursorWidth: 1,
 				...waveColors(),
 			});
-			wsRef.current = ws;
+			ws = instance;
-			ws.on("ready", () => {
+			wsRef.current = instance;
+			instance.on("ready", () => {
+				// This media is for drawing only — never let it make sound.
+				instance.setMuted(true);
 				setReady(true);
-				setDuration(ws?.getDuration() ?? 0);
+				setDuration(instance.getDuration());
+				if (isActiveRef.current) instance.setTime(currentTimeRef.current);
+			});
+			// Clicking the waveform: start this track if it isn't playing, then seek.
+			instance.on("interaction", (time: number) => {
+				if (!isActiveRef.current) toggleRef.current(props.id);
+				seekRef.current(time);
 			});
-			ws.on("play", () => setPlaying(true));
-			ws.on("pause", () => setPlaying(false));
-			ws.on("finish", () => setPlaying(false));
-			ws.on("timeupdate", (t) => setCurrent(t));
 		})();
 
 		return () => {
@@ -82,15 +102,23 @@ export default function AudioPlayer(props: {
 		};
 	}, [props.src]);
 
+	// Mirror the engine's playback position onto the cursor while active.
+	useEffect(() => {
+		const ws = wsRef.current;
+		if (!ws || !ready) return;
+		if (!isActive) {
+			ws.setTime(0);
+			return;
+		}
+		ws.setTime(currentTimeRef.current);
+		return subscribeTime((t) => wsRef.current?.setTime(t));
+	}, [isActive, ready, subscribeTime]);
+
 	// Re-tint the waveform when the user toggles light/dark.
 	useEffect(() => {
 		wsRef.current?.setOptions(waveColors());
 	}, [resolvedTheme]);
 
-	function togglePlay() {
-		wsRef.current?.playPause();
-	}
-
 	async function handleDownload() {
 		setDownloading(true);
 		try {
@@ -114,6 +142,8 @@ export default function AudioPlayer(props: {
 		}
 	}
 
+	const playing = isActive && isPlaying;
+
 	return (
 		<div className="flex items-center gap-3 rounded-lg border bg-transparent px-3 py-2">
 			<Button
@@ -122,13 +152,13 @@ export default function AudioPlayer(props: {
 				variant="ghost"
 				aria-label={playing ? "Pause" : "Play"}
 				disabled={!ready}
-				onClick={togglePlay}
+				onClick={() => toggle(props.id)}
 			>
 				{playing ? <Pause /> : <Play />}
 			</Button>
 
 			<span className="w-10 shrink-0 text-right font-mono text-xs text-muted-foreground tabular-nums">
-				{formatTime(current)}
+				{formatTime(isActive ? currentTime : 0)}
 			</span>
 
 			<div className="relative flex-1">

src/app/music/_components/MusicMiniPlayer.tsx

@@ -0,0 +1,73 @@
+'use client'
+
+import { useState } from "react";
+import { Music } from "lucide-react";
+import {
+	Drawer,
+	DrawerContent,
+	DrawerHeader,
+	DrawerTitle,
+	DrawerTrigger,
+} from "~/components/ui/drawer";
+import { Slider } from "~/components/ui/slider";
+import { useMusicPlayer } from "./MusicPlayerProvider";
+import PlayerControls from "./PlayerControls";
+
+function formatTime(seconds: number) {
+	if (!Number.isFinite(seconds)) return "0:00";
+	const m = Math.floor(seconds / 60);
+	const s = Math.floor(seconds % 60);
+	return `${m}:${s.toString().padStart(2, "0")}`;
+}
+
+/**
+ * Global, persistent mini-player: a floating button (shown once something is
+ * loaded) that opens a drawer with the transport controls and a scrubber, so
+ * playback can be controlled from any page while it keeps running in the
+ * background.
+ */
+export default function MusicMiniPlayer() {
+	const { currentTrack, isPlaying, currentTime, duration, seek } = useMusicPlayer();
+	const [open, setOpen] = useState(false);
+
+	if (!currentTrack) return null;
+
+	return (
+		<Drawer open={open} onOpenChange={setOpen}>
+			<DrawerTrigger asChild>
+				<button
+					type="button"
+					aria-label="Open player"
+					className="fixed bottom-4 left-4 z-40 flex max-w-[60vw] items-center gap-2 rounded-full border bg-background/80 px-4 py-2 shadow-lg backdrop-blur-md transition-colors hover:bg-background"
+				>
+					<Music className={isPlaying ? "animate-pulse" : ""} />
+					<span className="truncate text-sm">{currentTrack.title}</span>
+				</button>
+			</DrawerTrigger>
+			<DrawerContent>
+				<DrawerHeader>
+					<DrawerTitle>{currentTrack.title}</DrawerTitle>
+				</DrawerHeader>
+				<div className="mx-auto flex w-full max-w-md flex-col gap-4 px-4 pb-8">
+					<div className="flex items-center gap-2">
+						<span className="w-10 text-right font-mono text-xs text-muted-foreground tabular-nums">
+							{formatTime(currentTime)}
+						</span>
+						<Slider
+							className="flex-1"
+							min={0}
+							max={duration || 1}
+							step={0.1}
+							value={[currentTime]}
+							onValueChange={([v]) => seek(v ?? 0)}
+						/>
+						<span className="w-10 font-mono text-xs text-muted-foreground tabular-nums">
+							{formatTime(duration)}
+						</span>
+					</div>
+					<PlayerControls />
+				</div>
+			</DrawerContent>
+		</Drawer>
+	);
+}

src/app/music/_components/MusicPlayerProvider.tsx

@@ -0,0 +1,314 @@
+'use client'
+
+import {
+	createContext,
+	useCallback,
+	useContext,
+	useEffect,
+	useMemo,
+	useRef,
+	useState,
+	type ReactNode,
+} from "react";
+import { trpc } from "~/app/_trpc/Client";
+import MusicMiniPlayer from "./MusicMiniPlayer";
+
+export type PlayerTrack = {
+	id: string;
+	title: string;
+	/** Streaming-friendly source actually played. */
+	src: string;
+	/** Original high-quality file for the download button. */
+	downloadUrl: string;
+	downloadName: string;
+};
+
+type MusicPlayerValue = {
+	tracks: PlayerTrack[];
+	currentId: string | null;
+	currentTrack: PlayerTrack | null;
+	isPlaying: boolean;
+	shuffle: boolean;
+	currentTime: number;
+	duration: number;
+	/** Play button on a track: start it, or toggle play/pause if already current. */
+	toggle: (id: string) => void;
+	/** Global play/pause — acts on the current track (or starts the first one). */
+	togglePlayCurrent: () => void;
+	next: () => void;
+	previous: () => void;
+	toggleShuffle: () => void;
+	seek: (seconds: number) => void;
+	/** Subscribe to playback time updates (for waveform cursors). */
+	subscribeTime: (cb: (time: number) => void) => () => void;
+};
+
+const MusicPlayerContext = createContext<MusicPlayerValue | null>(null);
+
+export function useMusicPlayer() {
+	const ctx = useContext(MusicPlayerContext);
+	if (!ctx) throw new Error("useMusicPlayer must be used within a MusicPlayerProvider");
+	return ctx;
+}
+
+export function MusicPlayerProvider({ children }: { children: ReactNode }) {
+	// The provider owns the playlist so playback survives navigating away from
+	// the music page. The query is cached, so the music page shares this request.
+	const { data } = trpc.music.list.useQuery();
+	const tracks = useMemo<PlayerTrack[]>(
+		() =>
+			(data ?? []).map((t) => ({
+				id: t.id,
+				title: t.title,
+				src: t.streamUrl ?? t.fileUrl,
+				downloadUrl: t.fileUrl,
+				downloadName: t.fileName,
+			})),
+		[data],
+	);
+
+	const [currentId, setCurrentId] = useState<string | null>(null);
+	const [isPlaying, setIsPlaying] = useState(false);
+	const [shuffle, setShuffle] = useState(false);
+	const [currentTime, setCurrentTime] = useState(0);
+	const [duration, setDuration] = useState(0);
+
+	const audioRef = useRef<HTMLAudioElement | null>(null);
+	const tracksRef = useRef(tracks);
+	tracksRef.current = tracks;
+
+	// Lightweight pub/sub so each waveform can follow playback time without every
+	// player re-rendering on the audio element's frequent timeupdate.
+	const timeSubs = useRef<Set<(t: number) => void>>(new Set());
+	const subscribeTime = useCallback((cb: (t: number) => void) => {
+		timeSubs.current.add(cb);
+		return () => {
+			timeSubs.current.delete(cb);
+		};
+	}, []);
+	const emitTime = useCallback((t: number) => {
+		timeSubs.current.forEach((cb) => cb(t));
+	}, []);
+
+	const currentTrack = useMemo(
+		() => tracks.find((t) => t.id === currentId) ?? null,
+		[tracks, currentId],
+	);
+
+	const toggle = useCallback((id: string) => {
+		setCurrentId((prev) => {
+			if (prev === id) {
+				setIsPlaying((p) => !p);
+				return prev;
+			}
+			setIsPlaying(true);
+			return id;
+		});
+	}, []);
+
+	const togglePlayCurrent = useCallback(() => {
+		setCurrentId((prev) => {
+			if (prev) {
+				setIsPlaying((p) => !p);
+				return prev;
+			}
+			const first = tracksRef.current[0]?.id ?? null;
+			if (first) setIsPlaying(true);
+			return first;
+		});
+	}, []);
+
+	const step = useCallback((dir: 1 | -1) => {
+		const ids = tracksRef.current.map((t) => t.id);
+		if (ids.length === 0) return;
+		setCurrentId((prev) => {
+			let nextId: string;
+			if (shuffle && dir === 1 && ids.length > 1) {
+				do {
+					nextId = ids[Math.floor(Math.random() * ids.length)]!;
+				} while (nextId === prev);
+			} else {
+				const idx = prev ? ids.indexOf(prev) : -1;
+				nextId = ids[(idx + dir + ids.length) % ids.length]!;
+			}
+			setIsPlaying(true);
+			return nextId;
+		});
+	}, [shuffle]);
+	const next = useCallback(() => step(1), [step]);
+	const previous = useCallback(() => step(-1), [step]);
+	const toggleShuffle = useCallback(() => setShuffle((s) => !s), []);
+
+	const stepRef = useRef(step);
+	stepRef.current = step;
+
+	const seek = useCallback(
+		(s: number) => {
+			if (audioRef.current) audioRef.current.currentTime = s;
+			setCurrentTime(s);
+			emitTime(s);
+		},
+		[emitTime],
+	);
+
+	// Persistent audio element + listeners, created once on the client.
+	useEffect(() => {
+		const audio = new Audio();
+		audio.preload = "metadata";
+		audioRef.current = audio;
+		const onTime = () => {
+			setCurrentTime(audio.currentTime);
+			emitTime(audio.currentTime);
+		};
+		const onMeta = () => setDuration(audio.duration || 0);
+		const onEnded = () => stepRef.current(1);
+		audio.addEventListener("timeupdate", onTime);
+		audio.addEventListener("loadedmetadata", onMeta);
+		audio.addEventListener("ended", onEnded);
+		return () => {
+			audio.pause();
+			audio.removeEventListener("timeupdate", onTime);
+			audio.removeEventListener("loadedmetadata", onMeta);
+			audio.removeEventListener("ended", onEnded);
+			audioRef.current = null;
+		};
+	}, [emitTime]);
+
+	// Swap the source when the current track changes.
+	useEffect(() => {
+		const audio = audioRef.current;
+		if (!audio) return;
+		if (!currentTrack) {
+			audio.removeAttribute("src");
+			audio.load();
+			return;
+		}
+		if (audio.src !== currentTrack.src) {
+			audio.src = currentTrack.src;
+			audio.load();
+			setCurrentTime(0);
+			setDuration(0);
+		}
+	}, [currentTrack]);
+
+	// Reflect the desired play state onto the element.
+	useEffect(() => {
+		const audio = audioRef.current;
+		if (!audio || !currentTrack) return;
+		if (isPlaying) audio.play().catch(() => {});
+		else audio.pause();
+	}, [isPlaying, currentTrack]);
+
+	// OS-level media controls (lock screen, notification shade, media keys, etc.)
+	// via the Media Session API. Wire the transport actions to our state.
+	useEffect(() => {
+		if (typeof navigator === "undefined" || !("mediaSession" in navigator)) return;
+		const ms = navigator.mediaSession;
+		const handlers: [MediaSessionAction, MediaSessionActionHandler][] = [
+			["play", () => setIsPlaying(true)],
+			["pause", () => setIsPlaying(false)],
+			["previoustrack", () => stepRef.current(-1)],
+			["nexttrack", () => stepRef.current(1)],
+			[
+				"seekto",
+				(details) => {
+					if (typeof details.seekTime === "number") seek(details.seekTime);
+				},
+			],
+			[
+				"seekbackward",
+				(details) => seek((audioRef.current?.currentTime ?? 0) - (details.seekOffset ?? 10)),
+			],
+			[
+				"seekforward",
+				(details) => seek((audioRef.current?.currentTime ?? 0) + (details.seekOffset ?? 10)),
+			],
+		];
+		for (const [action, handler] of handlers) {
+			try {
+				ms.setActionHandler(action, handler);
+			} catch {
+				// Action unsupported by this browser — ignore.
+			}
+		}
+		return () => {
+			for (const [action] of handlers) {
+				try {
+					ms.setActionHandler(action, null);
+				} catch {
+					// ignore
+				}
+			}
+		};
+	}, [seek]);
+
+	// Keep the OS-visible metadata in sync with the current track.
+	useEffect(() => {
+		if (typeof navigator === "undefined" || !("mediaSession" in navigator)) return;
+		navigator.mediaSession.metadata = currentTrack
+			? new MediaMetadata({
+					title: currentTrack.title,
+					artist: "Gregor Lohaus",
+				})
+			: null;
+	}, [currentTrack]);
+
+	// Reflect play/pause state to the OS so the right button is shown.
+	useEffect(() => {
+		if (typeof navigator === "undefined" || !("mediaSession" in navigator)) return;
+		navigator.mediaSession.playbackState = currentTrack
+			? isPlaying
+				? "playing"
+				: "paused"
+			: "none";
+	}, [isPlaying, currentTrack]);
+
+	// Keep the scrubber position on the OS controls in sync.
+	useEffect(() => {
+		if (typeof navigator === "undefined" || !("mediaSession" in navigator)) return;
+		if (!("setPositionState" in navigator.mediaSession)) return;
+		try {
+			if (duration > 0 && Number.isFinite(duration)) {
+				navigator.mediaSession.setPositionState({
+					duration,
+					position: Math.min(currentTime, duration),
+					playbackRate: audioRef.current?.playbackRate ?? 1,
+				});
+			} else {
+				navigator.mediaSession.setPositionState();
+			}
+		} catch {
+			// Some browsers throw on invalid state — ignore.
+		}
+	}, [currentTime, duration]);
+
+	const value = useMemo<MusicPlayerValue>(
+		() => ({
+			tracks,
+			currentId,
+			currentTrack,
+			isPlaying,
+			shuffle,
+			currentTime,
+			duration,
+			toggle,
+			togglePlayCurrent,
+			next,
+			previous,
+			toggleShuffle,
+			seek,
+			subscribeTime,
+		}),
+		[
+			tracks, currentId, currentTrack, isPlaying, shuffle, currentTime, duration,
+			toggle, togglePlayCurrent, next, previous, toggleShuffle, seek, subscribeTime,
+		],
+	);
+
+	return (
+		<MusicPlayerContext.Provider value={value}>
+			{children}
+			<MusicMiniPlayer />
+		</MusicPlayerContext.Provider>
+	);
+}

src/app/music/_components/Page.tsx

@@ -0,0 +1,68 @@
+'use client'
+
+import * as Card from "~/components/ui/card";
+import { useTimeLine } from "../../_providers/GsapProvicer";
+import AnimatedPageTitle from "../../_components/Animated/AnimatedPageTitle";
+import AnimateTextIn from "../../_components/Animated/AnimateIn";
+import { ScrollArea } from "~/components/ui/scroll-area";
+import AnimatePopUp from "../../_components/Animated/AnimatePopUp";
+import AudioPlayer from "./AudioPlayer";
+import type { RouterOutputs } from "~/server/routers/_app";
+
+export default function MusicPage(props: {
+  tracks: RouterOutputs['music']['list'],
+}) {
+  const { tracks } = props;
+  useTimeLine(tracks)
+  return (
+    <ScrollArea className="px-10 lg:px-0 w-full h-full max-w-4xl mx-auto pt-10">
+      <AnimatedPageTitle position={0}><span>Just Some </span> <span>Music I Made</span> </AnimatedPageTitle>
+      <div className="flex flex-wrap h-fit content-center">
+        <AnimateTextIn once className="flex flex-wrap mr-[1em]" position={0.5}>
+          <div><p className="break-after-avoid mr-[1em]">All works on this page are licensed under:</p></div>
+          <div><a href="https://creativecommons.org/licenses/by-nc-sa/4.0/">CC BY-NC-SA 4.0</a></div>
+        </AnimateTextIn>
+        <AnimatePopUp duration={1} ease='elastic.inOut' position={2} once className="items-center content-center">
+          <div className="flex flex-row">
+            <img className="max-w-[1em]" src="https://mirrors.creativecommons.org/presskit/icons/cc.svg" alt="" />
+            <img className="max-w-[1em] ml-[1em]" src="https://mirrors.creativecommons.org/presskit/icons/by.svg" alt="" />
+            <img className="max-w-[1em] ml-[1em]" src="https://mirrors.creativecommons.org/presskit/icons/nc.svg" alt="" />
+            <img className="max-w-[1em] ml-[1em]" src="https://mirrors.creativecommons.org/presskit/icons/sa.svg" alt="" />
+          </div>
+        </AnimatePopUp>
+      </div>
+      <div className="pt-10" />
+      {tracks && tracks.map((track, i) => (
+        <div key={track.id}>
+          <Card.AnimatedCard position={i + 1}>
+            <Card.CardHeader>
+              <AnimateTextIn once position={i + 1.2} animation="slide">
+                <Card.CardTitle>{track.title}</Card.CardTitle>
+              </AnimateTextIn>
+            </Card.CardHeader>
+            <Card.CardContent className="flex flex-col gap-3">
+              {track.description && (
+                <AnimatePopUp once position={i + 1.25} duration={2}>
+                  <p className="text-sm text-muted-foreground">{track.description}</p>
+                </AnimatePopUp>
+              )}
+              <AnimatePopUp duration={2} ease='elastic.inOut'  position={i + 1.3} once>
+                <AudioPlayer
+                  id={track.id}
+                  src={track.streamUrl ?? track.fileUrl}
+                  downloadUrl={track.fileUrl}
+                  downloadName={track.fileName}
+                />
+              </AnimatePopUp>
+            </Card.CardContent>
+          </Card.AnimatedCard>
+          <div className="pt-5" />
+        </div>
+      ))}
+      {!tracks?.length &&
+        <div className="flex justify-center items-center text-muted-foreground">
+          No music yet.
+        </div>}
+    </ScrollArea>
+  );
+}

src/app/music/_components/PlayerControls.tsx

@@ -0,0 +1,40 @@
+'use client'
+
+import { Pause, Play, Shuffle, SkipBack, SkipForward } from "lucide-react";
+import { Button } from "~/components/ui/button";
+import { useMusicPlayer } from "./MusicPlayerProvider";
+
+export default function PlayerControls() {
+	const { isPlaying, shuffle, togglePlayCurrent, next, previous, toggleShuffle } =
+		useMusicPlayer();
+
+	return (
+		<div className="flex items-center justify-center gap-1">
+			<Button type="button" size="icon" variant="ghost" aria-label="Previous track" onClick={previous}>
+				<SkipBack />
+			</Button>
+			<Button
+				type="button"
+				size="icon-lg"
+				variant="secondary"
+				aria-label={isPlaying ? "Pause" : "Play"}
+				onClick={togglePlayCurrent}
+			>
+				{isPlaying ? <Pause /> : <Play />}
+			</Button>
+			<Button type="button" size="icon" variant="ghost" aria-label="Skip to next track" onClick={next}>
+				<SkipForward />
+			</Button>
+			<Button
+				type="button"
+				size="icon"
+				variant={shuffle ? "secondary" : "ghost"}
+				aria-label={shuffle ? "Shuffle on" : "Shuffle off"}
+				aria-pressed={shuffle}
+				onClick={toggleShuffle}
+			>
+				<Shuffle />
+			</Button>
+		</div>
+	);
+}

src/app/music/page.tsx

@@ -1,66 +1,13 @@
-'use client'
+import { Suspense } from "react";
-import { trpc } from "~/app/_trpc/Client";
+import { servTrpc as trpc } from "../_trpc/ServerClient";
-import * as Card from "~/components/ui/card";
+import Page from "./_components/Page";
-import { useTimeLine } from "../_providers/GsapProvicer";
+
-import AnimatedPageTitle from "../_components/Animated/AnimatedPageTitle";
+export default async function MusicPage() {
-import { Spinner } from "~/components/ui/spinner";
+  const tracks = await trpc.music.list();
-import AnimateTextIn from "../_components/Animated/AnimateIn";
+
-import { ScrollArea } from "~/components/ui/scroll-area";
-import AnimatePopUp from "../_components/Animated/AnimatePopUp";
-import AudioPlayer from "./_components/AudioPlayer";
-export default function MusicPage() {
-	const { data: tracks, isLoading } = trpc.music.list.useQuery();
-	useTimeLine(tracks)
   return (
-    <ScrollArea className="px-10 lg:px-0 w-full h-full max-w-4xl mx-auto pt-10">
+    <Suspense>
-			<AnimatedPageTitle position={0}><span>Just Some </span> <span>Music I Made</span> </AnimatedPageTitle>
+      <Page tracks={tracks} />
-			<div className="flex flex-wrap h-fit content-center">
+    </Suspense>
-				<AnimateTextIn className="flex flex-wrap mr-[1em]" position={0.5}>
-					<div><p className="break-after-avoid mr-[1em]">All works on this page are licensed under:</p></div>
-					<div><a href="https://creativecommons.org/licenses/by-nc-sa/4.0/">CC BY-NC-SA 4.0</a></div>
-				</AnimateTextIn>
-				<AnimatePopUp position={2} className="items-center content-center">
-					<div className="flex flex-row">
-						<img className="max-w-[1em]" src="https://mirrors.creativecommons.org/presskit/icons/cc.svg" alt="" />
-						<img className="max-w-[1em] ml-[1em]" src="https://mirrors.creativecommons.org/presskit/icons/by.svg" alt="" />
-						<img className="max-w-[1em] ml-[1em]" src="https://mirrors.creativecommons.org/presskit/icons/nc.svg" alt="" />
-						<img className="max-w-[1em] ml-[1em]" src="https://mirrors.creativecommons.org/presskit/icons/sa.svg" alt="" />
-					</div>
-				</AnimatePopUp>
-			</div>
-			<div className="pt-10" />
-			{tracks && tracks.map((track, i) => (
-				<div key={track.id}>
-					<Card.AnimatedCard position={i + 1}>
-						<Card.CardHeader>
-							<AnimateTextIn position={i + 1.2} animation="slide">
-								<Card.CardTitle>{track.title}</Card.CardTitle>
-							</AnimateTextIn>
-						</Card.CardHeader>
-						<Card.CardContent className="flex flex-col gap-3">
-							{track.description && (
-								<p className="text-sm text-muted-foreground gsapant">{track.description}</p>
-							)}
-							<AnimatePopUp position={i + 1.3}>
-								<AudioPlayer
-									src={track.streamUrl ?? track.fileUrl}
-									downloadUrl={track.fileUrl}
-									downloadName={track.fileName}
-								/>
-							</AnimatePopUp>
-						</Card.CardContent>
-					</Card.AnimatedCard>
-					<div className="pt-5" />
-				</div>
-			))}
-			{!isLoading && !tracks?.length &&
-				<div className="flex justify-center items-center text-muted-foreground">
-					No music yet.
-				</div>
-			}
-			{isLoading && <div className="w-full h-full items-center flex flex-row content-center gap-4 justify-center">
-				<Spinner /> Loading Tracks
-			</div>}
-		</ScrollArea>
   );
 }

src/app/projects/_components/Page.tsx

@@ -0,0 +1,111 @@
+'use client'
+
+import type { ReactNode } from "react";
+import * as Card from "~/components/ui/card";
+import { Badge } from "~/components/ui/badge";
+import { StackBadge } from "~/components/StackBadge";
+import { ScrollArea } from "~/components/ui/scroll-area";
+import AnimatedPageTitle from "../../_components/Animated/AnimatedPageTitle";
+import AnimateTextIn from "../../_components/Animated/AnimateIn";
+import { useTimeLine } from "../../_providers/GsapProvicer";
+import AnimatePopUp from "../../_components/Animated/AnimatePopUp";
+import { Button } from "~/components/ui/button";
+import type { RouterOutputs } from "~/server/routers/_app";
+
+export default function ProjectsPage(props: {
+  projects: RouterOutputs['projectv2']['listWithStack'],
+  descriptions: Record<string, ReactNode>,
+}) {
+  const { projects, descriptions } = props;
+  useTimeLine(projects)
+
+  if (!projects?.length) {
+    return (
+      <div className="flex justify-center items-center min-h-[200px] text-muted-foreground">
+        No projects yet.
+      </div>
+    );
+  }
+
+  return (
+    <ScrollArea className="px-10 lg:px-0 w-full h-full max-w-4xl mx-auto pt-10">
+      <AnimatedPageTitle position={0}><span>Projects I've Been</span><span> Working on</span> </AnimatedPageTitle>
+      <div className="pt-10" />
+      {projects.map((project, i) => (
+        <div id={project.id} key={i} className="scroll-mt-10">
+          <Card.AnimatedCard position={i + 1.2} key={project.id}>
+            <Card.CardHeader>
+              <div className="flex items-start justify-between gap-2 flex-wrap">
+                <AnimateTextIn once position={i + 1.4} animation="slide"><Card.CardTitle>{project.title}</Card.CardTitle></AnimateTextIn>
+                <div className="flex gap-2 flex-wrap">
+                  {project.sourceType && (
+                    <AnimatePopUp position={i + 2} duration={2} once>
+                      <Badge variant={project.sourceType === "open" ? "secondary" : "outline"}>
+                        {project.sourceType === "open" ? "Open Source" : "Closed Source"}
+                      </Badge>
+                    </AnimatePopUp>
+                  )}
+                  {project.releaseStatus && (
+                    <Badge variant={project.releaseStatus === "released" ? "default" : "outline"}>
+                      {project.releaseStatus === "released" ? "Released" : "Unreleased"}
+                    </Badge>
+                  )}
+                </div>
+              </div>
+            </Card.CardHeader>
+            {(project.description || project.sourceLink || project.releaseLink || project.techStack?.stackItems?.length) && (
+              <Card.CardContent className="flex flex-col gap-3">
+                {project.description && (
+                  <div className="prose prose-sm dark:prose-invert max-w-none text-muted-foreground">
+                    <AnimatePopUp once position={i + 1.4} duration={10}>
+                      {descriptions[project.id] ?? project.description}
+                    </AnimatePopUp>
+                  </div>
+                )}
+                <div className="flex flex-row">
+                  {project.techStack?.stackItems && project.techStack.stackItems.length > 0 && (
+                    <div className="flex flex-wrap gap-1.5">
+                      {project.techStack.stackItems.map((item, k) => (
+                        <AnimatePopUp key={k} position={(i + 2) + k * 0.5} once>  <StackBadge key={item} item={item} /> </AnimatePopUp>
+                      ))}
+                    </div>
+                  )}
+                  {(project.sourceLink || project.releaseLink) && (
+                    <div className="ml-auto flex-col lg:flex-row justify-center gap-5">
+                      {project.sourceLink &&
+                        <Button variant='outline' className="cursor-pointer mb-3 lg:mb-0 lg:mr-3 min-w-18">
+                          <a
+                            href={project.sourceLink}
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            className='items-center'
+                          >
+                            Source
+                          </a>
+                        </Button>
+                      }
+                      {project.releaseLink &&
+                        <Button variant='default' className="cursor-pointer min-w-18 items-center">
+                          <a
+                            href={project.releaseLink}
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            className='items-center'
+                          >
+                            Live
+                          </a>
+                        </Button>
+
+                      }
+                    </div>
+                  )}
+                </div>
+              </Card.CardContent>
+            )}
+          </Card.AnimatedCard>
+          <div className="pt-5" />
+        </div>
+      ))}
+    </ScrollArea>
+  );
+}

src/app/projects/page.tsx

@@ -1,121 +1,40 @@
-'use client'
+import { Suspense, type ReactNode } from "react";
+import { MDXRemote } from "next-mdx-remote/rsc";
+import rehypeHighlight from "rehype-highlight";
+import remarkGfm from "remark-gfm";
+import { servTrpc as trpc } from "../_trpc/ServerClient";
+import { mdxComponents } from "~/components/mdx-components";
+import Page from "./_components/Page";
 
-import { trpc } from "~/app/_trpc/Client";
+export default async function ProjectsPage() {
-import * as Card from "~/components/ui/card";
+  const projects = await trpc.projectv2.listWithStack();
-import { Badge } from "~/components/ui/badge";
-import { StackBadge } from "~/components/StackBadge";
-import Markdown from "react-markdown";
-import { ScrollArea } from "~/components/ui/scroll-area";
-import AnimatedPageTitle from "../_components/Animated/AnimatedPageTitle";
-import AnimateTextIn from "../_components/Animated/AnimateIn";
-import { useTimeLine } from "../_providers/GsapProvicer";
-import AnimatePopUp from "../_components/Animated/AnimatePopUp";
-import { Button } from "~/components/ui/button";
-import remarkGfm from "remark-gfm"
 
-export default function ProjectsPage() {
+  // Render the MDX descriptions on the server so they exist at first paint.
-  const { data: projects, isLoading } = trpc.projectv2.listWithStack.useQuery();
+  // The client tree (which runs the GSAP entrance via useTimeLine) only places
-  useTimeLine(projects)
+  // these already-rendered nodes — it never invokes the MDX renderer itself, so
-  if (isLoading) {
+  // the 'use client' boundary stays intact and the animations no longer play
-    return (
+  // against an un-rendered fallback.
-      <div className="flex justify-center items-center min-h-[200px] text-muted-foreground">
+  const descriptions: Record<string, ReactNode> = {};
-        Loading...
+  for (const project of projects ?? []) {
-      </div>
+    if (!project.description?.trim()) continue;
-    );
+    descriptions[project.id] = (
-  }
+      <MDXRemote
-
+        source={project.description}
-  if (!projects?.length) {
+        components={mdxComponents}
-    return (
+        options={{
-      <div className="flex justify-center items-center min-h-[200px] text-muted-foreground">
+          mdxOptions: {
-        No projects yet.
+            format: "md",
-      </div>
+            remarkPlugins: [remarkGfm],
+            rehypePlugins: [rehypeHighlight],
+          },
+        }}
+      />
     );
   }
 
   return (
-    <ScrollArea className="px-10 lg:px-0 w-full h-full max-w-4xl mx-auto pt-10">
+    <Suspense>
-      <AnimatedPageTitle position={0}><span>Projects I've Been</span><span> Working on</span> </AnimatedPageTitle>
+      <Page projects={projects} descriptions={descriptions} />
-      <div className="pt-10" />
+    </Suspense>
-      {projects.map((project, i) => (
-        <div id={project.id} key={i} className="scroll-mt-10">
-          <Card.AnimatedCard position={i + 1.2} key={project.id}>
-            <Card.CardHeader>
-              <div className="flex items-start justify-between gap-2 flex-wrap">
-                <AnimateTextIn once position={i + 1.4} animation="slide"><Card.CardTitle>{project.title}</Card.CardTitle></AnimateTextIn>
-                <div className="flex gap-2 flex-wrap">
-                  {project.sourceType && (
-                    <AnimatePopUp position={i + 2} duration={2} once>
-                      <Badge variant={project.sourceType === "open" ? "secondary" : "outline"}>
-                        {project.sourceType === "open" ? "Open Source" : "Closed Source"}
-                      </Badge>
-                    </AnimatePopUp>
-                  )}
-                  {project.releaseStatus && (
-                    <Badge variant={project.releaseStatus === "released" ? "default" : "outline"}>
-                      {project.releaseStatus === "released" ? "Released" : "Unreleased"}
-                    </Badge>
-                  )}
-                </div>
-              </div>
-            </Card.CardHeader>
-            {(project.description || project.sourceLink || project.releaseLink || project.techStack?.stackItems?.length) && (
-              <Card.CardContent className="flex flex-col gap-3">
-                {project.description && (
-                  <div className="prose prose-sm dark:prose-invert max-w-none text-muted-foreground">
-                    <AnimatePopUp once position={i + 1.4} duration={10}>
-                      <Markdown remarkPlugins={[remarkGfm]}>{project.description}</Markdown>
-                    </AnimatePopUp>
-                  </div>
-                )}
-                <div className="flex flex-row">
-                  {project.techStack?.stackItems && project.techStack.stackItems.length > 0 && (
-                    <div className="flex flex-wrap gap-1.5">
-                      {project.techStack.stackItems.map((item, k) => (
-                        <AnimatePopUp key={k} position={(i + 2) + k * 0.5} once>  <StackBadge key={item} item={item} /> </AnimatePopUp>
-                      ))}
-                    </div>
-                  )}
-                  {(project.sourceLink || project.releaseLink) && (
-                    <div className="ml-auto flex-col lg:flex-row justify-center gap-5">
-                      {project.sourceLink &&
-                        <Button variant='outline' className="cursor-pointer mb-3 lg:mb-0 lg:mr-3 min-w-18">
-                          <a
-                            href={project.sourceLink}
-                            target="_blank"
-                            rel="noopener noreferrer"
-                            className='items-center'
-                          >
-                            Source
-                          </a>
-                        </Button>
-                      }
-                      {project.releaseLink &&
-                        <Button variant='default' className="cursor-pointer min-w-18 items-center">
-                          <a
-                            href={project.releaseLink}
-                            target="_blank"
-                            rel="noopener noreferrer"
-                            className='items-center'
-                          >
-                            Live
-                          </a>
-                        </Button>
-
-                      }
-                    </div>
-                  )}
-                </div>
-              </Card.CardContent>
-            )}
-          </Card.AnimatedCard>
-          <div className="pt-5" />
-        </div>
-      ))}
-      {/* Scroll runway: lets the last cards' ScrollTrigger exit points be
-          reached past the visible area, so on short viewports the second-to-last
-          card animates out off-screen instead of being frozen mid-exit at the
-          bottom of the scroll. Tune the height if a card is still caught. */}
-      <div aria-hidden className="h-[70dvh] shrink-0" />
-    </ScrollArea>
   );
 }

src/components/ClientMdx.tsx

@@ -0,0 +1,79 @@
+"use client";
+
+import { evaluate } from "@mdx-js/mdx";
+import { MDXProvider, useMDXComponents } from "@mdx-js/react";
+import type { MDXComponents } from "mdx/types";
+import { useEffect, useState, type ComponentType, type ReactNode } from "react";
+import * as runtime from "react/jsx-runtime";
+import rehypeHighlight from "rehype-highlight";
+import remarkGfm from "remark-gfm";
+import { mdxComponents } from "~/components/mdx-components";
+
+type MdxModule = {
+  default: ComponentType<{ components?: MDXComponents }>;
+};
+
+type ClientMdxProps = {
+  source: string;
+  components?: MDXComponents;
+  format?: "md" | "mdx";
+  fallback?: ReactNode;
+  errorFallback?: (error: Error) => ReactNode;
+};
+
+export function ClientMdx({
+  source,
+  components = mdxComponents,
+  format = "md",
+  fallback = null,
+  errorFallback,
+}: ClientMdxProps) {
+  const [Content, setContent] = useState<MdxModule["default"] | null>(null);
+  const [error, setError] = useState<Error | null>(null);
+
+  useEffect(() => {
+    let cancelled = false;
+    const trimmed = source.trim();
+
+    if (!trimmed) {
+      setContent(null);
+      setError(null);
+      return;
+    }
+
+    void evaluate(trimmed, {
+      ...runtime,
+      baseUrl: import.meta.url,
+      format,
+      useMDXComponents,
+      rehypePlugins: [rehypeHighlight],
+      remarkPlugins: [remarkGfm],
+    })
+      .then((mod) => {
+        if (cancelled) return;
+        setContent(() => (mod as MdxModule).default);
+        setError(null);
+      })
+      .catch((nextError: unknown) => {
+        if (cancelled) return;
+        setContent(null);
+        setError(nextError instanceof Error ? nextError : new Error("Failed to render MDX"));
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [format, source]);
+
+  if (error) {
+    return errorFallback ? errorFallback(error) : <p>{source}</p>;
+  }
+
+  if (!Content) return <>{fallback}</>;
+
+  return (
+    <MDXProvider components={components}>
+      <Content components={components} />
+    </MDXProvider>
+  );
+}

src/components/mdx-components.tsx

@@ -1,5 +1,10 @@
 import Link from "next/link";
-import { Children, isValidElement, type ComponentPropsWithoutRef, type ReactNode } from "react";
+import {
+  Children,
+  isValidElement,
+  type ComponentPropsWithoutRef,
+  type ReactNode,
+} from "react";
 import { Badge } from "~/components/ui/badge";
 import { Button } from "~/components/ui/button";
 import { cn } from "~/lib/utils";

src/components/ui/card.tsx

@@ -1,3 +1,4 @@
+"use client"
 import * as React from "react"
 import { useRef } from "react";
 import gsap from 'gsap'
@@ -36,7 +37,9 @@ function AnimatedCard({
     scrollOnly,
     once,
     debugId: `card-${position}`,
-    makeReveal: (el) => gsap.from(el, { x: -100, opacity: 0, duration: 0.5, paused: true }),
+    // Start hidden via CSS (see className) so the server-rendered card never
+    // flashes visible before GSAP runs; reveal animates *to* the shown state.
+    makeReveal: (el) => gsap.to(el, { x: 0, opacity: 1, duration: 0.5, paused: true }),
   })
   return (
     <div
@@ -44,7 +47,7 @@ function AnimatedCard({
       data-slot="card"
       data-size={size}
       className={cn(
-        "group/card flex flex-col gap-4 overflow-hidden rounded-xl bg-card py-4 text-sm text-card-foreground ring-1 ring-foreground/10 has-data-[slot=card-footer]:pb-0 has-[>img:first-child]:pt-0 data-[size=sm]:gap-3 data-[size=sm]:py-3 data-[size=sm]:has-data-[slot=card-footer]:pb-0 *:[img:first-child]:rounded-t-xl *:[img:last-child]:rounded-b-xl bg-opacity-60 backdrop-blur-sm",
+        "opacity-0 -translate-x-[100px] group/card flex flex-col gap-4 overflow-hidden rounded-xl bg-card py-4 text-sm text-card-foreground ring-1 ring-foreground/10 has-data-[slot=card-footer]:pb-0 has-[>img:first-child]:pt-0 data-[size=sm]:gap-3 data-[size=sm]:py-3 data-[size=sm]:has-data-[slot=card-footer]:pb-0 *:[img:first-child]:rounded-t-xl *:[img:last-child]:rounded-b-xl bg-opacity-60 backdrop-blur-sm",
         className
       )}
       {...props}

src/server/routers/blog.ts

@@ -305,6 +305,25 @@ export const blogRouter = router({
     };
   }),
 
+  metadataBySlug: publicProcedure.input(z.string()).query(async ({ input: slug }) => {
+    const post = await db.query.blogPost.findFirst({
+      where(fields, operators) {
+        return operators.eq(fields.slug, slug);
+      },
+    });
+
+    if (!post) throw new TRPCError({ code: "NOT_FOUND", message: `Post "${slug}" not found` });
+
+    return {
+      slug: post.slug,
+      title: post.title,
+      date: post.date,
+      description: post.description,
+      tags: post.tags ?? [],
+      fileUrl: post.fileUrl,
+    };
+  }),
+
   syncFromUploadThing: publicProcedure.mutation(async () => {
     await assertAdmin();
 

src/server/routers/cvCategory.ts

@@ -13,6 +13,20 @@ export const cvCategoryRouter = router({
     console.log(res);
     return res;
   }),
+  // Single round-trip for the whole CV page: every category (across all layout
+  // positions) with its entries already populated. Lets the page fetch-then-render
+  // instead of waterfalling per-category/per-entry queries, so all content is
+  // present before the entrance animation runs.
+  listAllWithEntries: publicProcedure.query(async () => {
+    const res = await db.query.cvCategory.findMany({
+      with: {
+        cvEntry: {
+          orderBy: (t, { desc }) => desc(t.toTime),
+        },
+      },
+    })
+    return res;
+  }),
   getById: publicProcedure.input(z.string()).query(async ({input}) => {
     const res = await db.query.cvCategory.findFirst({
       where(fields, operators) {

src/server/trpc.ts

@@ -1,5 +1,8 @@
 import { initTRPC } from "@trpc/server"
+import superjson from "superjson"
 
-const t = initTRPC.create();
+const t = initTRPC.create({
+	transformer: superjson,
+});
 export const router = t.router;
 export const publicProcedure = t.procedure;