21 Commits

Author SHA1 Message Date
c742b8e457 fix height problems 2026-06-18 01:58:53 +02:00
0d79adb104 fix cv animations 2026-06-18 01:41:25 +02:00
3e5be46503 Merge branch 'mdx-refactor' 2026-06-18 01:33:00 +02:00
73ba2b573d cleanup markdown 2026-06-18 01:32:05 +02:00
c1fe73dbd0 remove stupid spacer 2026-06-16 19:55:38 +02:00
af4ff18917 Merge branch 'fix-cv-animations' 2026-06-16 19:16:37 +02:00
b59fb2b3af fetch on render instead of fetch as you render 2026-06-16 19:16:31 +02:00
58dc4ce53f Merge branch 'background-music-playback' 2026-06-16 19:13:44 +02:00
53bc70ab05 use audio session api 2026-06-16 19:13:32 +02:00
1b3f30cc90 Merge branch 'fix-cv-animations' 2026-06-16 19:10:33 +02:00
fd5063d1c4 cv entry uses animated components 2026-06-16 19:10:28 +02:00
303ac83fe2 Merge branch 'backround-music-playback' 2026-06-16 19:01:21 +02:00
91315730ac background playback 2026-06-16 19:00:59 +02:00
13649cd6dc Merge branch 'fix-cv-animations' 2026-06-16 18:56:05 +02:00
1e0f033d07 refactor to use existing animated components 2026-06-16 18:56:02 +02:00
39563b6740 Merge branch 'fix-cv-animations' 2026-06-16 18:42:19 +02:00
dcc4f47ccf fix cv animations 2026-06-16 18:42:06 +02:00
c8a9ab5984 Merge branch 'ai-model-select' 2026-06-16 18:40:14 +02:00
54f108ac8d model selector 2026-06-16 18:40:08 +02:00
865ef0b316 refactor animations once again 2026-06-16 15:41:03 +02:00
63b0405a7a display waveform 2026-06-16 13:07:41 +02:00
35 changed files with 1802 additions and 1039 deletions

