Compare commits
15 Commits
b59fb2b3af
...
fix-cv-ani
| Author | SHA1 | Date | |
|---|---|---|---|
| c742b8e457 | |||
| 0d79adb104 | |||
| 3e5be46503 | |||
| 73ba2b573d | |||
| c1fe73dbd0 | |||
| af4ff18917 | |||
| 58dc4ce53f | |||
| 53bc70ab05 | |||
| 1b3f30cc90 | |||
| 303ac83fe2 | |||
| 91315730ac | |||
| 13649cd6dc | |||
| 39563b6740 | |||
| c8a9ab5984 | |||
| 54f108ac8d |
@@ -31,7 +31,11 @@
|
|||||||
"@fortawesome/react-fontawesome": "^3.3.1",
|
"@fortawesome/react-fontawesome": "^3.3.1",
|
||||||
"@gsap/react": "^2.1.2",
|
"@gsap/react": "^2.1.2",
|
||||||
"@hookform/resolvers": "^5.4.0",
|
"@hookform/resolvers": "^5.4.0",
|
||||||
|
"@mdx-js/mdx": "^3.1.1",
|
||||||
|
"@mdx-js/react": "^3.1.1",
|
||||||
|
"@mdx-js/loader": "^3.1.1",
|
||||||
"@neondatabase/serverless": "^1.1.0",
|
"@neondatabase/serverless": "^1.1.0",
|
||||||
|
"@next/mdx": "^16.2.9",
|
||||||
"@radix-ui/react-accordion": "^1.2.12",
|
"@radix-ui/react-accordion": "^1.2.12",
|
||||||
"@radix-ui/react-alert-dialog": "^1.1.15",
|
"@radix-ui/react-alert-dialog": "^1.1.15",
|
||||||
"@radix-ui/react-aspect-ratio": "^1.1.8",
|
"@radix-ui/react-aspect-ratio": "^1.1.8",
|
||||||
@@ -67,6 +71,7 @@
|
|||||||
"@trpc/next": "^11.17.0",
|
"@trpc/next": "^11.17.0",
|
||||||
"@trpc/react-query": "^11.17.0",
|
"@trpc/react-query": "^11.17.0",
|
||||||
"@trpc/server": "^11.17.0",
|
"@trpc/server": "^11.17.0",
|
||||||
|
"@types/mdx": "^2.0.14",
|
||||||
"@uiw/react-md-editor": "^4.1.1",
|
"@uiw/react-md-editor": "^4.1.1",
|
||||||
"@uploadthing/react": "^7.3.3",
|
"@uploadthing/react": "^7.3.3",
|
||||||
"@vercel/speed-insights": "^2.0.0",
|
"@vercel/speed-insights": "^2.0.0",
|
||||||
@@ -94,7 +99,6 @@
|
|||||||
"react-day-picker": "^10.0.1",
|
"react-day-picker": "^10.0.1",
|
||||||
"react-dom": "^19.2.6",
|
"react-dom": "^19.2.6",
|
||||||
"react-hook-form": "^7.77.0",
|
"react-hook-form": "^7.77.0",
|
||||||
"react-markdown": "^10.1.0",
|
|
||||||
"react-resizable-panels": "^4.11.2",
|
"react-resizable-panels": "^4.11.2",
|
||||||
"recharts": "3.8.1",
|
"recharts": "3.8.1",
|
||||||
"rehype-highlight": "^7.0.2",
|
"rehype-highlight": "^7.0.2",
|
||||||
@@ -103,6 +107,7 @@
|
|||||||
"server-only": "^0.0.1",
|
"server-only": "^0.0.1",
|
||||||
"shadcn": "^4.10.0",
|
"shadcn": "^4.10.0",
|
||||||
"sonner": "^2.0.7",
|
"sonner": "^2.0.7",
|
||||||
|
"superjson": "^2.2.6",
|
||||||
"tailwind-merge": "^3.6.0",
|
"tailwind-merge": "^3.6.0",
|
||||||
"tailwindcss-motion": "^1.1.1",
|
"tailwindcss-motion": "^1.1.1",
|
||||||
"type-fest": "^5.7.0",
|
"type-fest": "^5.7.0",
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
"use client"
|
||||||
import { useRef, type HTMLAttributes, type ReactNode } from "react";
|
import { useRef, type HTMLAttributes, type ReactNode } from "react";
|
||||||
import { SplitText } from "gsap/SplitText";
|
import { SplitText } from "gsap/SplitText";
|
||||||
import gsap from 'gsap'
|
import gsap from 'gsap'
|
||||||
@@ -11,6 +12,7 @@ const AnimateTextIn = ({
|
|||||||
speed = 1,
|
speed = 1,
|
||||||
scrollOnly = false,
|
scrollOnly = false,
|
||||||
once = false,
|
once = false,
|
||||||
|
debugId,
|
||||||
className
|
className
|
||||||
}: {
|
}: {
|
||||||
children: ReactNode,
|
children: ReactNode,
|
||||||
@@ -18,6 +20,7 @@ const AnimateTextIn = ({
|
|||||||
position?: gsap.Position,
|
position?: gsap.Position,
|
||||||
scrollOnly?: boolean,
|
scrollOnly?: boolean,
|
||||||
once?: boolean,
|
once?: boolean,
|
||||||
|
debugId?: string,
|
||||||
speed?: number,
|
speed?: number,
|
||||||
className?: HTMLAttributes<HTMLDivElement>['className']
|
className?: HTMLAttributes<HTMLDivElement>['className']
|
||||||
}) => {
|
}) => {
|
||||||
@@ -26,7 +29,7 @@ const AnimateTextIn = ({
|
|||||||
position,
|
position,
|
||||||
scrollOnly,
|
scrollOnly,
|
||||||
once,
|
once,
|
||||||
debugId: `text-${position}`,
|
debugId: debugId ?? `text-${position}`,
|
||||||
makeReveal: (node) => {
|
makeReveal: (node) => {
|
||||||
// The wrapper starts at opacity 0 (so there's no flash of unsplit text);
|
// The wrapper starts at opacity 0 (so there's no flash of unsplit text);
|
||||||
// reveal the wrapper and let the per-character tween do the animation.
|
// reveal the wrapper and let the per-character tween do the animation.
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ const AnimatePopUp = ({
|
|||||||
ease='elastic',
|
ease='elastic',
|
||||||
scrollOnly=false,
|
scrollOnly=false,
|
||||||
once=false,
|
once=false,
|
||||||
|
debugId,
|
||||||
}:{
|
}:{
|
||||||
children:ReactNode
|
children:ReactNode
|
||||||
position:gsap.Position,
|
position:gsap.Position,
|
||||||
@@ -17,9 +18,10 @@ const AnimatePopUp = ({
|
|||||||
ease?:gsap.EaseString|gsap.EaseFunction,
|
ease?:gsap.EaseString|gsap.EaseFunction,
|
||||||
scrollOnly?:boolean,
|
scrollOnly?:boolean,
|
||||||
once?:boolean,
|
once?:boolean,
|
||||||
|
debugId?:string,
|
||||||
}) => {
|
}) => {
|
||||||
return (
|
return (
|
||||||
<AnimatedDiv children={children} position={position} scrollOnly={scrollOnly} once={once} className={cn(className,'h-0 translate-y-[50] overflow-hidden')} height='auto' y={0} overflow='' ease={ease} duration={duration} />
|
<AnimatedDiv children={children} position={position} scrollOnly={scrollOnly} once={once} debugId={debugId} className={cn(className,'h-0 translate-y-[50] overflow-hidden')} height='auto' y={0} overflow='' ease={ease} duration={duration} />
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
"use client"
|
||||||
import gsap from "gsap";
|
import gsap from "gsap";
|
||||||
import { type HTMLAttributes, type ReactNode, useRef } from "react";
|
import { type HTMLAttributes, type ReactNode, useRef } from "react";
|
||||||
import { useReveal } from "./useReveal";
|
import { useReveal } from "./useReveal";
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
import { useGSAP } from "@gsap/react"
|
import { useGSAP } from "@gsap/react"
|
||||||
import { ScrollTrigger } from "gsap/all"
|
import { ScrollTrigger } from "gsap/all"
|
||||||
import type { RefObject } from "react"
|
import type { RefObject } from "react"
|
||||||
import { GSAP_DEBUG, useGsapContext } from "~/app/_providers/GsapProvicer"
|
import { GSAP_DEBUG, nearestScroller, useGsapContext } from "~/app/_providers/GsapProvicer"
|
||||||
|
|
||||||
export type UseRevealOptions = {
|
export type UseRevealOptions = {
|
||||||
position: gsap.Position
|
position: gsap.Position
|
||||||
@@ -39,9 +39,12 @@ export function useReveal(
|
|||||||
const ctx = useGsapContext()
|
const ctx = useGsapContext()
|
||||||
useGSAP(() => {
|
useGSAP(() => {
|
||||||
const el = ref.current
|
const el = ref.current
|
||||||
if (!el || !ctx) return
|
if (!el || !ctx) {
|
||||||
|
if (GSAP_DEBUG) console.log("[cv-debug][useReveal:skip]", { debugId, hasEl: !!el, hasCtx: !!ctx })
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
const scroller = ctx.getScroller()
|
const scroller = nearestScroller(el)
|
||||||
const scrollerEl = scroller instanceof Element ? scroller : undefined
|
const scrollerEl = scroller instanceof Element ? scroller : undefined
|
||||||
|
|
||||||
const rect = el.getBoundingClientRect()
|
const rect = el.getBoundingClientRect()
|
||||||
@@ -53,6 +56,28 @@ export function useReveal(
|
|||||||
bottom = r.top + r.height
|
bottom = r.top + r.height
|
||||||
}
|
}
|
||||||
const isInView = rect.bottom > top && rect.top < bottom
|
const isInView = rect.bottom > top && rect.top < bottom
|
||||||
|
if (GSAP_DEBUG) {
|
||||||
|
const scrollerRect = scrollerEl?.getBoundingClientRect()
|
||||||
|
console.log("[cv-debug][useReveal:register]", {
|
||||||
|
debugId,
|
||||||
|
position,
|
||||||
|
scrollOnly,
|
||||||
|
once,
|
||||||
|
isInView,
|
||||||
|
rect: { top: rect.top, bottom: rect.bottom, height: rect.height },
|
||||||
|
viewport: { top, bottom },
|
||||||
|
scroller:
|
||||||
|
scroller === window
|
||||||
|
? "window"
|
||||||
|
: {
|
||||||
|
slot: scrollerEl?.getAttribute("data-slot"),
|
||||||
|
className: scrollerEl?.className,
|
||||||
|
clientHeight: scrollerEl?.clientHeight,
|
||||||
|
scrollHeight: scrollerEl?.scrollHeight,
|
||||||
|
rect: scrollerRect ? { top: scrollerRect.top, bottom: scrollerRect.bottom, height: scrollerRect.height } : undefined,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
const reveal = makeReveal(el)
|
const reveal = makeReveal(el)
|
||||||
// A reveal that animates height (pop-ups) shifts every trigger below it.
|
// A reveal that animates height (pop-ups) shifts every trigger below it.
|
||||||
@@ -83,19 +108,26 @@ export function useReveal(
|
|||||||
if (isInView && !scrollOnly) {
|
if (isInView && !scrollOnly) {
|
||||||
// The shared timeline only decides *when* the entrance starts; the reveal
|
// The shared timeline only decides *when* the entrance starts; the reveal
|
||||||
// plays independently so the ScrollTrigger can take it over afterwards.
|
// plays independently so the ScrollTrigger can take it over afterwards.
|
||||||
|
if (GSAP_DEBUG) console.log("[cv-debug][useReveal:schedule]", { debugId, position })
|
||||||
ctx.schedule(() => reveal.play(), position)
|
ctx.schedule(() => reveal.play(), position)
|
||||||
// `once` elements keep their revealed state — no scroll trigger at all.
|
// `once` elements keep their revealed state — no scroll trigger at all.
|
||||||
if (!once) ctx.onReady(addReplayTrigger)
|
if (!once) {
|
||||||
|
if (GSAP_DEBUG) console.log("[cv-debug][useReveal:onReady]", { debugId })
|
||||||
|
ctx.onReady(addReplayTrigger)
|
||||||
|
}
|
||||||
} else if (isInView) {
|
} else if (isInView) {
|
||||||
// scrollOnly + already on screen: no enter crossing will fire, so reveal
|
// scrollOnly + already on screen: no enter crossing will fire, so reveal
|
||||||
// now. Keep a trigger for scroll-out unless this is a `once` element.
|
// now. Keep a trigger for scroll-out unless this is a `once` element.
|
||||||
|
if (GSAP_DEBUG) console.log("[cv-debug][useReveal:play-now]", { debugId, position })
|
||||||
reveal.play()
|
reveal.play()
|
||||||
if (!once) addReplayTrigger()
|
if (!once) addReplayTrigger()
|
||||||
} else if (once) {
|
} else if (once) {
|
||||||
// Off-screen: reveal when first reached, then self-destruct so it never
|
// Off-screen: reveal when first reached, then self-destruct so it never
|
||||||
// reverses.
|
// reverses.
|
||||||
|
if (GSAP_DEBUG) console.log("[cv-debug][useReveal:scroll-once]", { debugId, position })
|
||||||
ScrollTrigger.create({ ...baseTrigger, once: true, onEnter: () => reveal.play() })
|
ScrollTrigger.create({ ...baseTrigger, once: true, onEnter: () => reveal.play() })
|
||||||
} else {
|
} else {
|
||||||
|
if (GSAP_DEBUG) console.log("[cv-debug][useReveal:scroll-trigger-only]", { debugId, position })
|
||||||
addReplayTrigger()
|
addReplayTrigger()
|
||||||
}
|
}
|
||||||
}, { dependencies: [] })
|
}, { dependencies: [] })
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
@@ -20,6 +20,25 @@ ScrollTrigger.config({ ignoreMobileResize: true })
|
|||||||
// element and mount the GSDevTools timeline scrubber. Handy for seeing exactly
|
// element and mount the GSDevTools timeline scrubber. Handy for seeing exactly
|
||||||
// where each card's enter/exit lines sit relative to the viewport.
|
// where each card's enter/exit lines sit relative to the viewport.
|
||||||
export const GSAP_DEBUG = false
|
export const GSAP_DEBUG = false
|
||||||
|
|
||||||
|
export function nearestScroller(el: Element): Element | Window {
|
||||||
|
let node: Element | null = el.parentElement
|
||||||
|
while (node) {
|
||||||
|
if (node.getAttribute('data-slot') === 'scroll-area-viewport') {
|
||||||
|
const viewport = node as HTMLElement
|
||||||
|
const rect = viewport.getBoundingClientRect()
|
||||||
|
const hasUsableBox = rect.width > 0 && rect.height > 0
|
||||||
|
const canScroll =
|
||||||
|
viewport.scrollHeight > viewport.clientHeight ||
|
||||||
|
viewport.scrollWidth > viewport.clientWidth
|
||||||
|
|
||||||
|
if (hasUsableBox && canScroll) return viewport
|
||||||
|
}
|
||||||
|
node = node.parentElement
|
||||||
|
}
|
||||||
|
return window
|
||||||
|
}
|
||||||
|
|
||||||
const GsapContext = createContext<{
|
const GsapContext = createContext<{
|
||||||
// Add a real animation (with its own duration) to the entrance timeline.
|
// Add a real animation (with its own duration) to the entrance timeline.
|
||||||
addAnimation: (
|
addAnimation: (
|
||||||
@@ -47,14 +66,24 @@ export function useGsapContext() {
|
|||||||
export const useTimeLine = (dep:any,all?:boolean) => {
|
export const useTimeLine = (dep:any,all?:boolean) => {
|
||||||
const gsapContext = useGsapContext()
|
const gsapContext = useGsapContext()
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
if (GSAP_DEBUG) {
|
||||||
|
console.log("[cv-debug][useTimeLine:effect]", {
|
||||||
|
hasDep: !!dep,
|
||||||
|
isArray: dep instanceof Array,
|
||||||
|
length: dep instanceof Array ? dep.length : undefined,
|
||||||
|
all,
|
||||||
|
})
|
||||||
|
}
|
||||||
if (dep instanceof Array && all) {
|
if (dep instanceof Array && all) {
|
||||||
let acc = true;
|
let acc = true;
|
||||||
let allDepsSatisfied = dep.reduce((p,c) => c !== undefined && p ,acc )
|
let allDepsSatisfied = dep.reduce((p,c) => c !== undefined && p ,acc )
|
||||||
if (allDepsSatisfied) {
|
if (allDepsSatisfied) {
|
||||||
|
if (GSAP_DEBUG) console.log("[cv-debug][useTimeLine:resume-all]")
|
||||||
gsapContext?.resumeTimeline()
|
gsapContext?.resumeTimeline()
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (dep) {
|
if (dep) {
|
||||||
|
if (GSAP_DEBUG) console.log("[cv-debug][useTimeLine:resume]")
|
||||||
gsapContext?.resumeTimeline()
|
gsapContext?.resumeTimeline()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -100,7 +129,7 @@ export default function GsapProvider({ children }: { children: ReactNode }) {
|
|||||||
devToolsCreated.current = true
|
devToolsCreated.current = true
|
||||||
GSDevTools.create({ animation: tl.current })
|
GSDevTools.create({ animation: tl.current })
|
||||||
}
|
}
|
||||||
return () => { console.log("gsap cleanup") }
|
return () => { if (GSAP_DEBUG) console.log("gsap cleanup") }
|
||||||
})
|
})
|
||||||
|
|
||||||
// Handoff: fire registered callbacks once, when the entrance finishes.
|
// Handoff: fire registered callbacks once, when the entrance finishes.
|
||||||
@@ -108,11 +137,19 @@ export default function GsapProvider({ children }: { children: ReactNode }) {
|
|||||||
const readyCbs = useRef<Array<() => void>>([])
|
const readyCbs = useRef<Array<() => void>>([])
|
||||||
const fireReady = useCallback(() => {
|
const fireReady = useCallback(() => {
|
||||||
if (readyFired.current) return
|
if (readyFired.current) return
|
||||||
|
if (GSAP_DEBUG) {
|
||||||
|
console.log("[cv-debug][gsap:ready]", {
|
||||||
|
callbacks: readyCbs.current.length,
|
||||||
|
duration: tl.current?.duration(),
|
||||||
|
progress: tl.current?.progress(),
|
||||||
|
})
|
||||||
|
}
|
||||||
readyFired.current = true
|
readyFired.current = true
|
||||||
readyCbs.current.forEach((cb) => cb())
|
readyCbs.current.forEach((cb) => cb())
|
||||||
readyCbs.current = []
|
readyCbs.current = []
|
||||||
},[])
|
},[])
|
||||||
const onReady = useCallback((cb: () => void) => {
|
const onReady = useCallback((cb: () => void) => {
|
||||||
|
if (GSAP_DEBUG) console.log("[cv-debug][gsap:onReady]", { readyFired: readyFired.current })
|
||||||
if (readyFired.current) cb()
|
if (readyFired.current) cb()
|
||||||
else readyCbs.current.push(cb)
|
else readyCbs.current.push(cb)
|
||||||
},[])
|
},[])
|
||||||
@@ -122,14 +159,43 @@ export default function GsapProvider({ children }: { children: ReactNode }) {
|
|||||||
// entrance already played). Parking a tween in a finished, paused timeline
|
// entrance already played). Parking a tween in a finished, paused timeline
|
||||||
// would freeze it at its from-state, so once the entrance is done let the
|
// would freeze it at its from-state, so once the entrance is done let the
|
||||||
// (live) tween play on its own instead.
|
// (live) tween play on its own instead.
|
||||||
|
if (GSAP_DEBUG) {
|
||||||
|
console.log("[cv-debug][gsap:addAnimation]", {
|
||||||
|
position,
|
||||||
|
readyFired: readyFired.current,
|
||||||
|
durationBefore: tl.current?.duration(),
|
||||||
|
})
|
||||||
|
}
|
||||||
if (readyFired.current) return
|
if (readyFired.current) return
|
||||||
tl.current?.add(animation, position);
|
tl.current?.add(animation, position);
|
||||||
|
if (GSAP_DEBUG) {
|
||||||
|
console.log("[cv-debug][gsap:addAnimation:done]", {
|
||||||
|
position,
|
||||||
|
durationAfter: tl.current?.duration(),
|
||||||
|
children: tl.current?.getChildren(false, true, true).length,
|
||||||
|
})
|
||||||
|
}
|
||||||
},[])
|
},[])
|
||||||
const schedule = useCallback((fn: () => void, position: gsap.Position) => {
|
const schedule = useCallback((fn: () => void, position: gsap.Position) => {
|
||||||
// Same late-arrival case: a callback added past the playhead never fires, so
|
// Same late-arrival case: a callback added past the playhead never fires, so
|
||||||
// run the reveal immediately once the entrance has finished.
|
// run the reveal immediately once the entrance has finished.
|
||||||
|
if (GSAP_DEBUG) {
|
||||||
|
console.log("[cv-debug][gsap:schedule]", {
|
||||||
|
position,
|
||||||
|
readyFired: readyFired.current,
|
||||||
|
durationBefore: tl.current?.duration(),
|
||||||
|
childrenBefore: tl.current?.getChildren(false, true, true).length,
|
||||||
|
})
|
||||||
|
}
|
||||||
if (readyFired.current) { fn(); return }
|
if (readyFired.current) { fn(); return }
|
||||||
tl.current?.add(fn, position)
|
tl.current?.add(fn, position)
|
||||||
|
if (GSAP_DEBUG) {
|
||||||
|
console.log("[cv-debug][gsap:schedule:done]", {
|
||||||
|
position,
|
||||||
|
durationAfter: tl.current?.duration(),
|
||||||
|
childrenAfter: tl.current?.getChildren(false, true, true).length,
|
||||||
|
})
|
||||||
|
}
|
||||||
},[])
|
},[])
|
||||||
|
|
||||||
// Throttle ScrollTrigger.refresh() to once per frame so the ResizeObserver
|
// Throttle ScrollTrigger.refresh() to once per frame so the ResizeObserver
|
||||||
@@ -148,6 +214,12 @@ export default function GsapProvider({ children }: { children: ReactNode }) {
|
|||||||
const resizeObserver = useRef<ResizeObserver | null>(null)
|
const resizeObserver = useRef<ResizeObserver | null>(null)
|
||||||
|
|
||||||
const resetTimeline = useCallback(() => {
|
const resetTimeline = useCallback(() => {
|
||||||
|
if (GSAP_DEBUG) {
|
||||||
|
console.log("[cv-debug][gsap:reset]", {
|
||||||
|
duration: tl.current?.duration(),
|
||||||
|
progress: tl.current?.progress(),
|
||||||
|
})
|
||||||
|
}
|
||||||
tl.current?.kill()
|
tl.current?.kill()
|
||||||
tl.current?.revert()
|
tl.current?.revert()
|
||||||
ScrollTrigger.getAll().forEach(st => st.kill())
|
ScrollTrigger.getAll().forEach(st => st.kill())
|
||||||
@@ -161,7 +233,19 @@ export default function GsapProvider({ children }: { children: ReactNode }) {
|
|||||||
|
|
||||||
const resumeTimeline = useCallback(() => {
|
const resumeTimeline = useCallback(() => {
|
||||||
const t = tl.current
|
const t = tl.current
|
||||||
if (!t) return
|
if (!t) {
|
||||||
|
if (GSAP_DEBUG) console.log("[cv-debug][gsap:resume:skip-no-timeline]")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (GSAP_DEBUG) {
|
||||||
|
console.log("[cv-debug][gsap:resume:start]", {
|
||||||
|
duration: t.duration(),
|
||||||
|
progress: t.progress(),
|
||||||
|
paused: t.paused(),
|
||||||
|
readyFired: readyFired.current,
|
||||||
|
children: t.getChildren(false, true, true).length,
|
||||||
|
})
|
||||||
|
}
|
||||||
// When the orchestrated entrance finishes, hand off to scroll control and
|
// When the orchestrated entrance finishes, hand off to scroll control and
|
||||||
// realign triggers against the now-settled layout.
|
// realign triggers against the now-settled layout.
|
||||||
t.eventCallback("onComplete", () => { fireReady(); ScrollTrigger.refresh() })
|
t.eventCallback("onComplete", () => { fireReady(); ScrollTrigger.refresh() })
|
||||||
@@ -185,6 +269,13 @@ export default function GsapProvider({ children }: { children: ReactNode }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
t.resume()
|
t.resume()
|
||||||
|
if (GSAP_DEBUG) {
|
||||||
|
console.log("[cv-debug][gsap:resume:after]", {
|
||||||
|
duration: t.duration(),
|
||||||
|
progress: t.progress(),
|
||||||
|
paused: t.paused(),
|
||||||
|
})
|
||||||
|
}
|
||||||
},[getScroller, fireReady, scheduleRefresh])
|
},[getScroller, fireReady, scheduleRefresh])
|
||||||
|
|
||||||
// Fonts/markdown/images loading also change content height after the triggers
|
// Fonts/markdown/images loading also change content height after the triggers
|
||||||
|
|||||||
@@ -1,22 +1,3 @@
|
|||||||
import { httpBatchLink } from "@trpc/client";
|
|
||||||
import { trpcRouter } from "~/server/routers/_app";
|
import { trpcRouter } from "~/server/routers/_app";
|
||||||
|
|
||||||
function getBaseUrl() {
|
export const servTrpc = trpcRouter.createCaller({});
|
||||||
if (typeof window !== 'undefined')
|
|
||||||
// browser should use relative path
|
|
||||||
return '';
|
|
||||||
if (process.env.VERCEL_URL)
|
|
||||||
// reference for vercel.com
|
|
||||||
return `https://${process.env.VERCEL_URL}`;
|
|
||||||
if (process.env.RENDER_INTERNAL_HOSTNAME)
|
|
||||||
// reference for render.com
|
|
||||||
return `http://${process.env.RENDER_INTERNAL_HOSTNAME}:${process.env.PORT}`;
|
|
||||||
// assume localhost
|
|
||||||
return `http://localhost:${process.env.PORT ?? 3000}`;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const servTrpc = trpcRouter.createCaller({
|
|
||||||
links: [
|
|
||||||
httpBatchLink({url: `${getBaseUrl()}/api/trpc`}),
|
|
||||||
],
|
|
||||||
});
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
|
|||||||
import { ReactQueryStreamedHydration } from '@tanstack/react-query-next-experimental'
|
import { ReactQueryStreamedHydration } from '@tanstack/react-query-next-experimental'
|
||||||
import { httpBatchLink } from "@trpc/client";
|
import { httpBatchLink } from "@trpc/client";
|
||||||
import React, { useState } from "react"
|
import React, { useState } from "react"
|
||||||
|
import superjson from "superjson";
|
||||||
import { trpc } from "./Client";
|
import { trpc } from "./Client";
|
||||||
import getBaseUrl from "~/app/_trpc/GetBaseUrl";
|
import getBaseUrl from "~/app/_trpc/GetBaseUrl";
|
||||||
let clientQueryClient: QueryClient | undefined = undefined;
|
let clientQueryClient: QueryClient | undefined = undefined;
|
||||||
@@ -33,6 +34,7 @@ export default function TrpcProvider({ children }: { children: React.ReactNode }
|
|||||||
links: [
|
links: [
|
||||||
httpBatchLink({
|
httpBatchLink({
|
||||||
url: `${baseUrl}/api/trpc`,
|
url: `${baseUrl}/api/trpc`,
|
||||||
|
transformer: superjson,
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -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)
|
||||||
|
|||||||
48
src/app/admin/chat/_components/ModelSelector.tsx
Normal file
48
src/app/admin/chat/_components/ModelSelector.tsx
Normal 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>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -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>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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: {
|
||||||
|
|||||||
@@ -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>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import type { UIMessage } from "ai";
|
import type { UIMessage } from "ai";
|
||||||
import Markdown from "react-markdown";
|
import { ClientMdx } from "~/components/ClientMdx";
|
||||||
import { cn } from "~/lib/utils";
|
|
||||||
|
|
||||||
export const AssistantMessage = (props: { message: UIMessage }) => {
|
export const AssistantMessage = (props: { message: UIMessage }) => {
|
||||||
let message = props.message;
|
let message = props.message;
|
||||||
@@ -16,9 +15,7 @@ export const AssistantMessage = (props: { message: UIMessage }) => {
|
|||||||
{message.parts.map((part, i) => {
|
{message.parts.map((part, i) => {
|
||||||
if (part.type === 'text') {
|
if (part.type === 'text') {
|
||||||
return (
|
return (
|
||||||
<Markdown key={crypto.randomUUID()}>
|
<ClientMdx key={i} source={part.text} fallback={part.text} />
|
||||||
{part.text}
|
|
||||||
</Markdown>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if (part.type === 'tool-scheduleMeeting') {
|
if (part.type === 'tool-scheduleMeeting') {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
'use client'
|
import type { ReactNode } from "react"
|
||||||
import CvEntry from "./CvEntry"
|
import CvEntry from "./CvEntry"
|
||||||
import type { RouterOutputs } from "~/server/routers/_app"
|
import type { RouterOutputs } from "~/server/routers/_app"
|
||||||
import { cn } from "~/lib/utils"
|
import { cn } from "~/lib/utils"
|
||||||
@@ -14,13 +14,14 @@ type CvCategoryProps = {
|
|||||||
category: CvCategoryData,
|
category: CvCategoryData,
|
||||||
layout: "row" | "col",
|
layout: "row" | "col",
|
||||||
position?: number,
|
position?: number,
|
||||||
|
descriptions: Record<string, ReactNode>,
|
||||||
}
|
}
|
||||||
export default function CvCategory({ category, layout, position = 0 }: CvCategoryProps) {
|
export default function CvCategory({ category, layout, position = 0, descriptions }: CvCategoryProps) {
|
||||||
const entries = category.cvEntry
|
const entries = category.cvEntry
|
||||||
return (
|
return (
|
||||||
<AnimatedCard position={position} className={cn(layout == "row" ? "w-full" : "", "h-screen")}>
|
<AnimatedCard position={position} className={cn(layout == "row" ? "w-full" : "", "h-screen")}>
|
||||||
<CardHeader>
|
<CardHeader>
|
||||||
<AnimateTextIn position={position + 0.2} animation="slide">
|
<AnimateTextIn once position={position + 0.2} animation="slide" debugId={`cv-category-title:${category.name}:${position + 0.2}`}>
|
||||||
<CardTitle>{category.name}</CardTitle>
|
<CardTitle>{category.name}</CardTitle>
|
||||||
</AnimateTextIn>
|
</AnimateTextIn>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
@@ -28,8 +29,8 @@ export default function CvCategory({ category, layout, position = 0 }: CvCategor
|
|||||||
<CardContent className={cn(layout == "row" ? "flex flex-row flex-wrap justify-center lg:justify-between" : "flex flex-col", "gap-4", "overflow-scroll")}>
|
<CardContent className={cn(layout == "row" ? "flex flex-row flex-wrap justify-center lg:justify-between" : "flex flex-col", "gap-4", "overflow-scroll")}>
|
||||||
<ScrollArea>
|
<ScrollArea>
|
||||||
{entries.map((entry, i) => (
|
{entries.map((entry, i) => (
|
||||||
<AnimatePopUp position={position + 0.4 + i * 0.2} key={entry.id}>
|
<AnimatePopUp position={position + 0.4 + i * 0.2} debugId={`cv-entry-wrapper:${category.name}:${entry.title}:${position + 0.4 + i * 0.2}`} key={entry.id}>
|
||||||
<CvEntry position={position + 0.4 + i * 0.2} entry={entry} className={layout == "row" ? "w-full lg:w-fit" : undefined} />
|
<CvEntry position={position + 0.4 + i * 0.2} entry={entry} description={descriptions[entry.id]} className={layout == "row" ? "w-full lg:w-fit" : undefined} />
|
||||||
</AnimatePopUp>
|
</AnimatePopUp>
|
||||||
))}
|
))}
|
||||||
</ScrollArea>
|
</ScrollArea>
|
||||||
|
|||||||
@@ -1,18 +1,17 @@
|
|||||||
|
import type { ReactNode } from "react"
|
||||||
import { Card, CardContent, CardFooter, CardHeader, CardTitle } from "~/components/ui/card"
|
import { Card, CardContent, CardFooter, CardHeader, CardTitle } from "~/components/ui/card"
|
||||||
import { cn } from "~/lib/utils"
|
import { cn } 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 { ArrayElement } from "type-fest"
|
import type { ArrayElement } from "type-fest"
|
||||||
import AnimateTextIn from "~/app/_components/Animated/AnimateIn"
|
import AnimateTextIn from "~/app/_components/Animated/AnimateIn"
|
||||||
import AnimatePopUp from "~/app/_components/Animated/AnimatePopUp"
|
import AnimatedDiv from "~/app/_components/Animated/AnimatedDiv"
|
||||||
import type { CvCategoryData } from "./CvCategory"
|
import type { CvCategoryData } from "./CvCategory"
|
||||||
|
|
||||||
export type CvEntryData = ArrayElement<CvCategoryData['cvEntry']>
|
export type CvEntryData = ArrayElement<CvCategoryData['cvEntry']>
|
||||||
|
|
||||||
export default function CvEntry({ entry, className, position = 0 }: {
|
export default function CvEntry({ entry, description, className, position = 0 }: {
|
||||||
entry: CvEntryData,
|
entry: CvEntryData,
|
||||||
|
description?: ReactNode,
|
||||||
className?: string,
|
className?: string,
|
||||||
position?: number
|
position?: number
|
||||||
}) {
|
}) {
|
||||||
@@ -20,7 +19,7 @@ export default function CvEntry({ entry, className, position = 0 }: {
|
|||||||
<Card className={className ? cn("w-fit", className) : "w-fit"}>
|
<Card className={className ? cn("w-fit", className) : "w-fit"}>
|
||||||
{entry.title ?
|
{entry.title ?
|
||||||
<CardHeader>
|
<CardHeader>
|
||||||
<AnimateTextIn position={position} animation="slide">
|
<AnimateTextIn position={position} animation="slide" debugId={`cv-entry-title:${entry.title}:${position}`}>
|
||||||
<CardTitle> {entry.title} </CardTitle>
|
<CardTitle> {entry.title} </CardTitle>
|
||||||
</AnimateTextIn>
|
</AnimateTextIn>
|
||||||
</CardHeader> :
|
</CardHeader> :
|
||||||
@@ -28,17 +27,21 @@ export default function CvEntry({ entry, className, position = 0 }: {
|
|||||||
}
|
}
|
||||||
{entry.description ?
|
{entry.description ?
|
||||||
<CardContent className="text-sm lg:text-base">
|
<CardContent className="text-sm lg:text-base">
|
||||||
<AnimatePopUp position={position + 0.2}>
|
{/* Fade the description in place instead of collapsing its height:
|
||||||
|
the outer entry pop-up (CvCategory) measures height:auto when it
|
||||||
|
plays, so the description must stay laid out at full height or the
|
||||||
|
entry reveals too short. */}
|
||||||
|
<AnimatedDiv once position={position + 0.2} className="opacity-0" opacity={1} duration={0.5} debugId={`cv-entry-description:${entry.title}:${position + 0.2}`}>
|
||||||
<article className="prose prose-zinc dark:prose-invert max-w-none">
|
<article className="prose prose-zinc dark:prose-invert max-w-none">
|
||||||
<Markdown rehypePlugins={[rehypeHighlight, rehypeRaw]}>{entry.description}</Markdown>
|
{description ?? entry.description}
|
||||||
</article>
|
</article>
|
||||||
</AnimatePopUp>
|
</AnimatedDiv>
|
||||||
</CardContent> :
|
</CardContent> :
|
||||||
<></>
|
<></>
|
||||||
}
|
}
|
||||||
{!entry.hideDates ?
|
{!entry.hideDates ?
|
||||||
<CardFooter className="text-sm">
|
<CardFooter className="text-sm">
|
||||||
<AnimateTextIn position={position + 0.4}>
|
<AnimateTextIn position={position + 0.4} debugId={`cv-entry-dates:${entry.title}:${position + 0.4}`}>
|
||||||
{`von ${format(new Date(entry.fromTime), 'M. yyyy')} bis zum ${format(new Date(entry.toTime), 'M. yyyy')}`}
|
{`von ${format(new Date(entry.fromTime), 'M. yyyy')} bis zum ${format(new Date(entry.toTime), 'M. yyyy')}`}
|
||||||
</AnimateTextIn>
|
</AnimateTextIn>
|
||||||
</CardFooter> :
|
</CardFooter> :
|
||||||
|
|||||||
59
src/app/cv/_components/Page.tsx
Normal file
59
src/app/cv/_components/Page.tsx
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
'use client'
|
||||||
|
import type { ReactNode } from "react";
|
||||||
|
import { Sidebar, SidebarContent, SidebarProvider } from "~/components/ui/sidebar";
|
||||||
|
import type { RouterOutputs } from "~/server/routers/_app"
|
||||||
|
import SidebarTriggerDisappearsOnMobile from "./SidebarTriggerDisappearsOnMobile";
|
||||||
|
import CvCategory from "./CvCategory";
|
||||||
|
import { useTimeLine } from "~/app/_providers/GsapProvicer";
|
||||||
|
export default function CvPage(props: {
|
||||||
|
cv: RouterOutputs['categoryv2']['listAllWithEntries'],
|
||||||
|
descriptions: Record<string, ReactNode>,
|
||||||
|
}) {
|
||||||
|
useTimeLine(props.cv)
|
||||||
|
const { descriptions } = props
|
||||||
|
const byPosition = (pos: "sidebar" | "header" | "col1" | "col2") =>
|
||||||
|
props.cv?.filter((c) => c.layoutPosition === pos) ?? []
|
||||||
|
const sidebarCategories = byPosition("sidebar")
|
||||||
|
const headerCategories = byPosition("header")
|
||||||
|
const col1Categories = byPosition("col1")
|
||||||
|
const col2Categories = byPosition("col2")
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<SidebarProvider>
|
||||||
|
{sidebarCategories.length > 0 &&
|
||||||
|
<>
|
||||||
|
<SidebarTriggerDisappearsOnMobile />
|
||||||
|
<Sidebar>
|
||||||
|
<SidebarContent className="p-2 lg:pt-[3.2rem]">
|
||||||
|
{sidebarCategories.map((cat, i) => (
|
||||||
|
<CvCategory layout="col" position={i} category={cat} descriptions={descriptions} key={cat.id} />
|
||||||
|
))}
|
||||||
|
</SidebarContent>
|
||||||
|
</Sidebar>
|
||||||
|
</>
|
||||||
|
}
|
||||||
|
<div className="h-full w-full flex flex-wrap flex-row p-4 pt-8 ">
|
||||||
|
<div id="mainwrap" className="flex w-full flex-col gap-4 lg:px-[15vw]">
|
||||||
|
<div id="header" className="flex w-full h-fit flex-row gap-4 flex-wrap">
|
||||||
|
{headerCategories.map((cat, i) => (
|
||||||
|
<CvCategory layout="row" position={i} category={cat} descriptions={descriptions} key={cat.id} />
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<div id="colwrapper" className="flex flex-col lg:flex-row w-full h-3/4 gap-4">
|
||||||
|
<div id="col1" className={`flex flex-col w-full ${col1Categories.length > 0 ? "lg:w-1/2" : ""} h-full gap-4`}>
|
||||||
|
{col1Categories.map((cat, i) => (
|
||||||
|
<CvCategory layout="col" position={i} category={cat} descriptions={descriptions} key={cat.id} />
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<div id="col2" className={`flex flex-col w-full ${col2Categories.length > 0 ? "lg:w-1/2" : ""} h-full gap-4`}>
|
||||||
|
{col2Categories.map((cat, i) => (
|
||||||
|
<CvCategory layout="col" position={i} category={cat} descriptions={descriptions} key={cat.id} />
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</SidebarProvider>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,55 +1,42 @@
|
|||||||
'use client'
|
import { Suspense, type ReactNode } from "react";
|
||||||
import { useTimeLine } from "../_providers/GsapProvicer";
|
import { MDXRemote } from "next-mdx-remote/rsc";
|
||||||
import { trpc } from "../_trpc/Client";
|
import rehypeHighlight from "rehype-highlight";
|
||||||
import { SidebarContent, SidebarProvider, Sidebar } from "~/components/ui/sidebar";
|
import remarkGfm from "remark-gfm";
|
||||||
import SidebarTriggerDisappearsOnMobile from "./_components/SidebarTriggerDisappearsOnMobile";
|
import { servTrpc as trpc } from "../_trpc/ServerClient";
|
||||||
import CvCategory from "./_components/CvCategory";
|
import { mdxComponents } from "~/components/mdx-components";
|
||||||
export default function CvPage() {
|
import Page from "./_components/Page";
|
||||||
const cv = trpc.categoryv2.listAllWithEntries.useQuery();
|
|
||||||
useTimeLine(cv.data)
|
export default async function CvPage() {
|
||||||
const byPosition = (pos: "sidebar" | "header" | "col1" | "col2") =>
|
const cv = await trpc.categoryv2.listAllWithEntries();
|
||||||
cv.data?.filter((c) => c.layoutPosition === pos) ?? []
|
|
||||||
const sidebarCategories = byPosition("sidebar")
|
// Render the MDX descriptions on the server so they exist at first paint.
|
||||||
const headerCategories = byPosition("header")
|
// The client tree (which runs the GSAP entrance via useTimeLine) only places
|
||||||
const col1Categories = byPosition("col1")
|
// these already-rendered nodes — it never invokes the MDX renderer itself, so
|
||||||
const col2Categories = byPosition("col2")
|
// the 'use client' boundary stays intact and the animations no longer play
|
||||||
|
// against an un-rendered fallback.
|
||||||
|
const descriptions: Record<string, ReactNode> = {};
|
||||||
|
for (const category of cv ?? []) {
|
||||||
|
for (const entry of category.cvEntry) {
|
||||||
|
if (!entry.description?.trim()) continue;
|
||||||
|
descriptions[entry.id] = (
|
||||||
|
<MDXRemote
|
||||||
|
source={entry.description}
|
||||||
|
components={mdxComponents}
|
||||||
|
options={{
|
||||||
|
mdxOptions: {
|
||||||
|
format: "md",
|
||||||
|
remarkPlugins: [remarkGfm],
|
||||||
|
rehypePlugins: [rehypeHighlight],
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<Suspense>
|
||||||
<SidebarProvider>
|
<Page cv={cv} descriptions={descriptions} />
|
||||||
{sidebarCategories.length > 0 &&
|
</Suspense>
|
||||||
<>
|
|
||||||
<SidebarTriggerDisappearsOnMobile />
|
|
||||||
<Sidebar>
|
|
||||||
<SidebarContent className="p-2 lg:pt-[3.2rem]">
|
|
||||||
{sidebarCategories.map((cat, i) => (
|
|
||||||
<CvCategory layout="col" position={i} category={cat} key={cat.id} />
|
|
||||||
))}
|
|
||||||
</SidebarContent>
|
|
||||||
</Sidebar>
|
|
||||||
</>
|
|
||||||
}
|
|
||||||
<div className="h-full w-full flex flex-wrap flex-row p-4 pt-8 ">
|
|
||||||
<div id="mainwrap" className="flex w-full flex-col gap-4 lg:px-[15vw]">
|
|
||||||
<div id="header" className="flex w-full h-fit flex-row gap-4 flex-wrap">
|
|
||||||
{headerCategories.map((cat, i) => (
|
|
||||||
<CvCategory layout="row" position={i} category={cat} key={cat.id} />
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
<div id="colwrapper" className="flex flex-col lg:flex-row w-full h-3/4 gap-4">
|
|
||||||
<div id="col1" className={`flex flex-col w-full ${col1Categories.length > 0 ? "lg:w-1/2" : ""} h-full gap-4`}>
|
|
||||||
{col1Categories.map((cat, i) => (
|
|
||||||
<CvCategory layout="col" position={i} category={cat} key={cat.id} />
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
<div id="col2" className={`flex flex-col w-full ${col2Categories.length > 0 ? "lg:w-1/2" : ""} h-full gap-4`}>
|
|
||||||
{col2Categories.map((cat, i) => (
|
|
||||||
<CvCategory layout="col" position={i} category={cat} key={cat.id} />
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</SidebarProvider>
|
|
||||||
</>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import type WaveSurfer from "wavesurfer.js";
|
|||||||
import { Download, Loader2, Pause, Play } from "lucide-react";
|
import { Download, Loader2, Pause, Play } from "lucide-react";
|
||||||
import { Button } from "~/components/ui/button";
|
import { Button } from "~/components/ui/button";
|
||||||
import { toast } from "sonner";
|
import { toast } from "sonner";
|
||||||
|
import { useMusicPlayer } from "./MusicPlayerProvider";
|
||||||
|
|
||||||
function formatTime(seconds: number) {
|
function formatTime(seconds: number) {
|
||||||
if (!Number.isFinite(seconds)) return "0:00";
|
if (!Number.isFinite(seconds)) return "0:00";
|
||||||
@@ -28,32 +29,46 @@ function waveColors() {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Per-track waveform. Playback itself is owned by the shared MusicPlayer engine
|
||||||
|
* (so it keeps running across navigation); this wavesurfer instance is only a
|
||||||
|
* visual + seek surface that mirrors the engine when its track is active.
|
||||||
|
*/
|
||||||
export default function AudioPlayer(props: {
|
export default function AudioPlayer(props: {
|
||||||
/** Streaming-friendly source the player actually plays. */
|
id: string;
|
||||||
src: string;
|
src: string;
|
||||||
/** Original high-quality file offered via the download button. */
|
|
||||||
downloadUrl: string;
|
downloadUrl: string;
|
||||||
downloadName: string;
|
downloadName: string;
|
||||||
}) {
|
}) {
|
||||||
const containerRef = useRef<HTMLDivElement>(null);
|
const containerRef = useRef<HTMLDivElement>(null);
|
||||||
const wsRef = useRef<WaveSurfer | null>(null);
|
const wsRef = useRef<WaveSurfer | null>(null);
|
||||||
const [playing, setPlaying] = useState(false);
|
|
||||||
const [current, setCurrent] = useState(0);
|
|
||||||
const [duration, setDuration] = useState(0);
|
|
||||||
const [ready, setReady] = useState(false);
|
const [ready, setReady] = useState(false);
|
||||||
|
const [duration, setDuration] = useState(0);
|
||||||
const [downloading, setDownloading] = useState(false);
|
const [downloading, setDownloading] = useState(false);
|
||||||
const { resolvedTheme } = useTheme();
|
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(() => {
|
useEffect(() => {
|
||||||
let ws: WaveSurfer | null = null;
|
let ws: WaveSurfer | null = null;
|
||||||
let cancelled = false;
|
let cancelled = false;
|
||||||
setReady(false);
|
setReady(false);
|
||||||
setCurrent(0);
|
|
||||||
|
|
||||||
(async () => {
|
(async () => {
|
||||||
const WaveSurferClass = (await import("wavesurfer.js")).default;
|
const WaveSurferClass = (await import("wavesurfer.js")).default;
|
||||||
if (cancelled || !containerRef.current) return;
|
if (cancelled || !containerRef.current) return;
|
||||||
ws = WaveSurferClass.create({
|
const instance = WaveSurferClass.create({
|
||||||
container: containerRef.current,
|
container: containerRef.current,
|
||||||
url: props.src,
|
url: props.src,
|
||||||
height: 44,
|
height: 44,
|
||||||
@@ -64,15 +79,20 @@ export default function AudioPlayer(props: {
|
|||||||
cursorWidth: 1,
|
cursorWidth: 1,
|
||||||
...waveColors(),
|
...waveColors(),
|
||||||
});
|
});
|
||||||
wsRef.current = ws;
|
ws = instance;
|
||||||
ws.on("ready", () => {
|
wsRef.current = instance;
|
||||||
|
instance.on("ready", () => {
|
||||||
|
// This media is for drawing only — never let it make sound.
|
||||||
|
instance.setMuted(true);
|
||||||
setReady(true);
|
setReady(true);
|
||||||
setDuration(ws?.getDuration() ?? 0);
|
setDuration(instance.getDuration());
|
||||||
|
if (isActiveRef.current) instance.setTime(currentTimeRef.current);
|
||||||
|
});
|
||||||
|
// Clicking the waveform: start this track if it isn't playing, then seek.
|
||||||
|
instance.on("interaction", (time: number) => {
|
||||||
|
if (!isActiveRef.current) toggleRef.current(props.id);
|
||||||
|
seekRef.current(time);
|
||||||
});
|
});
|
||||||
ws.on("play", () => setPlaying(true));
|
|
||||||
ws.on("pause", () => setPlaying(false));
|
|
||||||
ws.on("finish", () => setPlaying(false));
|
|
||||||
ws.on("timeupdate", (t) => setCurrent(t));
|
|
||||||
})();
|
})();
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
@@ -82,15 +102,23 @@ export default function AudioPlayer(props: {
|
|||||||
};
|
};
|
||||||
}, [props.src]);
|
}, [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.
|
// Re-tint the waveform when the user toggles light/dark.
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
wsRef.current?.setOptions(waveColors());
|
wsRef.current?.setOptions(waveColors());
|
||||||
}, [resolvedTheme]);
|
}, [resolvedTheme]);
|
||||||
|
|
||||||
function togglePlay() {
|
|
||||||
wsRef.current?.playPause();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function handleDownload() {
|
async function handleDownload() {
|
||||||
setDownloading(true);
|
setDownloading(true);
|
||||||
try {
|
try {
|
||||||
@@ -114,6 +142,8 @@ export default function AudioPlayer(props: {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const playing = isActive && isPlaying;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex items-center gap-3 rounded-lg border bg-transparent px-3 py-2">
|
<div className="flex items-center gap-3 rounded-lg border bg-transparent px-3 py-2">
|
||||||
<Button
|
<Button
|
||||||
@@ -122,13 +152,13 @@ export default function AudioPlayer(props: {
|
|||||||
variant="ghost"
|
variant="ghost"
|
||||||
aria-label={playing ? "Pause" : "Play"}
|
aria-label={playing ? "Pause" : "Play"}
|
||||||
disabled={!ready}
|
disabled={!ready}
|
||||||
onClick={togglePlay}
|
onClick={() => toggle(props.id)}
|
||||||
>
|
>
|
||||||
{playing ? <Pause /> : <Play />}
|
{playing ? <Pause /> : <Play />}
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<span className="w-10 shrink-0 text-right font-mono text-xs text-muted-foreground tabular-nums">
|
<span className="w-10 shrink-0 text-right font-mono text-xs text-muted-foreground tabular-nums">
|
||||||
{formatTime(current)}
|
{formatTime(isActive ? currentTime : 0)}
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<div className="relative flex-1">
|
<div className="relative flex-1">
|
||||||
|
|||||||
73
src/app/music/_components/MusicMiniPlayer.tsx
Normal file
73
src/app/music/_components/MusicMiniPlayer.tsx
Normal 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>
|
||||||
|
);
|
||||||
|
}
|
||||||
314
src/app/music/_components/MusicPlayerProvider.tsx
Normal file
314
src/app/music/_components/MusicPlayerProvider.tsx
Normal 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>
|
||||||
|
);
|
||||||
|
}
|
||||||
40
src/app/music/_components/PlayerControls.tsx
Normal file
40
src/app/music/_components/PlayerControls.tsx
Normal 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>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -15,11 +15,11 @@ export default function MusicPage() {
|
|||||||
<ScrollArea className="px-10 lg:px-0 w-full h-full max-w-4xl mx-auto pt-10">
|
<ScrollArea className="px-10 lg:px-0 w-full h-full max-w-4xl mx-auto pt-10">
|
||||||
<AnimatedPageTitle position={0}><span>Just Some </span> <span>Music I Made</span> </AnimatedPageTitle>
|
<AnimatedPageTitle position={0}><span>Just Some </span> <span>Music I Made</span> </AnimatedPageTitle>
|
||||||
<div className="flex flex-wrap h-fit content-center">
|
<div className="flex flex-wrap h-fit content-center">
|
||||||
<AnimateTextIn className="flex flex-wrap mr-[1em]" position={0.5}>
|
<AnimateTextIn once className="flex flex-wrap mr-[1em]" position={0.5}>
|
||||||
<div><p className="break-after-avoid mr-[1em]">All works on this page are licensed under:</p></div>
|
<div><p className="break-after-avoid mr-[1em]">All works on this page are licensed under:</p></div>
|
||||||
<div><a href="https://creativecommons.org/licenses/by-nc-sa/4.0/">CC BY-NC-SA 4.0</a></div>
|
<div><a href="https://creativecommons.org/licenses/by-nc-sa/4.0/">CC BY-NC-SA 4.0</a></div>
|
||||||
</AnimateTextIn>
|
</AnimateTextIn>
|
||||||
<AnimatePopUp position={2} className="items-center content-center">
|
<AnimatePopUp duration={1} ease='elastic.inOut' position={2} once className="items-center content-center">
|
||||||
<div className="flex flex-row">
|
<div className="flex flex-row">
|
||||||
<img className="max-w-[1em]" src="https://mirrors.creativecommons.org/presskit/icons/cc.svg" alt="" />
|
<img className="max-w-[1em]" src="https://mirrors.creativecommons.org/presskit/icons/cc.svg" alt="" />
|
||||||
<img className="max-w-[1em] ml-[1em]" src="https://mirrors.creativecommons.org/presskit/icons/by.svg" alt="" />
|
<img className="max-w-[1em] ml-[1em]" src="https://mirrors.creativecommons.org/presskit/icons/by.svg" alt="" />
|
||||||
@@ -33,7 +33,7 @@ export default function MusicPage() {
|
|||||||
<div key={track.id}>
|
<div key={track.id}>
|
||||||
<Card.AnimatedCard position={i + 1}>
|
<Card.AnimatedCard position={i + 1}>
|
||||||
<Card.CardHeader>
|
<Card.CardHeader>
|
||||||
<AnimateTextIn position={i + 1.2} animation="slide">
|
<AnimateTextIn once position={i + 1.2} animation="slide">
|
||||||
<Card.CardTitle>{track.title}</Card.CardTitle>
|
<Card.CardTitle>{track.title}</Card.CardTitle>
|
||||||
</AnimateTextIn>
|
</AnimateTextIn>
|
||||||
</Card.CardHeader>
|
</Card.CardHeader>
|
||||||
@@ -41,8 +41,9 @@ export default function MusicPage() {
|
|||||||
{track.description && (
|
{track.description && (
|
||||||
<p className="text-sm text-muted-foreground gsapant">{track.description}</p>
|
<p className="text-sm text-muted-foreground gsapant">{track.description}</p>
|
||||||
)}
|
)}
|
||||||
<AnimatePopUp position={i + 1.3}>
|
<AnimatePopUp duration={2} ease='elastic.inOut' position={i + 1.3} once>
|
||||||
<AudioPlayer
|
<AudioPlayer
|
||||||
|
id={track.id}
|
||||||
src={track.streamUrl ?? track.fileUrl}
|
src={track.streamUrl ?? track.fileUrl}
|
||||||
downloadUrl={track.fileUrl}
|
downloadUrl={track.fileUrl}
|
||||||
downloadName={track.fileName}
|
downloadName={track.fileName}
|
||||||
|
|||||||
@@ -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();
|
||||||
@@ -63,7 +62,7 @@ export default function ProjectsPage() {
|
|||||||
{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 once 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>
|
||||||
)}
|
)}
|
||||||
@@ -111,11 +110,6 @@ export default function ProjectsPage() {
|
|||||||
<div className="pt-5" />
|
<div className="pt-5" />
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
{/* Scroll runway: lets the last cards' ScrollTrigger exit points be
|
|
||||||
reached past the visible area, so on short viewports the second-to-last
|
|
||||||
card animates out off-screen instead of being frozen mid-exit at the
|
|
||||||
bottom of the scroll. Tune the height if a card is still caught. */}
|
|
||||||
<div aria-hidden className="h-[70dvh] shrink-0" />
|
|
||||||
</ScrollArea>
|
</ScrollArea>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
79
src/components/ClientMdx.tsx
Normal file
79
src/components/ClientMdx.tsx
Normal 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>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -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";
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
"use client"
|
||||||
import * as React from "react"
|
import * as React from "react"
|
||||||
import { useRef } from "react";
|
import { useRef } from "react";
|
||||||
import gsap from 'gsap'
|
import gsap from 'gsap'
|
||||||
|
|||||||
@@ -175,6 +175,7 @@ export const chatMessageRelations = relations(chatMessage, ({ one }) => ({
|
|||||||
export const systemSettings = createTable(
|
export const systemSettings = createTable(
|
||||||
"systemSetting",
|
"systemSetting",
|
||||||
(d) => ({
|
(d) => ({
|
||||||
systemPropmt: d.text()
|
systemPropmt: d.text(),
|
||||||
|
model: d.text()
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -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();
|
||||||
|
|
||||||
|
|||||||
@@ -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 })
|
||||||
}),
|
}),
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
import { initTRPC } from "@trpc/server"
|
import { initTRPC } from "@trpc/server"
|
||||||
|
import superjson from "superjson"
|
||||||
|
|
||||||
const t = initTRPC.create();
|
const t = initTRPC.create({
|
||||||
|
transformer: superjson,
|
||||||
|
});
|
||||||
export const router = t.router;
|
export const router = t.router;
|
||||||
export const publicProcedure = t.procedure;
|
export const publicProcedure = t.procedure;
|
||||||
|
|||||||
Reference in New Issue
Block a user