fix cv animations

This commit is contained in:
2026-06-18 01:41:25 +02:00
parent 3e5be46503
commit 0d79adb104
15 changed files with 606 additions and 724 deletions

1026
bun.lock

File diff suppressed because it is too large Load Diff

View File

@@ -33,7 +33,9 @@
"@hookform/resolvers": "^5.4.0", "@hookform/resolvers": "^5.4.0",
"@mdx-js/mdx": "^3.1.1", "@mdx-js/mdx": "^3.1.1",
"@mdx-js/react": "^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",
@@ -69,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",
@@ -104,6 +107,7 @@
"server-only": "^0.0.1", "server-only": "^0.0.1",
"shadcn": "^4.10.0", "shadcn": "^4.10.0",
"sonner": "^2.0.7", "sonner": "^2.0.7",
"superjson": "^2.2.6",
"tailwind-merge": "^3.6.0", "tailwind-merge": "^3.6.0",
"tailwindcss-motion": "^1.1.1", "tailwindcss-motion": "^1.1.1",
"type-fest": "^5.7.0", "type-fest": "^5.7.0",

View File

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

View File

@@ -9,6 +9,7 @@ const AnimatePopUp = ({
ease='elastic', ease='elastic',
scrollOnly=false, scrollOnly=false,
once=false, once=false,
debugId,
}:{ }:{
children:ReactNode children:ReactNode
position:gsap.Position, position:gsap.Position,
@@ -17,9 +18,10 @@ const AnimatePopUp = ({
ease?:gsap.EaseString|gsap.EaseFunction, ease?:gsap.EaseString|gsap.EaseFunction,
scrollOnly?:boolean, scrollOnly?:boolean,
once?:boolean, once?:boolean,
debugId?:string,
}) => { }) => {
return ( return (
<AnimatedDiv children={children} position={position} scrollOnly={scrollOnly} once={once} className={cn(className,'h-0 translate-y-[50] overflow-hidden')} height='auto' y={0} overflow='' ease={ease} duration={duration} /> <AnimatedDiv children={children} position={position} scrollOnly={scrollOnly} once={once} debugId={debugId} className={cn(className,'h-0 translate-y-[50] overflow-hidden')} height='auto' y={0} overflow='' ease={ease} duration={duration} />
) )
} }

View File

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

View File

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

View File

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

View File

@@ -1,22 +1,3 @@
import { httpBatchLink } from "@trpc/client";
import { trpcRouter } from "~/server/routers/_app"; import { trpcRouter } from "~/server/routers/_app";
function getBaseUrl() { export const servTrpc = trpcRouter.createCaller({});
if (typeof window !== 'undefined')
// browser should use relative path
return '';
if (process.env.VERCEL_URL)
// reference for vercel.com
return `https://${process.env.VERCEL_URL}`;
if (process.env.RENDER_INTERNAL_HOSTNAME)
// reference for render.com
return `http://${process.env.RENDER_INTERNAL_HOSTNAME}:${process.env.PORT}`;
// assume localhost
return `http://localhost:${process.env.PORT ?? 3000}`;
};
export const servTrpc = trpcRouter.createCaller({
links: [
httpBatchLink({url: `${getBaseUrl()}/api/trpc`}),
],
});

View File

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

View File

@@ -1,4 +1,3 @@
'use client'
import CvEntry from "./CvEntry" import CvEntry from "./CvEntry"
import type { RouterOutputs } from "~/server/routers/_app" import type { RouterOutputs } from "~/server/routers/_app"
import { cn } from "~/lib/utils" import { cn } from "~/lib/utils"
@@ -20,7 +19,7 @@ export default function CvCategory({ category, layout, position = 0 }: CvCategor
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,7 +27,7 @@ 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} className={layout == "row" ? "w-full lg:w-fit" : undefined} />
</AnimatePopUp> </AnimatePopUp>
))} ))}

View File

