18 Commits

38 changed files with 1367 additions and 1246 deletions

1029
bun.lock

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

@@ -9,6 +9,7 @@ const AnimatePopUp = ({
ease='elastic', ease='elastic',
scrollOnly=false, scrollOnly=false,
once=false, once=false,
debugId,
}:{ }:{
children:ReactNode children:ReactNode
position:gsap.Position, position:gsap.Position,
@@ -17,9 +18,10 @@ const AnimatePopUp = ({
ease?:gsap.EaseString|gsap.EaseFunction, ease?:gsap.EaseString|gsap.EaseFunction,
scrollOnly?:boolean, scrollOnly?:boolean,
once?:boolean, once?:boolean,
debugId?:string,
}) => { }) => {
return ( 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} />
) )
} }

View File

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

View File

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

View File

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

View File

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

View File

@@ -20,6 +20,25 @@ ScrollTrigger.config({ ignoreMobileResize: true })
// element and mount the GSDevTools timeline scrubber. Handy for seeing exactly // element and mount the GSDevTools timeline scrubber. Handy for seeing exactly
// where each card's enter/exit lines sit relative to the viewport. // where each card's enter/exit lines sit relative to the viewport.
export const GSAP_DEBUG = false 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<{ const GsapContext = createContext<{
// Add a real animation (with its own duration) to the entrance timeline. // Add a real animation (with its own duration) to the entrance timeline.
addAnimation: ( addAnimation: (
@@ -47,14 +66,24 @@ export function useGsapContext() {
export const useTimeLine = (dep:any,all?:boolean) => { export const useTimeLine = (dep:any,all?:boolean) => {
const gsapContext = useGsapContext() const gsapContext = useGsapContext()
useEffect(() => { 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) { if (dep instanceof Array && all) {
let acc = true; let acc = true;
let allDepsSatisfied = dep.reduce((p,c) => c !== undefined && p ,acc ) let allDepsSatisfied = dep.reduce((p,c) => c !== undefined && p ,acc )
if (allDepsSatisfied) { if (allDepsSatisfied) {
if (GSAP_DEBUG) console.log("[cv-debug][useTimeLine:resume-all]")
gsapContext?.resumeTimeline() gsapContext?.resumeTimeline()
} }
} else { } else {
if (dep) { if (dep) {
if (GSAP_DEBUG) console.log("[cv-debug][useTimeLine:resume]")
gsapContext?.resumeTimeline() gsapContext?.resumeTimeline()
} }
} }
@@ -100,7 +129,7 @@ export default function GsapProvider({ children }: { children: ReactNode }) {
devToolsCreated.current = true devToolsCreated.current = true
GSDevTools.create({ animation: tl.current }) GSDevTools.create({ animation: tl.current })
} }
return () => { console.log("gsap cleanup") } return () => { if (GSAP_DEBUG) console.log("gsap cleanup") }
}) })
// Handoff: fire registered callbacks once, when the entrance finishes. // Handoff: fire registered callbacks once, when the entrance finishes.
@@ -108,11 +137,19 @@ export default function GsapProvider({ children }: { children: ReactNode }) {
const readyCbs = useRef<Array<() => void>>([]) const readyCbs = useRef<Array<() => void>>([])
const fireReady = useCallback(() => { const fireReady = useCallback(() => {
if (readyFired.current) return 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 readyFired.current = true
readyCbs.current.forEach((cb) => cb()) readyCbs.current.forEach((cb) => cb())
readyCbs.current = [] readyCbs.current = []
},[]) },[])
const onReady = useCallback((cb: () => void) => { const onReady = useCallback((cb: () => void) => {
if (GSAP_DEBUG) console.log("[cv-debug][gsap:onReady]", { readyFired: readyFired.current })
if (readyFired.current) cb() if (readyFired.current) cb()
else readyCbs.current.push(cb) else readyCbs.current.push(cb)
},[]) },[])
@@ -122,14 +159,43 @@ export default function GsapProvider({ children }: { children: ReactNode }) {
// entrance already played). Parking a tween in a finished, paused timeline // 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 // would freeze it at its from-state, so once the entrance is done let the
// (live) tween play on its own instead. // (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 if (readyFired.current) return
tl.current?.add(animation, position); 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) => { const schedule = useCallback((fn: () => void, position: gsap.Position) => {
// Same late-arrival case: a callback added past the playhead never fires, so // Same late-arrival case: a callback added past the playhead never fires, so
// run the reveal immediately once the entrance has finished. // 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 } if (readyFired.current) { fn(); return }
tl.current?.add(fn, position) 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 // Throttle ScrollTrigger.refresh() to once per frame so the ResizeObserver
@@ -148,6 +214,12 @@ export default function GsapProvider({ children }: { children: ReactNode }) {
const resizeObserver = useRef<ResizeObserver | null>(null) const resizeObserver = useRef<ResizeObserver | null>(null)
const resetTimeline = useCallback(() => { 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?.kill()
tl.current?.revert() tl.current?.revert()
ScrollTrigger.getAll().forEach(st => st.kill()) ScrollTrigger.getAll().forEach(st => st.kill())
@@ -161,7 +233,19 @@ export default function GsapProvider({ children }: { children: ReactNode }) {
const resumeTimeline = useCallback(() => { const resumeTimeline = useCallback(() => {
const t = tl.current 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 // When the orchestrated entrance finishes, hand off to scroll control and
// realign triggers against the now-settled layout. // realign triggers against the now-settled layout.
t.eventCallback("onComplete", () => { fireReady(); ScrollTrigger.refresh() }) t.eventCallback("onComplete", () => { fireReady(); ScrollTrigger.refresh() })
@@ -185,6 +269,13 @@ export default function GsapProvider({ children }: { children: ReactNode }) {
} }
t.resume() t.resume()
if (GSAP_DEBUG) {
console.log("[cv-debug][gsap:resume:after]", {
duration: t.duration(),
progress: t.progress(),
paused: t.paused(),
})
}
},[getScroller, fireReady, scheduleRefresh]) },[getScroller, fireReady, scheduleRefresh])
// Fonts/markdown/images loading also change content height after the triggers // Fonts/markdown/images loading also change content height after the triggers

View File

@@ -1,22 +1,3 @@
import { httpBatchLink } from "@trpc/client";
import { trpcRouter } from "~/server/routers/_app"; 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`}),
],
});

View File

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

View File

@@ -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>
);
}

View File

@@ -4,9 +4,9 @@ import { useEffect, useState } from 'react'
import { MDXRemote } from 'next-mdx-remote' import { MDXRemote } from 'next-mdx-remote'
import { serialize } from 'next-mdx-remote/serialize' import { serialize } from 'next-mdx-remote/serialize'
import type { MDXRemoteSerializeResult } from 'next-mdx-remote' 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 [compiled, setCompiled] = useState<MDXRemoteSerializeResult | null>(null)
const [error, setError] = useState<string | null>(null) const [error, setError] = useState<string | null>(null)

View File

@@ -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} />,
}
}

View File

@@ -10,15 +10,8 @@ import { TextInputFormField, MdeFormField } from '~/app/_components/Form/Fields'
import { usePathname, useRouter } from 'next/navigation' import { usePathname, useRouter } from 'next/navigation'
import { useTheme } from 'next-themes' import { useTheme } from 'next-themes'
import type { RouterOutputs } from '~/server/routers/_app' 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'] type BlogPost = RouterOutputs['blog']['bySlug']
@@ -35,116 +28,6 @@ function parseTags(value: string | undefined): string[] {
return value?.split(',').map((tag) => tag.trim()).filter(Boolean) ?? [] 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 }) { export default function CreateUpdateBlogForm(params: { className?: string, entity?: BlogPost }) {
const [slug, setSlug] = useState<string | undefined>(params.entity?.slug) const [slug, setSlug] = useState<string | undefined>(params.entity?.slug)
const [originalSlug, setOriginalSlug] = 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 path = usePathname()
const router = useRouter() 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({ const createMutation = trpc.blog.insert.useMutation({
onSuccess: (data) => { onSuccess: (data) => {
@@ -226,9 +104,7 @@ export default function CreateUpdateBlogForm(params: { className?: string, entit
name='content' name='content'
label='Content' label='Content'
dataColorMode={(theme as 'dark' | 'light') ?? 'dark'} dataColorMode={(theme as 'dark' | 'light') ?? 'dark'}
autocompleteSuggestions={autocompleteSuggestions} {...mdxEditorProps}
triggerConfigs={blogTriggerConfigs}
renderPreview={(source) => <BlogMdxEditorPreview source={source} />}
/> />
</FormScaffold> </FormScaffold>
</div> </div>

View File

@@ -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>
);
}

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,5 +1,5 @@
'use client' 'use client'
import { useState, useEffect } from 'react' import { useState, useEffect, useRef } from 'react'
import { useChat } from '@ai-sdk/react' import { useChat } from '@ai-sdk/react'
import { DefaultChatTransport, type UIMessage } from 'ai' import { DefaultChatTransport, type UIMessage } from 'ai'
import { Button } from '~/components/ui/button' import { Button } from '~/components/ui/button'
@@ -83,14 +83,21 @@ function AuthenticatedChatInterface({ dbMessages, sessionId }: ChatInterfaceProp
sendMessage({ text }) sendMessage({ text })
} }
const gsapContext = useGsapContext() const gsapContext = useGsapContext()
const didInitialScroll = useRef(false)
useEffect(() => { 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 ( return (
<div className="flex flex-col h-full"> <div className="flex flex-col h-full">
{messages && {messages &&
@@ -114,7 +121,7 @@ function AuthenticatedChatInterface({ dbMessages, sessionId }: ChatInterfaceProp
</div> </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 <Textarea
name='message' name='message'
value={input} value={input}

View File

@@ -6,7 +6,7 @@ import { ScrollArea } from '~/components/ui/scroll-area';
import { memo } from 'react'; import { memo } from 'react';
const Messages = memo(({messages,status}: { messages: UIMessage[],status:ChatStatus}) => { const Messages = memo(({messages,status}: { messages: UIMessage[],status:ChatStatus}) => {
return ( 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) => ( {messages.map((message, i) => (
<Card.AnimatedCard scrollOnly={true} key={i}> <Card.AnimatedCard scrollOnly={true} key={i}>
<Card.CardContent> <Card.CardContent>

View File

@@ -9,11 +9,11 @@ export default function ChatPage() {
const {messages,session,isLoading,error} = useMessages() const {messages,session,isLoading,error} = useMessages()
useTimeLine(messages) useTimeLine(messages)
return ( 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}> <AnimatedPageTitle position={0}>
<span>Talk To My </span> <span> AI-Assistant</span> <span>Talk To My </span> <span> AI-Assistant</span>
</AnimatedPageTitle> </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 && {!isLoading &&
<ChatInterface sessionId={session?.id} dbMessages={messages ?? []}/> <ChatInterface sessionId={session?.id} dbMessages={messages ?? []}/>
} }

View File

@@ -1,42 +1,43 @@
'use client' import type { ReactNode } from "react"
import { trpc } from "~/app/_trpc/Client"
import CvEntry from "./CvEntry" import CvEntry from "./CvEntry"
import type { RouterOutputs } from "~/server/routers/_app" import type { RouterOutputs } from "~/server/routers/_app"
import { cn } from "~/lib/utils" import { cn } from "~/lib/utils"
import { AnimatedCard, CardContent, CardHeader, CardTitle } from "~/components/ui/card" import { AnimatedCard, CardContent, CardHeader, CardTitle } from "~/components/ui/card"
import type { ArrayElement } from "type-fest" 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"; import { ScrollArea } from "~/components/ui/scroll-area";
export type CvCategoryData = ArrayElement<RouterOutputs['categoryv2']['listAllWithEntries']>
type CvCategoryProps = { type CvCategoryProps = {
initialData: ArrayElement<RouterOutputs['categoryv2']['listByLayoutPosition']>, category: CvCategoryData,
layout: "row"|"col", layout: "row" | "col",
position?: number, position?: number,
children?: React.ReactElement<Parameters<typeof CvEntry>> 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 (
const position = props.position ?? 0 <AnimatedCard position={position} className={cn(layout == "row" ? "w-full" : "", "h-screen")}>
return ( <CardHeader>
<AnimatedCard position={position} className={cn(props.layout == "row" ? "w-full" : "", "h-screen")}> <AnimateTextIn once position={position + 0.2} animation="slide" debugId={`cv-category-title:${category.name}:${position + 0.2}`}>
<CardHeader> <CardTitle>{category.name}</CardTitle>
<CardTitle> </AnimateTextIn>
{category.data?.name} </CardHeader>
</CardTitle> {entries.length > 0 ?
</CardHeader> <CardContent className={cn(layout == "row" ? "flex flex-row flex-wrap justify-center lg:justify-between" : "flex flex-col", "gap-4", "overflow-scroll")}>
{(entries.data?.length ? entries.data?.length : 0 ) > 0 ? <ScrollArea>
<CardContent className={cn(props.layout == "row" ? "flex flex-row flex-wrap justify-center lg:justify-between" : "flex flex-col","gap-4","overflow-scroll")}> {entries.map((entry, i) => (
<ScrollArea> <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}>
{entries.data?.map((entry,i) => ( <CvEntry position={position + 0.4 + i * 0.2} entry={entry} description={descriptions[entry.id]} className={layout == "row" ? "w-full lg:w-fit" : undefined} />
<AnimatePopUp position={position + 0.4 + i * 0.2} key={entry.id}> </AnimatePopUp>
<CvEntry className={props.layout == "row" ? "w-full lg:w-fit" : undefined} initialData={entry}/> ))}
</AnimatePopUp> </ScrollArea>
))} </CardContent>
</ScrollArea> :
</CardContent> <></>
: }
<></> </AnimatedCard>
} )
</AnimatedCard>
)
} }

View File

@@ -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 { 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 { 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" 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 ( return (
<> <Card className={className ? cn("w-fit", className) : "w-fit"}>
{ {entry.title ?
data ? <CardHeader>
<> <AnimateTextIn position={position} animation="slide" debugId={`cv-entry-title:${entry.title}:${position}`}>
<Card className={params.className ? cn("w-fit", params.className) : "w-fit"}> <CardTitle> {entry.title} </CardTitle>
{ </AnimateTextIn>
data.title ? </CardHeader> :
<CardHeader> <></>
<CardTitle> {data.title} </CardTitle>
</CardHeader> :
<></>
}
{
data.description ?
<CardContent className="text-sm lg:text-base">
<article className="prose prose-zinc dark:prose-invert max-w-none">
<Markdown rehypePlugins={[rehypeHighlight, rehypeRaw]}>{data.description}</Markdown>
</article>
</CardContent> :
<></>
}
{
!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')}`}
</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>
</>
} }
</> {entry.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">
{description ?? entry.description}
</article>
</AnimatedDiv>
</CardContent> :
<></>
}
{!entry.hideDates ?
<CardFooter className="text-sm">
<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>
) )
} }

View File

@@ -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>
</>
)
}

View File

@@ -1,56 +1,42 @@
'use client' import { Suspense, type ReactNode } from "react";
import { useTimeLine } from "../_providers/GsapProvicer"; import { MDXRemote } from "next-mdx-remote/rsc";
import { trpc } from "../_trpc/Client"; import rehypeHighlight from "rehype-highlight";
import { SidebarContent, SidebarProvider, Sidebar } from "~/components/ui/sidebar"; import remarkGfm from "remark-gfm";
import SidebarTriggerDisappearsOnMobile from "./_components/SidebarTriggerDisappearsOnMobile"; import { servTrpc as trpc } from "../_trpc/ServerClient";
import CvCategory from "./_components/CvCategory"; import { mdxComponents } from "~/components/mdx-components";
export default function CvPage() { import Page from "./_components/Page";
const sidebarCategories = trpc.categoryv2.listByLayoutPosition.useQuery("sidebar");
const col1Categories = trpc.categoryv2.listByLayoutPosition.useQuery("col1"); export default async function CvPage() {
const headerCategories = trpc.categoryv2.listByLayoutPosition.useQuery("header"); const cv = await trpc.categoryv2.listAllWithEntries();
const col2Categories = trpc.categoryv2.listByLayoutPosition.useQuery("col2");
useTimeLine(col2Categories.data) // Render the MDX descriptions on the server so they exist at first paint.
// The client tree (which runs the GSAP entrance via useTimeLine) only places
// these already-rendered nodes — it never invokes the MDX renderer itself, so
// the 'use client' boundary stays intact and the animations no longer play
// against an un-rendered fallback.
const descriptions: Record<string, ReactNode> = {};
for (const category of cv ?? []) {
for (const entry of category.cvEntry) {
if (!entry.description?.trim()) continue;
descriptions[entry.id] = (
<MDXRemote
source={entry.description}
components={mdxComponents}
options={{
mdxOptions: {
format: "md",
remarkPlugins: [remarkGfm],
rehypePlugins: [rehypeHighlight],
},
}}
/>
);
}
}
return ( return (
<> <Suspense>
<SidebarProvider> <Page cv={cv} descriptions={descriptions} />
{sidebarCategories.data && </Suspense>
<>
<SidebarTriggerDisappearsOnMobile />
<Sidebar>
<SidebarContent className="p-2 lg:pt-[3.2rem]">
{sidebarCategories.data?.map((cat, i) => {
if (cat !== undefined) {
return (
<CvCategory layout="col" position={i} 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, i) => (
<CvCategory layout="row" position={i} 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, i) => (
<CvCategory layout="col" position={i} 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, i) => (
<CvCategory layout="col" position={i} initialData={cat} key={cat.id} />
))}
</div>
</div>
</div>
</div>
</SidebarProvider>
</>
) )
} }

View File

@@ -53,7 +53,7 @@ export default async function RootLayout({
<MusicPlayerProvider> <MusicPlayerProvider>
<AnimatedBackGroundContainer followSpeed={0.003} particleCount={100} orbitRadius={2000}> <AnimatedBackGroundContainer followSpeed={0.003} particleCount={100} orbitRadius={2000}>
<TopNav /> <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} {children}
</main> </main>
{modal} {modal}

View File

@@ -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>
);
}

View File

@@ -1,67 +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"; return (
import AnimatePopUp from "../_components/Animated/AnimatePopUp"; <Suspense>
import AudioPlayer from "./_components/AudioPlayer"; <Page tracks={tracks} />
export default function MusicPage() { </Suspense>
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">
<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 && (
<p className="text-sm text-muted-foreground gsapant">{track.description}</p>
)}
<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>
))}
{!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>
);
} }

