Compare commits
16 Commits
af4ff18917
...
additional
| Author | SHA1 | Date | |
|---|---|---|---|
| 85af4aec77 | |||
| 05740e122e | |||
| 95666e20e9 | |||
| 993137068e | |||
| 5755bd3184 | |||
| ca29bd5003 | |||
| 62f808b0cf | |||
| cb3ece4f99 | |||
| c5faf8fa57 | |||
| a7354ad774 | |||
| c742b8e457 | |||
| 4ce93a0466 | |||
| 0d79adb104 | |||
| 3e5be46503 | |||
| 73ba2b573d | |||
| c1fe73dbd0 |
@@ -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: [] })
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ export default function FormScaffold<T extends FieldValues,>(params: {
|
|||||||
}) {
|
}) {
|
||||||
const { form, onSubmit, title, id, className, children } = params
|
const { form, onSubmit, title, id, className, children } = params
|
||||||
return (
|
return (
|
||||||
<Card.Card className={className ? className : "w-5/6 lg:w-1/2"}>
|
<Card.Card className={className ? className : "w-full"}>
|
||||||
<Card.CardHeader>
|
<Card.CardHeader>
|
||||||
<Card.CardTitle>
|
<Card.CardTitle>
|
||||||
<DependentText bool={id ? true : false} true={`Update ${title}`} false={`Create ${title}`} />
|
<DependentText bool={id ? true : false} true={`Update ${title}`} false={`Create ${title}`} />
|
||||||
|
|||||||
@@ -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,
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
})
|
})
|
||||||
|
|||||||
25
src/app/actions/cancelMeeting.ts
Normal file
25
src/app/actions/cancelMeeting.ts
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
'use server'
|
||||||
|
import { getGoogleCalendarClient, getGoogleCalendarId } from '~/server/googleCalendar'
|
||||||
|
|
||||||
|
export async function cancelMeeting({ eventId }: { eventId: string }) {
|
||||||
|
try {
|
||||||
|
const calendar = getGoogleCalendarClient()
|
||||||
|
|
||||||
|
await calendar.events.delete({
|
||||||
|
calendarId: getGoogleCalendarId(),
|
||||||
|
eventId,
|
||||||
|
})
|
||||||
|
|
||||||
|
return {
|
||||||
|
success: true,
|
||||||
|
eventId,
|
||||||
|
message: 'Meeting removed from Gregor availability calendar.',
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Failed to cancel meeting:', error)
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
error: 'Failed to remove the meeting from Gregor availability calendar.',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,34 @@
|
|||||||
'use server'
|
'use server'
|
||||||
import { clerkClient, auth } from '@clerk/nextjs/server'
|
|
||||||
import { google } from 'googleapis'
|
|
||||||
import { env } from '~/env'
|
import { env } from '~/env'
|
||||||
|
import { getGoogleCalendarClient, getGoogleCalendarId } from '~/server/googleCalendar'
|
||||||
|
|
||||||
|
function googleCalendarDate(date: Date) {
|
||||||
|
return date.toISOString().replace(/[-:]|\.\d{3}/g, '')
|
||||||
|
}
|
||||||
|
|
||||||
|
function createGoogleCalendarTemplateLink({
|
||||||
|
title,
|
||||||
|
description,
|
||||||
|
startTime,
|
||||||
|
endTime,
|
||||||
|
gregorEmail,
|
||||||
|
}: {
|
||||||
|
title: string
|
||||||
|
description: string
|
||||||
|
startTime: Date
|
||||||
|
endTime: Date
|
||||||
|
gregorEmail: string
|
||||||
|
}) {
|
||||||
|
const params = new URLSearchParams({
|
||||||
|
action: 'TEMPLATE',
|
||||||
|
text: title,
|
||||||
|
dates: `${googleCalendarDate(startTime)}/${googleCalendarDate(endTime)}`,
|
||||||
|
details: description,
|
||||||
|
add: gregorEmail,
|
||||||
|
})
|
||||||
|
|
||||||
|
return `https://calendar.google.com/calendar/render?${params.toString()}`
|
||||||
|
}
|
||||||
|
|
||||||
export async function scheduleMeeting({
|
export async function scheduleMeeting({
|
||||||
title,
|
title,
|
||||||
@@ -19,56 +46,39 @@ export async function scheduleMeeting({
|
|||||||
attendeeName?: string
|
attendeeName?: string
|
||||||
}) {
|
}) {
|
||||||
try {
|
try {
|
||||||
const clerk = await clerkClient()
|
const calendar = getGoogleCalendarClient()
|
||||||
const userAuth = await auth()
|
|
||||||
const user = await clerk.users.getUser(userAuth.userId?userAuth.userId:"")
|
|
||||||
// Get admin's Google OAuth token to create the event on Gregor's calendar
|
|
||||||
const adminTokenResponse = await clerk.users.getUserOauthAccessToken(
|
|
||||||
env.ADMIN_USER_CLERK_ID,
|
|
||||||
'oauth_google',
|
|
||||||
)
|
|
||||||
const adminToken = adminTokenResponse.data[0]
|
|
||||||
|
|
||||||
if (!adminToken?.token) {
|
|
||||||
return { success: false, error: 'Admin Google Calendar not connected. Ensure the admin account is linked with Google and has calendar scope enabled.' }
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try to resolve visitor's Google email for the invite
|
|
||||||
let visitorEmail: string | undefined = attendeeEmail
|
|
||||||
if (!visitorEmail) {
|
|
||||||
visitorEmail = user?.emailAddresses.at(0)?.emailAddress ?? undefined
|
|
||||||
}
|
|
||||||
|
|
||||||
const oAuth2Client = new google.auth.OAuth2()
|
|
||||||
oAuth2Client.setCredentials({ access_token: adminToken.token })
|
|
||||||
const calendar = google.calendar({ version: 'v3', auth: oAuth2Client })
|
|
||||||
|
|
||||||
const startTime = new Date(dateTime)
|
const startTime = new Date(dateTime)
|
||||||
const endTime = new Date(startTime.getTime() + durationMinutes * 60 * 1000)
|
const endTime = new Date(startTime.getTime() + durationMinutes * 60 * 1000)
|
||||||
|
const attendeeNote = attendeeEmail
|
||||||
|
? `\n\nVisitor: ${attendeeName ?? 'Unknown'} <${attendeeEmail}>`
|
||||||
|
: ''
|
||||||
|
const eventDescription = `${description}${attendeeNote}`
|
||||||
|
|
||||||
const attendees: { email: string; displayName?: string }[] = []
|
const eventRequest = {
|
||||||
if (visitorEmail) {
|
|
||||||
attendees.push({ email: visitorEmail, displayName: attendeeName })
|
|
||||||
}
|
|
||||||
|
|
||||||
const event = await calendar.events.insert({
|
|
||||||
calendarId: 'primary',
|
|
||||||
sendUpdates: 'all',
|
|
||||||
requestBody: {
|
|
||||||
summary: title,
|
summary: title,
|
||||||
description,
|
description: eventDescription,
|
||||||
start: { dateTime: startTime.toISOString(), timeZone: 'UTC' },
|
start: { dateTime: startTime.toISOString(), timeZone: 'UTC' },
|
||||||
end: { dateTime: endTime.toISOString(), timeZone: 'UTC' },
|
end: { dateTime: endTime.toISOString(), timeZone: 'UTC' },
|
||||||
attendees,
|
}
|
||||||
},
|
const event = await calendar.events.insert({
|
||||||
sendNotifications: true
|
calendarId: getGoogleCalendarId(),
|
||||||
|
requestBody: eventRequest,
|
||||||
|
})
|
||||||
|
|
||||||
|
const addToCalendarLink = createGoogleCalendarTemplateLink({
|
||||||
|
title,
|
||||||
|
description,
|
||||||
|
startTime,
|
||||||
|
endTime,
|
||||||
|
gregorEmail: env.GREGOR_MEETING_EMAIL,
|
||||||
})
|
})
|
||||||
|
|
||||||
return {
|
return {
|
||||||
success: true,
|
success: true,
|
||||||
eventId: event.data.id,
|
eventId: event.data.id,
|
||||||
htmlLink: event.data.htmlLink,
|
addToCalendarLink,
|
||||||
message: `Meeting "${title}" scheduled for ${startTime.toLocaleString()}${visitorEmail ? `. Invite sent to ${visitorEmail}.` : '.'}`,
|
message: `Meeting "${title}" scheduled for ${startTime.toLocaleString()}.${attendeeEmail ? ` Visitor email noted: ${attendeeEmail}.` : ''} The add-to-calendar link invites ${env.GREGOR_MEETING_EMAIL}.`,
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to schedule meeting:', error)
|
console.error('Failed to schedule meeting:', error)
|
||||||
|
|||||||
98
src/app/admin/_components/MdxComponentReference.tsx
Normal file
98
src/app/admin/_components/MdxComponentReference.tsx
Normal file
@@ -0,0 +1,98 @@
|
|||||||
|
import { ChevronsUpDown } from "lucide-react";
|
||||||
|
import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "~/components/ui/accordion";
|
||||||
|
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "~/components/ui/collapsible";
|
||||||
|
|
||||||
|
const examples = [
|
||||||
|
{
|
||||||
|
name: "Lead",
|
||||||
|
description: "Intro paragraph with larger muted text.",
|
||||||
|
code: `<Lead>
|
||||||
|
Short opening summary.
|
||||||
|
</Lead>`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Callout",
|
||||||
|
description: "Highlighted note, tip, or warning block.",
|
||||||
|
code: `<Callout title="Heads up" variant="note">
|
||||||
|
Important context for readers.
|
||||||
|
</Callout>
|
||||||
|
|
||||||
|
<Callout title="Tip" variant="tip">
|
||||||
|
A practical recommendation.
|
||||||
|
</Callout>
|
||||||
|
|
||||||
|
<Callout title="Careful" variant="warning">
|
||||||
|
A caveat or tradeoff.
|
||||||
|
</Callout>`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "ButtonLink",
|
||||||
|
description: "Button-styled internal or external link.",
|
||||||
|
code: `<ButtonLink href="/projects">
|
||||||
|
View projects
|
||||||
|
</ButtonLink>
|
||||||
|
|
||||||
|
<ButtonLink href="https://example.com" variant="outline">
|
||||||
|
External resource
|
||||||
|
</ButtonLink>`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Figure",
|
||||||
|
description: "Image with optional caption.",
|
||||||
|
code: `<Figure
|
||||||
|
src="https://example.com/image.jpg"
|
||||||
|
alt="Describe the image"
|
||||||
|
caption="Optional caption"
|
||||||
|
/>`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "PullQuote",
|
||||||
|
description: "Large emphasized quote or takeaway.",
|
||||||
|
code: `<PullQuote>
|
||||||
|
A highlighted quote or strong takeaway.
|
||||||
|
</PullQuote>`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "TagList",
|
||||||
|
description: "Inline list of tag badges.",
|
||||||
|
code: `<TagList tags={["nextjs", "mdx", "uploadthing"]} />`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Badge",
|
||||||
|
description: "Small inline label.",
|
||||||
|
code: `<Badge variant="outline">Next.js</Badge>`,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
export default function MdxComponentReference() {
|
||||||
|
return (
|
||||||
|
<Collapsible className="rounded-lg border">
|
||||||
|
<CollapsibleTrigger className="flex w-full items-center justify-between gap-2 p-4 text-left">
|
||||||
|
<h2 className="text-base font-semibold">MDX Components</h2>
|
||||||
|
<ChevronsUpDown className="size-4 shrink-0 text-muted-foreground" />
|
||||||
|
</CollapsibleTrigger>
|
||||||
|
<CollapsibleContent className="px-4 pb-4">
|
||||||
|
<p className="text-muted-foreground text-sm">
|
||||||
|
Components available inside MDX content. Type <code className="rounded bg-muted px-1">[[</code> for internal links or <code className="rounded bg-muted px-1"><</code> for component snippets.
|
||||||
|
</p>
|
||||||
|
<Accordion type="single" collapsible className="mt-3">
|
||||||
|
{examples.map((example) => (
|
||||||
|
<AccordionItem key={example.name} value={example.name}>
|
||||||
|
<AccordionTrigger>
|
||||||
|
<span>
|
||||||
|
<span className="block">{example.name}</span>
|
||||||
|
<span className="text-muted-foreground block text-xs font-normal">{example.description}</span>
|
||||||
|
</span>
|
||||||
|
</AccordionTrigger>
|
||||||
|
<AccordionContent>
|
||||||
|
<pre className="bg-muted overflow-x-auto rounded-md p-3 text-xs">
|
||||||
|
<code>{example.code}</code>
|
||||||
|
</pre>
|
||||||
|
</AccordionContent>
|
||||||
|
</AccordionItem>
|
||||||
|
))}
|
||||||
|
</Accordion>
|
||||||
|
</CollapsibleContent>
|
||||||
|
</Collapsible>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -4,9 +4,9 @@ import { useEffect, useState } from 'react'
|
|||||||
import { MDXRemote } from 'next-mdx-remote'
|
import { MDXRemote } from 'next-mdx-remote'
|
||||||
import { serialize } from 'next-mdx-remote/serialize'
|
import { serialize } from 'next-mdx-remote/serialize'
|
||||||
import type { MDXRemoteSerializeResult } from 'next-mdx-remote'
|
import type { MDXRemoteSerializeResult } from 'next-mdx-remote'
|
||||||
import { mdxComponents } from '~/app/blog/_components/mdx-components'
|
import { mdxComponents } from '~/components/mdx-components'
|
||||||
|
|
||||||
export default function BlogMdxEditorPreview(params: { source: string }) {
|
export default function MdxEditorPreview(params: { source: string }) {
|
||||||
const [compiled, setCompiled] = useState<MDXRemoteSerializeResult | null>(null)
|
const [compiled, setCompiled] = useState<MDXRemoteSerializeResult | null>(null)
|
||||||
const [error, setError] = useState<string | null>(null)
|
const [error, setError] = useState<string | null>(null)
|
||||||
|
|
||||||
143
src/app/admin/_components/useMdxEditorFieldProps.tsx
Normal file
143
src/app/admin/_components/useMdxEditorFieldProps.tsx
Normal file
@@ -0,0 +1,143 @@
|
|||||||
|
'use client'
|
||||||
|
|
||||||
|
import { trpc } from '~/app/_trpc/Client'
|
||||||
|
import type { RouterOutputs } from '~/server/routers/_app'
|
||||||
|
import {
|
||||||
|
AUTOCOMPLETE_CURSOR_MARKER,
|
||||||
|
linkSuggestionsToAutocomplete,
|
||||||
|
type AutocompleteTriggerConfig,
|
||||||
|
type InternalLinkSuggestion,
|
||||||
|
type MdeAutocompleteSuggestion,
|
||||||
|
} from '~/app/_components/Form/Fields/InternalLinkTextarea'
|
||||||
|
import MdxEditorPreview from './MdxEditorPreview'
|
||||||
|
|
||||||
|
function internalLinkSuggestions(params: {
|
||||||
|
posts?: RouterOutputs['blog']['list'],
|
||||||
|
projects?: RouterOutputs['projectv2']['listWithStack'],
|
||||||
|
}): InternalLinkSuggestion[] {
|
||||||
|
const postLinks = params.posts?.map((post) => ({
|
||||||
|
label: post.title,
|
||||||
|
href: `/blog/${post.slug}`,
|
||||||
|
group: 'Blog',
|
||||||
|
})) ?? []
|
||||||
|
|
||||||
|
const projectLinks = params.projects?.map((project) => ({
|
||||||
|
label: project.title,
|
||||||
|
href: `/projects#${project.id}`,
|
||||||
|
group: 'Project',
|
||||||
|
})) ?? []
|
||||||
|
|
||||||
|
return [...postLinks, ...projectLinks]
|
||||||
|
}
|
||||||
|
|
||||||
|
const mdxAutocompleteSuggestions: MdeAutocompleteSuggestion[] = [
|
||||||
|
{
|
||||||
|
label: 'Lead',
|
||||||
|
value: `<Lead>\n${AUTOCOMPLETE_CURSOR_MARKER}\n</Lead>`,
|
||||||
|
detail: 'Intro paragraph with larger muted text.',
|
||||||
|
group: 'Component',
|
||||||
|
trigger: '<',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Callout note',
|
||||||
|
value: `<Callout title="Heads up" variant="note">\n${AUTOCOMPLETE_CURSOR_MARKER}\n</Callout>`,
|
||||||
|
detail: 'Highlighted note block.',
|
||||||
|
group: 'Component',
|
||||||
|
trigger: '<',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Callout tip',
|
||||||
|
value: `<Callout title="Tip" variant="tip">\n${AUTOCOMPLETE_CURSOR_MARKER}\n</Callout>`,
|
||||||
|
detail: 'Highlighted tip block.',
|
||||||
|
group: 'Component',
|
||||||
|
trigger: '<',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Callout warning',
|
||||||
|
value: `<Callout title="Careful" variant="warning">\n${AUTOCOMPLETE_CURSOR_MARKER}\n</Callout>`,
|
||||||
|
detail: 'Highlighted warning block.',
|
||||||
|
group: 'Component',
|
||||||
|
trigger: '<',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'ButtonLink',
|
||||||
|
value: `<ButtonLink href="${AUTOCOMPLETE_CURSOR_MARKER}">\nView projects\n</ButtonLink>`,
|
||||||
|
detail: 'Button-styled internal or external link.',
|
||||||
|
group: 'Component',
|
||||||
|
trigger: '<',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Figure',
|
||||||
|
value: `<Figure\n src="${AUTOCOMPLETE_CURSOR_MARKER}"\n alt="Describe the image"\n caption="Optional caption"\n/>`,
|
||||||
|
detail: 'Image with optional caption.',
|
||||||
|
group: 'Component',
|
||||||
|
trigger: '<',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'PullQuote',
|
||||||
|
value: `<PullQuote>\n${AUTOCOMPLETE_CURSOR_MARKER}\n</PullQuote>`,
|
||||||
|
detail: 'Large emphasized quote.',
|
||||||
|
group: 'Component',
|
||||||
|
trigger: '<',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'TagList',
|
||||||
|
value: `<TagList tags={[${AUTOCOMPLETE_CURSOR_MARKER}]} />`,
|
||||||
|
detail: 'Inline list of tag badges.',
|
||||||
|
group: 'Component',
|
||||||
|
trigger: '<',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Badge',
|
||||||
|
value: `<Badge variant="outline">${AUTOCOMPLETE_CURSOR_MARKER}</Badge>`,
|
||||||
|
detail: 'Small inline label.',
|
||||||
|
group: 'Component',
|
||||||
|
trigger: '<',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Image',
|
||||||
|
value: ``,
|
||||||
|
detail: 'Markdown image',
|
||||||
|
group: 'Markdown',
|
||||||
|
trigger: '!',
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
|
const mdxTriggerConfigs: AutocompleteTriggerConfig[] = [
|
||||||
|
{
|
||||||
|
trigger: '[[',
|
||||||
|
label: 'Internal links',
|
||||||
|
isQueryValid: (query) => !query.includes(']'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
trigger: '<',
|
||||||
|
label: 'MDX components',
|
||||||
|
isQueryValid: (query) => !/[\s>]/.test(query),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
trigger: '!',
|
||||||
|
label: 'Markdown',
|
||||||
|
isQueryValid: (query) => !/[\s\)]/.test(query),
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Shared props for an MDX-aware `MdeFormField`: internal-link + component
|
||||||
|
* autocomplete, trigger configs, and a live MDX preview. Used by every admin
|
||||||
|
* form that edits MDX content (blog, project, cv entry).
|
||||||
|
*/
|
||||||
|
export function useMdxEditorFieldProps() {
|
||||||
|
const posts = trpc.blog.list.useQuery(undefined, { refetchInterval: 5000 })
|
||||||
|
const projects = trpc.projectv2.listWithStack.useQuery()
|
||||||
|
|
||||||
|
const autocompleteSuggestions = [
|
||||||
|
...linkSuggestionsToAutocomplete(internalLinkSuggestions({ posts: posts.data, projects: projects.data })),
|
||||||
|
...mdxAutocompleteSuggestions,
|
||||||
|
]
|
||||||
|
|
||||||
|
return {
|
||||||
|
autocompleteSuggestions,
|
||||||
|
triggerConfigs: mdxTriggerConfigs,
|
||||||
|
renderPreview: (source: string) => <MdxEditorPreview source={source} />,
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -10,15 +10,8 @@ import { TextInputFormField, MdeFormField } from '~/app/_components/Form/Fields'
|
|||||||
import { usePathname, useRouter } from 'next/navigation'
|
import { usePathname, useRouter } from 'next/navigation'
|
||||||
import { useTheme } from 'next-themes'
|
import { useTheme } from 'next-themes'
|
||||||
import type { RouterOutputs } from '~/server/routers/_app'
|
import type { RouterOutputs } from '~/server/routers/_app'
|
||||||
import MdxComponentReference from './MdxComponentReference'
|
import MdxComponentReference from '~/app/admin/_components/MdxComponentReference'
|
||||||
import BlogMdxEditorPreview from './BlogMdxEditorPreview'
|
import { useMdxEditorFieldProps } from '~/app/admin/_components/useMdxEditorFieldProps'
|
||||||
import {
|
|
||||||
AUTOCOMPLETE_CURSOR_MARKER,
|
|
||||||
linkSuggestionsToAutocomplete,
|
|
||||||
type AutocompleteTriggerConfig,
|
|
||||||
type InternalLinkSuggestion,
|
|
||||||
type MdeAutocompleteSuggestion,
|
|
||||||
} from '~/app/_components/Form/Fields/InternalLinkTextarea'
|
|
||||||
|
|
||||||
type BlogPost = RouterOutputs['blog']['bySlug']
|
type BlogPost = RouterOutputs['blog']['bySlug']
|
||||||
|
|
||||||
@@ -35,116 +28,6 @@ function parseTags(value: string | undefined): string[] {
|
|||||||
return value?.split(',').map((tag) => tag.trim()).filter(Boolean) ?? []
|
return value?.split(',').map((tag) => tag.trim()).filter(Boolean) ?? []
|
||||||
}
|
}
|
||||||
|
|
||||||
function internalLinkSuggestions(params: {
|
|
||||||
posts?: RouterOutputs['blog']['list'],
|
|
||||||
projects?: RouterOutputs['projectv2']['listWithStack'],
|
|
||||||
}): InternalLinkSuggestion[] {
|
|
||||||
const postLinks = params.posts?.map((post) => ({
|
|
||||||
label: post.title,
|
|
||||||
href: `/blog/${post.slug}`,
|
|
||||||
group: 'Blog',
|
|
||||||
})) ?? []
|
|
||||||
|
|
||||||
const projectLinks = params.projects?.map((project) => ({
|
|
||||||
label: project.title,
|
|
||||||
href: `/projects#${project.id}`,
|
|
||||||
group: 'Project',
|
|
||||||
})) ?? []
|
|
||||||
|
|
||||||
return [...postLinks, ...projectLinks]
|
|
||||||
}
|
|
||||||
|
|
||||||
const blogAutocompleteSuggestions: MdeAutocompleteSuggestion[] = [
|
|
||||||
{
|
|
||||||
label: 'Lead',
|
|
||||||
value: `<Lead>\n${AUTOCOMPLETE_CURSOR_MARKER}\n</Lead>`,
|
|
||||||
detail: 'Intro paragraph with larger muted text.',
|
|
||||||
group: 'Component',
|
|
||||||
trigger: '<',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'Callout note',
|
|
||||||
value: `<Callout title="Heads up" variant="note">\n${AUTOCOMPLETE_CURSOR_MARKER}\n</Callout>`,
|
|
||||||
detail: 'Highlighted note block.',
|
|
||||||
group: 'Component',
|
|
||||||
trigger: '<',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'Callout tip',
|
|
||||||
value: `<Callout title="Tip" variant="tip">\n${AUTOCOMPLETE_CURSOR_MARKER}\n</Callout>`,
|
|
||||||
detail: 'Highlighted tip block.',
|
|
||||||
group: 'Component',
|
|
||||||
trigger: '<',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'Callout warning',
|
|
||||||
value: `<Callout title="Careful" variant="warning">\n${AUTOCOMPLETE_CURSOR_MARKER}\n</Callout>`,
|
|
||||||
detail: 'Highlighted warning block.',
|
|
||||||
group: 'Component',
|
|
||||||
trigger: '<',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'ButtonLink',
|
|
||||||
value: `<ButtonLink href="${AUTOCOMPLETE_CURSOR_MARKER}">\nView projects\n</ButtonLink>`,
|
|
||||||
detail: 'Button-styled internal or external link.',
|
|
||||||
group: 'Component',
|
|
||||||
trigger: '<',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'Figure',
|
|
||||||
value: `<Figure\n src="${AUTOCOMPLETE_CURSOR_MARKER}"\n alt="Describe the image"\n caption="Optional caption"\n/>`,
|
|
||||||
detail: 'Image with optional caption.',
|
|
||||||
group: 'Component',
|
|
||||||
trigger: '<',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'PullQuote',
|
|
||||||
value: `<PullQuote>\n${AUTOCOMPLETE_CURSOR_MARKER}\n</PullQuote>`,
|
|
||||||
detail: 'Large emphasized quote.',
|
|
||||||
group: 'Component',
|
|
||||||
trigger: '<',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'TagList',
|
|
||||||
value: `<TagList tags={[${AUTOCOMPLETE_CURSOR_MARKER}]} />`,
|
|
||||||
detail: 'Inline list of tag badges.',
|
|
||||||
group: 'Component',
|
|
||||||
trigger: '<',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'Badge',
|
|
||||||
value: `<Badge variant="outline">${AUTOCOMPLETE_CURSOR_MARKER}</Badge>`,
|
|
||||||
detail: 'Small inline label.',
|
|
||||||
group: 'Component',
|
|
||||||
trigger: '<',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'Image',
|
|
||||||
value: ``,
|
|
||||||
detail: 'Markdown image',
|
|
||||||
group: 'Markdown',
|
|
||||||
trigger: '!',
|
|
||||||
},
|
|
||||||
]
|
|
||||||
|
|
||||||
const blogTriggerConfigs: AutocompleteTriggerConfig[] = [
|
|
||||||
{
|
|
||||||
trigger: '[[',
|
|
||||||
label: 'Internal links',
|
|
||||||
isQueryValid: (query) => !query.includes(']'),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
trigger: '<',
|
|
||||||
label: 'MDX components',
|
|
||||||
isQueryValid: (query) => !/[\s>]/.test(query),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
trigger: '!',
|
|
||||||
label: 'Markdown',
|
|
||||||
isQueryValid: (query) => !/[\s\)]/.test(query),
|
|
||||||
},
|
|
||||||
]
|
|
||||||
|
|
||||||
export default function CreateUpdateBlogForm(params: { className?: string, entity?: BlogPost }) {
|
export default function CreateUpdateBlogForm(params: { className?: string, entity?: BlogPost }) {
|
||||||
const [slug, setSlug] = useState<string | undefined>(params.entity?.slug)
|
const [slug, setSlug] = useState<string | undefined>(params.entity?.slug)
|
||||||
const [originalSlug, setOriginalSlug] = useState<string | undefined>(params.entity?.slug)
|
const [originalSlug, setOriginalSlug] = useState<string | undefined>(params.entity?.slug)
|
||||||
@@ -162,12 +45,7 @@ export default function CreateUpdateBlogForm(params: { className?: string, entit
|
|||||||
})
|
})
|
||||||
const path = usePathname()
|
const path = usePathname()
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
const posts = trpc.blog.list.useQuery(undefined, { refetchInterval: 5000 })
|
const mdxEditorProps = useMdxEditorFieldProps()
|
||||||
const projects = trpc.projectv2.listWithStack.useQuery()
|
|
||||||
const autocompleteSuggestions = [
|
|
||||||
...linkSuggestionsToAutocomplete(internalLinkSuggestions({ posts: posts.data, projects: projects.data })),
|
|
||||||
...blogAutocompleteSuggestions,
|
|
||||||
]
|
|
||||||
|
|
||||||
const createMutation = trpc.blog.insert.useMutation({
|
const createMutation = trpc.blog.insert.useMutation({
|
||||||
onSuccess: (data) => {
|
onSuccess: (data) => {
|
||||||
@@ -226,9 +104,7 @@ export default function CreateUpdateBlogForm(params: { className?: string, entit
|
|||||||
name='content'
|
name='content'
|
||||||
label='Content'
|
label='Content'
|
||||||
dataColorMode={(theme as 'dark' | 'light') ?? 'dark'}
|
dataColorMode={(theme as 'dark' | 'light') ?? 'dark'}
|
||||||
autocompleteSuggestions={autocompleteSuggestions}
|
{...mdxEditorProps}
|
||||||
triggerConfigs={blogTriggerConfigs}
|
|
||||||
renderPreview={(source) => <BlogMdxEditorPreview source={source} />}
|
|
||||||
/>
|
/>
|
||||||
</FormScaffold>
|
</FormScaffold>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,91 +0,0 @@
|
|||||||
import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "~/components/ui/accordion";
|
|
||||||
|
|
||||||
const examples = [
|
|
||||||
{
|
|
||||||
name: "Lead",
|
|
||||||
description: "Intro paragraph with larger muted text.",
|
|
||||||
code: `<Lead>
|
|
||||||
Short opening summary for the post.
|
|
||||||
</Lead>`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "Callout",
|
|
||||||
description: "Highlighted note, tip, or warning block.",
|
|
||||||
code: `<Callout title="Heads up" variant="note">
|
|
||||||
Important context for readers.
|
|
||||||
</Callout>
|
|
||||||
|
|
||||||
<Callout title="Tip" variant="tip">
|
|
||||||
A practical recommendation.
|
|
||||||
</Callout>
|
|
||||||
|
|
||||||
<Callout title="Careful" variant="warning">
|
|
||||||
A caveat or tradeoff.
|
|
||||||
</Callout>`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "ButtonLink",
|
|
||||||
description: "Button-styled internal or external link.",
|
|
||||||
code: `<ButtonLink href="/projects">
|
|
||||||
View projects
|
|
||||||
</ButtonLink>
|
|
||||||
|
|
||||||
<ButtonLink href="https://example.com" variant="outline">
|
|
||||||
External resource
|
|
||||||
</ButtonLink>`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "Figure",
|
|
||||||
description: "Image with optional caption.",
|
|
||||||
code: `<Figure
|
|
||||||
src="https://example.com/image.jpg"
|
|
||||||
alt="Describe the image"
|
|
||||||
caption="Optional caption"
|
|
||||||
/>`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "PullQuote",
|
|
||||||
description: "Large emphasized quote or takeaway.",
|
|
||||||
code: `<PullQuote>
|
|
||||||
A highlighted quote or strong takeaway.
|
|
||||||
</PullQuote>`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "TagList",
|
|
||||||
description: "Inline list of tag badges inside the post body.",
|
|
||||||
code: `<TagList tags={["nextjs", "mdx", "uploadthing"]} />`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "Badge",
|
|
||||||
description: "Small inline label.",
|
|
||||||
code: `<Badge variant="outline">Next.js</Badge>`,
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
export default function MdxComponentReference() {
|
|
||||||
return (
|
|
||||||
<section className="rounded-lg border p-4">
|
|
||||||
<h2 className="text-base font-semibold">MDX Components</h2>
|
|
||||||
<p className="text-muted-foreground mt-1 text-sm">
|
|
||||||
Components available inside blog post content. Type <code className="rounded bg-muted px-1">[[</code> for internal links or <code className="rounded bg-muted px-1"><</code> for component snippets.
|
|
||||||
</p>
|
|
||||||
<Accordion type="single" collapsible className="mt-3">
|
|
||||||
{examples.map((example) => (
|
|
||||||
<AccordionItem key={example.name} value={example.name}>
|
|
||||||
<AccordionTrigger>
|
|
||||||
<span>
|
|
||||||
<span className="block">{example.name}</span>
|
|
||||||
<span className="text-muted-foreground block text-xs font-normal">{example.description}</span>
|
|
||||||
</span>
|
|
||||||
</AccordionTrigger>
|
|
||||||
<AccordionContent>
|
|
||||||
<pre className="bg-muted overflow-x-auto rounded-md p-3 text-xs">
|
|
||||||
<code>{example.code}</code>
|
|
||||||
</pre>
|
|
||||||
</AccordionContent>
|
|
||||||
</AccordionItem>
|
|
||||||
))}
|
|
||||||
</Accordion>
|
|
||||||
</section>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -14,6 +14,8 @@ import { useState } from 'react';
|
|||||||
import { SelectFormField, TextInputFormField, MdeFormField, CalenderFormField, BooleanFormField } from '~/app/_components/Form/Fields'
|
import { SelectFormField, TextInputFormField, MdeFormField, CalenderFormField, BooleanFormField } from '~/app/_components/Form/Fields'
|
||||||
import { usePathname, useRouter } from 'next/navigation';
|
import { usePathname, useRouter } from 'next/navigation';
|
||||||
import {FormMutationContextProvider, type FormCreateMutationInterface} from '~/app/_components/Form/Components/MutationProvider';
|
import {FormMutationContextProvider, type FormCreateMutationInterface} from '~/app/_components/Form/Components/MutationProvider';
|
||||||
|
import MdxComponentReference from '~/app/admin/_components/MdxComponentReference';
|
||||||
|
import { useMdxEditorFieldProps } from '~/app/admin/_components/useMdxEditorFieldProps';
|
||||||
export default function CreateUpdateCvEntryForm(params: { className?: string, entity?: IterableElement<RouterOutputs['entry']['select']>, isUpdate?: boolean }) {
|
export default function CreateUpdateCvEntryForm(params: { className?: string, entity?: IterableElement<RouterOutputs['entry']['select']>, isUpdate?: boolean }) {
|
||||||
const [id, setId] = useState<string | undefined>(params.entity ? params.entity.id : undefined)
|
const [id, setId] = useState<string | undefined>(params.entity ? params.entity.id : undefined)
|
||||||
const { theme } = useTheme()
|
const { theme } = useTheme()
|
||||||
@@ -34,6 +36,7 @@ export default function CreateUpdateCvEntryForm(params: { className?: string, en
|
|||||||
})
|
})
|
||||||
let path = usePathname()
|
let path = usePathname()
|
||||||
let router = useRouter()
|
let router = useRouter()
|
||||||
|
const mdxEditorProps = useMdxEditorFieldProps()
|
||||||
const createMutation = trpc.entry.insert.useMutation({ onSuccess: makeOnSuccess('create', form, setId) })
|
const createMutation = trpc.entry.insert.useMutation({ onSuccess: makeOnSuccess('create', form, setId) })
|
||||||
const updateMutation = trpc.entry.update.useMutation({ onSuccess: makeOnSuccess('update', form) })
|
const updateMutation = trpc.entry.update.useMutation({ onSuccess: makeOnSuccess('update', form) })
|
||||||
const deleteMutation = trpc.entry.delete.useMutation({ onSuccess: makeOnSuccess('delete', form, undefined, path, router) })
|
const deleteMutation = trpc.entry.delete.useMutation({ onSuccess: makeOnSuccess('delete', form, undefined, path, router) })
|
||||||
@@ -51,6 +54,8 @@ export default function CreateUpdateCvEntryForm(params: { className?: string, en
|
|||||||
updateMutation:updateMutation,
|
updateMutation:updateMutation,
|
||||||
deleteMutation:deleteMutation
|
deleteMutation:deleteMutation
|
||||||
}}>
|
}}>
|
||||||
|
<div className='flex flex-col gap-4'>
|
||||||
|
<MdxComponentReference />
|
||||||
<FormScaffold
|
<FormScaffold
|
||||||
form={form}
|
form={form}
|
||||||
onSubmit={onSubmit}
|
onSubmit={onSubmit}
|
||||||
@@ -70,11 +75,12 @@ export default function CreateUpdateCvEntryForm(params: { className?: string, en
|
|||||||
}
|
}
|
||||||
</SelectFormField>
|
</SelectFormField>
|
||||||
<TextInputFormField control={form.control} name='title' label='Title' />
|
<TextInputFormField control={form.control} name='title' label='Title' />
|
||||||
<MdeFormField control={form.control} name='description' label='Description' dataColorMode={(theme as "dark" | "light") ? (theme as "dark" | "light") : "dark"} />
|
<MdeFormField control={form.control} name='description' label='Description' dataColorMode={(theme as "dark" | "light") ? (theme as "dark" | "light") : "dark"} {...mdxEditorProps} />
|
||||||
<CalenderFormField control={form.control} name='fromTime' label='From Date' />
|
<CalenderFormField control={form.control} name='fromTime' label='From Date' />
|
||||||
<CalenderFormField control={form.control} name='toTime' label='To Date' />
|
<CalenderFormField control={form.control} name='toTime' label='To Date' />
|
||||||
<BooleanFormField control={form.control} name='hideDates' label='Hide Dates' />
|
<BooleanFormField control={form.control} name='hideDates' label='Hide Dates' />
|
||||||
</FormScaffold>
|
</FormScaffold>
|
||||||
|
</div>
|
||||||
</FormMutationContextProvider>
|
</FormMutationContextProvider>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,6 +14,8 @@ import { usePathname, useRouter } from 'next/navigation';
|
|||||||
import { useTheme } from 'next-themes';
|
import { useTheme } from 'next-themes';
|
||||||
import { makeUseRelationShipWithNameIndex } from '~/lib/hooks';
|
import { makeUseRelationShipWithNameIndex } from '~/lib/hooks';
|
||||||
import { FormMutationContextProvider } from '~/app/_components/Form/Components/MutationProvider';
|
import { FormMutationContextProvider } from '~/app/_components/Form/Components/MutationProvider';
|
||||||
|
import MdxComponentReference from '~/app/admin/_components/MdxComponentReference';
|
||||||
|
import { useMdxEditorFieldProps } from '~/app/admin/_components/useMdxEditorFieldProps';
|
||||||
export default function CreateUpdateProjectForm(params: { className?: string, entity?: IterableElement<RouterOutputs['project']['select']> }) {
|
export default function CreateUpdateProjectForm(params: { className?: string, entity?: IterableElement<RouterOutputs['project']['select']> }) {
|
||||||
const [id, setId] = useState<string | undefined>(params.entity ? params.entity.id : undefined)
|
const [id, setId] = useState<string | undefined>(params.entity ? params.entity.id : undefined)
|
||||||
const { theme } = useTheme()
|
const { theme } = useTheme()
|
||||||
@@ -35,6 +37,7 @@ export default function CreateUpdateProjectForm(params: { className?: string, en
|
|||||||
})
|
})
|
||||||
let path = usePathname()
|
let path = usePathname()
|
||||||
let router = useRouter()
|
let router = useRouter()
|
||||||
|
const mdxEditorProps = useMdxEditorFieldProps()
|
||||||
const createMutation = trpc.project.insert.useMutation({ onSuccess: makeOnSuccess('create', form, setId) })
|
const createMutation = trpc.project.insert.useMutation({ onSuccess: makeOnSuccess('create', form, setId) })
|
||||||
const updateMutation = trpc.project.update.useMutation({ onSuccess: makeOnSuccess('update', form) })
|
const updateMutation = trpc.project.update.useMutation({ onSuccess: makeOnSuccess('update', form) })
|
||||||
const deleteMutation = trpc.project.delete.useMutation({ onSuccess: makeOnSuccess('delete', form, undefined, path, router) })
|
const deleteMutation = trpc.project.delete.useMutation({ onSuccess: makeOnSuccess('delete', form, undefined, path, router) })
|
||||||
@@ -50,6 +53,8 @@ export default function CreateUpdateProjectForm(params: { className?: string, en
|
|||||||
updateMutation: updateMutation,
|
updateMutation: updateMutation,
|
||||||
deleteMutation: deleteMutation
|
deleteMutation: deleteMutation
|
||||||
}}>
|
}}>
|
||||||
|
<div className='flex flex-col gap-4'>
|
||||||
|
<MdxComponentReference />
|
||||||
<FormScaffold
|
<FormScaffold
|
||||||
form={form}
|
form={form}
|
||||||
onSubmit={onSubmit}
|
onSubmit={onSubmit}
|
||||||
@@ -69,7 +74,7 @@ export default function CreateUpdateProjectForm(params: { className?: string, en
|
|||||||
}
|
}
|
||||||
</SelectFormField>
|
</SelectFormField>
|
||||||
<TextInputFormField control={form.control} name='title' label='Title' />
|
<TextInputFormField control={form.control} name='title' label='Title' />
|
||||||
<MdeFormField control={form.control} name='description' label='Description' dataColorMode={(theme as "dark" | "light") ?? "dark"} />
|
<MdeFormField control={form.control} name='description' label='Description' dataColorMode={(theme as "dark" | "light") ?? "dark"} {...mdxEditorProps} />
|
||||||
<SelectFormField control={form.control} name='sourceType' label='Source Type' defaultValue={'open'} placeholder='open' >
|
<SelectFormField control={form.control} name='sourceType' label='Source Type' defaultValue={'open'} placeholder='open' >
|
||||||
<SelectItem value="open"> open </SelectItem>
|
<SelectItem value="open"> open </SelectItem>
|
||||||
<SelectItem value="closed"> closed </SelectItem>
|
<SelectItem value="closed"> closed </SelectItem>
|
||||||
@@ -82,6 +87,7 @@ export default function CreateUpdateProjectForm(params: { className?: string, en
|
|||||||
<TextInputFormField control={form.control} label='Release Link' name='releaseLink' />
|
<TextInputFormField control={form.control} label='Release Link' name='releaseLink' />
|
||||||
<IntInputFormField control={form.control} label='Order Position' name='orderPos'/>
|
<IntInputFormField control={form.control} label='Order Position' name='orderPos'/>
|
||||||
</FormScaffold>
|
</FormScaffold>
|
||||||
|
</div>
|
||||||
</FormMutationContextProvider>
|
</FormMutationContextProvider>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,12 @@
|
|||||||
import { auth } from '@clerk/nextjs/server'
|
import { auth } from '@clerk/nextjs/server'
|
||||||
import { createOpenAI } from '@ai-sdk/openai'
|
import { createOpenAI } from '@ai-sdk/openai'
|
||||||
import { streamText, tool, convertToModelMessages, stepCountIs, type UIMessage } from 'ai'
|
import { streamText, convertToModelMessages, stepCountIs, type UIMessage } from 'ai'
|
||||||
import { success, z } from 'zod'
|
|
||||||
import { eq, and } from 'drizzle-orm'
|
import { eq, and } from 'drizzle-orm'
|
||||||
import { env } from '~/env'
|
import { env } from '~/env'
|
||||||
import { db } from '~/server/db'
|
import { db } from '~/server/db'
|
||||||
import { chatSession, chatMessage } from '~/server/dbschema/schema'
|
import { chatSession, chatMessage } from '~/server/dbschema/schema'
|
||||||
import { servTrpc } from '~/app/_trpc/ServerClient'
|
import { servTrpc } from '~/app/_trpc/ServerClient'
|
||||||
import { scheduleMeeting } from '~/app/actions/scheduleMeeting'
|
import { createChatTools } from '~/server/ai/tools'
|
||||||
import currentTime from '~/app/actions/currentTime';
|
|
||||||
|
|
||||||
const openai = createOpenAI({ apiKey: env.OPENAI_API_KEY })
|
const openai = createOpenAI({ apiKey: env.OPENAI_API_KEY })
|
||||||
|
|
||||||
@@ -31,7 +29,17 @@ 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 configuredSystemPrompt = await servTrpc.chat.getSystemPrompt() || 'You are an AI recruiter assistant.'
|
||||||
|
const systemPrompt = `${configuredSystemPrompt}
|
||||||
|
|
||||||
|
Runtime context:
|
||||||
|
- Current server time: ${new Date().toISOString()}.
|
||||||
|
- Default meeting timezone: Europe/Berlin.
|
||||||
|
- For availability questions like "next open spot", call getAvailability once. It defaults to checking from now. Use nextAvailableSlot for the next opening, or the first item in availableSlots if needed. Do not call getAvailability again just to get more slots.
|
||||||
|
- After scheduleMeeting succeeds, include only the returned addToCalendarLink for the visitor. Format it as a Markdown link like [Add this meeting to your Google Calendar](URL); do not paste the raw URL. Explain briefly that this link lets them add the meeting to their own calendar and invite Gregor. Do not mention internal Google Calendar event links.
|
||||||
|
- You can remove meetings from Gregor's availability calendar with cancelMeeting only when you have the exact eventId from a previous scheduleMeeting result. If a visitor asks to reschedule and you have both the old eventId and a confirmed new slot, call cancelMeeting once for the old event and scheduleMeeting once for the new event. If you do not have the old eventId, ask for clarification instead of guessing.
|
||||||
|
- When rescheduling, make clear that cancelMeeting only removes the old slot from Gregor's availability calendar. If the visitor already added the old link to their own calendar, they may need to remove that copy themselves.
|
||||||
|
- Do not calculate or invent calendar availability yourself.`
|
||||||
const model = await servTrpc.chat.getModel()
|
const model = await servTrpc.chat.getModel()
|
||||||
|
|
||||||
// Save the latest user message
|
// Save the latest user message
|
||||||
@@ -50,42 +58,14 @@ export async function POST(req: Request) {
|
|||||||
model: openai(model),
|
model: openai(model),
|
||||||
system: systemPrompt,
|
system: systemPrompt,
|
||||||
messages: await convertToModelMessages(messages),
|
messages: await convertToModelMessages(messages),
|
||||||
tools: {
|
tools: createChatTools(),
|
||||||
scheduleMeeting: tool({
|
stopWhen: stepCountIs(3),
|
||||||
description: 'Schedule a meeting with Gregor Lohaus and add it to his Google Calendar',
|
|
||||||
inputSchema: z.object({
|
|
||||||
title: z.string().describe('Meeting title, make something up if not provided'),
|
|
||||||
description: z.string().describe('Meeting description / agenda, make something up if not provided'),
|
|
||||||
dateTime: z
|
|
||||||
.string()
|
|
||||||
.describe(
|
|
||||||
'ISO 8601 datetime for the meeting start, e.g. 2025-04-01T10:00:00',
|
|
||||||
),
|
|
||||||
durationMinutes: z
|
|
||||||
.number()
|
|
||||||
.int()
|
|
||||||
.min(15)
|
|
||||||
.max(120)
|
|
||||||
.describe('Duration of the meeting in minutes, if none provided ask if 20 minutes is ok'),
|
|
||||||
attendeeEmail: z
|
|
||||||
.string()
|
|
||||||
.email()
|
|
||||||
.optional()
|
|
||||||
.describe('Optional Email of the visitor to invite (if provided)'),
|
|
||||||
attendeeName: z.string().optional().describe('Name of the visitor'),
|
|
||||||
}),
|
|
||||||
execute: async (input) => scheduleMeeting({ ...input }),
|
|
||||||
}),
|
|
||||||
getCurrentUnixTime: tool({
|
|
||||||
description: 'Get the current unix time to reference for meeting dates',
|
|
||||||
inputSchema: z.object({
|
|
||||||
none: z.string().optional().describe("no inputs are needed")
|
|
||||||
}),
|
|
||||||
execute: async () => currentTime()
|
|
||||||
})
|
|
||||||
},
|
|
||||||
stopWhen: stepCountIs(5),
|
|
||||||
onFinish: async ({ text, finishReason }) => {
|
onFinish: async ({ text, finishReason }) => {
|
||||||
|
console.log('[ai:chat:onFinish]', {
|
||||||
|
finishReason,
|
||||||
|
hasText: Boolean(text),
|
||||||
|
textLength: text.length,
|
||||||
|
})
|
||||||
if (text && finishReason === 'stop') {
|
if (text && finishReason === 'stop') {
|
||||||
await db.insert(chatMessage).values({
|
await db.insert(chatMessage).values({
|
||||||
sessionId,
|
sessionId,
|
||||||
|
|||||||
@@ -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,24 @@
|
|||||||
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";
|
|
||||||
|
function toolLabel(type: string) {
|
||||||
|
switch (type) {
|
||||||
|
case "tool-searchSiteContent":
|
||||||
|
return "Searching site content";
|
||||||
|
case "tool-getRelevantExperience":
|
||||||
|
return "Finding relevant experience";
|
||||||
|
case "tool-getProjectDetails":
|
||||||
|
return "Loading project details";
|
||||||
|
case "tool-getAvailability":
|
||||||
|
return "Checking availability";
|
||||||
|
case "tool-cancelMeeting":
|
||||||
|
return "Removing meeting";
|
||||||
|
case "tool-getCurrentUnixTime":
|
||||||
|
return "Checking current time";
|
||||||
|
default:
|
||||||
|
return "Using tool";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export const AssistantMessage = (props: { message: UIMessage }) => {
|
export const AssistantMessage = (props: { message: UIMessage }) => {
|
||||||
let message = props.message;
|
let message = props.message;
|
||||||
@@ -11,14 +29,12 @@ export const AssistantMessage = (props: { message: UIMessage }) => {
|
|||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
className=
|
className=
|
||||||
'max-w-[80%] px-4 py-2 text-sm space-y-2 bg-muted'
|
'max-w-[80%] min-w-0 px-4 py-2 text-sm space-y-2 bg-muted break-words [overflow-wrap:anywhere] [&_a]:break-all [&_pre]:max-w-full [&_pre]:overflow-x-auto'
|
||||||
>
|
>
|
||||||
{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') {
|
||||||
@@ -26,7 +42,7 @@ export const AssistantMessage = (props: { message: UIMessage }) => {
|
|||||||
type: 'tool-scheduleMeeting'
|
type: 'tool-scheduleMeeting'
|
||||||
state: string
|
state: string
|
||||||
input: unknown
|
input: unknown
|
||||||
output?: { success: boolean; message?: string; htmlLink?: string; error?: string }
|
output?: { success: boolean; error?: string }
|
||||||
}
|
}
|
||||||
if (toolPart.state === 'input-available' || toolPart.state === 'input-streaming') {
|
if (toolPart.state === 'input-available' || toolPart.state === 'input-streaming') {
|
||||||
return (
|
return (
|
||||||
@@ -37,29 +53,64 @@ export const AssistantMessage = (props: { message: UIMessage }) => {
|
|||||||
}
|
}
|
||||||
if (toolPart.state === 'output-available' && toolPart.output) {
|
if (toolPart.state === 'output-available' && toolPart.output) {
|
||||||
const result = toolPart.output
|
const result = toolPart.output
|
||||||
|
if (result.success) return null
|
||||||
return (
|
return (
|
||||||
<div key={i} className="text-xs mt-1 p-2 bg-background/20 rounded">
|
<div key={i} className="text-xs mt-1 p-2 bg-background/20 rounded">
|
||||||
{result.success ? (
|
|
||||||
<span>
|
|
||||||
✓ {result.message}{' '}
|
|
||||||
{result.htmlLink && (
|
|
||||||
<a
|
|
||||||
href={result.htmlLink}
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
className="underline"
|
|
||||||
>
|
|
||||||
View event
|
|
||||||
</a>
|
|
||||||
)}
|
|
||||||
</span>
|
|
||||||
) : (
|
|
||||||
<span>✗ {result.error}</span>
|
<span>✗ {result.error}</span>
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (part.type === 'tool-cancelMeeting') {
|
||||||
|
const toolPart = part as unknown as {
|
||||||
|
type: 'tool-cancelMeeting'
|
||||||
|
state: string
|
||||||
|
output?: { success: boolean; error?: string }
|
||||||
|
}
|
||||||
|
if (toolPart.state === 'input-available' || toolPart.state === 'input-streaming') {
|
||||||
|
return (
|
||||||
|
<p key={i} className="text-xs opacity-70 italic">
|
||||||
|
Removing meeting…
|
||||||
|
</p>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
if (toolPart.state === 'output-available' && toolPart.output) {
|
||||||
|
if (toolPart.output.success) return null
|
||||||
|
return (
|
||||||
|
<div key={i} className="text-xs mt-1 p-2 bg-background/20 rounded">
|
||||||
|
<span>✗ {toolPart.output.error}</span>
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (part.type.startsWith('tool-')) {
|
||||||
|
const toolPart = part as unknown as {
|
||||||
|
type: string
|
||||||
|
state: string
|
||||||
|
output?: { success?: boolean; results?: unknown[]; matches?: unknown[]; availableSlots?: unknown[]; project?: unknown; error?: string }
|
||||||
|
}
|
||||||
|
if (toolPart.state === 'input-available' || toolPart.state === 'input-streaming') {
|
||||||
|
return (
|
||||||
|
<p key={i} className="text-xs opacity-70 italic">
|
||||||
|
{toolLabel(toolPart.type)}...
|
||||||
|
</p>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
if (toolPart.state === 'output-available') {
|
||||||
|
const count = toolPart.output?.results?.length
|
||||||
|
?? toolPart.output?.matches?.length
|
||||||
|
?? toolPart.output?.availableSlots?.length
|
||||||
|
return (
|
||||||
|
<p key={i} className="text-xs opacity-70 italic">
|
||||||
|
{toolPart.output?.success === false
|
||||||
|
? (toolPart.output.error ?? `${toolLabel(toolPart.type)} failed`)
|
||||||
|
: count != null
|
||||||
|
? `${toolLabel(toolPart.type)} complete (${count})`
|
||||||
|
: `${toolLabel(toolPart.type)} complete`}
|
||||||
|
</p>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
return null
|
return null
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
'use client'
|
'use client'
|
||||||
import { useState, useEffect } from 'react'
|
import { useState, useEffect, useRef } from 'react'
|
||||||
import { useChat } from '@ai-sdk/react'
|
import { useChat } from '@ai-sdk/react'
|
||||||
import { DefaultChatTransport, type UIMessage } from 'ai'
|
import { DefaultChatTransport, type UIMessage } from 'ai'
|
||||||
import { Button } from '~/components/ui/button'
|
import { Button } from '~/components/ui/button'
|
||||||
@@ -54,7 +54,7 @@ function addInitMessage(messageArray: UIMessage[]) {
|
|||||||
role: 'assistant',
|
role: 'assistant',
|
||||||
parts: [{
|
parts: [{
|
||||||
type: 'text',
|
type: 'text',
|
||||||
text: "Hi im gregors ai assistant,you can ask me to provide general information or to schedule a meeting."
|
text: "Hi, I'm Gregor's AI assistant. Ask me about his experience, projects, blog posts, or availability for a meeting."
|
||||||
}],
|
}],
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -83,14 +83,21 @@ function AuthenticatedChatInterface({ dbMessages, sessionId }: ChatInterfaceProp
|
|||||||
sendMessage({ text })
|
sendMessage({ text })
|
||||||
}
|
}
|
||||||
const gsapContext = useGsapContext()
|
const gsapContext = useGsapContext()
|
||||||
|
const didInitialScroll = useRef(false)
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let scroller = gsapContext?.getScroller()
|
const scroller = gsapContext?.getScroller()
|
||||||
if (scroller instanceof Window) {
|
if (!scroller || scroller instanceof Window) {
|
||||||
return;
|
return
|
||||||
}
|
}
|
||||||
console.log(scroller?.scrollHeight)
|
// Jump instantly on first open so the chat starts pinned to the bottom;
|
||||||
scroller?.scrollTo({ behavior: 'smooth', top: scroller.scrollHeight })
|
// animate subsequent updates. Defer a frame so the messages have laid out
|
||||||
}, [messages])
|
// (and any streaming content has grown) before we measure scrollHeight.
|
||||||
|
const behavior: ScrollBehavior = didInitialScroll.current ? 'smooth' : 'auto'
|
||||||
|
didInitialScroll.current = true
|
||||||
|
requestAnimationFrame(() => {
|
||||||
|
scroller.scrollTo({ behavior, top: scroller.scrollHeight })
|
||||||
|
})
|
||||||
|
}, [messages, status])
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col h-full">
|
<div className="flex flex-col h-full">
|
||||||
{messages &&
|
{messages &&
|
||||||
@@ -114,7 +121,7 @@ function AuthenticatedChatInterface({ dbMessages, sessionId }: ChatInterfaceProp
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<div className="p-4 border-t flex flex-row gap-2">
|
<div className="p-4 border-t flex flex-row gap-2 shrink-0">
|
||||||
<Textarea
|
<Textarea
|
||||||
name='message'
|
name='message'
|
||||||
value={input}
|
value={input}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { ScrollArea } from '~/components/ui/scroll-area';
|
|||||||
import { memo } from 'react';
|
import { memo } from 'react';
|
||||||
const Messages = memo(({messages,status}: { messages: UIMessage[],status:ChatStatus}) => {
|
const Messages = memo(({messages,status}: { messages: UIMessage[],status:ChatStatus}) => {
|
||||||
return (
|
return (
|
||||||
<ScrollArea data-scroller-priority='1' className="w-full h-[90%] max-w-4xl mx-auto">
|
<ScrollArea data-scroller-priority='1' className="w-full flex-1 min-h-0 max-w-4xl mx-auto">
|
||||||
{messages.map((message, i) => (
|
{messages.map((message, i) => (
|
||||||
<Card.AnimatedCard scrollOnly={true} key={i}>
|
<Card.AnimatedCard scrollOnly={true} key={i}>
|
||||||
<Card.CardContent>
|
<Card.CardContent>
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ export const UserMessage = (props:{message: UIMessage}) => {
|
|||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
className=
|
className=
|
||||||
'max-w-[80%] px-4 py-2 text-sm space-y-2 bg-primary'
|
'max-w-[80%] min-w-0 px-4 py-2 text-sm space-y-2 bg-primary break-words whitespace-pre-wrap [overflow-wrap:anywhere]'
|
||||||
>
|
>
|
||||||
{message}
|
{message}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -9,11 +9,11 @@ export default function ChatPage() {
|
|||||||
const {messages,session,isLoading,error} = useMessages()
|
const {messages,session,isLoading,error} = useMessages()
|
||||||
useTimeLine(messages)
|
useTimeLine(messages)
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col px-10 lg:px-0 w-full h-full max-w-4xl mx-auto pt-10">
|
<div className="flex flex-col px-10 lg:px-0 w-full h-full max-w-4xl mx-auto pt-10 pb-4">
|
||||||
<AnimatedPageTitle position={0}>
|
<AnimatedPageTitle position={0}>
|
||||||
<span>Talk To My </span> <span> AI-Assistant</span>
|
<span>Talk To My </span> <span> AI-Assistant</span>
|
||||||
</AnimatedPageTitle>
|
</AnimatedPageTitle>
|
||||||
<div className='flex items-center h-[80%] w-full my-auto w-full'>
|
<div className='flex flex-1 min-h-0 w-full'>
|
||||||
{!isLoading &&
|
{!isLoading &&
|
||||||
<ChatInterface sessionId={session?.id} dbMessages={messages ?? []}/>
|
<ChatInterface sessionId={session?.id} dbMessages={messages ?? []}/>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
||||||
return (
|
// against an un-rendered fallback.
|
||||||
<>
|
const descriptions: Record<string, ReactNode> = {};
|
||||||
<SidebarProvider>
|
for (const category of cv ?? []) {
|
||||||
{sidebarCategories.length > 0 &&
|
for (const entry of category.cvEntry) {
|
||||||
<>
|
if (!entry.description?.trim()) continue;
|
||||||
<SidebarTriggerDisappearsOnMobile />
|
descriptions[entry.id] = (
|
||||||
<Sidebar>
|
<MDXRemote
|
||||||
<SidebarContent className="p-2 lg:pt-[3.2rem]">
|
source={entry.description}
|
||||||
{sidebarCategories.map((cat, i) => (
|
components={mdxComponents}
|
||||||
<CvCategory layout="col" position={i} category={cat} key={cat.id} />
|
options={{
|
||||||
))}
|
mdxOptions: {
|
||||||
</SidebarContent>
|
format: "md",
|
||||||
</Sidebar>
|
remarkPlugins: [remarkGfm],
|
||||||
</>
|
rehypePlugins: [rehypeHighlight],
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
<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">
|
return (
|
||||||
{headerCategories.map((cat, i) => (
|
<Suspense>
|
||||||
<CvCategory layout="row" position={i} category={cat} key={cat.id} />
|
<Page cv={cv} descriptions={descriptions} />
|
||||||
))}
|
</Suspense>
|
||||||
</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>
|
|
||||||
</>
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ export default async function RootLayout({
|
|||||||
<MusicPlayerProvider>
|
<MusicPlayerProvider>
|
||||||
<AnimatedBackGroundContainer followSpeed={0.003} particleCount={100} orbitRadius={2000}>
|
<AnimatedBackGroundContainer followSpeed={0.003} particleCount={100} orbitRadius={2000}>
|
||||||
<TopNav />
|
<TopNav />
|
||||||
<main className="absolute lg:top-10 h-screen lg:h-[calc(100vh-var(--spacing)*10)] w-screen">
|
<main className="absolute lg:top-10 h-[100dvh] lg:h-[calc(100vh-var(--spacing)*10)] w-screen">
|
||||||
{children}
|
{children}
|
||||||
</main>
|
</main>
|
||||||
{modal}
|
{modal}
|
||||||
|
|||||||
68
src/app/music/_components/Page.tsx
Normal file
68
src/app/music/_components/Page.tsx
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
'use client'
|
||||||
|
|
||||||
|
import * as Card from "~/components/ui/card";
|
||||||
|
import { useTimeLine } from "../../_providers/GsapProvicer";
|
||||||
|
import AnimatedPageTitle from "../../_components/Animated/AnimatedPageTitle";
|
||||||
|
import AnimateTextIn from "../../_components/Animated/AnimateIn";
|
||||||
|
import { ScrollArea } from "~/components/ui/scroll-area";
|
||||||
|
import AnimatePopUp from "../../_components/Animated/AnimatePopUp";
|
||||||
|
import AudioPlayer from "./AudioPlayer";
|
||||||
|
import type { RouterOutputs } from "~/server/routers/_app";
|
||||||
|
|
||||||
|
export default function MusicPage(props: {
|
||||||
|
tracks: RouterOutputs['music']['list'],
|
||||||
|
}) {
|
||||||
|
const { tracks } = props;
|
||||||
|
useTimeLine(tracks)
|
||||||
|
return (
|
||||||
|
<ScrollArea className="px-10 lg:px-0 w-full h-full max-w-4xl mx-auto pt-10">
|
||||||
|
<AnimatedPageTitle position={0}><span>Just Some </span> <span>Music I Made</span> </AnimatedPageTitle>
|
||||||
|
<div className="flex flex-wrap h-fit content-center">
|
||||||
|
<AnimateTextIn once className="flex flex-wrap mr-[1em]" position={0.5}>
|
||||||
|
<div><p className="break-after-avoid mr-[1em]">All works on this page are licensed under:</p></div>
|
||||||
|
<div><a href="https://creativecommons.org/licenses/by-nc-sa/4.0/">CC BY-NC-SA 4.0</a></div>
|
||||||
|
</AnimateTextIn>
|
||||||
|
<AnimatePopUp duration={1} ease='elastic.inOut' position={2} once className="items-center content-center">
|
||||||
|
<div className="flex flex-row">
|
||||||
|
<img className="max-w-[1em]" src="https://mirrors.creativecommons.org/presskit/icons/cc.svg" alt="" />
|
||||||
|
<img className="max-w-[1em] ml-[1em]" src="https://mirrors.creativecommons.org/presskit/icons/by.svg" alt="" />
|
||||||
|
<img className="max-w-[1em] ml-[1em]" src="https://mirrors.creativecommons.org/presskit/icons/nc.svg" alt="" />
|
||||||
|
<img className="max-w-[1em] ml-[1em]" src="https://mirrors.creativecommons.org/presskit/icons/sa.svg" alt="" />
|
||||||
|
</div>
|
||||||
|
</AnimatePopUp>
|
||||||
|
</div>
|
||||||
|
<div className="pt-10" />
|
||||||
|
{tracks && tracks.map((track, i) => (
|
||||||
|
<div key={track.id}>
|
||||||
|
<Card.AnimatedCard position={i + 1}>
|
||||||
|
<Card.CardHeader>
|
||||||
|
<AnimateTextIn once position={i + 1.2} animation="slide">
|
||||||
|
<Card.CardTitle>{track.title}</Card.CardTitle>
|
||||||
|
</AnimateTextIn>
|
||||||
|
</Card.CardHeader>
|
||||||
|
<Card.CardContent className="flex flex-col gap-3">
|
||||||
|
{track.description && (
|
||||||
|
<AnimatePopUp once position={i + 1.25} duration={2}>
|
||||||
|
<p className="text-sm text-muted-foreground">{track.description}</p>
|
||||||
|
</AnimatePopUp>
|
||||||
|
)}
|
||||||
|
<AnimatePopUp duration={2} ease='elastic.inOut' position={i + 1.3} once>
|
||||||
|
<AudioPlayer
|
||||||
|
id={track.id}
|
||||||
|
src={track.streamUrl ?? track.fileUrl}
|
||||||
|
downloadUrl={track.fileUrl}
|
||||||
|
downloadName={track.fileName}
|
||||||
|
/>
|
||||||
|
</AnimatePopUp>
|
||||||
|
</Card.CardContent>
|
||||||
|
</Card.AnimatedCard>
|
||||||
|
<div className="pt-5" />
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
{!tracks?.length &&
|
||||||
|
<div className="flex justify-center items-center text-muted-foreground">
|
||||||
|
No music yet.
|
||||||
|
</div>}
|
||||||
|
</ScrollArea>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,67 +1,13 @@
|
|||||||
'use client'
|
import { Suspense } from "react";
|
||||||
import { trpc } from "~/app/_trpc/Client";
|
import { servTrpc as trpc } from "../_trpc/ServerClient";
|
||||||
import * as Card from "~/components/ui/card";
|
import Page from "./_components/Page";
|
||||||
import { useTimeLine } from "../_providers/GsapProvicer";
|
|
||||||
import AnimatedPageTitle from "../_components/Animated/AnimatedPageTitle";
|
export default async function MusicPage() {
|
||||||
import { Spinner } from "~/components/ui/spinner";
|
const tracks = await trpc.music.list();
|
||||||
import AnimateTextIn from "../_components/Animated/AnimateIn";
|
|
||||||
import { ScrollArea } from "~/components/ui/scroll-area";
|
|
||||||
import AnimatePopUp from "../_components/Animated/AnimatePopUp";
|
|
||||||
import AudioPlayer from "./_components/AudioPlayer";
|
|
||||||
export default function MusicPage() {
|
|
||||||
const { data: tracks, isLoading } = trpc.music.list.useQuery();
|
|
||||||
useTimeLine(tracks)
|
|
||||||
return (
|
return (
|
||||||
<ScrollArea className="px-10 lg:px-0 w-full h-full max-w-4xl mx-auto pt-10">
|
<Suspense>
|
||||||
<AnimatedPageTitle position={0}><span>Just Some </span> <span>Music I Made</span> </AnimatedPageTitle>
|
<Page tracks={tracks} />
|
||||||
<div className="flex flex-wrap h-fit content-center">
|
</Suspense>
|
||||||
<AnimateTextIn once className="flex flex-wrap mr-[1em]" position={0.5}>
|
|
||||||
<div><p className="break-after-avoid mr-[1em]">All works on this page are licensed under:</p></div>
|
|
||||||
<div><a href="https://creativecommons.org/licenses/by-nc-sa/4.0/">CC BY-NC-SA 4.0</a></div>
|
|
||||||
</AnimateTextIn>
|
|
||||||
<AnimatePopUp duration={1} ease='elastic.inOut' position={2} once className="items-center content-center">
|
|
||||||
<div className="flex flex-row">
|
|
||||||
<img className="max-w-[1em]" src="https://mirrors.creativecommons.org/presskit/icons/cc.svg" alt="" />
|
|
||||||
<img className="max-w-[1em] ml-[1em]" src="https://mirrors.creativecommons.org/presskit/icons/by.svg" alt="" />
|
|
||||||
<img className="max-w-[1em] ml-[1em]" src="https://mirrors.creativecommons.org/presskit/icons/nc.svg" alt="" />
|
|
||||||
<img className="max-w-[1em] ml-[1em]" src="https://mirrors.creativecommons.org/presskit/icons/sa.svg" alt="" />
|
|
||||||
</div>
|
|
||||||
</AnimatePopUp>
|
|
||||||
</div>
|
|
||||||
<div className="pt-10" />
|
|
||||||
{tracks && tracks.map((track, i) => (
|
|
||||||
<div key={track.id}>
|
|
||||||
<Card.AnimatedCard position={i + 1}>
|
|
||||||
<Card.CardHeader>
|
|
||||||
<AnimateTextIn once position={i + 1.2} animation="slide">
|
|
||||||
<Card.CardTitle>{track.title}</Card.CardTitle>
|
|
||||||
</AnimateTextIn>
|
|
||||||
</Card.CardHeader>
|
|
||||||
<Card.CardContent className="flex flex-col gap-3">
|
|
||||||
{track.description && (
|
|
||||||
<p className="text-sm text-muted-foreground gsapant">{track.description}</p>
|
|
||||||
)}
|
|
||||||
<AnimatePopUp duration={2} ease='elastic.inOut' position={i + 1.3} once>
|
|
||||||
<AudioPlayer
|
|
||||||
id={track.id}
|
|
||||||
src={track.streamUrl ?? track.fileUrl}
|
|
||||||
downloadUrl={track.fileUrl}
|
|
||||||
downloadName={track.fileName}
|
|
||||||
/>
|
|
||||||
</AnimatePopUp>
|
|
||||||
</Card.CardContent>
|
|
||||||
</Card.AnimatedCard>
|
|
||||||
<div className="pt-5" />
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
{!isLoading && !tracks?.length &&
|
|
||||||
<div className="flex justify-center items-center text-muted-foreground">
|
|
||||||
No music yet.
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
{isLoading && <div className="w-full h-full items-center flex flex-row content-center gap-4 justify-center">
|
|
||||||
<Spinner /> Loading Tracks
|
|
||||||
</div>}
|
|
||||||
</ScrollArea>
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
111
src/app/projects/_components/Page.tsx
Normal file
111
src/app/projects/_components/Page.tsx
Normal file
@@ -0,0 +1,111 @@
|
|||||||
|
'use client'
|
||||||
|
|
||||||
|
import type { ReactNode } from "react";
|
||||||
|
import * as Card from "~/components/ui/card";
|
||||||
|
import { Badge } from "~/components/ui/badge";
|
||||||
|
import { StackBadge } from "~/components/StackBadge";
|
||||||
|
import { ScrollArea } from "~/components/ui/scroll-area";
|
||||||
|
import AnimatedPageTitle from "../../_components/Animated/AnimatedPageTitle";
|
||||||
|
import AnimateTextIn from "../../_components/Animated/AnimateIn";
|
||||||
|
import { useTimeLine } from "../../_providers/GsapProvicer";
|
||||||
|
import AnimatePopUp from "../../_components/Animated/AnimatePopUp";
|
||||||
|
import { Button } from "~/components/ui/button";
|
||||||
|
import type { RouterOutputs } from "~/server/routers/_app";
|
||||||
|
|
||||||
|
export default function ProjectsPage(props: {
|
||||||
|
projects: RouterOutputs['projectv2']['listWithStack'],
|
||||||
|
descriptions: Record<string, ReactNode>,
|
||||||
|
}) {
|
||||||
|
const { projects, descriptions } = props;
|
||||||
|
useTimeLine(projects)
|
||||||
|
|
||||||
|
if (!projects?.length) {
|
||||||
|
return (
|
||||||
|
<div className="flex justify-center items-center min-h-[200px] text-muted-foreground">
|
||||||
|
No projects yet.
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<ScrollArea className="px-10 lg:px-0 w-full h-full max-w-4xl mx-auto pt-10">
|
||||||
|
<AnimatedPageTitle position={0}><span>Projects I've Been</span><span> Working on</span> </AnimatedPageTitle>
|
||||||
|
<div className="pt-10" />
|
||||||
|
{projects.map((project, i) => (
|
||||||
|
<div id={project.id} key={i} className="scroll-mt-10">
|
||||||
|
<Card.AnimatedCard position={i + 1.2} key={project.id}>
|
||||||
|
<Card.CardHeader>
|
||||||
|
<div className="flex items-start justify-between gap-2 flex-wrap">
|
||||||
|
<AnimateTextIn once position={i + 1.4} animation="slide"><Card.CardTitle>{project.title}</Card.CardTitle></AnimateTextIn>
|
||||||
|
<div className="flex gap-2 flex-wrap">
|
||||||
|
{project.sourceType && (
|
||||||
|
<AnimatePopUp position={i + 2} duration={2} once>
|
||||||
|
<Badge variant={project.sourceType === "open" ? "secondary" : "outline"}>
|
||||||
|
{project.sourceType === "open" ? "Open Source" : "Closed Source"}
|
||||||
|
</Badge>
|
||||||
|
</AnimatePopUp>
|
||||||
|
)}
|
||||||
|
{project.releaseStatus && (
|
||||||
|
<Badge variant={project.releaseStatus === "released" ? "default" : "outline"}>
|
||||||
|
{project.releaseStatus === "released" ? "Released" : "Unreleased"}
|
||||||
|
</Badge>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</Card.CardHeader>
|
||||||
|
{(project.description || project.sourceLink || project.releaseLink || project.techStack?.stackItems?.length) && (
|
||||||
|
<Card.CardContent className="flex flex-col gap-3">
|
||||||
|
{project.description && (
|
||||||
|
<div className="prose prose-sm dark:prose-invert max-w-none text-muted-foreground">
|
||||||
|
<AnimatePopUp once position={i + 1.4} duration={10}>
|
||||||
|
{descriptions[project.id] ?? project.description}
|
||||||
|
</AnimatePopUp>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<div className="flex flex-row">
|
||||||
|
{project.techStack?.stackItems && project.techStack.stackItems.length > 0 && (
|
||||||
|
<div className="flex flex-wrap gap-1.5">
|
||||||
|
{project.techStack.stackItems.map((item, k) => (
|
||||||
|
<AnimatePopUp key={k} position={(i + 2) + k * 0.5} once> <StackBadge key={item} item={item} /> </AnimatePopUp>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{(project.sourceLink || project.releaseLink) && (
|
||||||
|
<div className="ml-auto flex-col lg:flex-row justify-center gap-5">
|
||||||
|
{project.sourceLink &&
|
||||||
|
<Button variant='outline' className="cursor-pointer mb-3 lg:mb-0 lg:mr-3 min-w-18">
|
||||||
|
<a
|
||||||
|
href={project.sourceLink}
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
className='items-center'
|
||||||
|
>
|
||||||
|
Source
|
||||||
|
</a>
|
||||||
|
</Button>
|
||||||
|
}
|
||||||
|
{project.releaseLink &&
|
||||||
|
<Button variant='default' className="cursor-pointer min-w-18 items-center">
|
||||||
|
<a
|
||||||
|
href={project.releaseLink}
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
className='items-center'
|
||||||
|
>
|
||||||
|
Live
|
||||||
|
</a>
|
||||||
|
</Button>
|
||||||
|
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</Card.CardContent>
|
||||||
|
)}
|
||||||
|
</Card.AnimatedCard>
|
||||||
|
<div className="pt-5" />
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</ScrollArea>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,121 +1,40 @@
|
|||||||
'use client'
|
import { Suspense, type ReactNode } from "react";
|
||||||
|
import { MDXRemote } from "next-mdx-remote/rsc";
|
||||||
|
import rehypeHighlight from "rehype-highlight";
|
||||||
|
import remarkGfm from "remark-gfm";
|
||||||
|
import { servTrpc as trpc } from "../_trpc/ServerClient";
|
||||||
|
import { mdxComponents } from "~/components/mdx-components";
|
||||||
|
import Page from "./_components/Page";
|
||||||
|
|
||||||
import { trpc } from "~/app/_trpc/Client";
|
export default async function ProjectsPage() {
|
||||||
import * as Card from "~/components/ui/card";
|
const projects = await trpc.projectv2.listWithStack();
|
||||||
import { Badge } from "~/components/ui/badge";
|
|
||||||
import { StackBadge } from "~/components/StackBadge";
|
|
||||||
import Markdown from "react-markdown";
|
|
||||||
import { ScrollArea } from "~/components/ui/scroll-area";
|
|
||||||
import AnimatedPageTitle from "../_components/Animated/AnimatedPageTitle";
|
|
||||||
import AnimateTextIn from "../_components/Animated/AnimateIn";
|
|
||||||
import { useTimeLine } from "../_providers/GsapProvicer";
|
|
||||||
import AnimatePopUp from "../_components/Animated/AnimatePopUp";
|
|
||||||
import { Button } from "~/components/ui/button";
|
|
||||||
import remarkGfm from "remark-gfm"
|
|
||||||
|
|
||||||
export default function ProjectsPage() {
|
// Render the MDX descriptions on the server so they exist at first paint.
|
||||||
const { data: projects, isLoading } = trpc.projectv2.listWithStack.useQuery();
|
// The client tree (which runs the GSAP entrance via useTimeLine) only places
|
||||||
useTimeLine(projects)
|
// these already-rendered nodes — it never invokes the MDX renderer itself, so
|
||||||
if (isLoading) {
|
// the 'use client' boundary stays intact and the animations no longer play
|
||||||
return (
|
// against an un-rendered fallback.
|
||||||
<div className="flex justify-center items-center min-h-[200px] text-muted-foreground">
|
const descriptions: Record<string, ReactNode> = {};
|
||||||
Loading...
|
for (const project of projects ?? []) {
|
||||||
</div>
|
if (!project.description?.trim()) continue;
|
||||||
);
|
descriptions[project.id] = (
|
||||||
}
|
<MDXRemote
|
||||||
|
source={project.description}
|
||||||
if (!projects?.length) {
|
components={mdxComponents}
|
||||||
return (
|
options={{
|
||||||
<div className="flex justify-center items-center min-h-[200px] text-muted-foreground">
|
mdxOptions: {
|
||||||
No projects yet.
|
format: "md",
|
||||||
</div>
|
remarkPlugins: [remarkGfm],
|
||||||
|
rehypePlugins: [rehypeHighlight],
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ScrollArea className="px-10 lg:px-0 w-full h-full max-w-4xl mx-auto pt-10">
|
<Suspense>
|
||||||
<AnimatedPageTitle position={0}><span>Projects I've Been</span><span> Working on</span> </AnimatedPageTitle>
|
<Page projects={projects} descriptions={descriptions} />
|
||||||
<div className="pt-10" />
|
</Suspense>
|
||||||
{projects.map((project, i) => (
|
|
||||||
<div id={project.id} key={i} className="scroll-mt-10">
|
|
||||||
<Card.AnimatedCard position={i + 1.2} key={project.id}>
|
|
||||||
<Card.CardHeader>
|
|
||||||
<div className="flex items-start justify-between gap-2 flex-wrap">
|
|
||||||
<AnimateTextIn once position={i + 1.4} animation="slide"><Card.CardTitle>{project.title}</Card.CardTitle></AnimateTextIn>
|
|
||||||
<div className="flex gap-2 flex-wrap">
|
|
||||||
{project.sourceType && (
|
|
||||||
<AnimatePopUp position={i + 2} duration={2} once>
|
|
||||||
<Badge variant={project.sourceType === "open" ? "secondary" : "outline"}>
|
|
||||||
{project.sourceType === "open" ? "Open Source" : "Closed Source"}
|
|
||||||
</Badge>
|
|
||||||
</AnimatePopUp>
|
|
||||||
)}
|
|
||||||
{project.releaseStatus && (
|
|
||||||
<Badge variant={project.releaseStatus === "released" ? "default" : "outline"}>
|
|
||||||
{project.releaseStatus === "released" ? "Released" : "Unreleased"}
|
|
||||||
</Badge>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</Card.CardHeader>
|
|
||||||
{(project.description || project.sourceLink || project.releaseLink || project.techStack?.stackItems?.length) && (
|
|
||||||
<Card.CardContent className="flex flex-col gap-3">
|
|
||||||
{project.description && (
|
|
||||||
<div className="prose prose-sm dark:prose-invert max-w-none text-muted-foreground">
|
|
||||||
<AnimatePopUp once position={i + 1.4} duration={10}>
|
|
||||||
<Markdown remarkPlugins={[remarkGfm]}>{project.description}</Markdown>
|
|
||||||
</AnimatePopUp>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<div className="flex flex-row">
|
|
||||||
{project.techStack?.stackItems && project.techStack.stackItems.length > 0 && (
|
|
||||||
<div className="flex flex-wrap gap-1.5">
|
|
||||||
{project.techStack.stackItems.map((item, k) => (
|
|
||||||
<AnimatePopUp key={k} position={(i + 2) + k * 0.5} once> <StackBadge key={item} item={item} /> </AnimatePopUp>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
{(project.sourceLink || project.releaseLink) && (
|
|
||||||
<div className="ml-auto flex-col lg:flex-row justify-center gap-5">
|
|
||||||
{project.sourceLink &&
|
|
||||||
<Button variant='outline' className="cursor-pointer mb-3 lg:mb-0 lg:mr-3 min-w-18">
|
|
||||||
<a
|
|
||||||
href={project.sourceLink}
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
className='items-center'
|
|
||||||
>
|
|
||||||
Source
|
|
||||||
</a>
|
|
||||||
</Button>
|
|
||||||
}
|
|
||||||
{project.releaseLink &&
|
|
||||||
<Button variant='default' className="cursor-pointer min-w-18 items-center">
|
|
||||||
<a
|
|
||||||
href={project.releaseLink}
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
className='items-center'
|
|
||||||
>
|
|
||||||
Live
|
|
||||||
</a>
|
|
||||||
</Button>
|
|
||||||
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</Card.CardContent>
|
|
||||||
)}
|
|
||||||
</Card.AnimatedCard>
|
|
||||||
<div className="pt-5" />
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
{/* Scroll runway: lets the last cards' ScrollTrigger exit points be
|
|
||||||
reached past the visible area, so on short viewports the second-to-last
|
|
||||||
card animates out off-screen instead of being frozen mid-exit at the
|
|
||||||
bottom of the scroll. Tune the height if a card is still caught. */}
|
|
||||||
<div aria-hidden className="h-[70dvh] shrink-0" />
|
|
||||||
</ScrollArea>
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
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";
|
||||||
@@ -95,12 +100,19 @@ function PullQuote({ children }: { children: ReactNode }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function ExternalLink(props: ComponentPropsWithoutRef<"a">) {
|
function ExternalLink(props: ComponentPropsWithoutRef<"a">) {
|
||||||
const href = props.href ?? "";
|
const { className, ...rest } = props;
|
||||||
const isExternal = /^https?:\/\//.test(href);
|
|
||||||
|
|
||||||
if (!isExternal) return <a {...props} />;
|
return (
|
||||||
|
<a
|
||||||
return <a {...props} target="_blank" rel="noreferrer" />;
|
{...rest}
|
||||||
|
target="_blank"
|
||||||
|
rel="noreferrer"
|
||||||
|
className={cn(
|
||||||
|
"text-sky-600 underline underline-offset-4 hover:text-sky-700 dark:text-sky-400 dark:hover:text-sky-300",
|
||||||
|
className,
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const blockComponents = new Set<unknown>([Callout, Figure, PullQuote, TagList]);
|
const blockComponents = new Set<unknown>([Callout, Figure, PullQuote, TagList]);
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
"use client"
|
||||||
import * as React from "react"
|
import * as React from "react"
|
||||||
import { useRef } from "react";
|
import { useRef } from "react";
|
||||||
import gsap from 'gsap'
|
import gsap from 'gsap'
|
||||||
@@ -36,7 +37,9 @@ function AnimatedCard({
|
|||||||
scrollOnly,
|
scrollOnly,
|
||||||
once,
|
once,
|
||||||
debugId: `card-${position}`,
|
debugId: `card-${position}`,
|
||||||
makeReveal: (el) => gsap.from(el, { x: -100, opacity: 0, duration: 0.5, paused: true }),
|
// Start hidden via CSS (see className) so the server-rendered card never
|
||||||
|
// flashes visible before GSAP runs; reveal animates *to* the shown state.
|
||||||
|
makeReveal: (el) => gsap.to(el, { x: 0, opacity: 1, duration: 0.5, paused: true }),
|
||||||
})
|
})
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
@@ -44,7 +47,7 @@ function AnimatedCard({
|
|||||||
data-slot="card"
|
data-slot="card"
|
||||||
data-size={size}
|
data-size={size}
|
||||||
className={cn(
|
className={cn(
|
||||||
"group/card flex flex-col gap-4 overflow-hidden rounded-xl bg-card py-4 text-sm text-card-foreground ring-1 ring-foreground/10 has-data-[slot=card-footer]:pb-0 has-[>img:first-child]:pt-0 data-[size=sm]:gap-3 data-[size=sm]:py-3 data-[size=sm]:has-data-[slot=card-footer]:pb-0 *:[img:first-child]:rounded-t-xl *:[img:last-child]:rounded-b-xl bg-opacity-60 backdrop-blur-sm",
|
"opacity-0 -translate-x-[100px] group/card flex flex-col gap-4 overflow-hidden rounded-xl bg-card py-4 text-sm text-card-foreground ring-1 ring-foreground/10 has-data-[slot=card-footer]:pb-0 has-[>img:first-child]:pt-0 data-[size=sm]:gap-3 data-[size=sm]:py-3 data-[size=sm]:has-data-[slot=card-footer]:pb-0 *:[img:first-child]:rounded-t-xl *:[img:last-child]:rounded-b-xl bg-opacity-60 backdrop-blur-sm",
|
||||||
className
|
className
|
||||||
)}
|
)}
|
||||||
{...props}
|
{...props}
|
||||||
|
|||||||
@@ -31,6 +31,10 @@ export const env = createEnv({
|
|||||||
CLERK_SECRET_KEY: z.string(),
|
CLERK_SECRET_KEY: z.string(),
|
||||||
ADMIN_USER_CLERK_ID: z.string(),
|
ADMIN_USER_CLERK_ID: z.string(),
|
||||||
OPENAI_API_KEY: z.string(),
|
OPENAI_API_KEY: z.string(),
|
||||||
|
GOOGLE_SERVICE_ACCOUNT_EMAIL: z.string().email(),
|
||||||
|
GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY: z.string(),
|
||||||
|
GOOGLE_CALENDAR_ID: z.string(),
|
||||||
|
GREGOR_MEETING_EMAIL: z.string().email(),
|
||||||
NODE_ENV: z
|
NODE_ENV: z
|
||||||
.enum(["development", "test", "production"])
|
.enum(["development", "test", "production"])
|
||||||
.default("development"),
|
.default("development"),
|
||||||
@@ -72,6 +76,10 @@ export const env = createEnv({
|
|||||||
POSTGRES_PRISMA_URL: process.env.POSTGRES_PRISMA_URL,
|
POSTGRES_PRISMA_URL: process.env.POSTGRES_PRISMA_URL,
|
||||||
ADMIN_USER_CLERK_ID: process.env.ADMIN_USER_CLERK_ID,
|
ADMIN_USER_CLERK_ID: process.env.ADMIN_USER_CLERK_ID,
|
||||||
OPENAI_API_KEY: process.env.OPENAI_API_KEY,
|
OPENAI_API_KEY: process.env.OPENAI_API_KEY,
|
||||||
|
GOOGLE_SERVICE_ACCOUNT_EMAIL: process.env.GOOGLE_SERVICE_ACCOUNT_EMAIL,
|
||||||
|
GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY: process.env.GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY,
|
||||||
|
GOOGLE_CALENDAR_ID: process.env.GOOGLE_CALENDAR_ID,
|
||||||
|
GREGOR_MEETING_EMAIL: process.env.GREGOR_MEETING_EMAIL,
|
||||||
NEXT_PUBLIC_ADMIN_USER_CLERK_ID: process.env.NEXT_PUBLIC_ADMIN_USER_CLERK_ID,
|
NEXT_PUBLIC_ADMIN_USER_CLERK_ID: process.env.NEXT_PUBLIC_ADMIN_USER_CLERK_ID,
|
||||||
CLERK_SECRET_KEY: process.env.CLERK_SECRET_KEY,
|
CLERK_SECRET_KEY: process.env.CLERK_SECRET_KEY,
|
||||||
NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY: process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY,
|
NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY: process.env.NEXT_PUBLIC_CLERK_PUBLISHABLE_KEY,
|
||||||
|
|||||||
586
src/server/ai/tools.ts
Normal file
586
src/server/ai/tools.ts
Normal file
@@ -0,0 +1,586 @@
|
|||||||
|
import "server-only";
|
||||||
|
|
||||||
|
import { tool } from "ai";
|
||||||
|
import { desc } from "drizzle-orm";
|
||||||
|
import { z } from "zod";
|
||||||
|
import { cancelMeeting } from "~/app/actions/cancelMeeting";
|
||||||
|
import { scheduleMeeting } from "~/app/actions/scheduleMeeting";
|
||||||
|
import { db } from "~/server/db";
|
||||||
|
import { blogPost, music } from "~/server/dbschema/schema";
|
||||||
|
import { getGoogleCalendarClient, getGoogleCalendarId } from "~/server/googleCalendar";
|
||||||
|
|
||||||
|
const contentTypeSchema = z.enum(["cv", "project", "blog", "music"]);
|
||||||
|
|
||||||
|
type ContentType = z.infer<typeof contentTypeSchema>;
|
||||||
|
|
||||||
|
type SearchResult = {
|
||||||
|
type: ContentType;
|
||||||
|
title: string;
|
||||||
|
snippet: string;
|
||||||
|
url: string;
|
||||||
|
score: number;
|
||||||
|
metadata?: Record<string, unknown>;
|
||||||
|
};
|
||||||
|
|
||||||
|
type ProjectWithStack = Awaited<ReturnType<typeof loadProjects>>[number];
|
||||||
|
|
||||||
|
function stripMarkup(value: string | null | undefined) {
|
||||||
|
return (value ?? "")
|
||||||
|
.replace(/```[\s\S]*?```/g, " ")
|
||||||
|
.replace(/`([^`]+)`/g, "$1")
|
||||||
|
.replace(/<[^>]+>/g, " ")
|
||||||
|
.replace(/[#*_~[\]()>-]/g, " ")
|
||||||
|
.replace(/\s+/g, " ")
|
||||||
|
.trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
function tokenize(value: string) {
|
||||||
|
return Array.from(new Set(value.toLowerCase().match(/[a-z0-9+#.-]+/g) ?? []));
|
||||||
|
}
|
||||||
|
|
||||||
|
function scoreText(query: string, title: string, body: string, extraTerms: string[] = []) {
|
||||||
|
const normalizedQuery = query.trim().toLowerCase();
|
||||||
|
const titleLower = title.toLowerCase();
|
||||||
|
const bodyLower = body.toLowerCase();
|
||||||
|
const tokens = tokenize(query);
|
||||||
|
let score = 0;
|
||||||
|
|
||||||
|
if (normalizedQuery && titleLower.includes(normalizedQuery)) score += 40;
|
||||||
|
if (normalizedQuery && bodyLower.includes(normalizedQuery)) score += 20;
|
||||||
|
|
||||||
|
for (const token of tokens) {
|
||||||
|
if (titleLower.includes(token)) score += 12;
|
||||||
|
if (bodyLower.includes(token)) score += 6;
|
||||||
|
if (extraTerms.some((term) => term.toLowerCase() === token)) score += 10;
|
||||||
|
}
|
||||||
|
|
||||||
|
return score;
|
||||||
|
}
|
||||||
|
|
||||||
|
const projectCatalogTerms = new Set(["project", "projects", "portfolio", "work"]);
|
||||||
|
const genericQuestionTerms = new Set([
|
||||||
|
"a",
|
||||||
|
"about",
|
||||||
|
"all",
|
||||||
|
"any",
|
||||||
|
"are",
|
||||||
|
"can",
|
||||||
|
"current",
|
||||||
|
"do",
|
||||||
|
"give",
|
||||||
|
"have",
|
||||||
|
"list",
|
||||||
|
"me",
|
||||||
|
"of",
|
||||||
|
"on",
|
||||||
|
"show",
|
||||||
|
"site",
|
||||||
|
"tell",
|
||||||
|
"the",
|
||||||
|
"there",
|
||||||
|
"these",
|
||||||
|
"this",
|
||||||
|
"what",
|
||||||
|
"which",
|
||||||
|
"you",
|
||||||
|
]);
|
||||||
|
|
||||||
|
function isProjectCatalogQuery(query: string) {
|
||||||
|
const tokens = tokenize(query);
|
||||||
|
if (!tokens.some((token) => projectCatalogTerms.has(token))) return false;
|
||||||
|
return tokens.every((token) => projectCatalogTerms.has(token) || genericQuestionTerms.has(token));
|
||||||
|
}
|
||||||
|
|
||||||
|
function snippet(value: string, query: string, maxLength = 240) {
|
||||||
|
const text = stripMarkup(value);
|
||||||
|
if (text.length <= maxLength) return text;
|
||||||
|
|
||||||
|
const tokens = tokenize(query);
|
||||||
|
const lower = text.toLowerCase();
|
||||||
|
const firstMatch = tokens
|
||||||
|
.map((token) => lower.indexOf(token))
|
||||||
|
.filter((index) => index >= 0)
|
||||||
|
.sort((a, b) => a - b)[0] ?? 0;
|
||||||
|
const start = Math.max(0, firstMatch - 60);
|
||||||
|
const excerpt = text.slice(start, start + maxLength).trim();
|
||||||
|
|
||||||
|
return `${start > 0 ? "..." : ""}${excerpt}${start + maxLength < text.length ? "..." : ""}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function uniqueByUrl(results: SearchResult[]) {
|
||||||
|
const seen = new Set<string>();
|
||||||
|
return results.filter((result) => {
|
||||||
|
const key = `${result.type}:${result.url}:${result.title}`;
|
||||||
|
if (seen.has(key)) return false;
|
||||||
|
seen.add(key);
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadCvEntries() {
|
||||||
|
const categories = await db.query.cvCategory.findMany({
|
||||||
|
orderBy: (fields, { asc }) => [asc(fields.layoutPosition), asc(fields.name)],
|
||||||
|
with: {
|
||||||
|
cvEntry: {
|
||||||
|
orderBy: (fields, { desc }) => [desc(fields.toTime), desc(fields.fromTime)],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
return categories.flatMap((category) =>
|
||||||
|
category.cvEntry.map((entry) => ({
|
||||||
|
...entry,
|
||||||
|
categoryName: category.name ?? "CV",
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadProjects() {
|
||||||
|
return db.query.project.findMany({
|
||||||
|
orderBy: (fields, { asc }) => [asc(fields.orderPos), asc(fields.title), asc(fields.id)],
|
||||||
|
with: {
|
||||||
|
techStack: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function buildSearchResults(query: string, types: ContentType[]) {
|
||||||
|
const selected = new Set(types);
|
||||||
|
const results: SearchResult[] = [];
|
||||||
|
|
||||||
|
if (selected.has("cv")) {
|
||||||
|
const entries = await loadCvEntries();
|
||||||
|
for (const entry of entries) {
|
||||||
|
const body = stripMarkup(`${entry.categoryName} ${entry.description ?? ""}`);
|
||||||
|
const score = scoreText(query, entry.title, body);
|
||||||
|
if (score > 0 || !query.trim()) {
|
||||||
|
results.push({
|
||||||
|
type: "cv",
|
||||||
|
title: entry.title,
|
||||||
|
snippet: snippet(body, query),
|
||||||
|
url: "/cv",
|
||||||
|
score,
|
||||||
|
metadata: {
|
||||||
|
category: entry.categoryName,
|
||||||
|
fromTime: entry.fromTime,
|
||||||
|
toTime: entry.toTime,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (selected.has("project")) {
|
||||||
|
const projects = await loadProjects();
|
||||||
|
const catalogQuery = isProjectCatalogQuery(query);
|
||||||
|
for (const [index, item] of projects.entries()) {
|
||||||
|
const stackItems = item.techStack?.stackItems ?? [];
|
||||||
|
const body = stripMarkup(`${item.description ?? ""} ${stackItems.join(" ")}`);
|
||||||
|
const score = catalogQuery ? 1000 - index : scoreText(query, item.title, body, stackItems);
|
||||||
|
if (score > 0 || !query.trim() || catalogQuery) {
|
||||||
|
results.push({
|
||||||
|
type: "project",
|
||||||
|
title: item.title,
|
||||||
|
snippet: snippet(body || item.title, query),
|
||||||
|
url: `/projects#${item.id}`,
|
||||||
|
score,
|
||||||
|
metadata: {
|
||||||
|
id: item.id,
|
||||||
|
stackItems,
|
||||||
|
sourceType: item.sourceType,
|
||||||
|
releaseStatus: item.releaseStatus,
|
||||||
|
sourceLink: item.sourceLink,
|
||||||
|
releaseLink: item.releaseLink,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (selected.has("blog")) {
|
||||||
|
const posts = await db
|
||||||
|
.select({
|
||||||
|
slug: blogPost.slug,
|
||||||
|
title: blogPost.title,
|
||||||
|
date: blogPost.date,
|
||||||
|
description: blogPost.description,
|
||||||
|
tags: blogPost.tags,
|
||||||
|
})
|
||||||
|
.from(blogPost)
|
||||||
|
.orderBy(desc(blogPost.date), desc(blogPost.createdAt));
|
||||||
|
|
||||||
|
for (const post of posts) {
|
||||||
|
const tags = post.tags ?? [];
|
||||||
|
const body = stripMarkup(`${post.description ?? ""} ${tags.join(" ")}`);
|
||||||
|
const score = scoreText(query, post.title, body, tags);
|
||||||
|
if (score > 0 || !query.trim()) {
|
||||||
|
results.push({
|
||||||
|
type: "blog",
|
||||||
|
title: post.title,
|
||||||
|
snippet: snippet(body || post.title, query),
|
||||||
|
url: `/blog/${post.slug}`,
|
||||||
|
score,
|
||||||
|
metadata: {
|
||||||
|
slug: post.slug,
|
||||||
|
date: post.date,
|
||||||
|
tags,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (selected.has("music")) {
|
||||||
|
const tracks = await db.select().from(music).orderBy(desc(music.createdAt));
|
||||||
|
for (const track of tracks) {
|
||||||
|
const body = stripMarkup(track.description);
|
||||||
|
const score = scoreText(query, track.title, body);
|
||||||
|
if (score > 0 || !query.trim()) {
|
||||||
|
results.push({
|
||||||
|
type: "music",
|
||||||
|
title: track.title,
|
||||||
|
snippet: snippet(body || track.fileName, query),
|
||||||
|
url: "/music",
|
||||||
|
score,
|
||||||
|
metadata: {
|
||||||
|
id: track.id,
|
||||||
|
fileName: track.fileName,
|
||||||
|
hasStream: Boolean(track.streamUrl),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return uniqueByUrl(results).sort((a, b) => b.score - a.score || a.title.localeCompare(b.title));
|
||||||
|
}
|
||||||
|
|
||||||
|
function projectMatches(projectItem: ProjectWithStack, idOrTitle: string) {
|
||||||
|
const normalized = idOrTitle.trim().toLowerCase();
|
||||||
|
const title = projectItem.title.toLowerCase();
|
||||||
|
return projectItem.id === idOrTitle || title === normalized || title.includes(normalized);
|
||||||
|
}
|
||||||
|
|
||||||
|
function matchedTerms(text: string, terms: string[]) {
|
||||||
|
const lower = text.toLowerCase();
|
||||||
|
return terms.filter((term) => lower.includes(term.toLowerCase()));
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseDate(value: string | undefined, fallback: Date) {
|
||||||
|
if (!value?.trim()) return fallback;
|
||||||
|
const date = new Date(value);
|
||||||
|
return Number.isNaN(date.getTime()) ? fallback : date;
|
||||||
|
}
|
||||||
|
|
||||||
|
function safeTimeZone(value: string | undefined) {
|
||||||
|
const timeZone = value?.trim() || "Europe/Berlin";
|
||||||
|
try {
|
||||||
|
new Intl.DateTimeFormat("en-US", { timeZone }).format(new Date());
|
||||||
|
return timeZone;
|
||||||
|
} catch {
|
||||||
|
return "Europe/Berlin";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function isLikelyEmail(value: string) {
|
||||||
|
return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
function overlaps(
|
||||||
|
start: Date,
|
||||||
|
end: Date,
|
||||||
|
busy: Array<{ start: Date; end: Date }>,
|
||||||
|
) {
|
||||||
|
return busy.some((item) => start < item.end && end > item.start);
|
||||||
|
}
|
||||||
|
|
||||||
|
function getZonedParts(date: Date, timeZone: string) {
|
||||||
|
const formatter = new Intl.DateTimeFormat("en-US", {
|
||||||
|
timeZone,
|
||||||
|
weekday: "short",
|
||||||
|
hourCycle: "h23",
|
||||||
|
hour: "2-digit",
|
||||||
|
minute: "2-digit",
|
||||||
|
});
|
||||||
|
const parts = Object.fromEntries(formatter.formatToParts(date).map((part) => [part.type, part.value]));
|
||||||
|
return {
|
||||||
|
weekday: parts.weekday ?? "",
|
||||||
|
hour: Number(parts.hour ?? 0),
|
||||||
|
minute: Number(parts.minute ?? 0),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function isInsideWorkingHours(start: Date, end: Date, timeZone: string, workdayStartHour: number, workdayEndHour: number) {
|
||||||
|
const startParts = getZonedParts(start, timeZone);
|
||||||
|
const endParts = getZonedParts(end, timeZone);
|
||||||
|
const weekend = startParts.weekday === "Sat" || startParts.weekday === "Sun";
|
||||||
|
const startMinutes = startParts.hour * 60 + startParts.minute;
|
||||||
|
const endMinutes = endParts.hour * 60 + endParts.minute;
|
||||||
|
|
||||||
|
return !weekend && startMinutes >= workdayStartHour * 60 && endMinutes <= workdayEndHour * 60;
|
||||||
|
}
|
||||||
|
|
||||||
|
function availabilitySlots({
|
||||||
|
rangeStart,
|
||||||
|
rangeEnd,
|
||||||
|
busy,
|
||||||
|
durationMinutes,
|
||||||
|
timeZone,
|
||||||
|
workdayStartHour,
|
||||||
|
workdayEndHour,
|
||||||
|
}: {
|
||||||
|
rangeStart: Date;
|
||||||
|
rangeEnd: Date;
|
||||||
|
busy: Array<{ start: Date; end: Date }>;
|
||||||
|
durationMinutes: number;
|
||||||
|
timeZone: string;
|
||||||
|
workdayStartHour: number;
|
||||||
|
workdayEndHour: number;
|
||||||
|
}) {
|
||||||
|
const slots: Array<{ start: string; end: string }> = [];
|
||||||
|
const stepMinutes = 30;
|
||||||
|
const durationMs = durationMinutes * 60 * 1000;
|
||||||
|
const cursor = new Date(Math.ceil(rangeStart.getTime() / (stepMinutes * 60 * 1000)) * stepMinutes * 60 * 1000);
|
||||||
|
|
||||||
|
while (cursor.getTime() + durationMs <= rangeEnd.getTime() && slots.length < 10) {
|
||||||
|
const end = new Date(cursor.getTime() + durationMs);
|
||||||
|
if (
|
||||||
|
isInsideWorkingHours(cursor, end, timeZone, workdayStartHour, workdayEndHour)
|
||||||
|
&& !overlaps(cursor, end, busy)
|
||||||
|
) {
|
||||||
|
slots.push({ start: cursor.toISOString(), end: end.toISOString() });
|
||||||
|
}
|
||||||
|
cursor.setMinutes(cursor.getMinutes() + stepMinutes);
|
||||||
|
}
|
||||||
|
|
||||||
|
return slots;
|
||||||
|
}
|
||||||
|
|
||||||
|
function logAvailability(requestId: string, message: string, data?: Record<string, unknown>) {
|
||||||
|
console.log(`[ai:getAvailability:${requestId}] ${message}`, data ?? "");
|
||||||
|
}
|
||||||
|
|
||||||
|
export function createChatTools() {
|
||||||
|
return {
|
||||||
|
scheduleMeeting: tool({
|
||||||
|
description: "Schedule a meeting with Gregor Lohaus and add it to his Google Calendar. Use getAvailability first when the user asks for a meeting at a flexible or uncertain time.",
|
||||||
|
inputSchema: z.object({
|
||||||
|
title: z.string().describe("Meeting title, make something up if not provided"),
|
||||||
|
description: z.string().describe("Meeting description / agenda, make something up if not provided"),
|
||||||
|
dateTime: z
|
||||||
|
.string()
|
||||||
|
.describe("ISO 8601 datetime for the meeting start, e.g. 2026-06-18T10:00:00+02:00"),
|
||||||
|
durationMinutes: z
|
||||||
|
.number()
|
||||||
|
.int()
|
||||||
|
.min(15)
|
||||||
|
.max(120)
|
||||||
|
.describe("Duration of the meeting in minutes, if none provided ask if 20 minutes is ok"),
|
||||||
|
attendeeEmail: z
|
||||||
|
.string()
|
||||||
|
.optional()
|
||||||
|
.describe("Optional email of the visitor to invite, if provided"),
|
||||||
|
attendeeName: z.string().optional().describe("Name of the visitor"),
|
||||||
|
}),
|
||||||
|
execute: async (input) => {
|
||||||
|
if (input.attendeeEmail && !isLikelyEmail(input.attendeeEmail)) {
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
error: "The attendee email does not look valid. Ask the visitor to provide a valid email address before scheduling.",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return scheduleMeeting({ ...input });
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
cancelMeeting: tool({
|
||||||
|
description: "Remove a previously scheduled meeting from Gregor's dedicated availability calendar. Use only when you have the exact eventId returned by scheduleMeeting.",
|
||||||
|
inputSchema: z.object({
|
||||||
|
eventId: z.string().min(1).describe("Google Calendar event id returned by a previous scheduleMeeting tool call."),
|
||||||
|
}),
|
||||||
|
execute: async ({ eventId }) => cancelMeeting({ eventId }),
|
||||||
|
}),
|
||||||
|
searchSiteContent: tool({
|
||||||
|
description: "Search Gregor Lohaus's own website content across CV entries, projects, blog posts, and music. Use this for questions about Gregor's work, skills, writing, projects, or site content. For broad questions about Gregor's projects, use types ['project'] so the tool returns the project catalog.",
|
||||||
|
inputSchema: z.object({
|
||||||
|
query: z.string().describe("Search query, skill, technology, topic, or phrase."),
|
||||||
|
types: z.array(contentTypeSchema).optional().describe("Optional content types to search. Omit to search all site content."),
|
||||||
|
limit: z.number().int().min(1).max(12).optional().describe("Maximum number of results to return."),
|
||||||
|
}),
|
||||||
|
execute: async ({ query, types, limit }) => {
|
||||||
|
const results = await buildSearchResults(query, types?.length ? types : ["cv", "project", "blog", "music"]);
|
||||||
|
return {
|
||||||
|
success: true,
|
||||||
|
query,
|
||||||
|
results: results.slice(0, limit ?? 8).map(({ score, ...result }) => result),
|
||||||
|
};
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
getRelevantExperience: tool({
|
||||||
|
description: "Find Gregor's most relevant CV entries and projects for a role, skill set, seniority, or domain. Use this for recruiter-style qualification questions.",
|
||||||
|
inputSchema: z.object({
|
||||||
|
role: z.string().optional().describe("Role or job title, such as full-stack engineer or React Native developer."),
|
||||||
|
skills: z.array(z.string()).optional().describe("Technologies, tools, or skills to match."),
|
||||||
|
domain: z.string().optional().describe("Product or business domain to match, if any."),
|
||||||
|
seniority: z.string().optional().describe("Seniority or responsibility level to match, if any."),
|
||||||
|
limit: z.number().int().min(1).max(10).optional().describe("Maximum matching entries to return."),
|
||||||
|
}),
|
||||||
|
execute: async ({ role, skills, domain, seniority, limit }) => {
|
||||||
|
const terms = [role, domain, seniority, ...(skills ?? [])].filter((value): value is string => Boolean(value?.trim()));
|
||||||
|
const query = terms.join(" ");
|
||||||
|
const results = await buildSearchResults(query, ["cv", "project"]);
|
||||||
|
const selected = results.slice(0, limit ?? 6);
|
||||||
|
|
||||||
|
return {
|
||||||
|
success: true,
|
||||||
|
query,
|
||||||
|
matches: selected.map(({ score, ...result }) => ({
|
||||||
|
...result,
|
||||||
|
matchedTerms: matchedTerms(`${result.title} ${result.snippet} ${(result.metadata?.stackItems as string[] | undefined)?.join(" ") ?? ""}`, terms),
|
||||||
|
whyRelevant: result.type === "project"
|
||||||
|
? "Project match based on title, description, and technology stack."
|
||||||
|
: "CV match based on experience title, category, and description.",
|
||||||
|
})),
|
||||||
|
};
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
getProjectDetails: tool({
|
||||||
|
description: "Get detailed information for one of Gregor's projects, including description, stack, source link, release link, and project page URL.",
|
||||||
|
inputSchema: z.object({
|
||||||
|
idOrTitle: z.string().min(1).describe("Project id, exact title, or partial project title."),
|
||||||
|
}),
|
||||||
|
execute: async ({ idOrTitle }) => {
|
||||||
|
const projects = await loadProjects();
|
||||||
|
const found = projects.find((item) => projectMatches(item, idOrTitle));
|
||||||
|
|
||||||
|
if (!found) {
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
error: `No project matched "${idOrTitle}".`,
|
||||||
|
suggestions: projects.slice(0, 5).map((item) => ({
|
||||||
|
id: item.id,
|
||||||
|
title: item.title,
|
||||||
|
url: `/projects#${item.id}`,
|
||||||
|
})),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
success: true,
|
||||||
|
project: {
|
||||||
|
id: found.id,
|
||||||
|
title: found.title,
|
||||||
|
description: stripMarkup(found.description),
|
||||||
|
sourceType: found.sourceType,
|
||||||
|
sourceLink: found.sourceLink,
|
||||||
|
releaseStatus: found.releaseStatus,
|
||||||
|
releaseLink: found.releaseLink,
|
||||||
|
stackItems: found.techStack?.stackItems ?? [],
|
||||||
|
url: `/projects#${found.id}`,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
getAvailability: tool({
|
||||||
|
description: "Check Gregor's Google Calendar availability and suggest open meeting slots. Use this directly for questions like 'when is the next open spot?' or 'what times are available?'. If no date range is provided, it checks from now. Use before scheduling when the requested time is flexible.",
|
||||||
|
inputSchema: z.object({
|
||||||
|
fromDateTime: z.string().optional().describe("ISO 8601 range start. Defaults to now."),
|
||||||
|
toDateTime: z.string().optional().describe("ISO 8601 range end. Defaults to 14 days after the range start."),
|
||||||
|
durationMinutes: z.number().int().min(15).max(120).optional().describe("Desired meeting duration. Defaults to 30 minutes."),
|
||||||
|
timeZone: z.string().optional().describe("IANA time zone for working-hours filtering. Defaults to Europe/Berlin."),
|
||||||
|
workdayStartHour: z.number().int().min(0).max(23).optional().describe("Earliest local start hour. Defaults to 9."),
|
||||||
|
workdayEndHour: z.number().int().min(1).max(24).optional().describe("Latest local end hour. Defaults to 17."),
|
||||||
|
}),
|
||||||
|
execute: async (input) => {
|
||||||
|
const requestId = crypto.randomUUID();
|
||||||
|
logAvailability(requestId, "start", {
|
||||||
|
input,
|
||||||
|
});
|
||||||
|
|
||||||
|
const durationMinutes = input.durationMinutes ?? 30;
|
||||||
|
const timeZone = safeTimeZone(input.timeZone);
|
||||||
|
const workdayStartHour = input.workdayStartHour ?? 9;
|
||||||
|
const workdayEndHour = Math.max(input.workdayEndHour ?? 17, workdayStartHour + 1);
|
||||||
|
const rangeStart = parseDate(input.fromDateTime, new Date());
|
||||||
|
const defaultEnd = new Date(rangeStart.getTime() + 14 * 24 * 60 * 60 * 1000);
|
||||||
|
const requestedEnd = parseDate(input.toDateTime, defaultEnd);
|
||||||
|
const maxEnd = new Date(rangeStart.getTime() + 31 * 24 * 60 * 60 * 1000);
|
||||||
|
const rangeEnd = requestedEnd <= rangeStart ? defaultEnd : requestedEnd > maxEnd ? maxEnd : requestedEnd;
|
||||||
|
logAvailability(requestId, "resolved range", {
|
||||||
|
durationMinutes,
|
||||||
|
timeZone,
|
||||||
|
workdayStartHour,
|
||||||
|
workdayEndHour,
|
||||||
|
rangeStart: rangeStart.toISOString(),
|
||||||
|
rangeEnd: rangeEnd.toISOString(),
|
||||||
|
});
|
||||||
|
|
||||||
|
const calendar = getGoogleCalendarClient();
|
||||||
|
const calendarId = getGoogleCalendarId();
|
||||||
|
logAvailability(requestId, "service account calendar ready", {
|
||||||
|
calendarId,
|
||||||
|
});
|
||||||
|
|
||||||
|
let busy: Array<{ start: Date; end: Date }>;
|
||||||
|
try {
|
||||||
|
logAvailability(requestId, "freebusy request");
|
||||||
|
const response = await calendar.freebusy.query({
|
||||||
|
requestBody: {
|
||||||
|
timeMin: rangeStart.toISOString(),
|
||||||
|
timeMax: rangeEnd.toISOString(),
|
||||||
|
timeZone,
|
||||||
|
items: [{ id: calendarId }],
|
||||||
|
},
|
||||||
|
});
|
||||||
|
busy = (response.data.calendars?.[calendarId]?.busy ?? [])
|
||||||
|
.map((item) => ({
|
||||||
|
start: parseDate(item.start ?? undefined, rangeStart),
|
||||||
|
end: parseDate(item.end ?? undefined, rangeStart),
|
||||||
|
}))
|
||||||
|
.filter((item) => item.end > item.start);
|
||||||
|
logAvailability(requestId, "freebusy response", {
|
||||||
|
busyCount: busy.length,
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.error(`[ai:getAvailability:${requestId}] freebusy failed`, error);
|
||||||
|
return {
|
||||||
|
success: false,
|
||||||
|
error: "Failed to read Gregor's Google Calendar availability.",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const availableSlots = availabilitySlots({
|
||||||
|
rangeStart,
|
||||||
|
rangeEnd,
|
||||||
|
busy,
|
||||||
|
durationMinutes,
|
||||||
|
timeZone,
|
||||||
|
workdayStartHour,
|
||||||
|
workdayEndHour,
|
||||||
|
});
|
||||||
|
logAvailability(requestId, "complete", {
|
||||||
|
busyCount: busy.length,
|
||||||
|
availableSlotCount: availableSlots.length,
|
||||||
|
firstAvailableSlot: availableSlots[0],
|
||||||
|
});
|
||||||
|
const nextAvailableSlot = availableSlots[0] ?? null;
|
||||||
|
|
||||||
|
return {
|
||||||
|
success: true,
|
||||||
|
range: {
|
||||||
|
start: rangeStart.toISOString(),
|
||||||
|
end: rangeEnd.toISOString(),
|
||||||
|
timeZone,
|
||||||
|
},
|
||||||
|
durationMinutes,
|
||||||
|
busy: busy.map((item) => ({
|
||||||
|
start: item.start.toISOString(),
|
||||||
|
end: item.end.toISOString(),
|
||||||
|
})),
|
||||||
|
nextAvailableSlot,
|
||||||
|
availableSlots,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
}
|
||||||
20
src/server/googleCalendar.ts
Normal file
20
src/server/googleCalendar.ts
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
import "server-only";
|
||||||
|
|
||||||
|
import { google } from "googleapis";
|
||||||
|
import { env } from "~/env";
|
||||||
|
|
||||||
|
const calendarScope = "https://www.googleapis.com/auth/calendar";
|
||||||
|
|
||||||
|
export function getGoogleCalendarClient() {
|
||||||
|
const auth = new google.auth.JWT({
|
||||||
|
email: env.GOOGLE_SERVICE_ACCOUNT_EMAIL,
|
||||||
|
key: env.GOOGLE_SERVICE_ACCOUNT_PRIVATE_KEY.replace(/\\n/g, "\n"),
|
||||||
|
scopes: [calendarScope],
|
||||||
|
});
|
||||||
|
|
||||||
|
return google.calendar({ version: "v3", auth });
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getGoogleCalendarId() {
|
||||||
|
return env.GOOGLE_CALENDAR_ID;
|
||||||
|
}
|
||||||
@@ -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();
|
||||||
|
|
||||||
|
|||||||
@@ -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