1032
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,11 +107,13 @@
"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",
"uploadthing": "^7.7.4", "uploadthing": "^7.7.4",
"vaul": "^1.1.2", "vaul": "^1.1.2",
"wavesurfer.js": "^7.12.8",
"zod": "^4.4.3" "zod": "^4.4.3"
}, },
"devDependencies": { "devDependencies": {

View File

@@ -1,62 +1,46 @@
import { useGSAP } from "@gsap/react"; "use client"
import { useRef, type HTMLAttributes, type ReactNode } from "react"; import { useRef, type HTMLAttributes, type ReactNode } from "react";
import { useGsapContext } from "~/app/_providers/GsapProvicer";
import { SplitText } from "gsap/SplitText"; import { SplitText } from "gsap/SplitText";
import gsap from 'gsap' import gsap from 'gsap'
import { cn } from "~/lib/utils"; import { cn } from "~/lib/utils";
import { useReveal } from "./useReveal";
const AnimateTextIn = ({ const AnimateTextIn = ({
children, children,
animation = "type", animation = "type",
position = 0, position = 0,
tlId = undefined,
speed = 1, speed = 1,
scrollOnly = false, scrollOnly = false,
once = false,
debugId,
className className
}: { }: {
children: ReactNode, children: ReactNode,
animation?: "type" | "slide", animation?: "type" | "slide",
position?: gsap.Position, position?: gsap.Position,
tlId?: string,
scrollOnly?: boolean, scrollOnly?: boolean,
once?: boolean,
debugId?: string,
speed?: number, speed?: number,
className?: HTMLAttributes<HTMLDivElement>['className'] className?: HTMLAttributes<HTMLDivElement>['className']
}) => { }) => {
const el = useRef<HTMLDivElement>(null) const el = useRef<HTMLDivElement>(null)
const gsapContext = useGsapContext(); useReveal(el, {
useGSAP(() => { position,
const rect = el.current?.getBoundingClientRect() scrollOnly,
const scroller = gsapContext?.getScroller() once,
console.log(scroller) debugId: debugId ?? `text-${position}`,
let viewportTop = 0 makeReveal: (node) => {
let viewportBottom = window.innerHeight // The wrapper starts at opacity 0 (so there's no flash of unsplit text);
if (scroller && scroller instanceof Element) { // reveal the wrapper and let the per-character tween do the animation.
const scrollerRect = scroller.getBoundingClientRect() gsap.set(node, { opacity: 1 })
viewportTop = scrollerRect.top const split = new SplitText(node, { type: 'chars' })
viewportBottom = scrollerRect.top + scrollerRect.height
}
const isInView = rect && rect.bottom > viewportTop && rect.top < viewportBottom
console.log(isInView)
const chars = new SplitText(el.current, { type: 'chars' })
gsapContext?.addAnimation(gsap.to(el.current, { opacity: 100, duration: 0 }), 0, tlId)
const fromVars = animation === "slide" const fromVars = animation === "slide"
? { opacity: 0, x: -10, duration: 0.2 * speed, stagger: { each: 0.08 * speed }, ease: 'bounce.inOut', onComplete: () => chars.revert() } ? { opacity: 0, x: -10, duration: 0.2 * speed, stagger: { each: 0.08 * speed }, ease: 'bounce.inOut' }
: { opacity: 0, duration: 0.01 * speed, stagger: { each: 0.04 * speed }, ease: 'bounce.inOut', onComplete: () => chars.revert() } : { opacity: 0, duration: 0.01 * speed, stagger: { each: 0.04 * speed }, ease: 'bounce.inOut' }
if (isInView && !scrollOnly) { return gsap.from(split.chars, { ...fromVars, paused: true })
gsapContext?.addAnimation(gsap.from(chars.chars, fromVars), position, tlId) },
} else {
gsap.from(chars.chars,
{
...fromVars,
scrollTrigger: {
trigger: el.current,
start: 'top bottom',
end: 'bottom top',
toggleActions: "play reverse play reverse",
scroller
}
}) })
}
}, { dependencies: [] })
return ( return (
<div ref={el} className={cn(className, "opacity-0")}> <div ref={el} className={cn(className, "opacity-0")}>
{children} {children}

View File

@@ -6,16 +6,22 @@ const AnimatePopUp = ({
position, position,
className, className,
duration=1, duration=1,
ease='elastic' ease='elastic',
scrollOnly=false,
once=false,
debugId,
}:{ }:{
children:ReactNode children:ReactNode
position:gsap.Position, position:gsap.Position,
className?:HTMLAttributes<HTMLDivElement>['className'] className?:HTMLAttributes<HTMLDivElement>['className']
duration?:number, duration?:number,
ease?:gsap.EaseString|gsap.EaseFunction ease?:gsap.EaseString|gsap.EaseFunction,
scrollOnly?:boolean,
once?:boolean,
debugId?:string,
}) => { }) => {
return ( return (
<AnimatedDiv children={children} position={position} 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,36 +1,40 @@
"use client"
import gsap from "gsap"; import gsap from "gsap";
import { type HTMLAttributes, import { type HTMLAttributes, type ReactNode, useRef } from "react";
type ReactNode, useLayoutEffect, useRef } from "react"; import { useReveal } from "./useReveal";
import { useGsapContext } from "~/app/_providers/GsapProvicer";
const AnimatedDiv = ( const AnimatedDiv = (
{ {
children, children,
position, position,
className, className,
animationMode = 'to', animationMode = 'to',
scrollOnly = false,
once = false,
debugId,
...tweenVars ...tweenVars
}: }:
gsap.TweenVars & { gsap.TweenVars & {
children: ReactNode, children: ReactNode,
position: gsap.Position, position: gsap.Position,
animationMode?: 'from' | 'to', animationMode?: 'from' | 'to',
scrollOnly?: boolean,
once?: boolean,
debugId?: string,
className?: HTMLAttributes<HTMLDivElement>['className'] className?: HTMLAttributes<HTMLDivElement>['className']
} }
) => { ) => {
const div = useRef<HTMLDivElement>(null); const div = useRef<HTMLDivElement>(null)
const gsapContext = useGsapContext() useReveal(div, {
useLayoutEffect(() => { position,
let tween:gsap.core.Tween; scrollOnly,
switch(animationMode) { once,
case 'from': debugId,
tween = gsap.from(div.current,tweenVars); makeReveal: (el) =>
break; animationMode === 'from'
case 'to': ? gsap.from(el, { ...tweenVars, paused: true })
tween = gsap.to(div.current,tweenVars); : gsap.to(el, { ...tweenVars, paused: true }),
break; })
}
gsapContext?.addAnimation(tween,position)
},[])
return ( return (
<div ref={div} className={className}> <div ref={div} className={className}>
{children} {children}

View File

@@ -0,0 +1,134 @@
'use client'
import { useGSAP } from "@gsap/react"
import { ScrollTrigger } from "gsap/all"
import type { RefObject } from "react"
import { GSAP_DEBUG, nearestScroller, useGsapContext } from "~/app/_providers/GsapProvicer"
export type UseRevealOptions = {
position: gsap.Position
/** Skip the orchestrated entrance and let ScrollTrigger drive from the start. */
scrollOnly?: boolean
/**
* Reveal once and keep it: after the element animates in (entrance or first
* scroll-in) it never reverses on leave. Default false = animate out at the
* top and back in on scroll-up.
*/
once?: boolean
debugId?: string
/**
* Build the hidden -> shown animation for `el`. It must be a single,
* *independent* animation (not added to any timeline): `play()` reveals,
* `reverse()` hides. The hook pauses it, schedules its entrance through the
* shared timeline, and lets a ScrollTrigger drive the very same animation on
* scroll — so the two modes never fight over the element.
*/
makeReveal: (el: HTMLElement) => gsap.core.Tween | gsap.core.Timeline
}
/**
* Shared reveal behavior for cards, text and pop-ups: an element in view at
* load plays an orchestrated timeline entrance, then hands the *same* tween to
* a ScrollTrigger that animates it out at the top and back in on scroll-up. An
* element off-screen at load is ScrollTrigger-driven from the start.
*/
export function useReveal(
ref: RefObject<HTMLElement | null>,
{ position, scrollOnly = false, once = false, debugId, makeReveal }: UseRevealOptions,
) {
const ctx = useGsapContext()
useGSAP(() => {
const el = ref.current
if (!el || !ctx) {
if (GSAP_DEBUG) console.log("[cv-debug][useReveal:skip]", { debugId, hasEl: !!el, hasCtx: !!ctx })
return
}
const scroller = nearestScroller(el)
const scrollerEl = scroller instanceof Element ? scroller : undefined
const rect = el.getBoundingClientRect()
let top = 0
let bottom = window.innerHeight
if (scrollerEl) {
const r = scrollerEl.getBoundingClientRect()
top = r.top
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.
// Re-measure as it animates so positions track the real layout instead of
// only correcting at the very end. requestRefresh is throttled + deferred to
// the next frame, so this won't re-enter a ScrollTrigger callback.
reveal.eventCallback("onUpdate", () => ctx.requestRefresh())
reveal.pause()
const baseTrigger = {
trigger: el,
start: "top bottom",
end: "bottom top",
scroller: scrollerEl,
markers: GSAP_DEBUG,
id: GSAP_DEBUG ? debugId : undefined,
}
// Full behavior: in at the bottom, out at the top, and back on scroll-up.
const addReplayTrigger = () =>
ScrollTrigger.create({
...baseTrigger,
onEnter: () => reveal.play(),
onEnterBack: () => reveal.play(),
onLeave: () => reveal.reverse(),
onLeaveBack: () => reveal.reverse(),
})
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) {
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: [] })
}

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

@@ -9,11 +9,51 @@ gsap.registerPlugin(useGSAP)
gsap.registerPlugin(ScrollTrigger) gsap.registerPlugin(ScrollTrigger)
gsap.registerPlugin(SplitText) gsap.registerPlugin(SplitText)
gsap.registerPlugin(GSDevTools) gsap.registerPlugin(GSDevTools)
// iOS Safari shows/hides its address bar at the scroll extremes, which resizes
// the viewport and makes ScrollTrigger refresh + fire spurious onLeave/onEnter
// toggles (text animating out at the bottom and not coming back). Ignoring those
// mobile-toolbar resizes keeps the real enter/leave reverse behavior intact.
ScrollTrigger.config({ ignoreMobileResize: true })
// Flip to true to draw ScrollTrigger start/end markers on every animated
// 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<{ const GsapContext = createContext<{
// Add a real animation (with its own duration) to the entrance timeline.
addAnimation: ( addAnimation: (
animation: gsap.core.TimelineChild, animation: gsap.core.TimelineChild,
position: gsap.Position position: gsap.Position
) => void, ) => void,
// Schedule a zero-duration callback at `position` — used to *start* an
// independent reveal tween so the timeline only orchestrates timing.
schedule: (fn: () => void, position: gsap.Position) => void,
// Run `cb` once the entrance is done (timeline complete or first user scroll).
onReady: (cb: () => void) => void,
// Re-measure all ScrollTriggers (throttled to once per frame). Call it
// whenever an animation changes content height so trigger positions stay
// aligned with the real layout.
requestRefresh: () => void,
resetTimeline: () => void, resetTimeline: () => void,
resumeTimeline: () => void, resumeTimeline: () => void,
getScroller: () => Element | Window | null getScroller: () => Element | Window | null
@@ -26,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()
} }
} }
@@ -70,29 +120,174 @@ export default function GsapProvider({ children }: { children: ReactNode }) {
// } // }
return scrollerRef.current return scrollerRef.current
}, []) }, [])
const devToolsCreated = useRef(false)
useGSAP(() => { useGSAP(() => {
if (!tl.current) { if (!tl.current) {
tl.current = gsap.timeline({ paused: true }) tl.current = gsap.timeline({ paused: true })
} }
return () => { console.log("gsap cleanup") } if (GSAP_DEBUG && tl.current && !devToolsCreated.current) {
devToolsCreated.current = true
GSDevTools.create({ animation: tl.current })
}
return () => { if (GSAP_DEBUG) console.log("gsap cleanup") }
}) })
const addAnimation = useCallback((animation: gsap.core.TimelineChild, position: gsap.Position) => { // Handoff: fire registered callbacks once, when the entrance finishes.
console.log("add animation to:", position, tl.current !== undefined) const readyFired = useRef(false)
tl.current?.add(animation, position); 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)
const scheduleRefresh = useCallback(() => {
if (refreshQueued.current) return
refreshQueued.current = true
requestAnimationFrame(() => {
refreshQueued.current = false
ScrollTrigger.refresh()
})
},[])
const scrollCleanup = useRef<(() => void) | 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())
resizeObserver.current?.disconnect()
scrollCleanup.current?.()
scrollCleanup.current = null
readyFired.current = false
readyCbs.current = []
tl.current = gsap.timeline({paused:true}) tl.current = gsap.timeline({paused:true})
},[]) },[])
const resumeTimeline = useCallback(() => { const resumeTimeline = useCallback(() => {
console.log("resuming timeline:",tl.current) const t = tl.current
tl.current?.resume() 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() })
const scroller = getScroller()
// If the user scrolls before the entrance finishes, snap it to the end and
// switch to scroll control so the timeline and ScrollTriggers never fight
// over the same elements.
scrollCleanup.current?.()
const onFirstScroll = () => { t.progress(1); fireReady() }
scroller?.addEventListener("scroll", onFirstScroll, { once: true, passive: true })
scrollCleanup.current = () => scroller?.removeEventListener("scroll", onFirstScroll)
// Continuously realign triggers while content height changes — entrance
// growth, scroll-driven collapses, late-loading media.
if (scroller instanceof Element) {
const target = scroller.firstElementChild ?? scroller
resizeObserver.current?.disconnect()
resizeObserver.current = new ResizeObserver(scheduleRefresh)
resizeObserver.current.observe(target)
}
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
// were created; refresh so start/end stay aligned with the real card sizes.
useEffect(() => {
const refresh = () => ScrollTrigger.refresh()
window.addEventListener("load", refresh)
document.fonts?.ready.then(refresh).catch(() => {})
return () => window.removeEventListener("load", refresh)
}, []) }, [])
return ( return (
<GsapContext.Provider value={{ addAnimation, resetTimeline, resumeTimeline, getScroller }}> <GsapContext.Provider value={{ addAnimation, schedule, onReady, requestRefresh: scheduleRefresh, resetTimeline, resumeTimeline, getScroller }}>
{children} {children}
</GsapContext.Provider> </GsapContext.Provider>
) )

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

@@ -4,7 +4,7 @@ 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 BlogMdxEditorPreview(params: { source: string }) {
const [compiled, setCompiled] = useState<MDXRemoteSerializeResult | null>(null) const [compiled, setCompiled] = useState<MDXRemoteSerializeResult | null>(null)

View File

@@ -0,0 +1,48 @@
'use client'
import { trpc } from '~/app/_trpc/Client'
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from '~/components/ui/select'
export default function ModelSelector({ initialValue }: { initialValue: string }) {
const utils = trpc.useUtils()
const { data: models, isLoading, error } = trpc.chat.listModels.useQuery()
const { data: model = initialValue } = trpc.chat.getModel.useQuery(undefined, {
initialData: initialValue,
})
const mutation = trpc.chat.updateModel.useMutation({
onSuccess: () => utils.chat.getModel.invalidate(),
})
// Ensure the currently-saved model is always selectable, even if the
// OpenAI list doesn't include it (e.g. a deprecated model).
const options = Array.from(new Set([model, ...(models ?? [])])).filter(Boolean)
return (
<div className="flex flex-col gap-2">
<Select value={model} onValueChange={(v) => mutation.mutate({ model: v })}>
<SelectTrigger className="w-72">
<SelectValue placeholder={isLoading ? 'Loading models…' : 'Select a model'} />
</SelectTrigger>
<SelectContent>
{options.map((id) => (
<SelectItem key={id} value={id}>
{id}
</SelectItem>
))}
</SelectContent>
</Select>
<div className="flex items-center gap-3 text-sm text-muted-foreground">
{mutation.isPending && <span>Saving</span>}
{mutation.isSuccess && !mutation.isPending && <span>Saved</span>}
{error && <span className="text-destructive">Failed to load models: {error.message}</span>}
{mutation.error && <span className="text-destructive">{mutation.error.message}</span>}
</div>
</div>
)
}

View File

@@ -1,11 +1,23 @@
import { servTrpc } from '~/app/_trpc/ServerClient' import { servTrpc } from '~/app/_trpc/ServerClient'
import SystemPromptForm from './_components/SystemPromptForm' import SystemPromptForm from './_components/SystemPromptForm'
import ModelSelector from './_components/ModelSelector'
export default async function SystemPromptPage() { export default async function SystemPromptPage() {
const prompt = await servTrpc.chat.getSystemPrompt() const prompt = await servTrpc.chat.getSystemPrompt()
const model = await servTrpc.chat.getModel()
return ( return (
<div className="w-full max-w-2xl p-6 flex flex-col gap-4"> <div className="w-full max-w-2xl p-6 flex flex-col gap-8">
<div className="flex flex-col gap-4">
<div>
<h1 className="text-lg font-semibold">AI Model</h1>
<p className="text-sm text-muted-foreground">
The OpenAI model used to respond to chat requests.
</p>
</div>
<ModelSelector initialValue={model} />
</div>
<div className="flex flex-col gap-4">
<div> <div>
<h1 className="text-lg font-semibold">AI System Prompt</h1> <h1 className="text-lg font-semibold">AI System Prompt</h1>
<p className="text-sm text-muted-foreground"> <p className="text-sm text-muted-foreground">
@@ -14,5 +26,6 @@ export default async function SystemPromptPage() {
</div> </div>
<SystemPromptForm initialValue={prompt} /> <SystemPromptForm initialValue={prompt} />
</div> </div>
</div>
) )
} }

View File

@@ -32,6 +32,7 @@ export async function POST(req: Request) {
if (!session) return new Response('Session not found', { status: 404 }) if (!session) return new Response('Session not found', { status: 404 })
const systemPrompt = await servTrpc.chat.getSystemPrompt() || 'You are an AI recruiter assistant.' const systemPrompt = await servTrpc.chat.getSystemPrompt() || 'You are an AI recruiter assistant.'
const model = await servTrpc.chat.getModel()
// Save the latest user message // Save the latest user message
const lastMessage = messages[messages.length - 1] const lastMessage = messages[messages.length - 1]
@@ -46,7 +47,7 @@ export async function POST(req: Request) {
} }
const result = streamText({ const result = streamText({
model: openai('gpt-5-mini'), model: openai(model),
system: systemPrompt, system: systemPrompt,
messages: await convertToModelMessages(messages), messages: await convertToModelMessages(messages),
tools: { tools: {

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,35 +1,36 @@
'use client' import type { ReactNode } from "react"
import { trpc } from "~/app/_trpc/Client"
import CvEntry from "./CvEntry" 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 type { RouterOutputs } from "~/server/routers/_app"
import { cn } from "~/lib/utils" 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 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",
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 ( return (
<Card className={cn(props.layout == "row" ? "w-full" : "","gsapan", "h-screen")}> <AnimatedCard position={position} className={cn(layout == "row" ? "w-full" : "", "h-screen")}>
<CardHeader> <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> </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> <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> </AnimatePopUp>
))} ))}
</ScrollArea> </ScrollArea>
@@ -37,6 +38,6 @@ export default function CvCategory(props:CvCategoryProps) {
: :
<></> <></>
} }
</Card> </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 ?
<>
<Card className={params.className ? cn("w-fit", params.className) : "w-fit"}>
{
data.title ?
<CardHeader> <CardHeader>
<CardTitle> {data.title} </CardTitle> <AnimateTextIn position={position} animation="slide" debugId={`cv-entry-title:${entry.title}:${position}`}>
<CardTitle> {entry.title} </CardTitle>
</AnimateTextIn>
</CardHeader> : </CardHeader> :
<></> <></>
} }
{ {entry.description ?
data.description ?
<CardContent className="text-sm lg:text-base"> <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"> <article className="prose prose-zinc dark:prose-invert max-w-none">
<Markdown rehypePlugins={[rehypeHighlight, rehypeRaw]}>{data.description}</Markdown> {description ?? entry.description}
</article> </article>
</AnimatedDiv>
</CardContent> : </CardContent> :
<></> <></>
} }
{ {!entry.hideDates ?
!data.hideDates ?
<CardFooter className="text-sm"> <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> : </CardFooter> :
<></> <></>
} }
</Card> </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>
</>
}
</>
) )
} }

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,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 ( 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>
</>
) )
} }

