Skip to content
Merged
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
19 changes: 18 additions & 1 deletion locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
}
},
"sidebar": {
"builds": "Builds",
"navigation": "Navigation",
"home": "Home",
"tools": "Tools",
Expand Down Expand Up @@ -65,7 +66,23 @@
"viewErrorTooltip": "View error details",
"errorTitle": "Error",
"searchPlaceholder": "Search instances",
"noMatches": "No instances match"
"noMatches": "No instances match",
"buildsTitle": "Builds",
"newBuild": "Build",
"newBuildLabel": "New build",
"filterThisComputer": "This computer",
"whereLabel": "Where it runs",
"sortLabel": "Sort",
"sortLastUsed": "Last used",
"sortName": "Name",
"searchBuilds": "Search builds",
"startInstall": "Start",
"updateAvailable": "Update available",
"nothingMatches": "Nothing matches",
"nothingMatchesHint": "Try another word, or clear the filters to see everything.",
"clearFilters": "Clear filters",
"noBuildsTitle": "Set up where your work runs",
"noBuildsBody": "A build is ComfyUI with its own version, custom nodes and models. Install one on this computer, or run on Comfy Cloud with nothing to install."
},
"titleBar": {
"panelComfy": "ComfyUI",
Expand Down
19 changes: 18 additions & 1 deletion locales/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
}
},
"sidebar": {
"builds": "构建",
"navigation": "导航",
"home": "主页",
"tools": "工具",
Expand Down Expand Up @@ -65,7 +66,23 @@
"viewErrorTooltip": "查看错误详情",
"errorTitle": "错误",
"searchPlaceholder": "搜索实例",
"noMatches": "没有匹配的实例"
"noMatches": "没有匹配的实例",
"buildsTitle": "构建",
"newBuild": "构建",
"newBuildLabel": "新建构建",
"filterThisComputer": "此电脑",
"whereLabel": "运行位置",
"sortLabel": "排序",
"sortLastUsed": "最近使用",
"sortName": "名称",
"searchBuilds": "搜索构建",
"startInstall": "启动",
"updateAvailable": "有可用更新",
"nothingMatches": "没有匹配项",
"nothingMatchesHint": "换个关键词试试,或清除筛选条件查看全部内容。",
"clearFilters": "清除筛选",
"noBuildsTitle": "设置工作的运行位置",
"noBuildsBody": "构建是拥有独立版本、自定义节点和模型的 ComfyUI。你可以在此电脑上安装一个,也可以直接在 Comfy Cloud 上运行,无需安装。"
},
"titleBar": {
"panelComfy": "ComfyUI",
Expand Down
8 changes: 0 additions & 8 deletions scripts/eslint/vue-style-exceptions.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,6 @@
"reason": "Preserve the existing template-preview-pulse animation.",
"sha256": "f6939b02602758e17f40529cd24db181f95854f153bce6be496bf324b90d31f8"
},
"src/renderer/src/views/chooser/ChooserInstallTile.vue": {
"reason": "Preserve the existing chooser-tile-status-pulse animation.",
"sha256": "d3a61fc0d707f9c1e5411b5f5b62c70186381111d34d8d10742b542b0d588103"
},
"src/renderer/src/views/ChooserView.vue": {
"reason": "Register the integer --rows property used to reserve scroll height.",
"sha256": "24bda0dd767ac8a390648a2916635d54dba8ba9761851a15b77d8b203e70fba3"
},
"src/renderer/src/views/comfyUISettings/ConsoleTerminalPane.vue": {
"reason": "Unlayered xterm vendor integration overrides for generated terminal DOM.",
"sha256": "ac35f9448c82e5cb0eeba067da1566bd988d52f2b11e133325eccafa216010a0"
Expand Down
6 changes: 6 additions & 0 deletions src/renderer/src/assets/design-system-theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
--animate-pop-in: pop-in 160ms var(--ease-out-expo);
--animate-fade-in: fade-in 160ms ease-out;
--animate-status-pulse: status-pulse 2s ease-out infinite;
--animate-status-breathe: status-breathe 1.6s ease-in-out infinite;
--animate-shimmer: shimmer 1.6s ease-in-out infinite;
--animate-brand-takeover: brand-takeover-in 240ms cubic-bezier(0.22, 1, 0.36, 1) both;
--animate-gs-field-flash: gs-field-flash 2.2s ease-out;
Expand All @@ -86,6 +87,11 @@
box-shadow: 0 0 0 5px transparent;
}
}
@keyframes status-breathe {
50% {
opacity: 0.35;
}
}
@keyframes shimmer {
from {
background-position: 150% 0;
Expand Down
8 changes: 0 additions & 8 deletions src/renderer/src/components/BrandedPageHeader.vue
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
<script setup lang="ts">
import ComfyWordmark from './icons/ComfyWordmark.vue'

defineProps<{
title: string
description: string
logoTestId?: string
}>()
</script>

<template>
<header
class="branded-page-header box-border flex w-full items-center gap-7 @max-[700px]:flex-col @max-[700px]:items-start @max-[700px]:gap-2"
>
<ComfyWordmark
class="branded-page-header__wordmark block aspect-[173/48] h-auto w-[clamp(120px,8vw,180px)] shrink-0 text-comfy-yellow [anchor-name:--brand-beam-target]"
:data-testid="logoTestId"
aria-hidden="true"
/>
<div>
<h1 class="m-0 mb-1 text-[24px] leading-[1.2] font-semibold text-neutral-100">{{ title }}</h1>
<p class="branded-page-header__description m-0 text-[14px] text-text-muted">
Expand Down
36 changes: 36 additions & 0 deletions src/renderer/src/components/ui/SegmentedControl.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<script setup lang="ts" generic="T extends string">
import ToggleGroup from '@comfyorg/design-system/toggle-group/ToggleGroup'
import ToggleGroupItem from '@comfyorg/design-system/toggle-group/ToggleGroupItem'

defineProps<{
options: { value: T; label: string; count?: number }[]
label: string
}>()

const model = defineModel<T>({ required: true })
</script>

<template>
<ToggleGroup
v-model="model"
type="single"
:allow-empty="false"
roving-focus
class="inline-flex shrink-0 gap-0.5 rounded-[10px] bg-secondary p-[3px]"
:aria-label="label"
>
<ToggleGroupItem
v-for="option in options"
:key="option.value"
:value="option.value"
class="h-[26px] rounded-[7px] px-[11px] text-[13px] whitespace-nowrap hover:bg-transparent hover:text-foreground data-[state=on]:bg-accent data-[state=on]:hover:bg-accent"
>
{{ option.label
}}<span
v-if="option.count !== undefined"
class="ml-1.5 text-subtle-foreground tabular-nums"
>{{ option.count }}</span
>
</ToggleGroupItem>
</ToggleGroup>
</template>
28 changes: 28 additions & 0 deletions src/renderer/src/components/ui/StatusChip.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<script setup lang="ts">
const { tone = 'quiet' } = defineProps<{
tone?: 'go' | 'bad' | 'warn' | 'quiet'
}>()

const TONES = {
go: 'bg-success/14 text-success',
bad: 'bg-destructive/16 text-destructive',
warn: 'bg-warning/15 text-warning',
quiet: 'bg-foreground/7 text-muted-foreground'
}
</script>

<template>
<span
class="inline-flex h-5 shrink-0 items-center gap-[5px] rounded-full px-2 text-[11px] leading-none font-medium whitespace-nowrap"
:class="TONES[tone]"
>
<slot name="icon">
<span
class="size-1.5 rounded-full bg-current"
:class="tone === 'go' && 'animate-status-breathe motion-reduce:animate-none'"
aria-hidden="true"
/>
</slot>
<slot />
</span>
</template>
3 changes: 3 additions & 0 deletions src/renderer/src/composables/useInstallList.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ export interface UseInstallListOpts {
export interface UseInstallListApi {
searchQuery: Ref<string>
activeFilter: Ref<FilterKey>
/** Every install this surface can show, before the filter and search apply. */
effectiveInstalls: ComputedRef<Installation[]>
visibleInstalls: ComputedRef<Installation[]>
showEmptyHint: ComputedRef<boolean>
matchesQuery: (name: string) => boolean
Expand Down Expand Up @@ -152,6 +154,7 @@ export function useInstallList(opts: UseInstallListOpts): UseInstallListApi {
return {
searchQuery,
activeFilter,
effectiveInstalls,
visibleInstalls,
showEmptyHint,
matchesQuery,
Expand Down
6 changes: 6 additions & 0 deletions src/renderer/src/panel/AppSidebar.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ async function mountSidebar(activePage: DashboardPage = 'chooser') {
}

describe('AppSidebar', () => {
it('names the dashboard row after the page it opens', async () => {
const wrapper = await mountSidebar()

expect(wrapper.get('[data-testid="app-sidebar-chooser"]').text()).toBe('Builds')
})

it('marks only the current page', async () => {
const wrapper = await mountSidebar('benchmarks')

Expand Down
4 changes: 2 additions & 2 deletions src/renderer/src/panel/AppSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { computed } from 'vue'
import { useI18n } from 'vue-i18n'
import { useLocalStorage } from '@vueuse/core'
import { ChartColumn, Gauge, Home } from 'lucide-vue-next'
import { ChartColumn, Gauge, Server } from 'lucide-vue-next'
import type { Component } from 'vue'
import Button from '@comfyorg/design-system/button/Button'
import ComfyCLogo from '../components/icons/ComfyCLogo.vue'
Expand All @@ -27,7 +27,7 @@ const collapsed = useLocalStorage('comfy.desktop.sidebar.collapsed', false)
const toggleLabel = computed(() => (collapsed.value ? t('sidebar.expand') : t('sidebar.collapse')))

const mainRows = computed<SidebarRow[]>(() => [
{ page: 'chooser', label: t('sidebar.home'), icon: Home }
{ page: 'chooser', label: t('sidebar.builds'), icon: Server }
])
const toolRows = computed<SidebarRow[]>(() => [
{ page: 'benchmarks', label: t('fileMenu.benchmarks'), icon: ChartColumn },
Expand Down
2 changes: 0 additions & 2 deletions src/renderer/src/panel/PanelApp.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,6 @@ describe('PanelApp', () => {
await flushPromises()

expect(wrapper.find('[data-testid="benchmarks"]').exists()).toBe(true)
expect(wrapper.find('[data-testid="benchmarks-logo"]').exists()).toBe(true)
expect(wrapper.get('.branded-page-header h1').text()).toBe('Benchmarks')
expect(wrapper.get('.branded-page-header__description').text()).toBe(
'Browse and compare results from your performance tests.'
Expand Down Expand Up @@ -915,7 +914,6 @@ describe('PanelApp', () => {
await flushPromises()

expect(wrapper.find('[data-testid="performance-test"]').exists()).toBe(true)
expect(wrapper.find('[data-testid="performance-test-logo"]').exists()).toBe(true)
expect(wrapper.get('.branded-page-header h1').text()).toBe('Performance Tests')
expect(wrapper.find('[data-testid="app-sidebar"]').exists()).toBe(true)
expect(wrapper.findAll('.performance-test__selection-row')).toHaveLength(2)
Expand Down
1 change: 0 additions & 1 deletion src/renderer/src/views/BenchmarksView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,6 @@ onActivated(() => {
<BrandedPageHeader
:title="t('benchmarks.title')"
:description="t('benchmarks.description')"
logo-test-id="benchmarks-logo"
/>

<section
Expand Down
Loading
Loading