Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion apps/website/astro.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import tailwindcss from '@tailwindcss/vite'
import { isExcludedFromSitemap, isIndexableBuild } from './src/config/indexing'
import { DEFAULT_LOCALE, LOCALE_CODES } from './src/config/locales'
import { astroRedirects } from './src/config/redirects'
import { designPreviews } from './src/integrations/design-previews'
import { indexNowManifest } from './src/integrations/indexnow-manifest'
import { markdownTwins } from './src/integrations/markdown-twins'
import { workshopReleaseGate } from './src/integrations/workshop-release-gate'
Expand Down Expand Up @@ -38,7 +39,8 @@ export default defineConfig({
}),
markdownTwins(),
indexNowManifest(),
workshopReleaseGate()
workshopReleaseGate(),
designPreviews()
],
vite: {
plugins: [tailwindcss()],
Expand Down
2 changes: 1 addition & 1 deletion apps/website/src/components/hero/AngleNode.vue
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ onUnmounted(() => {

<template>
<div
class="relative flex size-full flex-col rounded-[1.25em] border border-white/12 bg-[#242428]"
class="relative flex size-full flex-col rounded-[1.25em] border border-white/12 bg-secondary-charcoal"
>
<div class="flex h-[2.25em] shrink-0 items-center px-[1.05em]">
<span class="size-[0.55em] rounded-full bg-primary-comfy-yellow" />
Expand Down
2 changes: 1 addition & 1 deletion apps/website/src/components/hero/ColorNode.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const saturationTrack = computed(

<template>
<div
class="relative flex size-full flex-col rounded-[1.25em] border border-white/12 bg-[#242428]"
class="relative flex size-full flex-col rounded-[1.25em] border border-white/12 bg-secondary-charcoal"
>
<div class="flex h-[2.25em] shrink-0 items-center px-[1.05em]">
<span
Expand Down
106 changes: 106 additions & 0 deletions apps/website/src/components/workshop/WorkflowNodeGraphFacts.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
<script setup lang="ts">
import { Box, Puzzle } from '@lucide/vue'
import { computed } from 'vue'

import type { Locale, TranslationKey } from '@/i18n/translations'
import { translationsFor } from '@/i18n/translations'
import type { NodeGraphWorkflow } from '@/lib/hub/node-graph-workflow'

const { workflow, locale = 'en' } = defineProps<{
workflow: NodeGraphWorkflow
locale?: Locale
}>()
const { t } = translationsFor(locale)

const facts = computed(() => {
const rows: { label: TranslationKey; value: string }[] = [
{
label: 'workshop.workflow.factWhere',
value: t('workshop.nodeGraph.runsWhere')
}
]
if (workflow.output)
rows.push({ label: 'workshop.workflow.factOutput', value: workflow.output })
if (workflow.author)
rows.push({ label: 'workshop.workflow.factAuthor', value: workflow.author })
return rows
})

const headingClass =
'text-2xs font-bold tracking-wider text-primary-warm-gray uppercase'
</script>

<template>
<div
class="overflow-hidden rounded-2xl border border-transparency-white-t8 bg-transparency-white-t4"
data-testid="workflow-facts"
>
<section
v-if="workflow.models.length"
class="px-5 py-4"
data-testid="workflow-runs-on"
>
<h3 :class="headingClass">{{ t('workshop.workflow.runsOn') }}</h3>
<ul class="mt-2 flex flex-col gap-1">
<li
v-for="name in workflow.models"
:key="name"
class="flex items-center gap-2.5 py-1.5"
>
<Box
class="size-4 shrink-0 text-primary-warm-gray"
aria-hidden="true"
/>
<span
class="min-w-0 flex-1 truncate text-base text-primary-comfy-canvas"
>
{{ name }}
</span>
</li>
</ul>
</section>

<section
v-if="workflow.customNodes.length"
class="border-t border-transparency-white-t8 px-5 py-4 first:border-t-0"
data-testid="workflow-custom-nodes"
>
<h3 :class="headingClass">{{ t('workshop.workflow.customNodes') }}</h3>
<ul class="mt-2 flex flex-col gap-1">
<li
v-for="name in workflow.customNodes"
:key="name"
class="flex items-center gap-2.5 py-1.5"
>
<Puzzle
class="size-4 shrink-0 text-primary-warm-gray"
aria-hidden="true"
/>
<span
class="min-w-0 flex-1 truncate text-base text-primary-comfy-canvas"
>
{{ name }}
</span>
</li>
</ul>
</section>

<section
class="border-t border-transparency-white-t8 px-5 py-4 first:border-t-0"
data-testid="workflow-details"
>
<dl class="flex flex-col gap-1 text-sm">
<div
v-for="fact in facts"
:key="fact.label"
class="grid grid-cols-[6rem_1fr] gap-4"
>
<dt class="text-primary-warm-gray">{{ t(fact.label) }}</dt>
<dd class="min-w-0 truncate text-primary-comfy-canvas tabular-nums">
{{ fact.value }}
</dd>
</div>
</dl>
</section>
</div>
</template>
50 changes: 50 additions & 0 deletions apps/website/src/components/workshop/WorkflowNodeGraphPage.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import { render, screen } from '@testing-library/vue'
import { describe, expect, it } from 'vitest'

import { WORKSHOP_CLOUD_BASE_URL } from '@/config/workshop-env'
import { nodeGraphWorkflowSample } from '@/lib/hub/node-graph-workflow'
import WorkflowNodeGraphPage from './WorkflowNodeGraphPage.vue'

function renderPage() {
return render(WorkflowNodeGraphPage, {
props: { workflow: nodeGraphWorkflowSample },
global: { stubs: { WorkflowGraph: true } }
})
}

describe('WorkflowNodeGraphPage', () => {
it('offers Download and Try in Cloud under the title', () => {
renderPage()

const actions = screen.getByTestId('workflow-actions')
const download = screen.getByTestId('node-graph-download')
const cloud = screen.getByTestId('node-graph-try-cloud')
expect(actions.contains(download)).toBe(true)
expect(actions.contains(cloud)).toBe(true)

expect(download.textContent.trim()).toBe('Download workflow')
expect(download.getAttribute('href')).toBe(
nodeGraphWorkflowSample.downloadUrl
)
expect(download.hasAttribute('download')).toBe(true)
expect(cloud.getAttribute('href')).toBe(
`${WORKSHOP_CLOUD_BASE_URL}/?template=templates-character_sheet`
)
expect(cloud.getAttribute('target')).toBe('_blank')
})

it('shows the graph and its facts without tabs', () => {
renderPage()

expect(screen.queryByRole('tablist')).toBeNull()
expect(screen.getByTestId('node-graph-graph')).toBeTruthy()

const facts = screen.getByTestId('workflow-facts')
for (const text of [
...nodeGraphWorkflowSample.models,
...nodeGraphWorkflowSample.customNodes,
'Runs in ComfyUI'
])
expect(facts.textContent).toContain(text)
})
})
128 changes: 128 additions & 0 deletions apps/website/src/components/workshop/WorkflowNodeGraphPage.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
<script setup lang="ts">
import { ArrowUpRight, ChevronLeft } from '@lucide/vue'
import { computed } from 'vue'

import Button from '@/components/ui/button/Button.vue'
import { getRoutes } from '@/config/routes'
import { WORKSHOP_CLOUD_BASE_URL } from '@/config/workshop-env'
import type { Locale } from '@/i18n/translations'
import { translationsFor } from '@/i18n/translations'
import type { NodeGraphWorkflow } from '@/lib/hub/node-graph-workflow'

import SectionHeading from './SectionHeading.vue'
import WorkflowGraph from './WorkflowGraph.vue'
import WorkflowNodeGraphFacts from './WorkflowNodeGraphFacts.vue'

const { workflow, locale = 'en' } = defineProps<{
workflow: NodeGraphWorkflow
locale?: Locale
}>()
const { t } = translationsFor(locale)
const routes = getRoutes()

const cloudHref = computed(
() =>
`${WORKSHOP_CLOUD_BASE_URL}/?template=${encodeURIComponent(workflow.templateId)}`
)
const samples = computed(() =>
workflow.examples
.filter((example) => example.mediaKind !== 'video')
.slice(0, 1)
.map((example) => example.outputUrl)
)

const pillClass =
'inline-flex h-7 items-center rounded-full border border-transparency-white-t20 px-3 text-xs leading-none text-primary-comfy-canvas transition-colors hover:border-primary-comfy-yellow hover:text-primary-comfy-yellow'
</script>

<template>
<div
class="mx-auto max-w-10xl px-6 pt-5 pb-20 lg:px-8"
data-testid="node-graph-workflow"
>
<a
:href="routes.hubWorkflows"
class="mb-7 inline-flex min-h-11 items-center gap-1 text-sm text-primary-warm-gray hover:text-primary-comfy-yellow"
>
<ChevronLeft class="size-4" aria-hidden="true" />
{{ t('workshop.catalogue.backToWorkflows') }}
</a>
<header class="mb-9" data-testid="workflow-hero">
<div
v-if="workflow.useCase"
class="mb-3 flex flex-wrap items-center gap-3"
>
<a
:href="workflow.useCase.href"
:class="pillClass"
data-testid="workflow-use-case"
>{{ workflow.useCase.label }}</a
>
</div>
<h1
class="max-w-4xl text-3xl font-light text-primary-comfy-canvas lg:text-5xl"
>
{{ workflow.name }}
</h1>
<p
class="mt-4 text-lg text-primary-warm-gray lg:truncate"
:title="workflow.summary"
>
{{ workflow.summary }}
</p>
<div
class="mt-6 flex flex-wrap items-center gap-2"
data-testid="workflow-actions"
>
<Button
as="a"
:href="workflow.downloadUrl"
download
variant="secondaryOutline"
class="h-auto min-h-11 max-w-full whitespace-normal"
:aria-label="t('workshop.workflow.download')"
data-testid="node-graph-download"
>{{ t('workshop.workflow.downloadShort') }}</Button
>
<Button
as="a"
:href="cloudHref"
target="_blank"
rel="noopener"
variant="ghost"
class="h-auto min-h-11 max-w-full font-bold tracking-wider whitespace-normal uppercase"
data-testid="node-graph-try-cloud"
>{{ t('workshop.workflow.tryCloud') }}
<template #append>
<ArrowUpRight aria-hidden="true" />
</template>
</Button>
</div>
</header>

<section data-testid="node-graph-details">
<SectionHeading
class="mb-8"
:title="t('workshop.workflow.inside')"
:subtitle="t('workshop.nodeGraph.graphHint')"
/>
<div class="grid gap-10 lg:grid-cols-12">
<div class="min-w-0 lg:col-span-8" data-testid="node-graph-graph">
<WorkflowGraph
:source="workflow.graph.source"
:samples
:fallback="workflow.graph.previewUrl"
:full-href="workflow.graph.previewUrl"
/>
</div>
<div class="min-w-0 lg:col-span-4">
<WorkflowNodeGraphFacts
:workflow="workflow"
:locale="locale"
class="lg:sticky lg:top-24"
/>
</div>
</div>
</section>
</div>
</template>
2 changes: 1 addition & 1 deletion apps/website/src/components/workshop/WorkflowPage.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ describe('WorkflowPage header', () => {
.getAllByRole('link')
.map((link) => [link.textContent.trim(), link.getAttribute('href')])
).toEqual([
['Download', template.downloadUrl],
['Download workflow', template.downloadUrl],
['Try in Cloud', cloudHref]
])
expect(
Expand Down
2 changes: 1 addition & 1 deletion apps/website/src/components/workshop/WorkflowPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ function captureWorkflowDownload() {
as="a"
:href="downloadUrl"
download
variant="outline"
variant="secondaryOutline"
class="h-auto min-h-11 max-w-full whitespace-normal"
:aria-label="t('workshop.workflow.download')"
@click="captureWorkflowDownload"
Expand Down
4 changes: 3 additions & 1 deletion apps/website/src/config/indexing.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { join, relative, sep } from 'node:path'
import { describe, expect, it, vi } from 'vitest'

import { websiteRoot } from '@website/paths'
import { DESIGN_PREVIEW_ROUTES } from '@/integrations/design-previews'
import { modelsBuildRoutes } from '@/integrations/workshop-release-gate'
import { routeOf } from '@/utils/hreflangRoutes'
import {
Expand Down Expand Up @@ -330,7 +331,8 @@ describe('NOINDEX_ROUTES', () => {

const builtRoutes = [
...astroFiles(pagesDir).map(pageRoute),
...modelsBuildRoutes(true).map(({ pattern }) => pattern)
...modelsBuildRoutes(true).map(({ pattern }) => pattern),
...DESIGN_PREVIEW_ROUTES.map(({ pattern }) => pattern)
].map(toMatcher)

it.for(NOINDEX_ROUTES)('%s is a route this site builds', (route) => {
Expand Down
1 change: 1 addition & 0 deletions apps/website/src/config/indexing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export const NOINDEX_ROUTES = [
'/changelog',
...PAYMENT_STATUSES.map((status) => `/payment/${status}`),
'/individual-submission',
'/hub-preview/node-graph-workflow',
'/booking-confirmation',
'/login',
'/signup',
Expand Down
20 changes: 20 additions & 0 deletions apps/website/src/integrations/design-previews.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { describe, expect, it } from 'vitest'

import { DESIGN_PREVIEW_ROUTES, isDesignPreviewBuild } from './design-previews'

describe('design previews', () => {
it('stays out of production builds', () => {
expect(isDesignPreviewBuild('production')).toBe(false)
})

it('builds on pull request previews and locally', () => {
expect(isDesignPreviewBuild('preview')).toBe(true)
expect(isDesignPreviewBuild(undefined)).toBe(true)
})

it('builds every preview in English and Chinese', () => {
const patterns = DESIGN_PREVIEW_ROUTES.map(({ pattern }) => pattern)
for (const pattern of patterns.filter((p) => !p.startsWith('/zh-CN/')))
expect(patterns).toContain(`/zh-CN${pattern}`)
})
})
Loading
Loading