View File

@@ -12,6 +12,7 @@ import TrpcProvider from "./_trpc/TrpcProvider";
import ThemeProvider from './_providers/ThemeProvider' import ThemeProvider from './_providers/ThemeProvider'
import GsapProvider from "./_providers/GsapProvicer"; import GsapProvider from "./_providers/GsapProvicer";
import {MessagesProvider} from "./_providers/MessagesProvider"; import {MessagesProvider} from "./_providers/MessagesProvider";
import { MusicPlayerProvider } from "./music/_components/MusicPlayerProvider";
import { CodeHighlightStyle } from "./_components/CodeHighlightSyle"; import { CodeHighlightStyle } from "./_components/CodeHighlightSyle";
import { cn } from "~/lib/utils"; import { cn } from "~/lib/utils";
import AnimatedBackGroundContainer from "./_components/Animated/AnimatedBackGroundContainer"; import AnimatedBackGroundContainer from "./_components/Animated/AnimatedBackGroundContainer";
@@ -49,6 +50,7 @@ export default async function RootLayout({
<body className="flex flex-col bg-background text-foreground"> <body className="flex flex-col bg-background text-foreground">
<ThemeProvider> <ThemeProvider>
<MessagesProvider> <MessagesProvider>
<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-screen lg:h-[calc(100vh-var(--spacing)*10)] w-screen">
@@ -57,6 +59,7 @@ export default async function RootLayout({
{modal} {modal}
</AnimatedBackGroundContainer> </AnimatedBackGroundContainer>
<ChatFAB /> <ChatFAB />
</MusicPlayerProvider>
</MessagesProvider> </MessagesProvider>
</ThemeProvider> </ThemeProvider>
</body> </body>

View File

@@ -1,10 +1,12 @@
'use client' 'use client'
import { useRef, useState } from "react"; import { useEffect, useRef, useState } from "react";
import { useTheme } from "next-themes";
import type WaveSurfer from "wavesurfer.js";
import { Download, Loader2, Pause, Play } from "lucide-react"; import { Download, Loader2, Pause, Play } from "lucide-react";
import { Slider } from "~/components/ui/slider";
import { Button } from "~/components/ui/button"; import { Button } from "~/components/ui/button";
import { toast } from "sonner"; import { toast } from "sonner";
import { useMusicPlayer } from "./MusicPlayerProvider";
function formatTime(seconds: number) { function formatTime(seconds: number) {
if (!Number.isFinite(seconds)) return "0:00"; if (!Number.isFinite(seconds)) return "0:00";
@@ -13,29 +15,109 @@ function formatTime(seconds: number) {
return `${m}:${s.toString().padStart(2, "0")}`; return `${m}:${s.toString().padStart(2, "0")}`;
} }
function cssVar(name: string, fallback: string) {
if (typeof window === "undefined") return fallback;
const v = getComputedStyle(document.documentElement).getPropertyValue(name).trim();
return v || fallback;
}
function waveColors() {
return {
waveColor: cssVar("--muted-foreground", "#9ca3af"),
progressColor: cssVar("--primary", "#e2761b"),
cursorColor: cssVar("--foreground", "#111827"),
};
}
/**
* 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: { export default function AudioPlayer(props: {
/** Streaming-friendly source the player actually plays. */ id: string;
src: string; src: string;
/** Original high-quality file offered via the download button. */
downloadUrl: string; downloadUrl: string;
downloadName: string; downloadName: string;
}) { }) {
const audioRef = useRef<HTMLAudioElement>(null); const containerRef = useRef<HTMLDivElement>(null);
const [playing, setPlaying] = useState(false); const wsRef = useRef<WaveSurfer | null>(null);
const [current, setCurrent] = useState(0); const [ready, setReady] = useState(false);
const [duration, setDuration] = useState(0); const [duration, setDuration] = useState(0);
const [seeking, setSeeking] = useState(false);
const [downloading, setDownloading] = useState(false); const [downloading, setDownloading] = useState(false);
const { resolvedTheme } = useTheme();
function togglePlay() { const { currentId, isPlaying, currentTime, toggle, seek, subscribeTime } = useMusicPlayer();
const audio = audioRef.current; const isActive = currentId === props.id;
if (!audio) return;
if (audio.paused) { // Reach live values from the once-created wavesurfer callbacks.
audio.play(); const isActiveRef = useRef(isActive);
} else { isActiveRef.current = isActive;
audio.pause(); 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);
(async () => {
const WaveSurferClass = (await import("wavesurfer.js")).default;
if (cancelled || !containerRef.current) return;
const instance = WaveSurferClass.create({
container: containerRef.current,
url: props.src,
height: 44,
barWidth: 2,
barGap: 1,
barRadius: 2,
normalize: true,
cursorWidth: 1,
...waveColors(),
});
ws = instance;
wsRef.current = instance;
instance.on("ready", () => {
// This media is for drawing only — never let it make sound.
instance.setMuted(true);
setReady(true);
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);
});
})();
return () => {
cancelled = true;
ws?.destroy();
wsRef.current = null;
};
}, [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]);
async function handleDownload() { async function handleDownload() {
setDownloading(true); setDownloading(true);
@@ -60,50 +142,33 @@ export default function AudioPlayer(props: {
} }
} }
const playing = isActive && isPlaying;
return ( return (
<div className="flex items-center gap-3 rounded-lg border bg-transparent px-3 py-2"> <div className="flex items-center gap-3 rounded-lg border bg-transparent px-3 py-2">
<audio
ref={audioRef}
src={props.src}
preload="metadata"
onPlay={() => setPlaying(true)}
onPause={() => setPlaying(false)}
onLoadedMetadata={(e) => setDuration(e.currentTarget.duration)}
onTimeUpdate={(e) => {
if (!seeking) setCurrent(e.currentTarget.currentTime);
}}
onEnded={() => setPlaying(false)}
/>
<Button <Button
type="button" type="button"
size="icon" size="icon"
variant="ghost" variant="ghost"
aria-label={playing ? "Pause" : "Play"} aria-label={playing ? "Pause" : "Play"}
onClick={togglePlay} disabled={!ready}
onClick={() => toggle(props.id)}
> >
{playing ? <Pause /> : <Play />} {playing ? <Pause /> : <Play />}
</Button> </Button>
<span className="w-10 shrink-0 text-right font-mono text-xs text-muted-foreground tabular-nums"> <span className="w-10 shrink-0 text-right font-mono text-xs text-muted-foreground tabular-nums">
{formatTime(current)} {formatTime(isActive ? currentTime : 0)}
</span> </span>
<Slider <div className="relative flex-1">
className="flex-1" <div ref={containerRef} className="w-full" />
min={0} {!ready && (
max={duration || 1} <div className="absolute inset-0 flex items-center">
step={0.1} <div className="h-7 w-full animate-pulse rounded bg-muted-foreground/15" />
value={[current]} </div>
onValueChange={([v]) => { )}
setSeeking(true); </div>
setCurrent(v ?? 0);
}}
onValueCommit={([v]) => {
if (audioRef.current) audioRef.current.currentTime = v ?? 0;
setSeeking(false);
}}
/>
<span className="w-10 shrink-0 font-mono text-xs text-muted-foreground tabular-nums"> <span className="w-10 shrink-0 font-mono text-xs text-muted-foreground tabular-nums">
{formatTime(duration)} {formatTime(duration)}

View File

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

View File

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

View File

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

View File

@@ -15,11 +15,11 @@ export default function MusicPage() {
<ScrollArea className="px-10 lg:px-0 w-full h-full max-w-4xl mx-auto pt-10"> <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> <AnimatedPageTitle position={0}><span>Just Some </span> <span>Music I Made</span> </AnimatedPageTitle>
<div className="flex flex-wrap h-fit content-center"> <div className="flex flex-wrap h-fit content-center">
<AnimateTextIn className="flex flex-wrap mr-[1em]" position={0.5}> <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><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> <div><a href="https://creativecommons.org/licenses/by-nc-sa/4.0/">CC BY-NC-SA 4.0</a></div>
</AnimateTextIn> </AnimateTextIn>
<AnimatePopUp position={2} className="items-center content-center"> <AnimatePopUp duration={1} ease='elastic.inOut' position={2} once className="items-center content-center">
<div className="flex flex-row"> <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]" 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/by.svg" alt="" />
@@ -33,7 +33,7 @@ export default function MusicPage() {
<div key={track.id}> <div key={track.id}>
<Card.AnimatedCard position={i + 1}> <Card.AnimatedCard position={i + 1}>
<Card.CardHeader> <Card.CardHeader>
<AnimateTextIn position={i + 1.2} animation="slide"> <AnimateTextIn once position={i + 1.2} animation="slide">
<Card.CardTitle>{track.title}</Card.CardTitle> <Card.CardTitle>{track.title}</Card.CardTitle>
</AnimateTextIn> </AnimateTextIn>
</Card.CardHeader> </Card.CardHeader>
@@ -41,8 +41,9 @@ export default function MusicPage() {
{track.description && ( {track.description && (
<p className="text-sm text-muted-foreground gsapant">{track.description}</p> <p className="text-sm text-muted-foreground gsapant">{track.description}</p>
)} )}
<AnimatePopUp position={i + 1.3}> <AnimatePopUp duration={2} ease='elastic.inOut' position={i + 1.3} once>
<AudioPlayer <AudioPlayer
id={track.id}
src={track.streamUrl ?? track.fileUrl} src={track.streamUrl ?? track.fileUrl}
downloadUrl={track.fileUrl} downloadUrl={track.fileUrl}
downloadName={track.fileName} downloadName={track.fileName}

View File

@@ -4,14 +4,13 @@ import { trpc } from "~/app/_trpc/Client";
import * as Card from "~/components/ui/card"; import * as Card from "~/components/ui/card";
import { Badge } from "~/components/ui/badge"; import { Badge } from "~/components/ui/badge";
import { StackBadge } from "~/components/StackBadge"; import { StackBadge } from "~/components/StackBadge";
import Markdown from "react-markdown";
import { ScrollArea } from "~/components/ui/scroll-area"; import { ScrollArea } from "~/components/ui/scroll-area";
import AnimatedPageTitle from "../_components/Animated/AnimatedPageTitle"; import AnimatedPageTitle from "../_components/Animated/AnimatedPageTitle";
import AnimateTextIn from "../_components/Animated/AnimateIn"; import AnimateTextIn from "../_components/Animated/AnimateIn";
import { useTimeLine } from "../_providers/GsapProvicer"; import { useTimeLine } from "../_providers/GsapProvicer";
import AnimatePopUp from "../_components/Animated/AnimatePopUp"; import AnimatePopUp from "../_components/Animated/AnimatePopUp";
import { Button } from "~/components/ui/button"; import { Button } from "~/components/ui/button";
import remarkGfm from "remark-gfm" import { ClientMdx } from "~/components/ClientMdx";
export default function ProjectsPage() { export default function ProjectsPage() {
const { data: projects, isLoading } = trpc.projectv2.listWithStack.useQuery(); const { data: projects, isLoading } = trpc.projectv2.listWithStack.useQuery();
@@ -41,10 +40,10 @@ export default function ProjectsPage() {
<Card.AnimatedCard position={i + 1.2} key={project.id}> <Card.AnimatedCard position={i + 1.2} key={project.id}>
<Card.CardHeader> <Card.CardHeader>
<div className="flex items-start justify-between gap-2 flex-wrap"> <div className="flex items-start justify-between gap-2 flex-wrap">
<AnimateTextIn position={i + 1.4} animation="slide"><Card.CardTitle>{project.title}</Card.CardTitle></AnimateTextIn> <AnimateTextIn once position={i + 1.4} animation="slide"><Card.CardTitle>{project.title}</Card.CardTitle></AnimateTextIn>
<div className="flex gap-2 flex-wrap"> <div className="flex gap-2 flex-wrap">
{project.sourceType && ( {project.sourceType && (
<AnimatePopUp position={i + 2} duration={2}> <AnimatePopUp position={i + 2} duration={2} once>
<Badge variant={project.sourceType === "open" ? "secondary" : "outline"}> <Badge variant={project.sourceType === "open" ? "secondary" : "outline"}>
{project.sourceType === "open" ? "Open Source" : "Closed Source"} {project.sourceType === "open" ? "Open Source" : "Closed Source"}
</Badge> </Badge>
@@ -62,8 +61,8 @@ export default function ProjectsPage() {
<Card.CardContent className="flex flex-col gap-3"> <Card.CardContent className="flex flex-col gap-3">
{project.description && ( {project.description && (
<div className="prose prose-sm dark:prose-invert max-w-none text-muted-foreground"> <div className="prose prose-sm dark:prose-invert max-w-none text-muted-foreground">
<AnimatePopUp position={i + 1.4} duration={10}> <AnimatePopUp once position={i + 1.4} duration={10}>
<Markdown remarkPlugins={[remarkGfm]}>{project.description}</Markdown> <ClientMdx source={project.description} fallback={project.description} />
</AnimatePopUp> </AnimatePopUp>
</div> </div>
)} )}
@@ -71,7 +70,7 @@ export default function ProjectsPage() {
{project.techStack?.stackItems && project.techStack.stackItems.length > 0 && ( {project.techStack?.stackItems && project.techStack.stackItems.length > 0 && (
<div className="flex flex-wrap gap-1.5"> <div className="flex flex-wrap gap-1.5">
{project.techStack.stackItems.map((item, k) => ( {project.techStack.stackItems.map((item, k) => (
<AnimatePopUp key={k} position={(i + 2) + k * 0.5}> <StackBadge key={item} item={item} /> </AnimatePopUp> <AnimatePopUp key={k} position={(i + 2) + k * 0.5} once> <StackBadge key={item} item={item} /> </AnimatePopUp>
))} ))}
</div> </div>
)} )}

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,7 +1,8 @@
import { useGSAP } from "@gsap/react"; import * as React from "react" "use client"
import * as React from "react"
import { useRef } from "react"; import { useRef } from "react";
import { useGsapContext } from "~/app/_providers/GsapProvicer";
import gsap from 'gsap' import gsap from 'gsap'
import { useReveal } from "~/app/_components/Animated/useReveal";
import { cn } from "~/lib/utils" import { cn } from "~/lib/utils"
function Card({ function Card({
@@ -27,40 +28,17 @@ function AnimatedCard({
position = 0, position = 0,
size = "default", size = "default",
scrollOnly = false, scrollOnly = false,
once = false,
...props ...props
}: React.ComponentProps<"div"> & { size?: "default" | "sm", position?: gsap.Position, scrollOnly?: boolean }) { }: React.ComponentProps<"div"> & { size?: "default" | "sm", position?: gsap.Position, scrollOnly?: boolean, once?: boolean }) {
const gsapContext = useGsapContext()
const ref = useRef<HTMLDivElement | null>(null) const ref = useRef<HTMLDivElement | null>(null)
useGSAP(() => { useReveal(ref, {
const rect = ref.current?.getBoundingClientRect() position,
const scroller = gsapContext?.getScroller() scrollOnly,
console.log(scroller) once,
let viewportTop = 0 debugId: `card-${position}`,
let viewportBottom = window.innerHeight makeReveal: (el) => gsap.from(el, { x: -100, opacity: 0, duration: 0.5, paused: true }),
if (scroller && scroller instanceof Element) {
const scrollerRect = scroller.getBoundingClientRect()
viewportTop = scrollerRect.top
viewportBottom = scrollerRect.top + scrollerRect.height
}
const isInView = rect && rect.bottom > viewportTop && rect.top < viewportBottom
console.log(isInView)
const fromVars = { x: -100, opacity: 0, duration: 0.5 }
if (isInView && !scrollOnly) {
gsapContext?.addAnimation(gsap.from(ref.current, fromVars), position)
} else {
gsap.from(ref.current,
{
...fromVars,
scrollTrigger: {
trigger: ref.current,
start: 'top bottom',
end: 'bottom top',
toggleActions: "play reverse play reverse",
scroller
}
}) })
}
}, { dependencies: [] })
return ( return (
<div <div
ref={ref} ref={ref}

View File

@@ -175,6 +175,7 @@ export const chatMessageRelations = relations(chatMessage, ({ one }) => ({
export const systemSettings = createTable( export const systemSettings = createTable(
"systemSetting", "systemSetting",
(d) => ({ (d) => ({
systemPropmt: d.text() systemPropmt: d.text(),
model: d.text()
}) })
) )

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

@@ -7,6 +7,26 @@ import { isAdmin } from '~/app/actions';
import { z } from 'zod'; import { z } from 'zod';
import { eq } from 'drizzle-orm'; import { eq } from 'drizzle-orm';
import { clerkClient, auth } from '@clerk/nextjs/server' import { clerkClient, auth } from '@clerk/nextjs/server'
import { env } from '~/env'
export const DEFAULT_MODEL = 'gpt-5-mini'
// Models returned by the OpenAI API that aren't usable for chat completions.
const NON_CHAT_MODEL = /embedding|image|audio|realtime|transcribe|tts|whisper|moderation|dall-e|search|codex|instruct/
async function readSettings() {
return db.select().from(systemSettings).limit(1).then((r) => r[0])
}
async function writeSettings(values: { systemPropmt?: string | null; model?: string | null }) {
const current = await readSettings()
await db.delete(systemSettings)
await db.insert(systemSettings).values({
systemPropmt: values.systemPropmt ?? current?.systemPropmt ?? null,
model: values.model ?? current?.model ?? null,
})
}
export const chatRouter = router({ export const chatRouter = router({
getSession: publicProcedure.query(async () => { getSession: publicProcedure.query(async () => {
const { userId } = await auth(); const { userId } = await auth();
@@ -66,13 +86,34 @@ export const chatRouter = router({
}), }),
getSystemPrompt: publicProcedure.query(async () => { getSystemPrompt: publicProcedure.query(async () => {
const row = await db.select().from(systemSettings).limit(1).then((r) => r[0]) const row = await readSettings()
return row?.systemPropmt ?? '' return row?.systemPropmt ?? ''
}), }),
updateSystemPrompt: publicProcedure.input(z.object({ prompt: z.string() })).mutation(async ({ input }) => { updateSystemPrompt: publicProcedure.input(z.object({ prompt: z.string() })).mutation(async ({ input }) => {
if (!(await isAdmin())) throw new TRPCError({ code: 'FORBIDDEN' }) if (!(await isAdmin())) throw new TRPCError({ code: 'FORBIDDEN' })
await db.delete(systemSettings) await writeSettings({ systemPropmt: input.prompt })
await db.insert(systemSettings).values({ systemPropmt: input.prompt }) }),
getModel: publicProcedure.query(async () => {
const row = await readSettings()
return row?.model ?? DEFAULT_MODEL
}),
listModels: publicProcedure.query(async () => {
if (!(await isAdmin())) throw new TRPCError({ code: 'FORBIDDEN' })
const res = await fetch('https://api.openai.com/v1/models', {
headers: { Authorization: `Bearer ${env.OPENAI_API_KEY}` },
})
if (!res.ok) {
throw new TRPCError({ code: 'INTERNAL_SERVER_ERROR', message: `failed to fetch models (${res.status})` })
}
const json = (await res.json()) as { data: { id: string }[] }
return json.data
.map((m) => m.id)
.filter((id) => (id.startsWith('gpt') || /^o\d/.test(id) || id.startsWith('chatgpt')) && !NON_CHAT_MODEL.test(id))
.sort()
}),
updateModel: publicProcedure.input(z.object({ model: z.string() })).mutation(async ({ input }) => {
if (!(await isAdmin())) throw new TRPCError({ code: 'FORBIDDEN' })
await writeSettings({ model: input.model })
}), }),
}) })

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;