From a7e8607e1ea0403e5a403569cec8ef2f35d55176 Mon Sep 17 00:00:00 2001 From: Mariana Martinho Date: Mon, 28 Sep 2026 23:06:26 +0000 Subject: [PATCH 01/72] feat(website): link each workshop app to its GitHub repository MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cinematic Studio and Re-shoot show a "View on GitHub" button beside their title. Until an app's repository is published it reads "GitHub · Coming soon" and is not a link; adding the URL to workshopAppRepo turns it on. --- .../cinematic-studio/AppRepoLink.test.ts | 26 ++++++++++ .../workshop/cinematic-studio/AppRepoLink.vue | 48 +++++++++++++++++++ .../cinematic-studio/CinematicFirstRun.vue | 3 ++ .../cinematic-studio/CinematicStudioPanel.vue | 9 +++- .../reshoot/ReshootHeader.vue | 19 ++++++-- apps/website/src/lib/workshop/apps.ts | 7 +++ .../src/lib/workshop/cinematic-studio/copy.ts | 8 ++++ 7 files changed, 114 insertions(+), 6 deletions(-) create mode 100644 apps/website/src/components/workshop/cinematic-studio/AppRepoLink.test.ts create mode 100644 apps/website/src/components/workshop/cinematic-studio/AppRepoLink.vue diff --git a/apps/website/src/components/workshop/cinematic-studio/AppRepoLink.test.ts b/apps/website/src/components/workshop/cinematic-studio/AppRepoLink.test.ts new file mode 100644 index 00000000000..f7bf4cfada7 --- /dev/null +++ b/apps/website/src/components/workshop/cinematic-studio/AppRepoLink.test.ts @@ -0,0 +1,26 @@ +import { render, screen } from '@testing-library/vue' +import { describe, expect, it } from 'vitest' + +import AppRepoLink from './AppRepoLink.vue' + +describe('AppRepoLink', () => { + it('opens the app repository on GitHub in a new tab', () => { + render(AppRepoLink, { + props: { repo: 'https://github.com/Comfy-Org/comfy-examples' } + }) + + const link = screen.getByRole('link', { name: 'View on GitHub' }) + expect(link).toHaveAttribute( + 'href', + 'https://github.com/Comfy-Org/comfy-examples' + ) + expect(link).toHaveAttribute('target', '_blank') + }) + + it('says the code is coming soon, without a link, until the repository exists', () => { + render(AppRepoLink, { props: { locale: 'zh-CN' } }) + + expect(screen.getByText('GitHub · 即将推出')).toBeInTheDocument() + expect(screen.queryByRole('link')).toBeNull() + }) +}) diff --git a/apps/website/src/components/workshop/cinematic-studio/AppRepoLink.vue b/apps/website/src/components/workshop/cinematic-studio/AppRepoLink.vue new file mode 100644 index 00000000000..243508ddd91 --- /dev/null +++ b/apps/website/src/components/workshop/cinematic-studio/AppRepoLink.vue @@ -0,0 +1,48 @@ + + + diff --git a/apps/website/src/components/workshop/cinematic-studio/CinematicFirstRun.vue b/apps/website/src/components/workshop/cinematic-studio/CinematicFirstRun.vue index d8bfda84889..de9541c3f2f 100644 --- a/apps/website/src/components/workshop/cinematic-studio/CinematicFirstRun.vue +++ b/apps/website/src/components/workshop/cinematic-studio/CinematicFirstRun.vue @@ -1,9 +1,11 @@ diff --git a/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootViewport.vue b/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootViewport.vue index c029c99916c..722c242102d 100644 --- a/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootViewport.vue +++ b/apps/website/src/components/workshop/cinematic-studio/reshoot/ReshootViewport.vue @@ -126,13 +126,18 @@ function zoom(event: WheelEvent) { class="absolute inset-x-4 bottom-4 flex items-center justify-between gap-3 text-xs text-primary-warm-white" > - {{ camera.azimuth }}° · {{ camera.elevation }}° diff --git a/apps/website/src/lib/workshop/cinematic-studio/reshoot-copy.ts b/apps/website/src/lib/workshop/cinematic-studio/reshoot-copy.ts index 7670429244d..695f9971806 100644 --- a/apps/website/src/lib/workshop/cinematic-studio/reshoot-copy.ts +++ b/apps/website/src/lib/workshop/cinematic-studio/reshoot-copy.ts @@ -120,8 +120,8 @@ const copy = { 'zh-CN': '闲置一段时间后的首次运行还需要加载模型。' }, 'reshoot.take.exampleHelp': { - en: 'Example result: the clip re-shot from a new angle at 768p. Aim a camera of your own on the left.', - 'zh-CN': '示例结果:该片段以 768p 从新角度重拍。在左侧设置你自己的机位。' + en: 'Example result: the clip re-shot from a new angle at 768p. Aim a camera of your own to try it.', + 'zh-CN': '示例结果:该片段以 768p 从新角度重拍。设置你自己的机位试试。' }, 'reshoot.frames': { en: '{frames} frames at 24 fps ({seconds} s)', @@ -191,6 +191,7 @@ const copy = { en: 'Drag to orbit · Scroll to move closer', 'zh-CN': '拖动以环绕 · 滚动以靠近' }, + 'reshoot.dragHint.touch': { en: 'Drag to orbit', 'zh-CN': '拖动以环绕' }, 'reshoot.needsDepth': { en: 'Analyze depth to aim a new camera.', 'zh-CN': '分析深度后即可设置新机位。' @@ -245,8 +246,8 @@ const copy = { 'reshoot.take.cancelled': { en: 'Cancelled', 'zh-CN': '已取消' }, 'reshoot.download': { en: 'Download', 'zh-CN': '下载' }, 'reshoot.demoNote': { - en: 'Design prototype: no jobs run. Takes show the example result.', - 'zh-CN': '设计原型:不会运行任务,镜头显示示例结果。' + en: 'Preview: takes play the example result for now.', + 'zh-CN': '预览版:目前镜头播放示例结果。' } } as const satisfies Record From 432b6e08a4206ce04b974642baaca52afc33b353 Mon Sep 17 00:00:00 2001 From: Mariana Martinho Date: Tue, 29 Sep 2026 09:36:43 +0000 Subject: [PATCH 10/72] fix(website): a workflow's example output leaves no gap under it on a phone --- apps/website/e2e/workshop-api-actions.spec.ts | 13 +++++++++++++ .../src/components/workshop/PlaygroundOutput.vue | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/apps/website/e2e/workshop-api-actions.spec.ts b/apps/website/e2e/workshop-api-actions.spec.ts index 1723094a1c1..1c75ea5020c 100644 --- a/apps/website/e2e/workshop-api-actions.spec.ts +++ b/apps/website/e2e/workshop-api-actions.spec.ts @@ -78,3 +78,16 @@ test('the workflow API tab opens with the key action and what it needs beside th expect(action.y).toBeLessThanOrEqual(code.y) expect(action.x).toBeGreaterThanOrEqual(code.x + code.width) }) + +test('@mobile the workflow example output is as tall as its 16:9 media', async ({ + page, + context +}) => { + await allowWorkflows(context) + await page.goto(WORKFLOW_PATH) + + const output = page.getByTestId('playground-output') + await expect(output).toHaveAttribute('data-state', 'example') + const media = await frame(output.getByTestId('output-media')) + expect(media.height).toBeCloseTo((media.width * 9) / 16, 0) +}) diff --git a/apps/website/src/components/workshop/PlaygroundOutput.vue b/apps/website/src/components/workshop/PlaygroundOutput.vue index 54f7d170479..e53624213e4 100644 --- a/apps/website/src/components/workshop/PlaygroundOutput.vue +++ b/apps/website/src/components/workshop/PlaygroundOutput.vue @@ -290,7 +290,12 @@ const earlierClass = (active: boolean) => diff --git a/apps/website/src/lib/workshop/cinematic-studio/copy.test.ts b/apps/website/src/lib/workshop/cinematic-studio/copy.test.ts index 0b348901371..c4e5d52fcfb 100644 --- a/apps/website/src/lib/workshop/cinematic-studio/copy.test.ts +++ b/apps/website/src/lib/workshop/cinematic-studio/copy.test.ts @@ -4,8 +4,8 @@ import { tc } from './copy' describe('tc', () => { it('fills named values in the locale word order', () => { - expect(tc('cinematic.stage.thumb', 'zh-CN', { shot: 2, take: 'B' })).toBe( - '镜头 2,第 B 条' - ) + expect( + tc('cinematic.stage.takeName', 'zh-CN', { shot: 2, take: 'B' }) + ).toBe('镜头 2,第 B 条') }) }) diff --git a/apps/website/src/lib/workshop/cinematic-studio/copy.ts b/apps/website/src/lib/workshop/cinematic-studio/copy.ts index 806cec6d3d2..171a0ad210c 100644 --- a/apps/website/src/lib/workshop/cinematic-studio/copy.ts +++ b/apps/website/src/lib/workshop/cinematic-studio/copy.ts @@ -54,10 +54,6 @@ const copy = { en: 'Video · MiniMax H3', 'zh-CN': '视频 · MiniMax H3' }, - 'cinematic.stage.renderingTake': { - en: 'Rendering take {take}', - 'zh-CN': '正在渲染第 {take} 条' - }, 'cinematic.stage.longWait': { en: 'Still going. Some models take about a minute. Nothing is queued; yours already started.', 'zh-CN': '仍在进行。部分模型需要约一分钟。没有排队,你的任务已经开始。' @@ -773,7 +769,7 @@ const copy = { en: 'Sequence', 'zh-CN': '序列' }, - 'cinematic.stage.thumb': { + 'cinematic.stage.takeName': { en: 'Shot {shot}, take {take}', 'zh-CN': '镜头 {shot},第 {take} 条' } From 595d87994aeffe2d9258ef1bb444ae878237f083 Mon Sep 17 00:00:00 2001 From: Mariana Martinho Date: Tue, 29 Sep 2026 00:33:42 +0000 Subject: [PATCH 20/72] test(website): start the take's clock when the test renders it The fixture froze the take's start when the module loaded, while the caption counts from the current time, so the elapsed reading drifted with however long the suite took to reach this file. --- .../cinematic-studio/CinematicTakeProgress.test.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/website/src/components/workshop/cinematic-studio/CinematicTakeProgress.test.ts b/apps/website/src/components/workshop/cinematic-studio/CinematicTakeProgress.test.ts index 6ff45fab336..281a4dab728 100644 --- a/apps/website/src/components/workshop/cinematic-studio/CinematicTakeProgress.test.ts +++ b/apps/website/src/components/workshop/cinematic-studio/CinematicTakeProgress.test.ts @@ -11,7 +11,7 @@ const take: Take = { prompt: 'a courtyard at dusk', modelSlug: 'bfl--flux-2-max--generate-images', aspect: '16:9', - startedAt: Date.now(), + startedAt: 0, status: 'rendering' } @@ -20,7 +20,11 @@ describe('CinematicTakeProgress', () => { // that is running has to answer to the same name, and "Rendering take A" // read as an instruction rather than as the name of a take. it('calls the running take what the take buttons call it', () => { - render(CinematicTakeProgress, { props: { take } }) + // The clock counts from the take's own start, so a fixture frozen at + // module load would drift against it as the suite runs. + render(CinematicTakeProgress, { + props: { take: { ...take, startedAt: Date.now() } } + }) const caption = screen.getByRole('status') expect(caption).toHaveTextContent('Shot 1, take A') From 8d4f910071ac0448933660afeb10c4fbe6cbbc9a Mon Sep 17 00:00:00 2001 From: Mariana Martinho Date: Tue, 29 Sep 2026 01:03:23 +0000 Subject: [PATCH 21/72] fix(website): the running take says out loud that it is rendering --- .../CinematicTakeProgress.test.ts | 21 +++++++------------ .../CinematicTakeProgress.vue | 2 +- .../src/lib/workshop/cinematic-studio/copy.ts | 4 ++++ 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/apps/website/src/components/workshop/cinematic-studio/CinematicTakeProgress.test.ts b/apps/website/src/components/workshop/cinematic-studio/CinematicTakeProgress.test.ts index 281a4dab728..d80094a9deb 100644 --- a/apps/website/src/components/workshop/cinematic-studio/CinematicTakeProgress.test.ts +++ b/apps/website/src/components/workshop/cinematic-studio/CinematicTakeProgress.test.ts @@ -4,30 +4,23 @@ import { describe, expect, it } from 'vitest' import type { Take } from '../../../lib/workshop/cinematic-studio/reel' import CinematicTakeProgress from './CinematicTakeProgress.vue' -const take: Take = { +const renderingTake = (): Take => ({ id: 'take-1', shot: 1, letter: 'A', prompt: 'a courtyard at dusk', modelSlug: 'bfl--flux-2-max--generate-images', aspect: '16:9', - startedAt: 0, + startedAt: Date.now(), status: 'rendering' -} +}) describe('CinematicTakeProgress', () => { - // The buttons under the stage call this frame "Shot 1, take A". The frame - // that is running has to answer to the same name, and "Rendering take A" - // read as an instruction rather than as the name of a take. - it('calls the running take what the take buttons call it', () => { - // The clock counts from the take's own start, so a fixture frozen at - // module load would drift against it as the suite runs. - render(CinematicTakeProgress, { - props: { take: { ...take, startedAt: Date.now() } } - }) + it('says a take is rendering and names it as the take buttons do', () => { + render(CinematicTakeProgress, { props: { take: renderingTake() } }) const caption = screen.getByRole('status') - expect(caption).toHaveTextContent('Shot 1, take A') - expect(caption).toHaveTextContent('0:00') + expect(caption).toHaveTextContent('Rendering Shot 1, take A') + expect(caption).toHaveTextContent(/\d+:\d{2}/) }) }) diff --git a/apps/website/src/components/workshop/cinematic-studio/CinematicTakeProgress.vue b/apps/website/src/components/workshop/cinematic-studio/CinematicTakeProgress.vue index 4e3340c1ba4..cf13dcb4f2b 100644 --- a/apps/website/src/components/workshop/cinematic-studio/CinematicTakeProgress.vue +++ b/apps/website/src/components/workshop/cinematic-studio/CinematicTakeProgress.vue @@ -44,7 +44,7 @@ const elapsed = computed(() => Math.max(0, now.value - take.startedAt)) aria-hidden="true" /> {{ - tc('cinematic.stage.takeName', locale, { + tc('cinematic.stage.renderingTakeName', locale, { shot: take.shot, take: take.letter }) diff --git a/apps/website/src/lib/workshop/cinematic-studio/copy.ts b/apps/website/src/lib/workshop/cinematic-studio/copy.ts index 171a0ad210c..fe540c327f1 100644 --- a/apps/website/src/lib/workshop/cinematic-studio/copy.ts +++ b/apps/website/src/lib/workshop/cinematic-studio/copy.ts @@ -772,6 +772,10 @@ const copy = { 'cinematic.stage.takeName': { en: 'Shot {shot}, take {take}', 'zh-CN': '镜头 {shot},第 {take} 条' + }, + 'cinematic.stage.renderingTakeName': { + en: 'Rendering Shot {shot}, take {take}', + 'zh-CN': '正在渲染镜头 {shot},第 {take} 条' } } as const satisfies Record From ca8b7a58e271388085634b9a7ff1afac1054a5bb Mon Sep 17 00:00:00 2001 From: Mariana Martinho Date: Tue, 29 Sep 2026 00:54:39 +0000 Subject: [PATCH 22/72] fix(website): direction options show their preview frame, not a drawn icon The drawn shot, light, film and look icons are dropped everywhere: the composer segments and the shot-list rows show the option's preview frame again (Auto shows a dashed circle, Grade keeps its palette), and the picker tiles lose the icon in their corner. One thumbnail component serves both. --- .../CinematicDirectionIcon.vue | 121 -------- .../CinematicDirectionSegments.vue | 24 +- .../CinematicDirectionThumb.vue | 35 +++ .../cinematic-studio/CinematicOptionGrid.vue | 16 -- .../cinematic-studio/CinematicShotList.vue | 29 +- .../cinematic-studio/direction-icons.test.ts | 24 -- .../cinematic-studio/direction-icons.ts | 261 ------------------ 7 files changed, 41 insertions(+), 469 deletions(-) delete mode 100644 apps/website/src/components/workshop/cinematic-studio/CinematicDirectionIcon.vue create mode 100644 apps/website/src/components/workshop/cinematic-studio/CinematicDirectionThumb.vue delete mode 100644 apps/website/src/lib/workshop/cinematic-studio/direction-icons.test.ts delete mode 100644 apps/website/src/lib/workshop/cinematic-studio/direction-icons.ts diff --git a/apps/website/src/components/workshop/cinematic-studio/CinematicDirectionIcon.vue b/apps/website/src/components/workshop/cinematic-studio/CinematicDirectionIcon.vue deleted file mode 100644 index f36fae010a5..00000000000 --- a/apps/website/src/components/workshop/cinematic-studio/CinematicDirectionIcon.vue +++ /dev/null @@ -1,121 +0,0 @@ - - - diff --git a/apps/website/src/components/workshop/cinematic-studio/CinematicDirectionSegments.vue b/apps/website/src/components/workshop/cinematic-studio/CinematicDirectionSegments.vue index c3f008d5d17..86ae0ef6176 100644 --- a/apps/website/src/components/workshop/cinematic-studio/CinematicDirectionSegments.vue +++ b/apps/website/src/components/workshop/cinematic-studio/CinematicDirectionSegments.vue @@ -14,7 +14,7 @@ import { } from '../../../lib/workshop/cinematic-studio/catalog' import type { Locale } from '../../../i18n/translations' import { tc } from '../../../lib/workshop/cinematic-studio/copy' -import CinematicDirectionIcon from './CinematicDirectionIcon.vue' +import CinematicDirectionThumb from './CinematicDirectionThumb.vue' import CinematicTooltip from './CinematicTooltip.vue' const { @@ -36,8 +36,7 @@ const segments = computed(() => part: group.part, title: tc(group.title, locale), label: tc(option.label, locale), - option: option.id, - palette: option.palette + option } }) ) @@ -69,24 +68,7 @@ const segments = computed(() => " @click="emit('open', segment.part)" > - key: group.part, title: tc(group.title, locale), value: tc(option.label, locale), - option: option.id, - palette: option.palette + option } }) ) @@ -103,29 +102,7 @@ const rowClass = (key: PickerKey) => :class="rowClass(row.key)" @click="emit('open', row.key)" > -