View File

@@ -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>
);
}

View File

@@ -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 ( 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>
); );
} }

View File

@@ -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>
);
}

View File

@@ -1,5 +1,10 @@
import Link from "next/link"; 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 { Badge } from "~/components/ui/badge";
import { Button } from "~/components/ui/button"; import { Button } from "~/components/ui/button";
import { cn } from "~/lib/utils"; import { cn } from "~/lib/utils";

View File

@@ -1,3 +1,4 @@
"use client"
import * as React from "react" import * as React from "react"
import { useRef } from "react"; import { useRef } from "react";
import gsap from 'gsap' import gsap from 'gsap'
@@ -36,7 +37,9 @@ function AnimatedCard({
scrollOnly, scrollOnly,
once, once,
debugId: `card-${position}`, 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 ( return (
<div <div
@@ -44,7 +47,7 @@ function AnimatedCard({
data-slot="card" data-slot="card"
data-size={size} data-size={size}
className={cn( 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 className
)} )}
{...props} {...props}

View File

@@ -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 () => { syncFromUploadThing: publicProcedure.mutation(async () => {
await assertAdmin(); await assertAdmin();

View File

@@ -13,6 +13,20 @@ export const cvCategoryRouter = router({
console.log(res); console.log(res);
return 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}) => { getById: publicProcedure.input(z.string()).query(async ({input}) => {
const res = await db.query.cvCategory.findFirst({ const res = await db.query.cvCategory.findFirst({
where(fields, operators) { where(fields, operators) {

View File

@@ -1,5 +1,8 @@
import { initTRPC } from "@trpc/server" 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 router = t.router;
export const publicProcedure = t.procedure; export const publicProcedure = t.procedure;