20 Commits

Author SHA1 Message Date
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
7aa1746f97 convert flacs to aac for streaming 2026-06-16 12:49:30 +02:00
f5e8b87846 package updates, minor bug fixes, stack items, background animation fixes 2026-06-06 12:15:01 +02:00
52 changed files with 2310 additions and 662 deletions

View File

@@ -1,2 +1,4 @@
node_modules/** node_modules/**
.next/** .next/**
.worktrees
.clerk

690
bun.lock

File diff suppressed because it is too large Load Diff

View File

@@ -6,9 +6,10 @@ import "./src/env.js";
/** @type {import("next").NextConfig} */ /** @type {import("next").NextConfig} */
const config = { const config = {
typescript: { transpilePackages: ["next-mdx-remote"],
ignoreBuildErrors: true typescript: {
} ignoreBuildErrors: true,
},
}; };
export default config; export default config;

View File

@@ -5,6 +5,7 @@
"type": "module", "type": "module",
"scripts": { "scripts": {
"build": "next build", "build": "next build",
"build:ffmpeg-worker": "bun build node_modules/@ffmpeg/ffmpeg/dist/esm/worker.js --target browser --format esm --minify --outfile public/ffmpeg/worker.js",
"check": "biome check .", "check": "biome check .",
"check:unsafe": "biome check --write --unsafe .", "check:unsafe": "biome check --write --unsafe .",
"check:write": "biome check --write .", "check:write": "biome check --write .",
@@ -19,16 +20,20 @@
"test": "vitest --typecheck" "test": "vitest --typecheck"
}, },
"dependencies": { "dependencies": {
"@ai-sdk/openai": "^3.0.41", "@ai-sdk/openai": "^3.0.67",
"@ai-sdk/react": "^3.0.118", "@ai-sdk/react": "^3.0.195",
"@clerk/nextjs": "^7.0.2", "@clerk/nextjs": "^7.4.2",
"@electric-sql/pglite": "^0.3.16", "@electric-sql/pglite": "^0.4.6",
"@ffmpeg/ffmpeg": "^0.12.15",
"@ffmpeg/util": "^0.12.2",
"@fortawesome/fontawesome-svg-core": "^7.2.0", "@fortawesome/fontawesome-svg-core": "^7.2.0",
"@fortawesome/free-solid-svg-icons": "^7.2.0", "@fortawesome/free-solid-svg-icons": "^7.2.0",
"@fortawesome/react-fontawesome": "^3.2.0", "@fortawesome/react-fontawesome": "^3.3.1",
"@gsap/react": "^2.1.2", "@gsap/react": "^2.1.2",
"@hookform/resolvers": "^5.2.2", "@hookform/resolvers": "^5.4.0",
"@neondatabase/serverless": "^1.0.2", "@mdx-js/mdx": "^3.1.1",
"@mdx-js/react": "^3.1.1",
"@neondatabase/serverless": "^1.1.0",
"@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",
@@ -55,85 +60,85 @@
"@radix-ui/react-toggle": "^1.1.10", "@radix-ui/react-toggle": "^1.1.10",
"@radix-ui/react-toggle-group": "^1.1.11", "@radix-ui/react-toggle-group": "^1.1.11",
"@radix-ui/react-tooltip": "^1.2.8", "@radix-ui/react-tooltip": "^1.2.8",
"@t3-oss/env-nextjs": "^0.13.10", "@t3-oss/env-nextjs": "^0.13.11",
"@tailwindcss/typography": "^0.5.19", "@tailwindcss/typography": "^0.5.19",
"@tanstack/react-query": "^5.90.21", "@tanstack/react-query": "^5.100.14",
"@tanstack/react-query-next-experimental": "^5.91.0", "@tanstack/react-query-next-experimental": "^5.100.14",
"@testing-library/user-event": "^14.6.1", "@testing-library/user-event": "^14.6.1",
"@trpc/client": "^11.12.0", "@trpc/client": "^11.17.0",
"@trpc/next": "^11.12.0", "@trpc/next": "^11.17.0",
"@trpc/react-query": "^11.12.0", "@trpc/react-query": "^11.17.0",
"@trpc/server": "^11.12.0", "@trpc/server": "^11.17.0",
"@uiw/react-md-editor": "^4.0.11", "@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",
"ai": "^6.0.116", "ai": "^6.0.193",
"class-variance-authority": "^0.7.1", "class-variance-authority": "^0.7.1",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"cmdk": "^1.1.1", "cmdk": "^1.1.1",
"date-fns": "^4.1.0", "date-fns": "^4.4.0",
"date-format": "^4.0.14", "date-format": "^4.0.14",
"drizzle-orm": "^0.45.1", "drizzle-orm": "^0.45.2",
"drizzle-zod": "^0.8.3", "drizzle-zod": "^0.8.3",
"embla-carousel-react": "^8.6.0", "embla-carousel-react": "^8.6.0",
"glazejs": "^2.0.1", "glazejs": "^2.0.1",
"googleapis": "^171.4.0", "googleapis": "^173.0.0",
"gray-matter": "^4.0.3", "gray-matter": "^4.0.3",
"gsap": "^3.14.2", "gsap": "^3.15.0",
"input-otp": "^1.4.2", "input-otp": "^1.4.2",
"lucide-react": "^0.577.0", "lucide-react": "^1.17.0",
"next": "16.1.6", "next": "16.2.6",
"next-mdx-remote": "^6.0.0", "next-mdx-remote": "^6.0.0",
"next-themes": "^0.4.6", "next-themes": "^0.4.6",
"postgres": "^3.4.8", "postgres": "^3.4.9",
"radix-ui": "^1.4.3", "radix-ui": "^1.4.3",
"react": "^19.2.4", "react": "^19.2.6",
"react-day-picker": "^9.14.0", "react-day-picker": "^10.0.1",
"react-dom": "^19.2.4", "react-dom": "^19.2.6",
"react-hook-form": "^7.71.2", "react-hook-form": "^7.77.0",
"react-markdown": "^10.1.0", "react-resizable-panels": "^4.11.2",
"react-resizable-panels": "^4.7.2", "recharts": "3.8.1",
"recharts": "2.15.4",
"rehype-highlight": "^7.0.2", "rehype-highlight": "^7.0.2",
"rehype-raw": "^7.0.0", "rehype-raw": "^7.0.0",
"remark-gfm": "^4.0.1", "remark-gfm": "^4.0.1",
"server-only": "^0.0.1", "server-only": "^0.0.1",
"shadcn": "^4.0.2", "shadcn": "^4.10.0",
"sonner": "^2.0.7", "sonner": "^2.0.7",
"tailwind-merge": "^3.5.0", "tailwind-merge": "^3.6.0",
"tailwindcss-motion": "^1.1.1", "tailwindcss-motion": "^1.1.1",
"type-fest": "^5.4.4", "type-fest": "^5.7.0",
"uploadthing": "^7.7.4", "uploadthing": "^7.7.4",
"vaul": "^1.1.2", "vaul": "^1.1.2",
"zod": "^4.3.6" "wavesurfer.js": "^7.12.8",
"zod": "^4.4.3"
}, },
"devDependencies": { "devDependencies": {
"@biomejs/biome": "2.4.6", "@biomejs/biome": "2.4.16",
"@swc/jest": "^0.2.39", "@swc/jest": "^0.2.39",
"@tailwindcss/postcss": "^4.2.1", "@tailwindcss/postcss": "^4.3.0",
"@testing-library/dom": "^10.4.1", "@testing-library/dom": "^10.4.1",
"@testing-library/jest-dom": "^6.9.1", "@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "^16.3.2", "@testing-library/react": "^16.3.2",
"@types/jest": "^30.0.0", "@types/jest": "^30.0.0",
"@types/node": "^25.4.0", "@types/node": "^25.9.1",
"@types/react": "^19.2.14", "@types/react": "^19.2.15",
"@types/react-dom": "^19.2.3", "@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "^5.1.4", "@vitejs/plugin-react": "^6.0.2",
"@vitest/coverage-v8": "^4.0.18", "@vitest/coverage-v8": "^4.1.8",
"dotenv": "^17.3.1", "dotenv": "^17.4.2",
"drizzle-kit": "^0.31.9", "drizzle-kit": "^0.31.10",
"jest": "^30.3.0", "jest": "^30.4.2",
"jest-environment-jsdom": "^30.3.0", "jest-environment-jsdom": "^30.4.1",
"jsdom": "^28.1.0", "jsdom": "^29.1.1",
"next-router-mock": "^1.0.5", "next-router-mock": "^1.0.5",
"pg-mem": "^3.0.14", "pg-mem": "^3.0.14",
"postcss": "^8.5.8", "postcss": "^8.5.15",
"tailwindcss": "^4.2.1", "tailwindcss": "^4.3.0",
"ts-node": "^10.9.2", "ts-node": "^10.9.2",
"tw-animate-css": "^1.4.0", "tw-animate-css": "^1.4.0",
"typescript": "^5.9.3", "typescript": "^6.0.3",
"vite-tsconfig-paths": "^6.1.1", "vite-tsconfig-paths": "^6.1.1",
"vitest": "^4.0.18" "vitest": "^4.1.8"
}, },
"ct3aMetadata": { "ct3aMetadata": {
"initVersion": "7.39.3" "initVersion": "7.39.3"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

1
public/ffmpeg/worker.js Normal file
View File

@@ -0,0 +1 @@
var C="https://unpkg.com/@ffmpeg/core@0.12.9/dist/umd/ffmpeg-core.js",N;(function(E){E.LOAD="LOAD",E.EXEC="EXEC",E.FFPROBE="FFPROBE",E.WRITE_FILE="WRITE_FILE",E.READ_FILE="READ_FILE",E.DELETE_FILE="DELETE_FILE",E.RENAME="RENAME",E.CREATE_DIR="CREATE_DIR",E.LIST_DIR="LIST_DIR",E.DELETE_DIR="DELETE_DIR",E.ERROR="ERROR",E.DOWNLOAD="DOWNLOAD",E.PROGRESS="PROGRESS",E.LOG="LOG",E.MOUNT="MOUNT",E.UNMOUNT="UNMOUNT"})(N||(N={}));var G=Error("unknown message type"),V=Error("ffmpeg is not loaded, call `await ffmpeg.load()` first"),b=Error("called FFmpeg.terminate()"),v=Error("failed to import ffmpeg-core.js");var I,X=async({coreURL:E,wasmURL:D,workerURL:O})=>{let S=!I;try{if(!E)E=C;importScripts(E)}catch{if(!E||E===C)E=C.replace("/umd/","/esm/");if(self.createFFmpegCore=(await import(E)).default,!self.createFFmpegCore)throw v}let A=E,x=D?D:E.replace(/.js$/g,".wasm"),B=O?O:E.replace(/.js$/g,".worker.js");return I=await self.createFFmpegCore({mainScriptUrlOrBlob:`${A}#${btoa(JSON.stringify({wasmURL:x,workerURL:B}))}`}),I.setLogger((W)=>self.postMessage({type:N.LOG,data:W})),I.setProgress((W)=>self.postMessage({type:N.PROGRESS,data:W})),S},Y=({args:E,timeout:D=-1})=>{I.setTimeout(D),I.exec(...E);let O=I.ret;return I.reset(),O},j=({args:E,timeout:D=-1})=>{I.setTimeout(D),I.ffprobe(...E);let O=I.ret;return I.reset(),O},J=({path:E,data:D})=>{return I.FS.writeFile(E,D),!0},$=({path:E,encoding:D})=>I.FS.readFile(E,{encoding:D}),q=({path:E})=>{return I.FS.unlink(E),!0},z=({oldPath:E,newPath:D})=>{return I.FS.rename(E,D),!0},H=({path:E})=>{return I.FS.mkdir(E),!0},K=({path:E})=>{let D=I.FS.readdir(E),O=[];for(let S of D){let A=I.FS.stat(`${E}/${S}`),x=I.FS.isDir(A.mode);O.push({name:S,isDir:x})}return O},Q=({path:E})=>{return I.FS.rmdir(E),!0},R=({fsType:E,options:D,mountPoint:O})=>{let S=E,A=I.FS.filesystems[S];if(!A)return!1;return I.FS.mount(A,D,O),!0},Z=({mountPoint:E})=>{return I.FS.unmount(E),!0};self.onmessage=async({data:{id:E,type:D,data:O}})=>{let S=[],A;try{if(D!==N.LOAD&&!I)throw V;switch(D){case N.LOAD:A=await X(O);break;case N.EXEC:A=Y(O);break;case N.FFPROBE:A=j(O);break;case N.WRITE_FILE:A=J(O);break;case N.READ_FILE:A=$(O);break;case N.DELETE_FILE:A=q(O);break;case N.RENAME:A=z(O);break;case N.CREATE_DIR:A=H(O);break;case N.LIST_DIR:A=K(O);break;case N.DELETE_DIR:A=Q(O);break;case N.MOUNT:A=R(O);break;case N.UNMOUNT:A=Z(O);break;default:throw G}}catch(x){self.postMessage({id:E,type:N.ERROR,data:x.toString()});return}if(A instanceof Uint8Array)S.push(A.buffer);self.postMessage({id:E,type:D,data:A},S)};

View File

@@ -1,62 +1,43 @@
import { useGSAP } from "@gsap/react";
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,
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,
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: `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 fromVars = animation === "slide"
} ? { opacity: 0, x: -10, duration: 0.2 * speed, stagger: { each: 0.08 * speed }, ease: 'bounce.inOut' }
const isInView = rect && rect.bottom > viewportTop && rect.top < viewportBottom : { opacity: 0, duration: 0.01 * speed, stagger: { each: 0.04 * speed }, ease: 'bounce.inOut' }
console.log(isInView) return gsap.from(split.chars, { ...fromVars, paused: true })
const chars = new SplitText(el.current, { type: 'chars' }) },
gsapContext?.addAnimation(gsap.to(el.current, { opacity: 100, duration: 0 }), 0, tlId) })
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, duration: 0.01 * speed, stagger: { each: 0.04 * speed }, ease: 'bounce.inOut', onComplete: () => chars.revert() }
if (isInView && !scrollOnly) {
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,20 @@ const AnimatePopUp = ({
position, position,
className, className,
duration=1, duration=1,
ease='elastic' ease='elastic',
scrollOnly=false,
once=false,
}:{ }:{
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,
}) => { }) => {
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} className={cn(className,'h-0 translate-y-[50] overflow-hidden')} height='auto' y={0} overflow='' ease={ease} duration={duration} />
) )
} }

View File

@@ -1,7 +1,8 @@
"use client"; "use client";
import React, { useCallback, useEffect, useRef, useState } from "react";
import { useTheme } from "next-themes"; import { useTheme } from "next-themes";
import type React from "react";
import { useCallback, useEffect, useRef } from "react";
const PALETTES = { const PALETTES = {
dark: { dark: {
@@ -37,6 +38,12 @@ interface Particle {
wobblePhase: number; wobblePhase: number;
} }
interface CanvasSize {
dpr: number;
height: number;
width: number;
}
interface AnimatedBackgroundContainerProps { interface AnimatedBackgroundContainerProps {
children: React.ReactNode; children: React.ReactNode;
className?: string; className?: string;
@@ -48,6 +55,9 @@ interface AnimatedBackgroundContainerProps {
const DEFAULT_PARTICLE_COLORS: readonly string[] = PALETTES.dark.particles; const DEFAULT_PARTICLE_COLORS: readonly string[] = PALETTES.dark.particles;
const PARTICLE_COLOR_COUNT = DEFAULT_PARTICLE_COLORS.length; const PARTICLE_COLOR_COUNT = DEFAULT_PARTICLE_COLORS.length;
const EDGE_FADE_DISTANCE = 80;
const MAX_DEVICE_PIXEL_RATIO = 2;
const MOBILE_TARGET_DISTANCE = 30;
const rand = (min: number, max: number) => Math.random() * (max - min) + min; const rand = (min: number, max: number) => Math.random() * (max - min) + min;
@@ -87,15 +97,18 @@ export default function AnimatedBackgroundContainer({
const frameRef = useRef(0); const frameRef = useRef(0);
const animationFrameRef = useRef<number | null>(null); const animationFrameRef = useRef<number | null>(null);
const isMobileRef = useRef(false); const isMobileRef = useRef(false);
const isVisibleRef = useRef(true);
const prefersReducedMotionRef = useRef(false);
const particlesRef = useRef<Particle[]>([]); const particlesRef = useRef<Particle[]>([]);
const mousePosRef = useRef({ x: 0, y: 0 }); const mousePosRef = useRef({ x: 0, y: 0 });
const smoothMouseRef = useRef({ x: 0, y: 0 }); const smoothMouseRef = useRef({ x: 0, y: 0 });
const mobileAnchorRef = useRef({ x: 0, y: 0 }); const mobileAnchorRef = useRef({ x: 0, y: 0 });
const mobileTargetRef = useRef({ x: 0, y: 0 }); const mobileTargetRef = useRef({ x: 0, y: 0 });
const canvasSizeRef = useRef<CanvasSize>({ dpr: 1, height: 0, width: 0 });
const containerRectRef = useRef<DOMRect | null>(null);
const followSpeedRef = useRef(followSpeed); const followSpeedRef = useRef(followSpeed);
const mobileSpeedRef = useRef(mobileSpeed); const mobileSpeedRef = useRef(mobileSpeed);
const particleColorsRef = useRef<readonly string[]>(DEFAULT_PARTICLE_COLORS); const particleColorsRef = useRef<readonly string[]>(DEFAULT_PARTICLE_COLORS);
const [mounted, setMounted] = useState(false);
const { resolvedTheme } = useTheme(); const { resolvedTheme } = useTheme();
const isDark = resolvedTheme === undefined || resolvedTheme === "dark"; const isDark = resolvedTheme === undefined || resolvedTheme === "dark";
@@ -120,13 +133,13 @@ export default function AnimatedBackgroundContainer({
}, [particleCount, orbitRadius]); }, [particleCount, orbitRadius]);
const seedPositions = useCallback(() => { const seedPositions = useCallback(() => {
const container = containerRef.current; const { height, width } = canvasSizeRef.current;
if (!container) { if (width === 0 || height === 0) {
return; return;
} }
const centerX = container.clientWidth / 2; const centerX = width / 2;
const centerY = container.clientHeight / 2; const centerY = height / 2;
mousePosRef.current = { x: centerX, y: centerY }; mousePosRef.current = { x: centerX, y: centerY };
smoothMouseRef.current = { x: centerX, y: centerY }; smoothMouseRef.current = { x: centerX, y: centerY };
@@ -137,6 +150,13 @@ export default function AnimatedBackgroundContainer({
}; };
}, []); }, []);
const updateContainerRect = useCallback(() => {
const container = containerRef.current;
if (container) {
containerRectRef.current = container.getBoundingClientRect();
}
}, []);
const resizeCanvas = useCallback(() => { const resizeCanvas = useCallback(() => {
const canvas = canvasRef.current; const canvas = canvasRef.current;
const container = containerRef.current; const container = containerRef.current;
@@ -146,10 +166,19 @@ export default function AnimatedBackgroundContainer({
const width = container.clientWidth; const width = container.clientWidth;
const height = container.clientHeight; const height = container.clientHeight;
const dpr = window.devicePixelRatio || 1; const dpr = Math.min(window.devicePixelRatio || 1, MAX_DEVICE_PIXEL_RATIO);
const nextWidth = Math.round(width * dpr);
const nextHeight = Math.round(height * dpr);
canvas.width = width * dpr; canvasSizeRef.current = { dpr, height, width };
canvas.height = height * dpr; updateContainerRect();
if (canvas.width !== nextWidth) {
canvas.width = nextWidth;
}
if (canvas.height !== nextHeight) {
canvas.height = nextHeight;
}
canvas.style.width = `${width}px`; canvas.style.width = `${width}px`;
canvas.style.height = `${height}px`; canvas.style.height = `${height}px`;
@@ -160,14 +189,10 @@ export default function AnimatedBackgroundContainer({
ctx.setTransform(1, 0, 0, 1, 0, 0); ctx.setTransform(1, 0, 0, 1, 0, 0);
ctx.scale(dpr, dpr); ctx.scale(dpr, dpr);
seedPositions();
if (!mounted) { }, [seedPositions, updateContainerRect]);
seedPositions();
}
}, [mounted, seedPositions]);
useEffect(() => { useEffect(() => {
setMounted(true);
isMobileRef.current = isMobileDevice(); isMobileRef.current = isMobileDevice();
resizeCanvas(); resizeCanvas();
@@ -176,25 +201,35 @@ export default function AnimatedBackgroundContainer({
resizeCanvas(); resizeCanvas();
}; };
window.addEventListener("resize", handleResize); const resizeObserver =
return () => window.removeEventListener("resize", handleResize); "ResizeObserver" in window
}, [resizeCanvas]); ? new ResizeObserver(() => {
handleResize();
})
: null;
useEffect(() => { if (containerRef.current && resizeObserver) {
if (!mounted) { resizeObserver.observe(containerRef.current);
return;
} }
seedPositions(); window.addEventListener("resize", handleResize);
}, [mounted, seedPositions]); window.addEventListener("scroll", updateContainerRect, {
capture: true,
passive: true,
});
return () => {
resizeObserver?.disconnect();
window.removeEventListener("resize", handleResize);
window.removeEventListener("scroll", updateContainerRect, { capture: true });
};
}, [resizeCanvas, updateContainerRect]);
const handleMouseMove = useCallback((event: MouseEvent) => { const handleMouseMove = useCallback((event: MouseEvent) => {
const container = containerRef.current; const rect = containerRectRef.current;
if (!container || isMobileRef.current) { if (!rect || isMobileRef.current) {
return; return;
} }
const rect = container.getBoundingClientRect();
mousePosRef.current = { mousePosRef.current = {
x: event.clientX - rect.left, x: event.clientX - rect.left,
y: event.clientY - rect.top, y: event.clientY - rect.top,
@@ -212,13 +247,8 @@ export default function AnimatedBackgroundContainer({
}, [handleMouseMove]); }, [handleMouseMove]);
useEffect(() => { useEffect(() => {
if (!mounted) {
return;
}
const canvas = canvasRef.current; const canvas = canvasRef.current;
const container = containerRef.current; if (!canvas) {
if (!canvas || !container) {
return; return;
} }
@@ -227,9 +257,25 @@ export default function AnimatedBackgroundContainer({
return; return;
} }
const stopAnimation = () => {
if (animationFrameRef.current !== null) {
window.cancelAnimationFrame(animationFrameRef.current);
animationFrameRef.current = null;
}
};
const draw = () => { const draw = () => {
const width = container.clientWidth; if (!isVisibleRef.current || prefersReducedMotionRef.current) {
const height = container.clientHeight; animationFrameRef.current = null;
return;
}
const { height, width } = canvasSizeRef.current;
if (width === 0 || height === 0) {
animationFrameRef.current = window.requestAnimationFrame(draw);
return;
}
frameRef.current += 1; frameRef.current += 1;
if (isMobileRef.current) { if (isMobileRef.current) {
@@ -241,14 +287,15 @@ export default function AnimatedBackgroundContainer({
const dx = mobileTargetRef.current.x - mobileAnchorRef.current.x; const dx = mobileTargetRef.current.x - mobileAnchorRef.current.x;
const dy = mobileTargetRef.current.y - mobileAnchorRef.current.y; const dy = mobileTargetRef.current.y - mobileAnchorRef.current.y;
if (Math.hypot(dx, dy) < 30) { if (Math.hypot(dx, dy) < MOBILE_TARGET_DISTANCE) {
mobileTargetRef.current = { mobileTargetRef.current = {
x: rand(width * 0.15, width * 0.85), x: rand(width * 0.15, width * 0.85),
y: rand(height * 0.15, height * 0.85), y: rand(height * 0.15, height * 0.85),
}; };
} }
smoothMouseRef.current = { ...mobileAnchorRef.current }; smoothMouseRef.current.x = mobileAnchorRef.current.x;
smoothMouseRef.current.y = mobileAnchorRef.current.y;
} else { } else {
const desktopLerp = followSpeedRef.current; const desktopLerp = followSpeedRef.current;
smoothMouseRef.current.x += smoothMouseRef.current.x +=
@@ -275,7 +322,13 @@ export default function AnimatedBackgroundContainer({
const edgeFade = Math.max( const edgeFade = Math.max(
0, 0,
Math.min(x / 80, (width - x) / 80, y / 80, (height - y) / 80, 1), Math.min(
x / EDGE_FADE_DISTANCE,
(width - x) / EDGE_FADE_DISTANCE,
y / EDGE_FADE_DISTANCE,
(height - y) / EDGE_FADE_DISTANCE,
1,
),
); );
if (edgeFade <= 0) { if (edgeFade <= 0) {
@@ -293,15 +346,51 @@ export default function AnimatedBackgroundContainer({
animationFrameRef.current = window.requestAnimationFrame(draw); animationFrameRef.current = window.requestAnimationFrame(draw);
}; };
animationFrameRef.current = window.requestAnimationFrame(draw); const startAnimation = () => {
if (
return () => { animationFrameRef.current === null &&
if (animationFrameRef.current !== null) { isVisibleRef.current &&
window.cancelAnimationFrame(animationFrameRef.current); !prefersReducedMotionRef.current
animationFrameRef.current = null; ) {
animationFrameRef.current = window.requestAnimationFrame(draw);
} }
}; };
}, [mounted]);
const handleVisibilityChange = () => {
isVisibleRef.current = document.visibilityState === "visible";
if (isVisibleRef.current) {
startAnimation();
} else {
stopAnimation();
}
};
const motionMedia = window.matchMedia("(prefers-reduced-motion: reduce)");
const handleMotionChange = () => {
prefersReducedMotionRef.current = motionMedia.matches;
if (prefersReducedMotionRef.current) {
stopAnimation();
ctx.clearRect(0, 0, canvasSizeRef.current.width, canvasSizeRef.current.height);
} else {
startAnimation();
}
};
isVisibleRef.current = document.visibilityState === "visible";
prefersReducedMotionRef.current = motionMedia.matches;
startAnimation();
document.addEventListener("visibilitychange", handleVisibilityChange);
motionMedia.addEventListener("change", handleMotionChange);
return () => {
document.removeEventListener("visibilitychange", handleVisibilityChange);
motionMedia.removeEventListener("change", handleMotionChange);
stopAnimation();
};
}, []);
return ( return (
<div <div

View File

@@ -1,36 +1,39 @@
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',
className?:HTMLAttributes<HTMLDivElement>['className'] scrollOnly?: boolean,
once?: boolean,
debugId?: string,
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,102 @@
'use client'
import { useGSAP } from "@gsap/react"
import { ScrollTrigger } from "gsap/all"
import type { RefObject } from "react"
import { GSAP_DEBUG, 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) return
const scroller = ctx.getScroller()
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
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.
ctx.schedule(() => reveal.play(), position)
// `once` elements keep their revealed state — no scroll trigger at all.
if (!once) 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.
reveal.play()
if (!once) addReplayTrigger()
} else if (once) {
// Off-screen: reveal when first reached, then self-destruct so it never
// reverses.
ScrollTrigger.create({ ...baseTrigger, once: true, onEnter: () => reveal.play() })
} else {
addReplayTrigger()
}
}, { dependencies: [] })
}

View File

@@ -0,0 +1,53 @@
import type { ComponentProps } from "react";
import type { Control, FieldValues, Path } from "react-hook-form";
import { FormControl, FormField, FormItem, FormLabel } from "~/components/ui/form";
import { Input } from "~/components/ui/input";
type IntInputFormFieldProps<T extends FieldValues> = Omit<
ComponentProps<typeof Input>,
"defaultValue" | "name" | "onChange" | "type" | "value"
> & {
control: Control<T>;
emptyValue?: null | undefined;
label: string;
name: Path<T>;
};
export default function IntInputFormField<T extends FieldValues>({
control,
emptyValue,
label,
name,
...inputProps
}: IntInputFormFieldProps<T>) {
return (
<FormField
control={control}
name={name}
render={({ field }) => (
<FormItem className="flex flex-col">
<FormLabel>{label}</FormLabel>
<FormControl>
<Input
{...inputProps}
inputMode="numeric"
onBlur={field.onBlur}
onChange={(event) => {
const value = event.currentTarget.value;
field.onChange(
value === "" ? emptyValue : Number.parseInt(value, 10),
);
}}
placeholder={inputProps.placeholder ?? name}
ref={field.ref}
step={inputProps.step ?? 1}
type="number"
value={field.value ?? ""}
/>
</FormControl>
</FormItem>
)}
/>
);
}

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

@@ -1,6 +1,7 @@
import type { CheckedState } from "@radix-ui/react-checkbox"; import type { CheckedState } from "@radix-ui/react-checkbox";
import { ChevronDownIcon } from "lucide-react"; import { ChevronDownIcon } from "lucide-react";
import { createContext,useContext, useState } from "react"; import { ScrollArea } from "~/components/ui/scroll-area";
import { createContext,useContext, useState, type KeyboardEventHandler } from "react";
import { useFormContext, type Control, type ControllerRenderProps, type FieldValues, type Path } from "react-hook-form"; import { useFormContext, type Control, type ControllerRenderProps, type FieldValues, type Path } from "react-hook-form";
import type { Entries } from "type-fest"; import type { Entries } from "type-fest";
import { Button } from "~/components/ui/button"; import { Button } from "~/components/ui/button";
@@ -16,6 +17,7 @@ const MultiBooleanFieldContext = createContext<MultiBooleanFieldContextProps|und
function InnerMultiBooleanFormField(params: { options: string[], onChange: (arg0: string[]) => void }) { function InnerMultiBooleanFormField(params: { options: string[], onChange: (arg0: string[]) => void }) {
const context = useContext(MultiBooleanFieldContext) const context = useContext(MultiBooleanFieldContext)
const [searchBuffer, setSearchBuffer] = useState<string>("")
if (context === undefined) { if (context === undefined) {
return (<></>) return (<></>)
} }
@@ -43,19 +45,40 @@ function InnerMultiBooleanFormField(params: { options: string[], onChange: (arg0
} }
return context.checkedValues[key] return context.checkedValues[key]
} }
const handleKeyDown:KeyboardEventHandler = (e) => {
if (e.ctrlKey && e.key == "c") {
setSearchBuffer("")
} else if (e.code == "Backspace") {
setSearchBuffer((prev) => {
const newVal = prev.substring(0,prev.length - 2)
console.log(newVal)
return newVal
})
}
else if (e.key.length === 1) {
setSearchBuffer((prev) => {
const newVal = prev + e.key;
console.log(newVal)
return newVal;
})
}
}
return ( return (
<> <ScrollArea onKeyDown={handleKeyDown} className="flex h-60">
{ {
params.options.map((opt) => ( params.options.map((opt) => (
<FormItem key={opt}> opt.startsWith(searchBuffer) && <FormItem key={opt}>
<div className="flex flex-row justify-between py-2 border-b-1"> <div className="flex flex-row justify-between py-2 border-b">
<FormLabel>{opt}</FormLabel> <FormLabel>{opt}</FormLabel>
<Checkbox data-testid="multiboolean-checkbox" checked={checked(opt)} onCheckedChange={onCheckedItemChange(opt)} /> <Checkbox data-testid="multiboolean-checkbox" checked={checked(opt)} onCheckedChange={onCheckedItemChange(opt)} />
</div> </div>
</FormItem> </FormItem>
)) ))
} }
</> </ScrollArea>
) )
} }
export default function MultiBooleanFormField<T extends FieldValues>(params: { control: Control<T>, name: Path<T>, label: string, options: string[], defaultValues?: string[] }) { export default function MultiBooleanFormField<T extends FieldValues>(params: { control: Control<T>, name: Path<T>, label: string, options: string[], defaultValues?: string[] }) {
@@ -76,9 +99,9 @@ export default function MultiBooleanFormField<T extends FieldValues>(params: { c
</PopoverTrigger> </PopoverTrigger>
<FormControl> <FormControl>
<PopoverContent data-testid="multiboolean-content"> <PopoverContent data-testid="multiboolean-content">
<MultiBooleanFieldContext.Provider value={{checkedValues: checkedValues, setCheckedValue: setCheckedValues}}> <MultiBooleanFieldContext.Provider value={{checkedValues: checkedValues, setCheckedValue: setCheckedValues}}>
<InnerMultiBooleanFormField onChange={field.onChange} options={params.options} /> <InnerMultiBooleanFormField onChange={field.onChange} options={params.options} />
</MultiBooleanFieldContext.Provider> </MultiBooleanFieldContext.Provider>
</PopoverContent> </PopoverContent>
</FormControl> </FormControl>
</Popover> </Popover>

View File

@@ -1,5 +1,6 @@
export { default as BooleanFormField } from './BooleanFormField' export { default as BooleanFormField } from './BooleanFormField'
export { default as TextInputFormField } from './TextInputFormField' export { default as TextInputFormField } from './TextInputFormField'
export { default as IntInputFormField } from './IntInputFormField'
export { default as MultiBooleanFormField } from './MultiBooleanFormField' export { default as MultiBooleanFormField } from './MultiBooleanFormField'
export { default as SelectFormField } from './SelectFormField' export { default as SelectFormField } from './SelectFormField'
export { default as MdeFormField } from './MdeFormField' export { default as MdeFormField } from './MdeFormField'

View File

@@ -9,11 +9,32 @@ 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
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
@@ -70,29 +91,112 @@ 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 })
} }
if (GSAP_DEBUG && tl.current && !devToolsCreated.current) {
devToolsCreated.current = true
GSDevTools.create({ animation: tl.current })
}
return () => { console.log("gsap cleanup") } return () => { console.log("gsap cleanup") }
}) })
// Handoff: fire registered callbacks once, when the entrance finishes.
const readyFired = useRef(false)
const readyCbs = useRef<Array<() => void>>([])
const fireReady = useCallback(() => {
if (readyFired.current) return
readyFired.current = true
readyCbs.current.forEach((cb) => cb())
readyCbs.current = []
},[])
const onReady = useCallback((cb: () => void) => {
if (readyFired.current) cb()
else readyCbs.current.push(cb)
},[])
const addAnimation = useCallback((animation: gsap.core.TimelineChild, position: gsap.Position) => { const addAnimation = useCallback((animation: gsap.core.TimelineChild, position: gsap.Position) => {
console.log("add animation to:", position, tl.current !== undefined) // 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 (readyFired.current) return
tl.current?.add(animation, position); tl.current?.add(animation, position);
},[]) },[])
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 (readyFired.current) { fn(); return }
tl.current?.add(fn, position)
},[])
// 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(() => {
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) return
},[]) // 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()
},[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

@@ -3,7 +3,7 @@ import type { inferRouterOutputs } from '@trpc/server';
import { useUser } from '@clerk/nextjs' import { useUser } from '@clerk/nextjs'
import { createContext, useContext, useEffect, useState, type ReactNode } from 'react' import { createContext, useContext, useEffect, useState, type ReactNode } from 'react'
import { trpc } from '~/app/_trpc/Client' import { trpc } from '~/app/_trpc/Client'
import { type ChatRouter } from '~/server/routers/chat' import type { ChatRouter } from '~/server/routers/chat'
const MessageContext = createContext<{ const MessageContext = createContext<{
session?: inferRouterOutputs<ChatRouter>['getSession'] session?: inferRouterOutputs<ChatRouter>['getSession']
messages?: inferRouterOutputs<ChatRouter>['getMessages'] messages?: inferRouterOutputs<ChatRouter>['getMessages']

View File

@@ -6,8 +6,8 @@ import SimpleSidebarGroup from "~/components/ui/simple-sidebar-group";
export default function AdminSideBar() { export default function AdminSideBar() {
return ( return (
<> <>
<Sidebar variant="floating" className="h-[96%] mt-10 z-[51]"> <Sidebar variant="floating" className="h-full lg:h-[96%] lg:mt-10 z-51">
<SidebarTrigger className="absolute z-[52] left-65 top-100" /> <SidebarTrigger className="absolute z-52 left-65 top-100" />
<SidebarContent> <SidebarContent>
<ScrollArea> <ScrollArea>
<SimpleSidebarGroup lable="CV"> <SimpleSidebarGroup lable="CV">

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,18 +1,31 @@
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> <div className="flex flex-col gap-4">
<h1 className="text-lg font-semibold">AI System Prompt</h1> <div>
<p className="text-sm text-muted-foreground"> <h1 className="text-lg font-semibold">AI Model</h1>
This prompt is sent to the model on every chat request. <p className="text-sm text-muted-foreground">
</p> The OpenAI model used to respond to chat requests.
</p>
</div>
<ModelSelector initialValue={model} />
</div>
<div className="flex flex-col gap-4">
<div>
<h1 className="text-lg font-semibold">AI System Prompt</h1>
<p className="text-sm text-muted-foreground">
This prompt is sent to the model on every chat request.
</p>
</div>
<SystemPromptForm initialValue={prompt} />
</div> </div>
<SystemPromptForm initialValue={prompt} />
</div> </div>
) )
} }

View File

@@ -0,0 +1,100 @@
'use client'
import { useState } from "react";
import { AudioLines, Loader2, RefreshCw } from "lucide-react";
import { Button } from "~/components/ui/button";
import { trpc } from "~/app/_trpc/Client";
import { useUploadThing } from "~/lib/uploadthing";
import { transcodeToAac } from "~/lib/ffmpeg/transcode";
import { toast } from "sonner";
import type { RouterOutputs } from "~/server/routers/_app";
import type { IterableElement } from "type-fest";
export default function ConvertToStreamButton(props: {
track: IterableElement<RouterOutputs['music']['list']>;
}) {
const { track } = props;
const utils = trpc.useUtils();
const [busy, setBusy] = useState(false);
const [stage, setStage] = useState("");
const [progress, setProgress] = useState(0);
const setStream = trpc.music.setStream.useMutation({
onSuccess: () => utils.music.list.invalidate(),
});
const { startUpload } = useUploadThing("musicUploader");
async function handleConvert() {
setBusy(true);
setProgress(0);
let currentStage = "Loading ffmpeg";
const goto = (s: string) => {
currentStage = s;
setStage(s);
};
try {
goto("Transcoding");
const file = await transcodeToAac({
sourceUrl: track.fileUrl,
outputName: `${track.title || "track"}.m4a`,
onProgress: setProgress,
});
goto("Uploading");
const uploaded = await startUpload([file]);
const res = uploaded?.[0];
if (!res) throw new Error("Upload returned no file");
goto("Saving");
await setStream.mutateAsync({
id: track.id,
streamUrl: res.serverData.fileUrl,
streamKey: res.serverData.fileKey,
streamName: res.serverData.fileName,
});
toast("Streaming version saved");
} catch (e) {
console.error("[ConvertToStream] failed during", currentStage, e);
const detail =
e instanceof Error
? e.message
: typeof e === "string"
? e
: (() => {
try {
return JSON.stringify(e);
} catch {
return String(e);
}
})();
toast(`Conversion failed (${currentStage}): ${detail || "see console for details"}`);
} finally {
setBusy(false);
setStage("");
setProgress(0);
}
}
return (
<div className="flex items-center gap-2">
<Button type="button" variant="outline" size="sm" disabled={busy} onClick={handleConvert}>
{busy ? (
<Loader2 className="animate-spin" />
) : track.streamUrl ? (
<RefreshCw />
) : (
<AudioLines />
)}
{busy
? `${stage}${stage === "Transcoding" && progress ? ` ${Math.round(progress * 100)}%` : "…"}`
: track.streamUrl
? "Re-generate stream"
: "Generate stream (AAC)"}
</Button>
{track.streamUrl && !busy && (
<span className="text-xs text-muted-foreground">Streaming version ready</span>
)}
</div>
);
}

View File

@@ -3,6 +3,7 @@
import { trpc } from "~/app/_trpc/Client"; import { trpc } from "~/app/_trpc/Client";
import * as Card from "~/components/ui/card"; import * as Card from "~/components/ui/card";
import UploadMusicForm from "./_components/UploadMusicForm"; import UploadMusicForm from "./_components/UploadMusicForm";
import ConvertToStreamButton from "./_components/ConvertToStreamButton";
import { CollapsibleForm } from "~/app/_components/Form/Components"; import { CollapsibleForm } from "~/app/_components/Form/Components";
import { useEffect } from "react"; import { useEffect } from "react";
@@ -14,8 +15,9 @@ export default function AdminMusicPage() {
{tracks && <> {tracks && <>
{tracks.map((t) => ( {tracks.map((t) => (
<Card.Card key={t.id}> <Card.Card key={t.id}>
<Card.CardContent> <Card.CardContent className="flex flex-col gap-4">
<UploadMusicForm entity={t} className="w-full"/> <UploadMusicForm entity={t} className="w-full"/>
<ConvertToStreamButton track={t} />
</Card.CardContent> </Card.CardContent>
</Card.Card> </Card.Card>
))} ))}

View File

@@ -8,7 +8,7 @@ import type { IterableElement } from 'type-fest'
import { entitySchemas, makeOnSuccess } from "~/lib/utils"; import { entitySchemas, makeOnSuccess } from "~/lib/utils";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import type { RouterOutputs } from '~/server/routers/_app'; import type { RouterOutputs } from '~/server/routers/_app';
import { SelectFormField, TextInputFormField, MdeFormField } from '~/app/_components/Form/Fields' import { SelectFormField, TextInputFormField, MdeFormField, IntInputFormField } from '~/app/_components/Form/Fields'
import { FormScaffold } from '~/app/_components/Form/Components'; import { FormScaffold } from '~/app/_components/Form/Components';
import { usePathname, useRouter } from 'next/navigation'; import { usePathname, useRouter } from 'next/navigation';
import { useTheme } from 'next-themes'; import { useTheme } from 'next-themes';
@@ -29,7 +29,8 @@ export default function CreateUpdateProjectForm(params: { className?: string, en
releaseStatus: params.entity ? params.entity.releaseStatus : "unreleased", releaseStatus: params.entity ? params.entity.releaseStatus : "unreleased",
releaseLink: params.entity ? params.entity.releaseLink : "", releaseLink: params.entity ? params.entity.releaseLink : "",
sourceType: params.entity ? params.entity.sourceType : "open", sourceType: params.entity ? params.entity.sourceType : "open",
sourceLink: params.entity ? params.entity.sourceLink : "" sourceLink: params.entity ? params.entity.sourceLink : "",
orderPos: params.entity ? params.entity.orderPos : 0
} }
}) })
let path = usePathname() let path = usePathname()
@@ -79,6 +80,7 @@ export default function CreateUpdateProjectForm(params: { className?: string, en
<SelectItem value="unreleased"> unreleased </SelectItem> <SelectItem value="unreleased"> unreleased </SelectItem>
</SelectFormField> </SelectFormField>
<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'/>
</FormScaffold> </FormScaffold>
</FormMutationContextProvider> </FormMutationContextProvider>
) )

View File

@@ -46,7 +46,7 @@ export default function CreateUpdateStackForm(params: { className?: string, enti
id={id} id={id}
className={params.className} className={params.className}
> >
<MultiBooleanFormField control={form.control} name='stackItems' label='Stack Items' options={stackItemEnum.enumValues} defaultValues={params.entity?.stackItems ?? [""]} /> <MultiBooleanFormField control={form.control} name='stackItems' label='Stack Items' options={stackItemEnum.enumValues} defaultValues={params.entity?.stackItems ?? []} />
</FormScaffold> </FormScaffold>
</FormMutationContextProvider> </FormMutationContextProvider>
</> </>

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> <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,42 @@
'use client' 'use client'
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 AnimateTextIn from "~/app/_components/Animated/AnimateIn"
import AnimatePopUp from "~/app/_components/Animated/AnimatePopUp"
import { ScrollArea } from "~/components/ui/scroll-area";
export type CvCategoryData = ArrayElement<RouterOutputs['categoryv2']['listAllWithEntries']>
type CvCategoryProps = { type CvCategoryProps = {
initialData: ArrayElement<RouterOutputs['categoryv2']['listByLayoutPosition']>, category: CvCategoryData,
layout: "row"|"col", layout: "row" | "col",
children?: React.ReactElement<Parameters<typeof CvEntry>> position?: number,
} }
export default function CvCategory(props:CvCategoryProps) { export default function CvCategory({ category, layout, position = 0 }: CvCategoryProps) {
const category = trpc.categoryv2.getById.useQuery(props.initialData? props.initialData.id : ""); const entries = category.cvEntry
return ( return (
<Card className={cn(props.layout == "row" ? "w-full" : "","gsapan")}> <AnimatedCard position={position} className={cn(layout == "row" ? "w-full" : "", "h-screen")}>
<CardHeader> <CardHeader>
<CardTitle> <AnimateTextIn position={position + 0.2} animation="slide">
{category.data?.name} <CardTitle>{category.name}</CardTitle>
</CardTitle> </AnimateTextIn>
</CardHeader> </CardHeader>
{(category.data?.cvEntry.length ? category.data?.cvEntry.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")}>
{category.data?.cvEntry.map((entry) => ( <ScrollArea>
<CvEntry className={props.layout == "row" ? "w-full lg:w-fit" : undefined} key={entry.id} initialData={entry}/> {entries.map((entry, i) => (
))} <AnimatePopUp position={position + 0.4 + i * 0.2} key={entry.id}>
</CardContent> <CvEntry position={position + 0.4 + i * 0.2} entry={entry} className={layout == "row" ? "w-full lg:w-fit" : undefined} />
: </AnimatePopUp>
<></> ))}
} </ScrollArea>
</Card> </CardContent>
) :
<></>
}
</AnimatedCard>
)
} }

View File

@@ -1,68 +1,47 @@
import { trpc } from "~/app/_trpc/Client"
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 AnimatePopUp from "~/app/_components/Animated/AnimatePopUp"
className?: string import type { CvCategoryData } from "./CvCategory"
import { ClientMdx } from "~/components/ClientMdx"
export type CvEntryData = ArrayElement<CvCategoryData['cvEntry']>
export default function CvEntry({ entry, className, position = 0 }: {
entry: CvEntryData,
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">
<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">
<div>
<Markdown rehypePlugins={[rehypeHighlight, rehypeRaw]}>{data.description}</Markdown>
</div>
</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">
<AnimatePopUp position={position + 0.2}>
<article className="prose prose-zinc dark:prose-invert max-w-none">
<ClientMdx source={entry.description} fallback={entry.description} />
</article>
</AnimatePopUp>
</CardContent> :
<></>
}
{!entry.hideDates ?
<CardFooter className="text-sm">
<AnimateTextIn position={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

@@ -1,65 +1,29 @@
'use client' 'use client'
import { useGSAP } from "@gsap/react"; import { useTimeLine } from "../_providers/GsapProvicer";
import { useGsapContext,useTimeLine } from "../_providers/GsapProvicer";
import { trpc } from "../_trpc/Client"; import { trpc } from "../_trpc/Client";
import { useRef } from "react";
import { SidebarContent, SidebarProvider, Sidebar } from "~/components/ui/sidebar"; import { SidebarContent, SidebarProvider, Sidebar } from "~/components/ui/sidebar";
import SidebarTriggerDisappearsOnMobile from "./_components/SidebarTriggerDisappearsOnMobile"; import SidebarTriggerDisappearsOnMobile from "./_components/SidebarTriggerDisappearsOnMobile";
import CvCategory from "./_components/CvCategory"; import CvCategory from "./_components/CvCategory";
import gsap from 'gsap'
export default function CvPage() { export default function CvPage() {
const sidebarCategories = trpc.categoryv2.listByLayoutPosition.useQuery("sidebar"); const cv = trpc.categoryv2.listAllWithEntries.useQuery();
const col1Categories = trpc.categoryv2.listByLayoutPosition.useQuery("col1"); useTimeLine(cv.data)
const headerCategories = trpc.categoryv2.listByLayoutPosition.useQuery("header"); const byPosition = (pos: "sidebar" | "header" | "col1" | "col2") =>
const col2Categories = trpc.categoryv2.listByLayoutPosition.useQuery("col2"); cv.data?.filter((c) => c.layoutPosition === pos) ?? []
const gsapContext = useGsapContext() const sidebarCategories = byPosition("sidebar")
const container = useRef<HTMLDivElement>(null) const headerCategories = byPosition("header")
enum Direction { const col1Categories = byPosition("col1")
Left = 1, const col2Categories = byPosition("col2")
Up,
Right,
Down
}
const nextGsapConf = (direction: Direction) => {
switch (direction) {
case Direction.Left:
return { x: -100, opacity: 0, duration: 0.5 }
case Direction.Up:
return { y: -100, opacity: 0, duration: 0.5 }
case Direction.Right:
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 (
<> <>
<SidebarProvider ref={container}> <SidebarProvider>
{sidebarCategories.data && {sidebarCategories.length > 0 &&
<> <>
<SidebarTriggerDisappearsOnMobile /> <SidebarTriggerDisappearsOnMobile />
<Sidebar className="gsapan "> <Sidebar>
<SidebarContent className="p-2 lg:pt-[3.2rem]"> <SidebarContent className="p-2 lg:pt-[3.2rem]">
{sidebarCategories.data?.map((cat) => { {sidebarCategories.map((cat, i) => (
if (cat !== undefined) { <CvCategory layout="col" position={i} category={cat} key={cat.id} />
return ( ))}
<CvCategory layout="col" initialData={cat} key={cat.id} />
)
}
})}
</SidebarContent> </SidebarContent>
</Sidebar> </Sidebar>
</> </>
@@ -67,26 +31,20 @@ export default function CvPage() {
<div className="h-full w-full flex flex-wrap flex-row p-4 pt-8 "> <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="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"> <div id="header" className="flex w-full h-fit flex-row gap-4 flex-wrap">
{headerCategories.data?.map((cat) => { {headerCategories.map((cat, i) => (
return ( <CvCategory layout="row" position={i} category={cat} key={cat.id} />
<CvCategory layout="row" initialData={cat} key={cat.id} /> ))}
)
})}
</div> </div>
<div id="colwrapper" className="flex flex-col lg:flex-row w-full h-3/4 gap-4"> <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`}> <div id="col1" className={`flex flex-col w-full ${col1Categories.length > 0 ? "lg:w-1/2" : ""} h-full gap-4`}>
{col1Categories.data?.map((cat) => { {col1Categories.map((cat, i) => (
return ( <CvCategory layout="col" position={i} category={cat} key={cat.id} />
<CvCategory layout="col" initialData={cat} key={cat.id} /> ))}
)
})}
</div> </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`}> <div id="col2" className={`flex flex-col w-full ${col2Categories.length > 0 ? "lg:w-1/2" : ""} h-full gap-4`}>
{col2Categories.data?.map((cat) => { {col2Categories.map((cat, i) => (
return ( <CvCategory layout="col" position={i} category={cat} key={cat.id} />
<CvCategory layout="col" initialData={cat} key={cat.id} /> ))}
)
})}
</div> </div>
</div> </div>
</div> </div>

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

@@ -0,0 +1,190 @@
'use client'
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 { Button } from "~/components/ui/button";
import { toast } from "sonner";
import { useMusicPlayer } from "./MusicPlayerProvider";
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")}`;
}
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: {
id: string;
src: string;
downloadUrl: string;
downloadName: string;
}) {
const containerRef = useRef<HTMLDivElement>(null);
const wsRef = useRef<WaveSurfer | null>(null);
const [ready, setReady] = useState(false);
const [duration, setDuration] = useState(0);
const [downloading, setDownloading] = useState(false);
const { resolvedTheme } = useTheme();
const { currentId, isPlaying, currentTime, toggle, seek, subscribeTime } = useMusicPlayer();
const isActive = currentId === props.id;
// Reach live values from the once-created wavesurfer callbacks.
const isActiveRef = useRef(isActive);
isActiveRef.current = isActive;
const currentTimeRef = useRef(currentTime);
currentTimeRef.current = currentTime;
const toggleRef = useRef(toggle);
toggleRef.current = toggle;
const seekRef = useRef(seek);
seekRef.current = seek;
useEffect(() => {
let ws: WaveSurfer | null = null;
let cancelled = false;
setReady(false);
(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() {
setDownloading(true);
try {
// The download file is cross-origin, so the <a download> attribute is
// ignored — fetch it as a blob to force a real download.
const res = await fetch(props.downloadUrl);
if (!res.ok) throw new Error(`HTTP ${res.status}`);
const blob = await res.blob();
const url = URL.createObjectURL(blob);
const a = document.createElement("a");
a.href = url;
a.download = props.downloadName;
document.body.appendChild(a);
a.click();
a.remove();
URL.revokeObjectURL(url);
} catch (e) {
toast(`Download failed: ${e instanceof Error ? e.message : "unknown error"}`);
} finally {
setDownloading(false);
}
}
const playing = isActive && isPlaying;
return (
<div className="flex items-center gap-3 rounded-lg border bg-transparent px-3 py-2">
<Button
type="button"
size="icon"
variant="ghost"
aria-label={playing ? "Pause" : "Play"}
disabled={!ready}
onClick={() => toggle(props.id)}
>
{playing ? <Pause /> : <Play />}
</Button>
<span className="w-10 shrink-0 text-right font-mono text-xs text-muted-foreground tabular-nums">
{formatTime(isActive ? currentTime : 0)}
</span>
<div className="relative flex-1">
<div ref={containerRef} className="w-full" />
{!ready && (
<div className="absolute inset-0 flex items-center">
<div className="h-7 w-full animate-pulse rounded bg-muted-foreground/15" />
</div>
)}
</div>
<span className="w-10 shrink-0 font-mono text-xs text-muted-foreground tabular-nums">
{formatTime(duration)}
</span>
<Button
type="button"
size="icon"
variant="ghost"
aria-label="Download lossless file"
title="Download lossless file"
disabled={downloading}
onClick={handleDownload}
>
{downloading ? <Loader2 className="animate-spin" /> : <Download />}
</Button>
</div>
);
}

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

@@ -7,6 +7,7 @@ import { Spinner } from "~/components/ui/spinner";
import AnimateTextIn from "../_components/Animated/AnimateIn"; import AnimateTextIn from "../_components/Animated/AnimateIn";
import { ScrollArea } from "~/components/ui/scroll-area"; import { ScrollArea } from "~/components/ui/scroll-area";
import AnimatePopUp from "../_components/Animated/AnimatePopUp"; import AnimatePopUp from "../_components/Animated/AnimatePopUp";
import AudioPlayer from "./_components/AudioPlayer";
export default function MusicPage() { export default function MusicPage() {
const { data: tracks, isLoading } = trpc.music.list.useQuery(); const { data: tracks, isLoading } = trpc.music.list.useQuery();
useTimeLine(tracks) useTimeLine(tracks)
@@ -14,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="" />
@@ -32,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>
@@ -40,10 +41,13 @@ 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>
<audio controls className="w-full player" src={track.fileUrl}> <AudioPlayer
Your browser does not support the audio element. id={track.id}
</audio> src={track.streamUrl ?? track.fileUrl}
downloadUrl={track.fileUrl}
downloadName={track.fileName}
/>
</AnimatePopUp> </AnimatePopUp>
</Card.CardContent> </Card.CardContent>
</Card.AnimatedCard> </Card.AnimatedCard>

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

@@ -125,6 +125,30 @@ const STACK_META: Record<string, { label: string; icon?: SvglIcon }> = {
dark: "https://svgl.app/library/neon.svg", dark: "https://svgl.app/library/neon.svg",
}, },
}, },
typescript: {
label: "TypeScript",
icon: {
light: "https://svgl.app/library/typescript.svg",
dark: "https://svgl.app/library/typescript.svg",
},
},
javafx: { label: "JavaFX" },
x11: { label: "X11" },
zig: {
label: "Zig",
icon: {
light: "https://svgl.app/library/zig.svg",
dark: "https://svgl.app/library/zig.svg",
},
},
libghostty: { label: "libghostty" },
zod: {
label: "Zod",
icon: {
light: "https://svgl.app/library/zod.svg",
dark: "https://svgl.app/library/zod.svg",
},
},
}; };
export function StackBadge({ item }: { item: string }) { export function StackBadge({ item }: { item: string }) {

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,7 @@
import { useGSAP } from "@gsap/react"; import * as React from "react" 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 +27,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}

114
src/lib/ffmpeg/transcode.ts Normal file
View File

@@ -0,0 +1,114 @@
import { FFmpeg } from "@ffmpeg/ffmpeg";
import { fetchFile, toBlobURL } from "@ffmpeg/util";
// Single-threaded core: works without SharedArrayBuffer, so no COOP/COEP
// cross-origin-isolation headers are required. Slower than the MT core, which
// is fine for occasional admin-side transcodes.
const CORE_VERSION = "0.12.10";
// @ffmpeg/ffmpeg 0.12.x always spawns a `type: "module"` worker. A module
// worker can't `importScripts`, so the worker dynamically `import()`s the core —
// which means the core must be the ESM build, not UMD.
const CORE_BASE = `https://unpkg.com/@ffmpeg/core@${CORE_VERSION}/dist/esm`;
// Self-hosted worker, bundled from @ffmpeg/ffmpeg's ESM `worker.js` via the
// `build:ffmpeg-worker` package script (rerun it when bumping @ffmpeg/ffmpeg).
// The shipped UMD worker is unusable here: its
// dynamic import is webpack-compiled into a stub that throws MODULE_NOT_FOUND,
// and letting Next bundle the worker hits the same problem. Serving our own
// same-origin module worker keeps the native `import()` intact.
// Must be an absolute URL: the library resolves classWorkerURL against
// `import.meta.url`, which is a file:// base under Next, so a root-relative path
// would wrongly become `file:///ffmpeg/worker.js`.
const WORKER_PATH = "/ffmpeg/worker.js";
let instance: FFmpeg | null = null;
let loadPromise: Promise<FFmpeg> | null = null;
function load(onLog?: (msg: string) => void): Promise<FFmpeg> {
if (instance) return Promise.resolve(instance);
if (!loadPromise) {
loadPromise = (async () => {
const ffmpeg = new FFmpeg();
ffmpeg.on("log", ({ message }) => {
console.debug("[ffmpeg]", message);
onLog?.(message);
});
const ok = await ffmpeg.load({
coreURL: await toBlobURL(`${CORE_BASE}/ffmpeg-core.js`, "text/javascript"),
wasmURL: await toBlobURL(`${CORE_BASE}/ffmpeg-core.wasm`, "application/wasm"),
classWorkerURL: new URL(WORKER_PATH, window.location.origin).href,
});
if (!ok) throw new Error("ffmpeg.load() returned false — core failed to initialise");
instance = ffmpeg;
return ffmpeg;
})();
// If loading fails, clear the cached promise so the next click retries.
loadPromise.catch(() => {
loadPromise = null;
});
}
return loadPromise;
}
/**
* Transcodes a (FLAC) source URL to a streaming-friendly AAC/m4a file in the
* browser. Returns a File ready to hand to UploadThing's startUpload.
*/
export async function transcodeToAac(opts: {
sourceUrl: string;
outputName?: string;
bitrate?: string;
onProgress?: (ratio: number) => void;
onLog?: (msg: string) => void;
}): Promise<File> {
let lastLog = "";
const onLog = (msg: string) => {
if (msg.trim()) lastLog = msg;
opts.onLog?.(msg);
};
const ffmpeg = await load(onLog);
// `load` only wires the persisted instance's log handler on first init; make
// sure this call's logs are captured even when the instance was cached.
const logHandler = ({ message }: { message: string }) => onLog(message);
ffmpeg.on("log", logHandler);
const progressHandler = opts.onProgress
? ({ progress }: { progress: number }) =>
opts.onProgress?.(Math.min(1, Math.max(0, progress)))
: null;
if (progressHandler) ffmpeg.on("progress", progressHandler);
try {
// fetchFile pulls the source cross-origin; surface a clear message if the
// host (UploadThing) blocks it.
let sourceData: Uint8Array;
try {
sourceData = await fetchFile(opts.sourceUrl);
} catch (e) {
throw new Error(
`Could not fetch source file (CORS or network): ${e instanceof Error ? e.message : String(e)}`,
);
}
await ffmpeg.writeFile("input.flac", sourceData);
const code = await ffmpeg.exec([
"-i", "input.flac",
"-c:a", "aac",
"-b:a", opts.bitrate ?? "192k",
// Move the moov atom to the front so the player can start before the
// whole file has downloaded — the whole point of the stream version.
"-movflags", "+faststart",
"output.m4a",
]);
if (code !== 0) {
throw new Error(`ffmpeg exited with code ${code}: ${lastLog || "no log output"}`);
}
const data = await ffmpeg.readFile("output.m4a");
await ffmpeg.deleteFile("input.flac");
await ffmpeg.deleteFile("output.m4a");
// Copy into a fresh ArrayBuffer-backed view so the Blob typing is happy
// (readFile may be typed against a SharedArrayBuffer-backed Uint8Array).
const bytes = new Uint8Array(data as Uint8Array);
const blob = new Blob([bytes], { type: "audio/mp4" });
return new File([blob], opts.outputName ?? "stream.m4a", { type: "audio/mp4" });
} finally {
ffmpeg.off("log", logHandler);
if (progressHandler) ffmpeg.off("progress", progressHandler);
}
}

View File

@@ -7,6 +7,9 @@ export const createMusicInputSchema = z.object({
fileUrl: z.string(), fileUrl: z.string(),
fileKey: z.string(), fileKey: z.string(),
fileName: z.string(), fileName: z.string(),
streamUrl: z.string().optional().nullable(),
streamKey: z.string().optional().nullable(),
streamName: z.string().optional().nullable(),
}) })
export const updateMusicInputSchema = z.object({ export const updateMusicInputSchema = z.object({
id: z.string().uuid(), id: z.string().uuid(),
@@ -15,4 +18,14 @@ export const updateMusicInputSchema = z.object({
fileUrl: z.string().optional(), fileUrl: z.string().optional(),
fileKey: z.string().optional(), fileKey: z.string().optional(),
fileName: z.string().optional(), fileName: z.string().optional(),
streamUrl: z.string().optional().nullable(),
streamKey: z.string().optional().nullable(),
streamName: z.string().optional().nullable(),
})
export const setStreamInputSchema = z.object({
id: z.string().uuid(),
streamUrl: z.string(),
streamKey: z.string(),
streamName: z.string(),
}) })

View File

@@ -1,5 +1,7 @@
import { generateUploadButton, generateUploadDropzone } from "@uploadthing/react"; import { generateReactHelpers, generateUploadButton, generateUploadDropzone } from "@uploadthing/react";
import type { FileRouter } from "~/server/uploadthing"; import type { FileRouter } from "~/server/uploadthing";
export const UploadButton = generateUploadButton<FileRouter>(); export const UploadButton = generateUploadButton<FileRouter>();
export const UploadDropzone = generateUploadDropzone<FileRouter>(); export const UploadDropzone = generateUploadDropzone<FileRouter>();
export const { useUploadThing } = generateReactHelpers<FileRouter>();

View File

@@ -43,6 +43,7 @@ export const cvEntry = createTable(
.default(sql`CURRENT_TIMESTAMP`) .default(sql`CURRENT_TIMESTAMP`)
.notNull().$type<Date>(), .notNull().$type<Date>(),
updatedAt: d.timestamp({ withTimezone: true }).$onUpdate(() => new Date()).$type<Date>(), updatedAt: d.timestamp({ withTimezone: true }).$onUpdate(() => new Date()).$type<Date>(),
position: d.integer(),
}) })
) )
@@ -55,7 +56,7 @@ export const cvEntryRelations = relations(cvEntry, ({one}) => ({
export const sourceTypeEnum = pgEnum('source_type',['open','closed']) export const sourceTypeEnum = pgEnum('source_type',['open','closed'])
export const releaseStatus = pgEnum('release_status',['released','unreleased']) export const releaseStatus = pgEnum('release_status',['released','unreleased'])
export const stackItemEnum = pgEnum('stack_item',['drizzle','postgres','nextjs','react','servercomponents','php','laravel','reactnative','expo','mysql','nginx','protobuf','grpc','java','graalvm','spring','aws','s3','react-native','linux','debian','htmx','neon']) export const stackItemEnum = pgEnum('stack_item',['drizzle','postgres','nextjs','react','servercomponents','php','laravel','reactnative','expo','mysql','nginx','protobuf','grpc','java','graalvm','spring','aws','s3','react-native','linux','debian','htmx','neon','typescript','javafx','x11','zig','libghostty','zod'])
export const project = createTable( export const project = createTable(
"project", "project",
@@ -68,6 +69,7 @@ export const project = createTable(
releaseStatus: releaseStatus(), releaseStatus: releaseStatus(),
releaseLink: d.varchar({length: 200}), releaseLink: d.varchar({length: 200}),
stackId: d.uuid(), stackId: d.uuid(),
orderPos: d.integer(),
}) })
) )
@@ -92,9 +94,14 @@ export const music = createTable(
id: d.uuid().primaryKey().notNull(), id: d.uuid().primaryKey().notNull(),
title: d.varchar({ length: 100 }).notNull(), title: d.varchar({ length: 100 }).notNull(),
description: d.text(), description: d.text(),
// Original high-quality upload (e.g. FLAC), offered as a download.
fileUrl: d.varchar("file_url", { length: 500 }).notNull(), fileUrl: d.varchar("file_url", { length: 500 }).notNull(),
fileKey: d.varchar("file_key", { length: 200 }).notNull(), fileKey: d.varchar("file_key", { length: 200 }).notNull(),
fileName: d.varchar("file_name", { length: 200 }).notNull(), fileName: d.varchar("file_name", { length: 200 }).notNull(),
// Lighter, streaming-friendly transcode (e.g. AAC) used by the player.
streamUrl: d.varchar("stream_url", { length: 500 }),
streamKey: d.varchar("stream_key", { length: 200 }),
streamName: d.varchar("stream_name", { length: 200 }),
createdAt: d createdAt: d
.timestamp({ withTimezone: true }) .timestamp({ withTimezone: true })
.default(sql`CURRENT_TIMESTAMP`) .default(sql`CURRENT_TIMESTAMP`)
@@ -168,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,11 +13,22 @@ 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({
with: {
cvEntry: true
},
where(fields, operators) { where(fields, operators) {
return operators.eq(fields.id, input) return operators.eq(fields.id, input)
}, },

View File

@@ -13,4 +13,14 @@ export const cvEntryRouter = router({
}) })
return res; return res;
}), }),
byCategoryAndToDateDescending: publicProcedure.input(z.string()).query(async ({input}) => {
const res = await db.query.cvEntry.findMany({
with: {
category: true
},
where: (fields, {eq}) => eq(fields.categoryId,input),
orderBy: (t,{desc}) => desc(t.toTime),
})
return res;
})
}); });