@@ -4,6 +4,7 @@ import { format } from 'date-fns'
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 AnimatePopUp from "~/app/_components/Animated/AnimatePopUp"
import { MDXRemote } from "next-mdx-remote/rsc";
import type { CvCategoryData } from "./CvCategory" import type { CvCategoryData } from "./CvCategory"
import { ClientMdx } from "~/components/ClientMdx" import { ClientMdx } from "~/components/ClientMdx"
@@ -18,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> :
@@ -26,7 +27,7 @@ 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}> <AnimatePopUp once position={position + 0.2} 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">
<ClientMdx source={entry.description} fallback={entry.description} /> <ClientMdx source={entry.description} fallback={entry.description} />
</article> </article>
@@ -36,7 +37,7 @@ export default function CvEntry({ entry, className, position = 0 }: {
} }
{!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> :

View File

@@ -0,0 +1,54 @@
'use client'
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'] }) {
useTimeLine(props.cv)
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} key={cat.id} />
))}
</SidebarContent>
</Sidebar>
</>
}
<div className="h-full w-full flex flex-wrap flex-row p-4 pt-8 ">
<div id="mainwrap" className="flex w-full flex-col gap-4 lg:px-[15vw]">
<div id="header" className="flex w-full h-fit flex-row gap-4 flex-wrap">
{headerCategories.map((cat, i) => (
<CvCategory layout="row" position={i} category={cat} key={cat.id} />
))}
</div>
<div id="colwrapper" className="flex flex-col lg:flex-row w-full h-3/4 gap-4">
<div id="col1" className={`flex flex-col w-full ${col1Categories.length > 0 ? "lg:w-1/2" : ""} h-full gap-4`}>
{col1Categories.map((cat, i) => (
<CvCategory layout="col" position={i} category={cat} key={cat.id} />
))}
</div>
<div id="col2" className={`flex flex-col w-full ${col2Categories.length > 0 ? "lg:w-1/2" : ""} h-full gap-4`}>
{col2Categories.map((cat, i) => (
<CvCategory layout="col" position={i} category={cat} key={cat.id} />
))}
</div>
</div>
</div>
</div>
</SidebarProvider>
</>
)
}

View File

@@ -1,55 +1,11 @@
'use client' import { Suspense } from "react";
import { useTimeLine } from "../_providers/GsapProvicer"; import { servTrpc as trpc } from "../_trpc/ServerClient";
import { trpc } from "../_trpc/Client"; import Page from "./_components/Page";
import { SidebarContent, SidebarProvider, Sidebar } from "~/components/ui/sidebar"; export default async function CvPage() {
import SidebarTriggerDisappearsOnMobile from "./_components/SidebarTriggerDisappearsOnMobile"; const cv = await trpc.categoryv2.listAllWithEntries();
import CvCategory from "./_components/CvCategory";
export default function CvPage() {
const cv = trpc.categoryv2.listAllWithEntries.useQuery();
useTimeLine(cv.data)
const byPosition = (pos: "sidebar" | "header" | "col1" | "col2") =>
cv.data?.filter((c) => c.layoutPosition === pos) ?? []
const sidebarCategories = byPosition("sidebar")
const headerCategories = byPosition("header")
const col1Categories = byPosition("col1")
const col2Categories = byPosition("col2")
return ( return (
<> <Suspense>
<SidebarProvider> <Page cv={cv}/>
{sidebarCategories.length > 0 && </Suspense>
<>
<SidebarTriggerDisappearsOnMobile />
<Sidebar>
<SidebarContent className="p-2 lg:pt-[3.2rem]">
{sidebarCategories.map((cat, i) => (
<CvCategory layout="col" position={i} category={cat} key={cat.id} />
))}
</SidebarContent>
</Sidebar>
</>
}
<div className="h-full w-full flex flex-wrap flex-row p-4 pt-8 ">
<div id="mainwrap" className="flex w-full flex-col gap-4 lg:px-[15vw]">
<div id="header" className="flex w-full h-fit flex-row gap-4 flex-wrap">
{headerCategories.map((cat, i) => (
<CvCategory layout="row" position={i} category={cat} key={cat.id} />
))}
</div>
<div id="colwrapper" className="flex flex-col lg:flex-row w-full h-3/4 gap-4">
<div id="col1" className={`flex flex-col w-full ${col1Categories.length > 0 ? "lg:w-1/2" : ""} h-full gap-4`}>
{col1Categories.map((cat, i) => (
<CvCategory layout="col" position={i} category={cat} key={cat.id} />
))}
</div>
<div id="col2" className={`flex flex-col w-full ${col2Categories.length > 0 ? "lg:w-1/2" : ""} h-full gap-4`}>
{col2Categories.map((cat, i) => (
<CvCategory layout="col" position={i} category={cat} key={cat.id} />
))}
</div>
</div>
</div>
</div>
</SidebarProvider>
</>
) )
} }

View File

@@ -1,3 +1,4 @@
"use client"
import * as React from "react" import * as React from "react"
import { useRef } from "react"; import { useRef } from "react";
import gsap from 'gsap' import gsap from 'gsap'

View File

@@ -1,5 +1,8 @@
import { initTRPC } from "@trpc/server" import { initTRPC } from "@trpc/server"
import superjson from "superjson"
const t = initTRPC.create(); const t = initTRPC.create({
transformer: superjson,
});
export const router = t.router; export const router = t.router;
export const publicProcedure = t.procedure; export const publicProcedure = t.procedure;