diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 814c3e3..1f3b80a 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -2,9 +2,11 @@ FROM node:22-alpine AS deps WORKDIR /app COPY package.json package-lock.json ./ -# BuildKit-кеш npm — повторные сборки переиспользуют скачанные пакеты +# BuildKit-кеш npm — повторные сборки переиспользуют скачанные пакеты. +# npm install вместо npm ci: кросс-платформенный lockfile (Windows-host) +# не резолвит Linux-optional deps (@emnapi/core и др.), npm ci падает. RUN --mount=type=cache,target=/root/.npm \ - npm ci --prefer-offline --no-audit --no-fund + npm install --prefer-offline --no-audit --no-fund # ── Dev stage: Vite HMR (используется compose.dev.yml) ─────────────────────── FROM deps AS dev diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 14c91fe..00783d1 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -9,7 +9,7 @@ "version": "0.0.0", "dependencies": { "@base-ui/react": "^1.3.0", - "@fontsource-variable/dm-sans": "^5.2.8", + "@fontsource-variable/inter": "^5.3.0", "@fontsource-variable/jetbrains-mono": "^5.2.8", "@novnc/novnc": "^1.6.0", "@tailwindcss/vite": "^4.2.2", @@ -692,20 +692,20 @@ } }, "node_modules/@emnapi/core": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.9.2.tgz", - "integrity": "sha512-UC+ZhH3XtczQYfOlu3lNEkdW/p4dsJ1r/bP7H8+rhao3TTTMO1ATq/4DdIi23XuGoFY+Cz0JmCbdVl0hz9jZcA==", + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.3.tgz", + "integrity": "sha512-zLpS5asjEb7lq8jYLq37N6XKaE41DIexlY1rF/z4/tIl3wo13Sqm28fRyfIsKZD+NZ8mM5RoKkpW/rBcuoSZSg==", "license": "MIT", "optional": true, "dependencies": { - "@emnapi/wasi-threads": "1.2.1", + "@emnapi/wasi-threads": "1.2.3", "tslib": "^2.4.0" } }, "node_modules/@emnapi/runtime": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.9.2.tgz", - "integrity": "sha512-3U4+MIWHImeyu1wnmVygh5WlgfYDtyf0k8AbLhMFxOipihf6nrWC4syIm/SwEeec0mNSafiiNnMJwbza/Is6Lw==", + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.3.tgz", + "integrity": "sha512-Xz4Tpyki7XyrpbUK1jR1AhdAdaXyhhY4lZ3neLodmhpuWfy2PAQN5B46sAiU4liOXGLkHypn/qU+jvfWSCYYLA==", "license": "MIT", "optional": true, "dependencies": { @@ -713,9 +713,9 @@ } }, "node_modules/@emnapi/wasi-threads": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz", - "integrity": "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.3.tgz", + "integrity": "sha512-ELEBe8PsLvvJ6QMr0zLt8ffvOHW/dc1m3CEzNMg7aJUv3bMaoDtw2TXyDAwkYBuroxxuHEwhRTLJSe5sya547g==", "license": "MIT", "optional": true, "dependencies": { @@ -917,10 +917,10 @@ "integrity": "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==", "license": "MIT" }, - "node_modules/@fontsource-variable/dm-sans": { - "version": "5.2.8", - "resolved": "https://registry.npmjs.org/@fontsource-variable/dm-sans/-/dm-sans-5.2.8.tgz", - "integrity": "sha512-AxkvMTvNWgfrmlyjiV05vlHYJa+nRQCf1EfvIrQAPBpFJW0O9VTz7oAFr9S3lvbWdmnFoBk7yFqQL86u64nl2g==", + "node_modules/@fontsource-variable/inter": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/@fontsource-variable/inter/-/inter-5.3.0.tgz", + "integrity": "sha512-OupL48va4JNofb97w6NYeF9S7W/kHNKM0Er8Dem5nqi4jeOLrVJDoE8tZEpnMJmtkvNbB1EIPPwHcdkF6b1oUA==", "license": "OFL-1.1", "funding": { "url": "https://github.com/sponsors/ayuhito" diff --git a/frontend/package.json b/frontend/package.json index 3b64d17..22e9e90 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "@base-ui/react": "^1.3.0", - "@fontsource-variable/dm-sans": "^5.2.8", + "@fontsource-variable/inter": "^5.3.0", "@fontsource-variable/jetbrains-mono": "^5.2.8", "@novnc/novnc": "^1.6.0", "@tailwindcss/vite": "^4.2.2", diff --git a/frontend/src/components/shared/CommandPalette.tsx b/frontend/src/components/shared/CommandPalette.tsx index 13d32b8..c783e18 100644 --- a/frontend/src/components/shared/CommandPalette.tsx +++ b/frontend/src/components/shared/CommandPalette.tsx @@ -139,7 +139,7 @@ export default function CommandPalette() { onMouseEnter={() => setActiveIndex(i)} onClick={() => go(item.path)} className={cn( - 'flex w-full items-center gap-2.5 rounded-md px-2.5 py-1.5 text-left text-[13px] font-medium transition-colors', + 'flex w-full items-center gap-2.5 rounded-md px-2.5 py-1.5 text-left text-sm font-medium transition-colors', i === activeIndex ? 'bg-primary/10 text-primary' : 'text-foreground hover:bg-accent' diff --git a/frontend/src/components/ui/button.tsx b/frontend/src/components/ui/button.tsx index 6367338..bd56578 100644 --- a/frontend/src/components/ui/button.tsx +++ b/frontend/src/components/ui/button.tsx @@ -23,7 +23,7 @@ const buttonVariants = cva( default: "h-8 gap-1.5 px-2.5 has-data-[icon=inline-end]:pr-2 has-data-[icon=inline-start]:pl-2", xs: "h-6 gap-1 rounded-[min(var(--radius-md),10px)] px-2 text-xs in-data-[slot=button-group]:rounded-lg has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 [&_svg:not([class*='size-'])]:size-3", - sm: "h-7 gap-1 rounded-[min(var(--radius-md),12px)] px-2.5 text-[0.8rem] in-data-[slot=button-group]:rounded-lg has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 [&_svg:not([class*='size-'])]:size-3.5", + sm: "h-7 gap-1 rounded-[min(var(--radius-md),12px)] px-2.5 text-xs in-data-[slot=button-group]:rounded-lg has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5 [&_svg:not([class*='size-'])]:size-3.5", lg: "h-9 gap-1.5 px-2.5 has-data-[icon=inline-end]:pr-2 has-data-[icon=inline-start]:pl-2", icon: "size-8", "icon-xs": diff --git a/frontend/src/features/dashboard/DashboardPage.tsx b/frontend/src/features/dashboard/DashboardPage.tsx index f1169b8..959f2d5 100644 --- a/frontend/src/features/dashboard/DashboardPage.tsx +++ b/frontend/src/features/dashboard/DashboardPage.tsx @@ -73,7 +73,7 @@ function CircularGauge({ label, value }: { label: string; value: number }) { />
- {Math.round(clamped)} + {Math.round(clamped)}
{label} diff --git a/frontend/src/features/instances/InstanceActionDialogs.tsx b/frontend/src/features/instances/InstanceActionDialogs.tsx index ddcf51a..b0f12a4 100644 --- a/frontend/src/features/instances/InstanceActionDialogs.tsx +++ b/frontend/src/features/instances/InstanceActionDialogs.tsx @@ -1010,7 +1010,7 @@ function BackupDialog({ open, onClose, serverId, vmid, type, node, name }: Omit<
- setStorage(v ?? '')}> @@ -1031,7 +1031,7 @@ function BackupDialog({ open, onClose, serverId, vmid, type, node, name }: Omit<
- setMode(v ?? '')}> Snapshot @@ -1042,7 +1042,7 @@ function BackupDialog({ open, onClose, serverId, vmid, type, node, name }: Omit<
- setCompress(v ?? '')}> ZSTD diff --git a/frontend/src/features/scripts/ScriptExecuteDialog.tsx b/frontend/src/features/scripts/ScriptExecuteDialog.tsx index 53ba325..30afe32 100644 --- a/frontend/src/features/scripts/ScriptExecuteDialog.tsx +++ b/frontend/src/features/scripts/ScriptExecuteDialog.tsx @@ -35,7 +35,6 @@ export default function ScriptExecuteDialog({ script, onOpenChange }: Props) { // дальше поллим его до завершения (см. useScriptExecution). const { data: liveExec } = useScriptExecution(executionId ?? 0); const result: ScriptExecution | null = liveExec ?? null; - const isRunning = result?.status === 'running'; const serverIdNum = serverId ? Number(serverId) : 0; const { data: nodesData } = useNodes(serverIdNum || 0); @@ -87,7 +86,7 @@ export default function ScriptExecuteDialog({ script, onOpenChange }: Props) { params: paramValues, }, { - onSuccess: (r) => setResult(r), + onSuccess: (r) => setExecutionId(r.id), onError: (e) => toast.error((e as Error).message), }, ); diff --git a/frontend/src/fontsource.d.ts b/frontend/src/fontsource.d.ts index 46f2428..d4dc310 100644 --- a/frontend/src/fontsource.d.ts +++ b/frontend/src/fontsource.d.ts @@ -1,5 +1,5 @@ // @fontsource-variable/* packages ship CSS with no type declarations, so a // bare side-effect import isn't matched by Vite's `*.css` module glob. Declare // them as typeless modules to satisfy `tsc` (see main.tsx font imports). -declare module '@fontsource-variable/dm-sans'; +declare module '@fontsource-variable/inter'; declare module '@fontsource-variable/jetbrains-mono'; diff --git a/frontend/src/index.css b/frontend/src/index.css index 588dd37..dd4d880 100644 --- a/frontend/src/index.css +++ b/frontend/src/index.css @@ -5,14 +5,19 @@ @custom-variant dark (&:is(.dark *)); @theme inline { - --font-sans: "DM Sans Variable", system-ui, sans-serif; + --font-sans: "Inter Variable", system-ui, sans-serif; --font-mono: "JetBrains Mono Variable", ui-monospace, monospace; --font-heading: var(--font-sans); - /* One named step below text-xs (12px) for micro labels / meta text, so the - type scale is 11·12·14·16·18·24·32 instead of ad-hoc text-[10px]/[11px]. */ + /* Micro step for kbd hints, chart axis ticks, and compact badges. + Type scale: 11·12·13·14·16·18·24·32 */ --text-2xs: 0.6875rem; /* 11px */ --text-2xs--line-height: 1rem; + /* Bump xs/sm/base up by 1px for better readability at density. */ + --text-xs: 0.8125rem; /* 13px, default 12px */ + --text-xs--line-height: 1.125rem; + --text-sm: 0.9375rem; /* 15px, default 14px */ + --text-sm--line-height: 1.375rem; /* Semantic status tokens — use text-success / bg-warning / text-danger etc. instead of hardcoded green-500 / amber-500 / red-500 so both themes and diff --git a/frontend/src/layouts/AppLayout.tsx b/frontend/src/layouts/AppLayout.tsx index 05b509a..840aa6f 100644 --- a/frontend/src/layouts/AppLayout.tsx +++ b/frontend/src/layouts/AppLayout.tsx @@ -76,7 +76,7 @@ function SidebarContent() {
-

{user?.username ?? 'User'}

+

{user?.username ?? 'User'}

{user?.is_admin ? 'Admin' : 'User'}

diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx index 05a98c4..8062a8f 100644 --- a/frontend/src/main.tsx +++ b/frontend/src/main.tsx @@ -1,9 +1,9 @@ import { StrictMode } from 'react' import { createRoot } from 'react-dom/client' // Self-hosted fonts (font-display: swap built in) — no render-blocking -// external Google Fonts request. Family names: "DM Sans Variable" / +// external Google Fonts request. Family names: "Inter Variable" / // "JetBrains Mono Variable" (see --font-sans / --font-mono in index.css). -import '@fontsource-variable/dm-sans' +import '@fontsource-variable/inter' import '@fontsource-variable/jetbrains-mono' import './lib/i18n' import './index.css'