View File

@@ -5,7 +5,7 @@ import { eq } from "drizzle-orm";
import { isAdmin } from "~/app/actions"; import { isAdmin } from "~/app/actions";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { z } from "zod"; import { z } from "zod";
import { createMusicInputSchema, updateMusicInputSchema } from "~/lib/trpc/music/schemas"; import { createMusicInputSchema, updateMusicInputSchema, setStreamInputSchema } from "~/lib/trpc/music/schemas";
import { utapi } from "../uploadthing"; import { utapi } from "../uploadthing";
export const musicRouter = router({ export const musicRouter = router({
list: publicProcedure.query(async () => { list: publicProcedure.query(async () => {
@@ -33,6 +33,22 @@ export const musicRouter = router({
const { id, ...data } = input; const { id, ...data } = input;
return db.update(music).set(data).where(eq(music.id, id)).returning(); return db.update(music).set(data).where(eq(music.id, id)).returning();
}), }),
setStream: publicProcedure
.input(setStreamInputSchema)
.mutation(async ({ input }) => {
const admin = await isAdmin();
if (!admin) throw new TRPCError({ code: "FORBIDDEN", message: "Access denied" });
const { id, ...data } = input;
const existing = await db.select().from(music).where(eq(music.id, id)).limit(1);
const prev = existing.at(0);
if (!prev) throw new TRPCError({ code: "NOT_FOUND", message: "Track not found" });
const res = await db.update(music).set(data).where(eq(music.id, id)).returning();
// Drop the previous stream transcode so we don't orphan it on UploadThing.
if (prev.streamKey && prev.streamKey !== data.streamKey) {
utapi.deleteFiles(prev.streamKey);
}
return res.at(0);
}),
delete: publicProcedure delete: publicProcedure
.input(z.object({id:z.string().uuid()})) .input(z.object({id:z.string().uuid()}))
.mutation(async ({ input }) => { .mutation(async ({ input }) => {
@@ -41,7 +57,8 @@ export const musicRouter = router({
let res = await db.delete(music).where(eq(music.id, input.id)).returning(); let res = await db.delete(music).where(eq(music.id, input.id)).returning();
let ret = res.at(0) let ret = res.at(0)
if (ret) { if (ret) {
utapi.deleteFiles(ret.fileKey) const keys = [ret.fileKey, ret.streamKey].filter((k): k is string => !!k);
utapi.deleteFiles(keys)
} }
return ret; return ret;
}), }),

View File

@@ -1,5 +1,5 @@
import { publicProcedure, router } from "~/server/trpc";
import { db } from "~/server/db"; import { db } from "~/server/db";
import { publicProcedure, router } from "~/server/trpc";
type ReadmeRequest = { type ReadmeRequest = {
url: string; url: string;
@@ -71,6 +71,11 @@ async function fetchReadme(sourceLink: string) {
export const projectRouter = router({ export const projectRouter = router({
listWithStack: publicProcedure.query(async () => { listWithStack: publicProcedure.query(async () => {
const projects = await db.query.project.findMany({ const projects = await db.query.project.findMany({
orderBy: (project, { asc }) => [
asc(project.orderPos),
asc(project.title),
asc(project.id),
],
with: { with: {
techStack: true, techStack: true,
}, },