Compare commits
2 Commits
65b9184a22
...
7aa1746f97
| Author | SHA1 | Date | |
|---|---|---|---|
| 7aa1746f97 | |||
| f5e8b87846 |
@@ -6,9 +6,10 @@ import "./src/env.js";
|
||||
|
||||
/** @type {import("next").NextConfig} */
|
||||
const config = {
|
||||
typescript: {
|
||||
ignoreBuildErrors: true
|
||||
}
|
||||
transpilePackages: ["next-mdx-remote"],
|
||||
typescript: {
|
||||
ignoreBuildErrors: true,
|
||||
},
|
||||
};
|
||||
|
||||
export default config;
|
||||
|
||||
99
package.json
99
package.json
@@ -5,6 +5,7 @@
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"build": "next build",
|
||||
"build:ffmpeg-worker": "bun build node_modules/@ffmpeg/ffmpeg/dist/esm/worker.js --target browser --format esm --minify --outfile public/ffmpeg/worker.js",
|
||||
"check": "biome check .",
|
||||
"check:unsafe": "biome check --write --unsafe .",
|
||||
"check:write": "biome check --write .",
|
||||
@@ -19,16 +20,18 @@
|
||||
"test": "vitest --typecheck"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ai-sdk/openai": "^3.0.41",
|
||||
"@ai-sdk/react": "^3.0.118",
|
||||
"@clerk/nextjs": "^7.0.2",
|
||||
"@electric-sql/pglite": "^0.3.16",
|
||||
"@ai-sdk/openai": "^3.0.67",
|
||||
"@ai-sdk/react": "^3.0.195",
|
||||
"@clerk/nextjs": "^7.4.2",
|
||||
"@electric-sql/pglite": "^0.4.6",
|
||||
"@ffmpeg/ffmpeg": "^0.12.15",
|
||||
"@ffmpeg/util": "^0.12.2",
|
||||
"@fortawesome/fontawesome-svg-core": "^7.2.0",
|
||||
"@fortawesome/free-solid-svg-icons": "^7.2.0",
|
||||
"@fortawesome/react-fontawesome": "^3.2.0",
|
||||
"@fortawesome/react-fontawesome": "^3.3.1",
|
||||
"@gsap/react": "^2.1.2",
|
||||
"@hookform/resolvers": "^5.2.2",
|
||||
"@neondatabase/serverless": "^1.0.2",
|
||||
"@hookform/resolvers": "^5.4.0",
|
||||
"@neondatabase/serverless": "^1.1.0",
|
||||
"@radix-ui/react-accordion": "^1.2.12",
|
||||
"@radix-ui/react-alert-dialog": "^1.1.15",
|
||||
"@radix-ui/react-aspect-ratio": "^1.1.8",
|
||||
@@ -55,85 +58,85 @@
|
||||
"@radix-ui/react-toggle": "^1.1.10",
|
||||
"@radix-ui/react-toggle-group": "^1.1.11",
|
||||
"@radix-ui/react-tooltip": "^1.2.8",
|
||||
"@t3-oss/env-nextjs": "^0.13.10",
|
||||
"@t3-oss/env-nextjs": "^0.13.11",
|
||||
"@tailwindcss/typography": "^0.5.19",
|
||||
"@tanstack/react-query": "^5.90.21",
|
||||
"@tanstack/react-query-next-experimental": "^5.91.0",
|
||||
"@tanstack/react-query": "^5.100.14",
|
||||
"@tanstack/react-query-next-experimental": "^5.100.14",
|
||||
"@testing-library/user-event": "^14.6.1",
|
||||
"@trpc/client": "^11.12.0",
|
||||
"@trpc/next": "^11.12.0",
|
||||
"@trpc/react-query": "^11.12.0",
|
||||
"@trpc/server": "^11.12.0",
|
||||
"@uiw/react-md-editor": "^4.0.11",
|
||||
"@trpc/client": "^11.17.0",
|
||||
"@trpc/next": "^11.17.0",
|
||||
"@trpc/react-query": "^11.17.0",
|
||||
"@trpc/server": "^11.17.0",
|
||||
"@uiw/react-md-editor": "^4.1.1",
|
||||
"@uploadthing/react": "^7.3.3",
|
||||
"@vercel/speed-insights": "^2.0.0",
|
||||
"ai": "^6.0.116",
|
||||
"ai": "^6.0.193",
|
||||
"class-variance-authority": "^0.7.1",
|
||||
"clsx": "^2.1.1",
|
||||
"cmdk": "^1.1.1",
|
||||
"date-fns": "^4.1.0",
|
||||
"date-fns": "^4.4.0",
|
||||
"date-format": "^4.0.14",
|
||||
"drizzle-orm": "^0.45.1",
|
||||
"drizzle-orm": "^0.45.2",
|
||||
"drizzle-zod": "^0.8.3",
|
||||
"embla-carousel-react": "^8.6.0",
|
||||
"glazejs": "^2.0.1",
|
||||
"googleapis": "^171.4.0",
|
||||
"googleapis": "^173.0.0",
|
||||
"gray-matter": "^4.0.3",
|
||||
"gsap": "^3.14.2",
|
||||
"gsap": "^3.15.0",
|
||||
"input-otp": "^1.4.2",
|
||||
"lucide-react": "^0.577.0",
|
||||
"next": "16.1.6",
|
||||
"lucide-react": "^1.17.0",
|
||||
"next": "16.2.6",
|
||||
"next-mdx-remote": "^6.0.0",
|
||||
"next-themes": "^0.4.6",
|
||||
"postgres": "^3.4.8",
|
||||
"postgres": "^3.4.9",
|
||||
"radix-ui": "^1.4.3",
|
||||
"react": "^19.2.4",
|
||||
"react-day-picker": "^9.14.0",
|
||||
"react-dom": "^19.2.4",
|
||||
"react-hook-form": "^7.71.2",
|
||||
"react": "^19.2.6",
|
||||
"react-day-picker": "^10.0.1",
|
||||
"react-dom": "^19.2.6",
|
||||
"react-hook-form": "^7.77.0",
|
||||
"react-markdown": "^10.1.0",
|
||||
"react-resizable-panels": "^4.7.2",
|
||||
"recharts": "2.15.4",
|
||||
"react-resizable-panels": "^4.11.2",
|
||||
"recharts": "3.8.1",
|
||||
"rehype-highlight": "^7.0.2",
|
||||
"rehype-raw": "^7.0.0",
|
||||
"remark-gfm": "^4.0.1",
|
||||
"server-only": "^0.0.1",
|
||||
"shadcn": "^4.0.2",
|
||||
"shadcn": "^4.10.0",
|
||||
"sonner": "^2.0.7",
|
||||
"tailwind-merge": "^3.5.0",
|
||||
"tailwind-merge": "^3.6.0",
|
||||
"tailwindcss-motion": "^1.1.1",
|
||||
"type-fest": "^5.4.4",
|
||||
"type-fest": "^5.7.0",
|
||||
"uploadthing": "^7.7.4",
|
||||
"vaul": "^1.1.2",
|
||||
"zod": "^4.3.6"
|
||||
"zod": "^4.4.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@biomejs/biome": "2.4.6",
|
||||
"@biomejs/biome": "2.4.16",
|
||||
"@swc/jest": "^0.2.39",
|
||||
"@tailwindcss/postcss": "^4.2.1",
|
||||
"@tailwindcss/postcss": "^4.3.0",
|
||||
"@testing-library/dom": "^10.4.1",
|
||||
"@testing-library/jest-dom": "^6.9.1",
|
||||
"@testing-library/react": "^16.3.2",
|
||||
"@types/jest": "^30.0.0",
|
||||
"@types/node": "^25.4.0",
|
||||
"@types/react": "^19.2.14",
|
||||
"@types/node": "^25.9.1",
|
||||
"@types/react": "^19.2.15",
|
||||
"@types/react-dom": "^19.2.3",
|
||||
"@vitejs/plugin-react": "^5.1.4",
|
||||
"@vitest/coverage-v8": "^4.0.18",
|
||||
"dotenv": "^17.3.1",
|
||||
"drizzle-kit": "^0.31.9",
|
||||
"jest": "^30.3.0",
|
||||
"jest-environment-jsdom": "^30.3.0",
|
||||
"jsdom": "^28.1.0",
|
||||
"@vitejs/plugin-react": "^6.0.2",
|
||||
"@vitest/coverage-v8": "^4.1.8",
|
||||
"dotenv": "^17.4.2",
|
||||
"drizzle-kit": "^0.31.10",
|
||||
"jest": "^30.4.2",
|
||||
"jest-environment-jsdom": "^30.4.1",
|
||||
"jsdom": "^29.1.1",
|
||||
"next-router-mock": "^1.0.5",
|
||||
"pg-mem": "^3.0.14",
|
||||
"postcss": "^8.5.8",
|
||||
"tailwindcss": "^4.2.1",
|
||||
"postcss": "^8.5.15",
|
||||
"tailwindcss": "^4.3.0",
|
||||
"ts-node": "^10.9.2",
|
||||
"tw-animate-css": "^1.4.0",
|
||||
"typescript": "^5.9.3",
|
||||
"typescript": "^6.0.3",
|
||||
"vite-tsconfig-paths": "^6.1.1",
|
||||
"vitest": "^4.0.18"
|
||||
"vitest": "^4.1.8"
|
||||
},
|
||||
"ct3aMetadata": {
|
||||
"initVersion": "7.39.3"
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
1
public/ffmpeg/worker.js
Normal file
1
public/ffmpeg/worker.js
Normal file
@@ -0,0 +1 @@
|
||||
var C="https://unpkg.com/@ffmpeg/core@0.12.9/dist/umd/ffmpeg-core.js",N;(function(E){E.LOAD="LOAD",E.EXEC="EXEC",E.FFPROBE="FFPROBE",E.WRITE_FILE="WRITE_FILE",E.READ_FILE="READ_FILE",E.DELETE_FILE="DELETE_FILE",E.RENAME="RENAME",E.CREATE_DIR="CREATE_DIR",E.LIST_DIR="LIST_DIR",E.DELETE_DIR="DELETE_DIR",E.ERROR="ERROR",E.DOWNLOAD="DOWNLOAD",E.PROGRESS="PROGRESS",E.LOG="LOG",E.MOUNT="MOUNT",E.UNMOUNT="UNMOUNT"})(N||(N={}));var G=Error("unknown message type"),V=Error("ffmpeg is not loaded, call `await ffmpeg.load()` first"),b=Error("called FFmpeg.terminate()"),v=Error("failed to import ffmpeg-core.js");var I,X=async({coreURL:E,wasmURL:D,workerURL:O})=>{let S=!I;try{if(!E)E=C;importScripts(E)}catch{if(!E||E===C)E=C.replace("/umd/","/esm/");if(self.createFFmpegCore=(await import(E)).default,!self.createFFmpegCore)throw v}let A=E,x=D?D:E.replace(/.js$/g,".wasm"),B=O?O:E.replace(/.js$/g,".worker.js");return I=await self.createFFmpegCore({mainScriptUrlOrBlob:`${A}#${btoa(JSON.stringify({wasmURL:x,workerURL:B}))}`}),I.setLogger((W)=>self.postMessage({type:N.LOG,data:W})),I.setProgress((W)=>self.postMessage({type:N.PROGRESS,data:W})),S},Y=({args:E,timeout:D=-1})=>{I.setTimeout(D),I.exec(...E);let O=I.ret;return I.reset(),O},j=({args:E,timeout:D=-1})=>{I.setTimeout(D),I.ffprobe(...E);let O=I.ret;return I.reset(),O},J=({path:E,data:D})=>{return I.FS.writeFile(E,D),!0},$=({path:E,encoding:D})=>I.FS.readFile(E,{encoding:D}),q=({path:E})=>{return I.FS.unlink(E),!0},z=({oldPath:E,newPath:D})=>{return I.FS.rename(E,D),!0},H=({path:E})=>{return I.FS.mkdir(E),!0},K=({path:E})=>{let D=I.FS.readdir(E),O=[];for(let S of D){let A=I.FS.stat(`${E}/${S}`),x=I.FS.isDir(A.mode);O.push({name:S,isDir:x})}return O},Q=({path:E})=>{return I.FS.rmdir(E),!0},R=({fsType:E,options:D,mountPoint:O})=>{let S=E,A=I.FS.filesystems[S];if(!A)return!1;return I.FS.mount(A,D,O),!0},Z=({mountPoint:E})=>{return I.FS.unmount(E),!0};self.onmessage=async({data:{id:E,type:D,data:O}})=>{let S=[],A;try{if(D!==N.LOAD&&!I)throw V;switch(D){case N.LOAD:A=await X(O);break;case N.EXEC:A=Y(O);break;case N.FFPROBE:A=j(O);break;case N.WRITE_FILE:A=J(O);break;case N.READ_FILE:A=$(O);break;case N.DELETE_FILE:A=q(O);break;case N.RENAME:A=z(O);break;case N.CREATE_DIR:A=H(O);break;case N.LIST_DIR:A=K(O);break;case N.DELETE_DIR:A=Q(O);break;case N.MOUNT:A=R(O);break;case N.UNMOUNT:A=Z(O);break;default:throw G}}catch(x){self.postMessage({id:E,type:N.ERROR,data:x.toString()});return}if(A instanceof Uint8Array)S.push(A.buffer);self.postMessage({id:E,type:D,data:A},S)};
|
||||
@@ -1,7 +1,8 @@
|
||||
"use client";
|
||||
|
||||
import React, { useCallback, useEffect, useRef, useState } from "react";
|
||||
import { useTheme } from "next-themes";
|
||||
import type React from "react";
|
||||
import { useCallback, useEffect, useRef } from "react";
|
||||
|
||||
const PALETTES = {
|
||||
dark: {
|
||||
@@ -37,6 +38,12 @@ interface Particle {
|
||||
wobblePhase: number;
|
||||
}
|
||||
|
||||
interface CanvasSize {
|
||||
dpr: number;
|
||||
height: number;
|
||||
width: number;
|
||||
}
|
||||
|
||||
interface AnimatedBackgroundContainerProps {
|
||||
children: React.ReactNode;
|
||||
className?: string;
|
||||
@@ -48,6 +55,9 @@ interface AnimatedBackgroundContainerProps {
|
||||
|
||||
const DEFAULT_PARTICLE_COLORS: readonly string[] = PALETTES.dark.particles;
|
||||
const PARTICLE_COLOR_COUNT = DEFAULT_PARTICLE_COLORS.length;
|
||||
const EDGE_FADE_DISTANCE = 80;
|
||||
const MAX_DEVICE_PIXEL_RATIO = 2;
|
||||
const MOBILE_TARGET_DISTANCE = 30;
|
||||
|
||||
const rand = (min: number, max: number) => Math.random() * (max - min) + min;
|
||||
|
||||
@@ -87,15 +97,18 @@ export default function AnimatedBackgroundContainer({
|
||||
const frameRef = useRef(0);
|
||||
const animationFrameRef = useRef<number | null>(null);
|
||||
const isMobileRef = useRef(false);
|
||||
const isVisibleRef = useRef(true);
|
||||
const prefersReducedMotionRef = useRef(false);
|
||||
const particlesRef = useRef<Particle[]>([]);
|
||||
const mousePosRef = useRef({ x: 0, y: 0 });
|
||||
const smoothMouseRef = useRef({ x: 0, y: 0 });
|
||||
const mobileAnchorRef = useRef({ x: 0, y: 0 });
|
||||
const mobileTargetRef = useRef({ x: 0, y: 0 });
|
||||
const canvasSizeRef = useRef<CanvasSize>({ dpr: 1, height: 0, width: 0 });
|
||||
const containerRectRef = useRef<DOMRect | null>(null);
|
||||
const followSpeedRef = useRef(followSpeed);
|
||||
const mobileSpeedRef = useRef(mobileSpeed);
|
||||
const particleColorsRef = useRef<readonly string[]>(DEFAULT_PARTICLE_COLORS);
|
||||
const [mounted, setMounted] = useState(false);
|
||||
|
||||
const { resolvedTheme } = useTheme();
|
||||
const isDark = resolvedTheme === undefined || resolvedTheme === "dark";
|
||||
@@ -120,13 +133,13 @@ export default function AnimatedBackgroundContainer({
|
||||
}, [particleCount, orbitRadius]);
|
||||
|
||||
const seedPositions = useCallback(() => {
|
||||
const container = containerRef.current;
|
||||
if (!container) {
|
||||
const { height, width } = canvasSizeRef.current;
|
||||
if (width === 0 || height === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
const centerX = container.clientWidth / 2;
|
||||
const centerY = container.clientHeight / 2;
|
||||
const centerX = width / 2;
|
||||
const centerY = height / 2;
|
||||
|
||||
mousePosRef.current = { x: centerX, y: centerY };
|
||||
smoothMouseRef.current = { x: centerX, y: centerY };
|
||||
@@ -137,6 +150,13 @@ export default function AnimatedBackgroundContainer({
|
||||
};
|
||||
}, []);
|
||||
|
||||
const updateContainerRect = useCallback(() => {
|
||||
const container = containerRef.current;
|
||||
if (container) {
|
||||
containerRectRef.current = container.getBoundingClientRect();
|
||||
}
|
||||
}, []);
|
||||
|
||||
const resizeCanvas = useCallback(() => {
|
||||
const canvas = canvasRef.current;
|
||||
const container = containerRef.current;
|
||||
@@ -146,10 +166,19 @@ export default function AnimatedBackgroundContainer({
|
||||
|
||||
const width = container.clientWidth;
|
||||
const height = container.clientHeight;
|
||||
const dpr = window.devicePixelRatio || 1;
|
||||
const dpr = Math.min(window.devicePixelRatio || 1, MAX_DEVICE_PIXEL_RATIO);
|
||||
const nextWidth = Math.round(width * dpr);
|
||||
const nextHeight = Math.round(height * dpr);
|
||||
|
||||
canvas.width = width * dpr;
|
||||
canvas.height = height * dpr;
|
||||
canvasSizeRef.current = { dpr, height, width };
|
||||
updateContainerRect();
|
||||
|
||||
if (canvas.width !== nextWidth) {
|
||||
canvas.width = nextWidth;
|
||||
}
|
||||
if (canvas.height !== nextHeight) {
|
||||
canvas.height = nextHeight;
|
||||
}
|
||||
canvas.style.width = `${width}px`;
|
||||
canvas.style.height = `${height}px`;
|
||||
|
||||
@@ -160,14 +189,10 @@ export default function AnimatedBackgroundContainer({
|
||||
|
||||
ctx.setTransform(1, 0, 0, 1, 0, 0);
|
||||
ctx.scale(dpr, dpr);
|
||||
|
||||
if (!mounted) {
|
||||
seedPositions();
|
||||
}
|
||||
}, [mounted, seedPositions]);
|
||||
seedPositions();
|
||||
}, [seedPositions, updateContainerRect]);
|
||||
|
||||
useEffect(() => {
|
||||
setMounted(true);
|
||||
isMobileRef.current = isMobileDevice();
|
||||
resizeCanvas();
|
||||
|
||||
@@ -176,25 +201,35 @@ export default function AnimatedBackgroundContainer({
|
||||
resizeCanvas();
|
||||
};
|
||||
|
||||
window.addEventListener("resize", handleResize);
|
||||
return () => window.removeEventListener("resize", handleResize);
|
||||
}, [resizeCanvas]);
|
||||
const resizeObserver =
|
||||
"ResizeObserver" in window
|
||||
? new ResizeObserver(() => {
|
||||
handleResize();
|
||||
})
|
||||
: null;
|
||||
|
||||
useEffect(() => {
|
||||
if (!mounted) {
|
||||
return;
|
||||
if (containerRef.current && resizeObserver) {
|
||||
resizeObserver.observe(containerRef.current);
|
||||
}
|
||||
|
||||
seedPositions();
|
||||
}, [mounted, seedPositions]);
|
||||
window.addEventListener("resize", handleResize);
|
||||
window.addEventListener("scroll", updateContainerRect, {
|
||||
capture: true,
|
||||
passive: true,
|
||||
});
|
||||
return () => {
|
||||
resizeObserver?.disconnect();
|
||||
window.removeEventListener("resize", handleResize);
|
||||
window.removeEventListener("scroll", updateContainerRect, { capture: true });
|
||||
};
|
||||
}, [resizeCanvas, updateContainerRect]);
|
||||
|
||||
const handleMouseMove = useCallback((event: MouseEvent) => {
|
||||
const container = containerRef.current;
|
||||
if (!container || isMobileRef.current) {
|
||||
const rect = containerRectRef.current;
|
||||
if (!rect || isMobileRef.current) {
|
||||
return;
|
||||
}
|
||||
|
||||
const rect = container.getBoundingClientRect();
|
||||
mousePosRef.current = {
|
||||
x: event.clientX - rect.left,
|
||||
y: event.clientY - rect.top,
|
||||
@@ -212,13 +247,8 @@ export default function AnimatedBackgroundContainer({
|
||||
}, [handleMouseMove]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!mounted) {
|
||||
return;
|
||||
}
|
||||
|
||||
const canvas = canvasRef.current;
|
||||
const container = containerRef.current;
|
||||
if (!canvas || !container) {
|
||||
if (!canvas) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -227,9 +257,25 @@ export default function AnimatedBackgroundContainer({
|
||||
return;
|
||||
}
|
||||
|
||||
const stopAnimation = () => {
|
||||
if (animationFrameRef.current !== null) {
|
||||
window.cancelAnimationFrame(animationFrameRef.current);
|
||||
animationFrameRef.current = null;
|
||||
}
|
||||
};
|
||||
|
||||
const draw = () => {
|
||||
const width = container.clientWidth;
|
||||
const height = container.clientHeight;
|
||||
if (!isVisibleRef.current || prefersReducedMotionRef.current) {
|
||||
animationFrameRef.current = null;
|
||||
return;
|
||||
}
|
||||
|
||||
const { height, width } = canvasSizeRef.current;
|
||||
if (width === 0 || height === 0) {
|
||||
animationFrameRef.current = window.requestAnimationFrame(draw);
|
||||
return;
|
||||
}
|
||||
|
||||
frameRef.current += 1;
|
||||
|
||||
if (isMobileRef.current) {
|
||||
@@ -241,14 +287,15 @@ export default function AnimatedBackgroundContainer({
|
||||
|
||||
const dx = mobileTargetRef.current.x - mobileAnchorRef.current.x;
|
||||
const dy = mobileTargetRef.current.y - mobileAnchorRef.current.y;
|
||||
if (Math.hypot(dx, dy) < 30) {
|
||||
if (Math.hypot(dx, dy) < MOBILE_TARGET_DISTANCE) {
|
||||
mobileTargetRef.current = {
|
||||
x: rand(width * 0.15, width * 0.85),
|
||||
y: rand(height * 0.15, height * 0.85),
|
||||
};
|
||||
}
|
||||
|
||||
smoothMouseRef.current = { ...mobileAnchorRef.current };
|
||||
smoothMouseRef.current.x = mobileAnchorRef.current.x;
|
||||
smoothMouseRef.current.y = mobileAnchorRef.current.y;
|
||||
} else {
|
||||
const desktopLerp = followSpeedRef.current;
|
||||
smoothMouseRef.current.x +=
|
||||
@@ -275,7 +322,13 @@ export default function AnimatedBackgroundContainer({
|
||||
|
||||
const edgeFade = Math.max(
|
||||
0,
|
||||
Math.min(x / 80, (width - x) / 80, y / 80, (height - y) / 80, 1),
|
||||
Math.min(
|
||||
x / EDGE_FADE_DISTANCE,
|
||||
(width - x) / EDGE_FADE_DISTANCE,
|
||||
y / EDGE_FADE_DISTANCE,
|
||||
(height - y) / EDGE_FADE_DISTANCE,
|
||||
1,
|
||||
),
|
||||
);
|
||||
|
||||
if (edgeFade <= 0) {
|
||||
@@ -293,15 +346,51 @@ export default function AnimatedBackgroundContainer({
|
||||
animationFrameRef.current = window.requestAnimationFrame(draw);
|
||||
};
|
||||
|
||||
animationFrameRef.current = window.requestAnimationFrame(draw);
|
||||
|
||||
return () => {
|
||||
if (animationFrameRef.current !== null) {
|
||||
window.cancelAnimationFrame(animationFrameRef.current);
|
||||
animationFrameRef.current = null;
|
||||
const startAnimation = () => {
|
||||
if (
|
||||
animationFrameRef.current === null &&
|
||||
isVisibleRef.current &&
|
||||
!prefersReducedMotionRef.current
|
||||
) {
|
||||
animationFrameRef.current = window.requestAnimationFrame(draw);
|
||||
}
|
||||
};
|
||||
}, [mounted]);
|
||||
|
||||
const handleVisibilityChange = () => {
|
||||
isVisibleRef.current = document.visibilityState === "visible";
|
||||
|
||||
if (isVisibleRef.current) {
|
||||
startAnimation();
|
||||
} else {
|
||||
stopAnimation();
|
||||
}
|
||||
};
|
||||
|
||||
const motionMedia = window.matchMedia("(prefers-reduced-motion: reduce)");
|
||||
const handleMotionChange = () => {
|
||||
prefersReducedMotionRef.current = motionMedia.matches;
|
||||
|
||||
if (prefersReducedMotionRef.current) {
|
||||
stopAnimation();
|
||||
ctx.clearRect(0, 0, canvasSizeRef.current.width, canvasSizeRef.current.height);
|
||||
} else {
|
||||
startAnimation();
|
||||
}
|
||||
};
|
||||
|
||||
isVisibleRef.current = document.visibilityState === "visible";
|
||||
prefersReducedMotionRef.current = motionMedia.matches;
|
||||
startAnimation();
|
||||
|
||||
document.addEventListener("visibilitychange", handleVisibilityChange);
|
||||
motionMedia.addEventListener("change", handleMotionChange);
|
||||
|
||||
return () => {
|
||||
document.removeEventListener("visibilitychange", handleVisibilityChange);
|
||||
motionMedia.removeEventListener("change", handleMotionChange);
|
||||
stopAnimation();
|
||||
};
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<div
|
||||
|
||||
53
src/app/_components/Form/Fields/IntInputFormField.tsx
Normal file
53
src/app/_components/Form/Fields/IntInputFormField.tsx
Normal file
@@ -0,0 +1,53 @@
|
||||
import type { ComponentProps } from "react";
|
||||
import type { Control, FieldValues, Path } from "react-hook-form";
|
||||
import { FormControl, FormField, FormItem, FormLabel } from "~/components/ui/form";
|
||||
import { Input } from "~/components/ui/input";
|
||||
|
||||
type IntInputFormFieldProps<T extends FieldValues> = Omit<
|
||||
ComponentProps<typeof Input>,
|
||||
"defaultValue" | "name" | "onChange" | "type" | "value"
|
||||
> & {
|
||||
control: Control<T>;
|
||||
emptyValue?: null | undefined;
|
||||
label: string;
|
||||
name: Path<T>;
|
||||
};
|
||||
|
||||
export default function IntInputFormField<T extends FieldValues>({
|
||||
control,
|
||||
emptyValue,
|
||||
label,
|
||||
name,
|
||||
...inputProps
|
||||
}: IntInputFormFieldProps<T>) {
|
||||
return (
|
||||
<FormField
|
||||
control={control}
|
||||
name={name}
|
||||
render={({ field }) => (
|
||||
<FormItem className="flex flex-col">
|
||||
<FormLabel>{label}</FormLabel>
|
||||
<FormControl>
|
||||
<Input
|
||||
{...inputProps}
|
||||
inputMode="numeric"
|
||||
onBlur={field.onBlur}
|
||||
onChange={(event) => {
|
||||
const value = event.currentTarget.value;
|
||||
|
||||
field.onChange(
|
||||
value === "" ? emptyValue : Number.parseInt(value, 10),
|
||||
);
|
||||
}}
|
||||
placeholder={inputProps.placeholder ?? name}
|
||||
ref={field.ref}
|
||||
step={inputProps.step ?? 1}
|
||||
type="number"
|
||||
value={field.value ?? ""}
|
||||
/>
|
||||
</FormControl>
|
||||
</FormItem>
|
||||
)}
|
||||
/>
|
||||
);
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
import type { CheckedState } from "@radix-ui/react-checkbox";
|
||||
import { ChevronDownIcon } from "lucide-react";
|
||||
import { createContext,useContext, useState } from "react";
|
||||
import { ScrollArea } from "~/components/ui/scroll-area";
|
||||
import { createContext,useContext, useState, type KeyboardEventHandler } from "react";
|
||||
import { useFormContext, type Control, type ControllerRenderProps, type FieldValues, type Path } from "react-hook-form";
|
||||
import type { Entries } from "type-fest";
|
||||
import { Button } from "~/components/ui/button";
|
||||
@@ -16,6 +17,7 @@ const MultiBooleanFieldContext = createContext<MultiBooleanFieldContextProps|und
|
||||
|
||||
function InnerMultiBooleanFormField(params: { options: string[], onChange: (arg0: string[]) => void }) {
|
||||
const context = useContext(MultiBooleanFieldContext)
|
||||
const [searchBuffer, setSearchBuffer] = useState<string>("")
|
||||
if (context === undefined) {
|
||||
return (<></>)
|
||||
}
|
||||
@@ -43,19 +45,40 @@ function InnerMultiBooleanFormField(params: { options: string[], onChange: (arg0
|
||||
}
|
||||
return context.checkedValues[key]
|
||||
}
|
||||
|
||||
const handleKeyDown:KeyboardEventHandler = (e) => {
|
||||
if (e.ctrlKey && e.key == "c") {
|
||||
setSearchBuffer("")
|
||||
} else if (e.code == "Backspace") {
|
||||
setSearchBuffer((prev) => {
|
||||
const newVal = prev.substring(0,prev.length - 2)
|
||||
console.log(newVal)
|
||||
return newVal
|
||||
})
|
||||
}
|
||||
|
||||
else if (e.key.length === 1) {
|
||||
setSearchBuffer((prev) => {
|
||||
const newVal = prev + e.key;
|
||||
console.log(newVal)
|
||||
return newVal;
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<ScrollArea onKeyDown={handleKeyDown} className="flex h-60">
|
||||
{
|
||||
params.options.map((opt) => (
|
||||
<FormItem key={opt}>
|
||||
<div className="flex flex-row justify-between py-2 border-b-1">
|
||||
opt.startsWith(searchBuffer) && <FormItem key={opt}>
|
||||
<div className="flex flex-row justify-between py-2 border-b">
|
||||
<FormLabel>{opt}</FormLabel>
|
||||
<Checkbox data-testid="multiboolean-checkbox" checked={checked(opt)} onCheckedChange={onCheckedItemChange(opt)} />
|
||||
</div>
|
||||
</FormItem>
|
||||
))
|
||||
}
|
||||
</>
|
||||
</ScrollArea>
|
||||
)
|
||||
}
|
||||
export default function MultiBooleanFormField<T extends FieldValues>(params: { control: Control<T>, name: Path<T>, label: string, options: string[], defaultValues?: string[] }) {
|
||||
@@ -76,9 +99,9 @@ export default function MultiBooleanFormField<T extends FieldValues>(params: { c
|
||||
</PopoverTrigger>
|
||||
<FormControl>
|
||||
<PopoverContent data-testid="multiboolean-content">
|
||||
<MultiBooleanFieldContext.Provider value={{checkedValues: checkedValues, setCheckedValue: setCheckedValues}}>
|
||||
<InnerMultiBooleanFormField onChange={field.onChange} options={params.options} />
|
||||
</MultiBooleanFieldContext.Provider>
|
||||
<MultiBooleanFieldContext.Provider value={{checkedValues: checkedValues, setCheckedValue: setCheckedValues}}>
|
||||
<InnerMultiBooleanFormField onChange={field.onChange} options={params.options} />
|
||||
</MultiBooleanFieldContext.Provider>
|
||||
</PopoverContent>
|
||||
</FormControl>
|
||||
</Popover>
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
export { default as BooleanFormField } from './BooleanFormField'
|
||||
export { default as TextInputFormField } from './TextInputFormField'
|
||||
export { default as IntInputFormField } from './IntInputFormField'
|
||||
export { default as MultiBooleanFormField } from './MultiBooleanFormField'
|
||||
export { default as SelectFormField } from './SelectFormField'
|
||||
export { default as MdeFormField } from './MdeFormField'
|
||||
|
||||
@@ -3,7 +3,7 @@ import type { inferRouterOutputs } from '@trpc/server';
|
||||
import { useUser } from '@clerk/nextjs'
|
||||
import { createContext, useContext, useEffect, useState, type ReactNode } from 'react'
|
||||
import { trpc } from '~/app/_trpc/Client'
|
||||
import { type ChatRouter } from '~/server/routers/chat'
|
||||
import type { ChatRouter } from '~/server/routers/chat'
|
||||
const MessageContext = createContext<{
|
||||
session?: inferRouterOutputs<ChatRouter>['getSession']
|
||||
messages?: inferRouterOutputs<ChatRouter>['getMessages']
|
||||
|
||||
@@ -6,8 +6,8 @@ import SimpleSidebarGroup from "~/components/ui/simple-sidebar-group";
|
||||
export default function AdminSideBar() {
|
||||
return (
|
||||
<>
|
||||
<Sidebar variant="floating" className="h-[96%] mt-10 z-[51]">
|
||||
<SidebarTrigger className="absolute z-[52] left-65 top-100" />
|
||||
<Sidebar variant="floating" className="h-full lg:h-[96%] lg:mt-10 z-51">
|
||||
<SidebarTrigger className="absolute z-52 left-65 top-100" />
|
||||
<SidebarContent>
|
||||
<ScrollArea>
|
||||
<SimpleSidebarGroup lable="CV">
|
||||
|
||||
100
src/app/admin/music/_components/ConvertToStreamButton.tsx
Normal file
100
src/app/admin/music/_components/ConvertToStreamButton.tsx
Normal file
@@ -0,0 +1,100 @@
|
||||
'use client'
|
||||
|
||||
import { useState } from "react";
|
||||
import { AudioLines, Loader2, RefreshCw } from "lucide-react";
|
||||
import { Button } from "~/components/ui/button";
|
||||
import { trpc } from "~/app/_trpc/Client";
|
||||
import { useUploadThing } from "~/lib/uploadthing";
|
||||
import { transcodeToAac } from "~/lib/ffmpeg/transcode";
|
||||
import { toast } from "sonner";
|
||||
import type { RouterOutputs } from "~/server/routers/_app";
|
||||
import type { IterableElement } from "type-fest";
|
||||
|
||||
export default function ConvertToStreamButton(props: {
|
||||
track: IterableElement<RouterOutputs['music']['list']>;
|
||||
}) {
|
||||
const { track } = props;
|
||||
const utils = trpc.useUtils();
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [stage, setStage] = useState("");
|
||||
const [progress, setProgress] = useState(0);
|
||||
|
||||
const setStream = trpc.music.setStream.useMutation({
|
||||
onSuccess: () => utils.music.list.invalidate(),
|
||||
});
|
||||
|
||||
const { startUpload } = useUploadThing("musicUploader");
|
||||
|
||||
async function handleConvert() {
|
||||
setBusy(true);
|
||||
setProgress(0);
|
||||
let currentStage = "Loading ffmpeg";
|
||||
const goto = (s: string) => {
|
||||
currentStage = s;
|
||||
setStage(s);
|
||||
};
|
||||
try {
|
||||
goto("Transcoding");
|
||||
const file = await transcodeToAac({
|
||||
sourceUrl: track.fileUrl,
|
||||
outputName: `${track.title || "track"}.m4a`,
|
||||
onProgress: setProgress,
|
||||
});
|
||||
|
||||
goto("Uploading");
|
||||
const uploaded = await startUpload([file]);
|
||||
const res = uploaded?.[0];
|
||||
if (!res) throw new Error("Upload returned no file");
|
||||
|
||||
goto("Saving");
|
||||
await setStream.mutateAsync({
|
||||
id: track.id,
|
||||
streamUrl: res.serverData.fileUrl,
|
||||
streamKey: res.serverData.fileKey,
|
||||
streamName: res.serverData.fileName,
|
||||
});
|
||||
toast("Streaming version saved");
|
||||
} catch (e) {
|
||||
console.error("[ConvertToStream] failed during", currentStage, e);
|
||||
const detail =
|
||||
e instanceof Error
|
||||
? e.message
|
||||
: typeof e === "string"
|
||||
? e
|
||||
: (() => {
|
||||
try {
|
||||
return JSON.stringify(e);
|
||||
} catch {
|
||||
return String(e);
|
||||
}
|
||||
})();
|
||||
toast(`Conversion failed (${currentStage}): ${detail || "see console for details"}`);
|
||||
} finally {
|
||||
setBusy(false);
|
||||
setStage("");
|
||||
setProgress(0);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="flex items-center gap-2">
|
||||
<Button type="button" variant="outline" size="sm" disabled={busy} onClick={handleConvert}>
|
||||
{busy ? (
|
||||
<Loader2 className="animate-spin" />
|
||||
) : track.streamUrl ? (
|
||||
<RefreshCw />
|
||||
) : (
|
||||
<AudioLines />
|
||||
)}
|
||||
{busy
|
||||
? `${stage}${stage === "Transcoding" && progress ? ` ${Math.round(progress * 100)}%` : "…"}`
|
||||
: track.streamUrl
|
||||
? "Re-generate stream"
|
||||
: "Generate stream (AAC)"}
|
||||
</Button>
|
||||
{track.streamUrl && !busy && (
|
||||
<span className="text-xs text-muted-foreground">Streaming version ready</span>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -3,6 +3,7 @@
|
||||
import { trpc } from "~/app/_trpc/Client";
|
||||
import * as Card from "~/components/ui/card";
|
||||
import UploadMusicForm from "./_components/UploadMusicForm";
|
||||
import ConvertToStreamButton from "./_components/ConvertToStreamButton";
|
||||
import { CollapsibleForm } from "~/app/_components/Form/Components";
|
||||
import { useEffect } from "react";
|
||||
|
||||
@@ -14,8 +15,9 @@ export default function AdminMusicPage() {
|
||||
{tracks && <>
|
||||
{tracks.map((t) => (
|
||||
<Card.Card key={t.id}>
|
||||
<Card.CardContent>
|
||||
<Card.CardContent className="flex flex-col gap-4">
|
||||
<UploadMusicForm entity={t} className="w-full"/>
|
||||
<ConvertToStreamButton track={t} />
|
||||
</Card.CardContent>
|
||||
</Card.Card>
|
||||
))}
|
||||
|
||||
@@ -8,7 +8,7 @@ import type { IterableElement } from 'type-fest'
|
||||
import { entitySchemas, makeOnSuccess } from "~/lib/utils";
|
||||
import { useEffect, useState } from "react";
|
||||
import type { RouterOutputs } from '~/server/routers/_app';
|
||||
import { SelectFormField, TextInputFormField, MdeFormField } from '~/app/_components/Form/Fields'
|
||||
import { SelectFormField, TextInputFormField, MdeFormField, IntInputFormField } from '~/app/_components/Form/Fields'
|
||||
import { FormScaffold } from '~/app/_components/Form/Components';
|
||||
import { usePathname, useRouter } from 'next/navigation';
|
||||
import { useTheme } from 'next-themes';
|
||||
@@ -29,7 +29,8 @@ export default function CreateUpdateProjectForm(params: { className?: string, en
|
||||
releaseStatus: params.entity ? params.entity.releaseStatus : "unreleased",
|
||||
releaseLink: params.entity ? params.entity.releaseLink : "",
|
||||
sourceType: params.entity ? params.entity.sourceType : "open",
|
||||
sourceLink: params.entity ? params.entity.sourceLink : ""
|
||||
sourceLink: params.entity ? params.entity.sourceLink : "",
|
||||
orderPos: params.entity ? params.entity.orderPos : 0
|
||||
}
|
||||
})
|
||||
let path = usePathname()
|
||||
@@ -79,6 +80,7 @@ export default function CreateUpdateProjectForm(params: { className?: string, en
|
||||
<SelectItem value="unreleased"> unreleased </SelectItem>
|
||||
</SelectFormField>
|
||||
<TextInputFormField control={form.control} label='Release Link' name='releaseLink' />
|
||||
<IntInputFormField control={form.control} label='Order Position' name='orderPos'/>
|
||||
</FormScaffold>
|
||||
</FormMutationContextProvider>
|
||||
)
|
||||
|
||||
@@ -46,7 +46,7 @@ export default function CreateUpdateStackForm(params: { className?: string, enti
|
||||
id={id}
|
||||
className={params.className}
|
||||
>
|
||||
<MultiBooleanFormField control={form.control} name='stackItems' label='Stack Items' options={stackItemEnum.enumValues} defaultValues={params.entity?.stackItems ?? [""]} />
|
||||
<MultiBooleanFormField control={form.control} name='stackItems' label='Stack Items' options={stackItemEnum.enumValues} defaultValues={params.entity?.stackItems ?? []} />
|
||||
</FormScaffold>
|
||||
</FormMutationContextProvider>
|
||||
</>
|
||||
|
||||
@@ -16,7 +16,7 @@ export const AssistantMessage = (props: { message: UIMessage }) => {
|
||||
{message.parts.map((part, i) => {
|
||||
if (part.type === 'text') {
|
||||
return (
|
||||
<Markdown>
|
||||
<Markdown key={crypto.randomUUID()}>
|
||||
{part.text}
|
||||
</Markdown>
|
||||
)
|
||||
|
||||
@@ -7,6 +7,8 @@ import type { RouterOutputs } from "~/server/routers/_app"
|
||||
import { cn } from "~/lib/utils"
|
||||
import { Card, CardContent, CardHeader, CardTitle } from "~/components/ui/card"
|
||||
import type { ArrayElement } from "type-fest"
|
||||
import AnimatePopUp from "~/app/_components/Animated/AnimatePopUp";
|
||||
import { ScrollArea } from "~/components/ui/scroll-area";
|
||||
type CvCategoryProps = {
|
||||
initialData: ArrayElement<RouterOutputs['categoryv2']['listByLayoutPosition']>,
|
||||
layout: "row"|"col",
|
||||
@@ -14,18 +16,23 @@ type CvCategoryProps = {
|
||||
}
|
||||
export default function CvCategory(props:CvCategoryProps) {
|
||||
const category = trpc.categoryv2.getById.useQuery(props.initialData? props.initialData.id : "");
|
||||
const entries = trpc.entryv2.byCategoryAndToDateDescending.useQuery(category.data?.id || "")
|
||||
return (
|
||||
<Card className={cn(props.layout == "row" ? "w-full" : "","gsapan")}>
|
||||
<Card className={cn(props.layout == "row" ? "w-full" : "","gsapan", "h-screen")}>
|
||||
<CardHeader>
|
||||
<CardTitle>
|
||||
{category.data?.name}
|
||||
</CardTitle>
|
||||
</CardHeader>
|
||||
{(category.data?.cvEntry.length ? category.data?.cvEntry.length : 0 ) > 0 ?
|
||||
{(entries.data?.length ? entries.data?.length : 0 ) > 0 ?
|
||||
<CardContent className={cn(props.layout == "row" ? "flex flex-row flex-wrap justify-center lg:justify-between" : "flex flex-col","gap-4","overflow-scroll")}>
|
||||
{category.data?.cvEntry.map((entry) => (
|
||||
<CvEntry className={props.layout == "row" ? "w-full lg:w-fit" : undefined} key={entry.id} initialData={entry}/>
|
||||
<ScrollArea>
|
||||
{entries.data?.map((entry,i) => (
|
||||
<AnimatePopUp position={i}key={entry.id}>
|
||||
<CvEntry className={props.layout == "row" ? "w-full lg:w-fit" : undefined} initialData={entry}/>
|
||||
</AnimatePopUp>
|
||||
))}
|
||||
</ScrollArea>
|
||||
</CardContent>
|
||||
:
|
||||
<></>
|
||||
|
||||
@@ -30,9 +30,9 @@ export default function CvEntry(params: {
|
||||
{
|
||||
data.description ?
|
||||
<CardContent className="text-sm lg:text-base">
|
||||
<div>
|
||||
<article className="prose prose-zinc dark:prose-invert max-w-none">
|
||||
<Markdown rehypePlugins={[rehypeHighlight, rehypeRaw]}>{data.description}</Markdown>
|
||||
</div>
|
||||
</article>
|
||||
</CardContent> :
|
||||
<></>
|
||||
}
|
||||
|
||||
125
src/app/music/_components/AudioPlayer.tsx
Normal file
125
src/app/music/_components/AudioPlayer.tsx
Normal file
@@ -0,0 +1,125 @@
|
||||
'use client'
|
||||
|
||||
import { useRef, useState } from "react";
|
||||
import { Download, Loader2, Pause, Play } from "lucide-react";
|
||||
import { Slider } from "~/components/ui/slider";
|
||||
import { Button } from "~/components/ui/button";
|
||||
import { toast } from "sonner";
|
||||
|
||||
function formatTime(seconds: number) {
|
||||
if (!Number.isFinite(seconds)) return "0:00";
|
||||
const m = Math.floor(seconds / 60);
|
||||
const s = Math.floor(seconds % 60);
|
||||
return `${m}:${s.toString().padStart(2, "0")}`;
|
||||
}
|
||||
|
||||
export default function AudioPlayer(props: {
|
||||
/** Streaming-friendly source the player actually plays. */
|
||||
src: string;
|
||||
/** Original high-quality file offered via the download button. */
|
||||
downloadUrl: string;
|
||||
downloadName: string;
|
||||
}) {
|
||||
const audioRef = useRef<HTMLAudioElement>(null);
|
||||
const [playing, setPlaying] = useState(false);
|
||||
const [current, setCurrent] = useState(0);
|
||||
const [duration, setDuration] = useState(0);
|
||||
const [seeking, setSeeking] = useState(false);
|
||||
const [downloading, setDownloading] = useState(false);
|
||||
|
||||
function togglePlay() {
|
||||
const audio = audioRef.current;
|
||||
if (!audio) return;
|
||||
if (audio.paused) {
|
||||
audio.play();
|
||||
} else {
|
||||
audio.pause();
|
||||
}
|
||||
}
|
||||
|
||||
async function handleDownload() {
|
||||
setDownloading(true);
|
||||
try {
|
||||
// The download file is cross-origin, so the <a download> attribute is
|
||||
// ignored — fetch it as a blob to force a real download.
|
||||
const res = await fetch(props.downloadUrl);
|
||||
if (!res.ok) throw new Error(`HTTP ${res.status}`);
|
||||
const blob = await res.blob();
|
||||
const url = URL.createObjectURL(blob);
|
||||
const a = document.createElement("a");
|
||||
a.href = url;
|
||||
a.download = props.downloadName;
|
||||
document.body.appendChild(a);
|
||||
a.click();
|
||||
a.remove();
|
||||
URL.revokeObjectURL(url);
|
||||
} catch (e) {
|
||||
toast(`Download failed: ${e instanceof Error ? e.message : "unknown error"}`);
|
||||
} finally {
|
||||
setDownloading(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="flex items-center gap-3 rounded-lg border bg-transparent px-3 py-2">
|
||||
<audio
|
||||
ref={audioRef}
|
||||
src={props.src}
|
||||
preload="metadata"
|
||||
onPlay={() => setPlaying(true)}
|
||||
onPause={() => setPlaying(false)}
|
||||
onLoadedMetadata={(e) => setDuration(e.currentTarget.duration)}
|
||||
onTimeUpdate={(e) => {
|
||||
if (!seeking) setCurrent(e.currentTarget.currentTime);
|
||||
}}
|
||||
onEnded={() => setPlaying(false)}
|
||||
/>
|
||||
|
||||
<Button
|
||||
type="button"
|
||||
size="icon"
|
||||
variant="ghost"
|
||||
aria-label={playing ? "Pause" : "Play"}
|
||||
onClick={togglePlay}
|
||||
>
|
||||
{playing ? <Pause /> : <Play />}
|
||||
</Button>
|
||||
|
||||
<span className="w-10 shrink-0 text-right font-mono text-xs text-muted-foreground tabular-nums">
|
||||
{formatTime(current)}
|
||||
</span>
|
||||
|
||||
<Slider
|
||||
className="flex-1"
|
||||
min={0}
|
||||
max={duration || 1}
|
||||
step={0.1}
|
||||
value={[current]}
|
||||
onValueChange={([v]) => {
|
||||
setSeeking(true);
|
||||
setCurrent(v ?? 0);
|
||||
}}
|
||||
onValueCommit={([v]) => {
|
||||
if (audioRef.current) audioRef.current.currentTime = v ?? 0;
|
||||
setSeeking(false);
|
||||
}}
|
||||
/>
|
||||
|
||||
<span className="w-10 shrink-0 font-mono text-xs text-muted-foreground tabular-nums">
|
||||
{formatTime(duration)}
|
||||
</span>
|
||||
|
||||
<Button
|
||||
type="button"
|
||||
size="icon"
|
||||
variant="ghost"
|
||||
aria-label="Download lossless file"
|
||||
title="Download lossless file"
|
||||
disabled={downloading}
|
||||
onClick={handleDownload}
|
||||
>
|
||||
{downloading ? <Loader2 className="animate-spin" /> : <Download />}
|
||||
</Button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -7,6 +7,7 @@ import { Spinner } from "~/components/ui/spinner";
|
||||
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)
|
||||
@@ -41,9 +42,11 @@ export default function MusicPage() {
|
||||
<p className="text-sm text-muted-foreground gsapant">{track.description}</p>
|
||||
)}
|
||||
<AnimatePopUp position={i + 1.3}>
|
||||
<audio controls className="w-full player" src={track.fileUrl}>
|
||||
Your browser does not support the audio element.
|
||||
</audio>
|
||||
<AudioPlayer
|
||||
src={track.streamUrl ?? track.fileUrl}
|
||||
downloadUrl={track.fileUrl}
|
||||
downloadName={track.fileName}
|
||||
/>
|
||||
</AnimatePopUp>
|
||||
</Card.CardContent>
|
||||
</Card.AnimatedCard>
|
||||
|
||||
@@ -125,6 +125,30 @@ const STACK_META: Record<string, { label: string; icon?: SvglIcon }> = {
|
||||
dark: "https://svgl.app/library/neon.svg",
|
||||
},
|
||||
},
|
||||
typescript: {
|
||||
label: "TypeScript",
|
||||
icon: {
|
||||
light: "https://svgl.app/library/typescript.svg",
|
||||
dark: "https://svgl.app/library/typescript.svg",
|
||||
},
|
||||
},
|
||||
javafx: { label: "JavaFX" },
|
||||
x11: { label: "X11" },
|
||||
zig: {
|
||||
label: "Zig",
|
||||
icon: {
|
||||
light: "https://svgl.app/library/zig.svg",
|
||||
dark: "https://svgl.app/library/zig.svg",
|
||||
},
|
||||
},
|
||||
libghostty: { label: "libghostty" },
|
||||
zod: {
|
||||
label: "Zod",
|
||||
icon: {
|
||||
light: "https://svgl.app/library/zod.svg",
|
||||
dark: "https://svgl.app/library/zod.svg",
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
export function StackBadge({ item }: { item: string }) {
|
||||
|
||||
114
src/lib/ffmpeg/transcode.ts
Normal file
114
src/lib/ffmpeg/transcode.ts
Normal file
@@ -0,0 +1,114 @@
|
||||
import { FFmpeg } from "@ffmpeg/ffmpeg";
|
||||
import { fetchFile, toBlobURL } from "@ffmpeg/util";
|
||||
|
||||
// Single-threaded core: works without SharedArrayBuffer, so no COOP/COEP
|
||||
// cross-origin-isolation headers are required. Slower than the MT core, which
|
||||
// is fine for occasional admin-side transcodes.
|
||||
const CORE_VERSION = "0.12.10";
|
||||
// @ffmpeg/ffmpeg 0.12.x always spawns a `type: "module"` worker. A module
|
||||
// worker can't `importScripts`, so the worker dynamically `import()`s the core —
|
||||
// which means the core must be the ESM build, not UMD.
|
||||
const CORE_BASE = `https://unpkg.com/@ffmpeg/core@${CORE_VERSION}/dist/esm`;
|
||||
// Self-hosted worker, bundled from @ffmpeg/ffmpeg's ESM `worker.js` via the
|
||||
// `build:ffmpeg-worker` package script (rerun it when bumping @ffmpeg/ffmpeg).
|
||||
// The shipped UMD worker is unusable here: its
|
||||
// dynamic import is webpack-compiled into a stub that throws MODULE_NOT_FOUND,
|
||||
// and letting Next bundle the worker hits the same problem. Serving our own
|
||||
// same-origin module worker keeps the native `import()` intact.
|
||||
// Must be an absolute URL: the library resolves classWorkerURL against
|
||||
// `import.meta.url`, which is a file:// base under Next, so a root-relative path
|
||||
// would wrongly become `file:///ffmpeg/worker.js`.
|
||||
const WORKER_PATH = "/ffmpeg/worker.js";
|
||||
|
||||
let instance: FFmpeg | null = null;
|
||||
let loadPromise: Promise<FFmpeg> | null = null;
|
||||
|
||||
function load(onLog?: (msg: string) => void): Promise<FFmpeg> {
|
||||
if (instance) return Promise.resolve(instance);
|
||||
if (!loadPromise) {
|
||||
loadPromise = (async () => {
|
||||
const ffmpeg = new FFmpeg();
|
||||
ffmpeg.on("log", ({ message }) => {
|
||||
console.debug("[ffmpeg]", message);
|
||||
onLog?.(message);
|
||||
});
|
||||
const ok = await ffmpeg.load({
|
||||
coreURL: await toBlobURL(`${CORE_BASE}/ffmpeg-core.js`, "text/javascript"),
|
||||
wasmURL: await toBlobURL(`${CORE_BASE}/ffmpeg-core.wasm`, "application/wasm"),
|
||||
classWorkerURL: new URL(WORKER_PATH, window.location.origin).href,
|
||||
});
|
||||
if (!ok) throw new Error("ffmpeg.load() returned false — core failed to initialise");
|
||||
instance = ffmpeg;
|
||||
return ffmpeg;
|
||||
})();
|
||||
// If loading fails, clear the cached promise so the next click retries.
|
||||
loadPromise.catch(() => {
|
||||
loadPromise = null;
|
||||
});
|
||||
}
|
||||
return loadPromise;
|
||||
}
|
||||
|
||||
/**
|
||||
* Transcodes a (FLAC) source URL to a streaming-friendly AAC/m4a file in the
|
||||
* browser. Returns a File ready to hand to UploadThing's startUpload.
|
||||
*/
|
||||
export async function transcodeToAac(opts: {
|
||||
sourceUrl: string;
|
||||
outputName?: string;
|
||||
bitrate?: string;
|
||||
onProgress?: (ratio: number) => void;
|
||||
onLog?: (msg: string) => void;
|
||||
}): Promise<File> {
|
||||
let lastLog = "";
|
||||
const onLog = (msg: string) => {
|
||||
if (msg.trim()) lastLog = msg;
|
||||
opts.onLog?.(msg);
|
||||
};
|
||||
const ffmpeg = await load(onLog);
|
||||
// `load` only wires the persisted instance's log handler on first init; make
|
||||
// sure this call's logs are captured even when the instance was cached.
|
||||
const logHandler = ({ message }: { message: string }) => onLog(message);
|
||||
ffmpeg.on("log", logHandler);
|
||||
const progressHandler = opts.onProgress
|
||||
? ({ progress }: { progress: number }) =>
|
||||
opts.onProgress?.(Math.min(1, Math.max(0, progress)))
|
||||
: null;
|
||||
if (progressHandler) ffmpeg.on("progress", progressHandler);
|
||||
try {
|
||||
// fetchFile pulls the source cross-origin; surface a clear message if the
|
||||
// host (UploadThing) blocks it.
|
||||
let sourceData: Uint8Array;
|
||||
try {
|
||||
sourceData = await fetchFile(opts.sourceUrl);
|
||||
} catch (e) {
|
||||
throw new Error(
|
||||
`Could not fetch source file (CORS or network): ${e instanceof Error ? e.message : String(e)}`,
|
||||
);
|
||||
}
|
||||
await ffmpeg.writeFile("input.flac", sourceData);
|
||||
const code = await ffmpeg.exec([
|
||||
"-i", "input.flac",
|
||||
"-c:a", "aac",
|
||||
"-b:a", opts.bitrate ?? "192k",
|
||||
// Move the moov atom to the front so the player can start before the
|
||||
// whole file has downloaded — the whole point of the stream version.
|
||||
"-movflags", "+faststart",
|
||||
"output.m4a",
|
||||
]);
|
||||
if (code !== 0) {
|
||||
throw new Error(`ffmpeg exited with code ${code}: ${lastLog || "no log output"}`);
|
||||
}
|
||||
const data = await ffmpeg.readFile("output.m4a");
|
||||
await ffmpeg.deleteFile("input.flac");
|
||||
await ffmpeg.deleteFile("output.m4a");
|
||||
// Copy into a fresh ArrayBuffer-backed view so the Blob typing is happy
|
||||
// (readFile may be typed against a SharedArrayBuffer-backed Uint8Array).
|
||||
const bytes = new Uint8Array(data as Uint8Array);
|
||||
const blob = new Blob([bytes], { type: "audio/mp4" });
|
||||
return new File([blob], opts.outputName ?? "stream.m4a", { type: "audio/mp4" });
|
||||
} finally {
|
||||
ffmpeg.off("log", logHandler);
|
||||
if (progressHandler) ffmpeg.off("progress", progressHandler);
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,9 @@ export const createMusicInputSchema = z.object({
|
||||
fileUrl: z.string(),
|
||||
fileKey: z.string(),
|
||||
fileName: z.string(),
|
||||
streamUrl: z.string().optional().nullable(),
|
||||
streamKey: z.string().optional().nullable(),
|
||||
streamName: z.string().optional().nullable(),
|
||||
})
|
||||
export const updateMusicInputSchema = z.object({
|
||||
id: z.string().uuid(),
|
||||
@@ -15,4 +18,14 @@ export const updateMusicInputSchema = z.object({
|
||||
fileUrl: z.string().optional(),
|
||||
fileKey: z.string().optional(),
|
||||
fileName: z.string().optional(),
|
||||
streamUrl: z.string().optional().nullable(),
|
||||
streamKey: z.string().optional().nullable(),
|
||||
streamName: z.string().optional().nullable(),
|
||||
})
|
||||
|
||||
export const setStreamInputSchema = z.object({
|
||||
id: z.string().uuid(),
|
||||
streamUrl: z.string(),
|
||||
streamKey: z.string(),
|
||||
streamName: z.string(),
|
||||
})
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
import { generateUploadButton, generateUploadDropzone } from "@uploadthing/react";
|
||||
import { generateReactHelpers, generateUploadButton, generateUploadDropzone } from "@uploadthing/react";
|
||||
import type { FileRouter } from "~/server/uploadthing";
|
||||
|
||||
export const UploadButton = generateUploadButton<FileRouter>();
|
||||
export const UploadDropzone = generateUploadDropzone<FileRouter>();
|
||||
|
||||
export const { useUploadThing } = generateReactHelpers<FileRouter>();
|
||||
|
||||
@@ -43,6 +43,7 @@ export const cvEntry = createTable(
|
||||
.default(sql`CURRENT_TIMESTAMP`)
|
||||
.notNull().$type<Date>(),
|
||||
updatedAt: d.timestamp({ withTimezone: true }).$onUpdate(() => new Date()).$type<Date>(),
|
||||
position: d.integer(),
|
||||
})
|
||||
)
|
||||
|
||||
@@ -55,7 +56,7 @@ export const cvEntryRelations = relations(cvEntry, ({one}) => ({
|
||||
|
||||
export const sourceTypeEnum = pgEnum('source_type',['open','closed'])
|
||||
export const releaseStatus = pgEnum('release_status',['released','unreleased'])
|
||||
export const stackItemEnum = pgEnum('stack_item',['drizzle','postgres','nextjs','react','servercomponents','php','laravel','reactnative','expo','mysql','nginx','protobuf','grpc','java','graalvm','spring','aws','s3','react-native','linux','debian','htmx','neon'])
|
||||
export const stackItemEnum = pgEnum('stack_item',['drizzle','postgres','nextjs','react','servercomponents','php','laravel','reactnative','expo','mysql','nginx','protobuf','grpc','java','graalvm','spring','aws','s3','react-native','linux','debian','htmx','neon','typescript','javafx','x11','zig','libghostty','zod'])
|
||||
|
||||
export const project = createTable(
|
||||
"project",
|
||||
@@ -68,6 +69,7 @@ export const project = createTable(
|
||||
releaseStatus: releaseStatus(),
|
||||
releaseLink: d.varchar({length: 200}),
|
||||
stackId: d.uuid(),
|
||||
orderPos: d.integer(),
|
||||
})
|
||||
)
|
||||
|
||||
@@ -92,9 +94,14 @@ export const music = createTable(
|
||||
id: d.uuid().primaryKey().notNull(),
|
||||
title: d.varchar({ length: 100 }).notNull(),
|
||||
description: d.text(),
|
||||
// Original high-quality upload (e.g. FLAC), offered as a download.
|
||||
fileUrl: d.varchar("file_url", { length: 500 }).notNull(),
|
||||
fileKey: d.varchar("file_key", { length: 200 }).notNull(),
|
||||
fileName: d.varchar("file_name", { length: 200 }).notNull(),
|
||||
// Lighter, streaming-friendly transcode (e.g. AAC) used by the player.
|
||||
streamUrl: d.varchar("stream_url", { length: 500 }),
|
||||
streamKey: d.varchar("stream_key", { length: 200 }),
|
||||
streamName: d.varchar("stream_name", { length: 200 }),
|
||||
createdAt: d
|
||||
.timestamp({ withTimezone: true })
|
||||
.default(sql`CURRENT_TIMESTAMP`)
|
||||
|
||||
@@ -15,9 +15,6 @@ export const cvCategoryRouter = router({
|
||||
}),
|
||||
getById: publicProcedure.input(z.string()).query(async ({input}) => {
|
||||
const res = await db.query.cvCategory.findFirst({
|
||||
with: {
|
||||
cvEntry: true
|
||||
},
|
||||
where(fields, operators) {
|
||||
return operators.eq(fields.id, input)
|
||||
},
|
||||
|
||||
@@ -13,4 +13,14 @@ export const cvEntryRouter = router({
|
||||
})
|
||||
return res;
|
||||
}),
|
||||
byCategoryAndToDateDescending: publicProcedure.input(z.string()).query(async ({input}) => {
|
||||
const res = await db.query.cvEntry.findMany({
|
||||
with: {
|
||||
category: true
|
||||
},
|
||||
where: (fields, {eq}) => eq(fields.categoryId,input),
|
||||
orderBy: (t,{desc}) => desc(t.toTime),
|
||||
})
|
||||
return res;
|
||||
})
|
||||
});
|
||||
|
||||
@@ -5,7 +5,7 @@ import { eq } from "drizzle-orm";
|
||||
import { isAdmin } from "~/app/actions";
|
||||
import { TRPCError } from "@trpc/server";
|
||||
import { z } from "zod";
|
||||
import { createMusicInputSchema, updateMusicInputSchema } from "~/lib/trpc/music/schemas";
|
||||
import { createMusicInputSchema, updateMusicInputSchema, setStreamInputSchema } from "~/lib/trpc/music/schemas";
|
||||
import { utapi } from "../uploadthing";
|
||||
export const musicRouter = router({
|
||||
list: publicProcedure.query(async () => {
|
||||
@@ -33,6 +33,22 @@ export const musicRouter = router({
|
||||
const { id, ...data } = input;
|
||||
return db.update(music).set(data).where(eq(music.id, id)).returning();
|
||||
}),
|
||||
setStream: publicProcedure
|
||||
.input(setStreamInputSchema)
|
||||
.mutation(async ({ input }) => {
|
||||
const admin = await isAdmin();
|
||||
if (!admin) throw new TRPCError({ code: "FORBIDDEN", message: "Access denied" });
|
||||
const { id, ...data } = input;
|
||||
const existing = await db.select().from(music).where(eq(music.id, id)).limit(1);
|
||||
const prev = existing.at(0);
|
||||
if (!prev) throw new TRPCError({ code: "NOT_FOUND", message: "Track not found" });
|
||||
const res = await db.update(music).set(data).where(eq(music.id, id)).returning();
|
||||
// Drop the previous stream transcode so we don't orphan it on UploadThing.
|
||||
if (prev.streamKey && prev.streamKey !== data.streamKey) {
|
||||
utapi.deleteFiles(prev.streamKey);
|
||||
}
|
||||
return res.at(0);
|
||||
}),
|
||||
delete: publicProcedure
|
||||
.input(z.object({id:z.string().uuid()}))
|
||||
.mutation(async ({ input }) => {
|
||||
@@ -41,7 +57,8 @@ export const musicRouter = router({
|
||||
let res = await db.delete(music).where(eq(music.id, input.id)).returning();
|
||||
let ret = res.at(0)
|
||||
if (ret) {
|
||||
utapi.deleteFiles(ret.fileKey)
|
||||
const keys = [ret.fileKey, ret.streamKey].filter((k): k is string => !!k);
|
||||
utapi.deleteFiles(keys)
|
||||
}
|
||||
return ret;
|
||||
}),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { publicProcedure, router } from "~/server/trpc";
|
||||
import { db } from "~/server/db";
|
||||
import { publicProcedure, router } from "~/server/trpc";
|
||||
|
||||
type ReadmeRequest = {
|
||||
url: string;
|
||||
@@ -71,6 +71,11 @@ async function fetchReadme(sourceLink: string) {
|
||||
export const projectRouter = router({
|
||||
listWithStack: publicProcedure.query(async () => {
|
||||
const projects = await db.query.project.findMany({
|
||||
orderBy: (project, { asc }) => [
|
||||
asc(project.orderPos),
|
||||
asc(project.title),
|
||||
asc(project.id),
|
||||
],
|
||||
with: {
|
||||
techStack: true,
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user