diff --git a/packages/next/app/components/archive-progress.tsx b/packages/next/app/components/archive-progress.tsx index bf2c6ef..61dcf56 100644 --- a/packages/next/app/components/archive-progress.tsx +++ b/packages/next/app/components/archive-progress.tsx @@ -10,14 +10,17 @@ export default async function ArchiveProgress ({ vtuber }: IArchiveProgressProps // // Check if totalStreams is not zero before calculating completedPercentage // const completedPercentage = (totalStreams !== 0) ? Math.round(eligibleStreams / totalStreams * 100) : 0; - const totalStreams = await getStreamCountForVtuber(vtuber.id); - const eligibleStreams = await getStreamCountForVtuber(vtuber.id, ['good', 'issue']); + const goodStreams = await getStreamCountForVtuber(vtuber.id, ['good']) + const issueStreams = await getStreamCountForVtuber(vtuber.id, ['issue']) + const totalStreams = await getStreamCountForVtuber(vtuber.id) + const eligibleStreams = goodStreams+issueStreams const completedPercentage = (eligibleStreams / totalStreams) * 100 return (
{/*

{totalStreams} known streams
- {eligibleStreams} archived
+ {goodStreams} streams archived
+ {issueStreams} streams with issues

*/}

{eligibleStreams}/{totalStreams} Streams Archived ({completedPercentage}%)

{completedPercentage}% diff --git a/packages/next/app/components/funding-goal.tsx b/packages/next/app/components/funding-goal.tsx index 9b2adc7..a688a8e 100644 --- a/packages/next/app/components/funding-goal.tsx +++ b/packages/next/app/components/funding-goal.tsx @@ -38,7 +38,11 @@ export default async function FundingGoal(): Promise { Funding Goal
- CJ_Clippy + CJ_Clippy
diff --git a/packages/next/app/components/streams-table.tsx b/packages/next/app/components/streams-table.tsx index df78e9f..a8b352b 100644 --- a/packages/next/app/components/streams-table.tsx +++ b/packages/next/app/components/streams-table.tsx @@ -81,7 +81,7 @@ export default function StreamsTable() { } }, { - header: 'Date2', + header: 'Date', accessorFn: d => format(new Date(d.attributes.date2), 'yyyy-MM-dd HH:mm'), // accessorFn: d => new Date(d.attributes.date2), sortingFn: 'datetime', diff --git a/packages/next/app/components/vod-card.tsx b/packages/next/app/components/vod-card.tsx index 07021cd..c20f58a 100644 --- a/packages/next/app/components/vod-card.tsx +++ b/packages/next/app/components/vod-card.tsx @@ -35,7 +35,7 @@ export default function VodCard({id, title, date, muxAsset, thumbnail = 'https:/ alt={title} placeholder="blur" blurDataURL={vtuber.attributes.imageBlur} - fill={true} + layout="fill" style={{ objectFit: 'cover', }} diff --git a/t.wip.tiltfile b/t.wip.tiltfile index 0353546..9fe14d8 100644 --- a/t.wip.tiltfile +++ b/t.wip.tiltfile @@ -6,6 +6,7 @@ load('ext://dotenv', 'dotenv') dotenv(fn='.env') +default_registry('localhost:5001') # kubefwd all namespaces Tilt deploys to. @@ -229,10 +230,18 @@ docker_build( 'fp/scout-worker', '.', only=['./pnpm-lock.yaml', './package.json', './packages/scout', './packages/next'], + # ignore=['./packages/next'], dockerfile='d.scout.dockerfile', target='worker', + # cache_from='localhost:5001', live_update=[ sync('./packages/scout', '/app'), + ## this is a hack to avoid complete scout image rebuilds when src in ./packages/next is updated + ## ./packages/next needs to be in the build context because scout depends on types exported from next module (a feature of pnpm workspaces) + ## instead of a full rebuild, we put ./packages/next in the live_update spec so the changed files get shoved into /ignore-me + ## ideally, I would like to include ./packages/next in the build context, but ignore file changes there for rebuilds. + ## however, I don't think tilt has this capability. + sync('./packages/next', '/ignore-me'), run('cd /app && pnpm i', trigger=['./packages/scout/package.json', './packages/scout/pnpm-lock.yaml']), ], entrypoint='pnpm nodemon --ext js,ts,json,yaml --exec node --no-warnings=ExperimentalWarning --loader ts-node/esm ./src/temporal/worker.ts'