Merge branch 'feature/vmops' into claude/production-system-image-smcxyr
# Conflicts: # tests/conftest.py # tests/dev_server.py # web/app.py # web/static/app.css # web/static/icons.svg
Этот коммит содержится в:
@@ -630,3 +630,28 @@ details.advanced > .advanced-body { padding: 4px 16px 16px; }
|
||||
.download-error { color: var(--danger); }
|
||||
.catalog-item .meta code { padding: 1px 5px; border-radius: 5px; background: var(--surface-3); font: 12px/1.4 var(--mono); color: var(--text-2); }
|
||||
@media (max-width: 640px) { .download-item, .catalog-item { flex-wrap: wrap; } .download-item .grow, .catalog-item .grow { flex-basis: calc(100% - 50px); } }
|
||||
|
||||
/* ---------------------------------------------------------- vmops: live load, disks, notes */
|
||||
.list > * { min-width: 0; } /* длинное сообщение задачи обрезается, а не растягивает карточку на телефоне */
|
||||
.vm-title { color: var(--text-2); font-weight: 500; }
|
||||
.vm-meters { display: grid; gap: 3px; margin-top: 6px; max-width: 220px; }
|
||||
.vm-meter { display: grid; grid-template-columns: 14px minmax(0, 1fr) 46px; align-items: center; gap: 7px; color: var(--text-3); font-size: 11.5px; }
|
||||
.vm-meter .icon-sm { width: 14px; height: 14px; }
|
||||
.vm-meter .meter { display: block; margin: 0; height: 5px; }
|
||||
.vm-meter b { font-weight: 600; color: var(--text-2); text-align: right; white-space: nowrap; font-variant-numeric: tabular-nums; }
|
||||
.load-grid { display: grid; gap: 16px; }
|
||||
.load-row { display: grid; gap: 8px; }
|
||||
.load-row .row-between { font-size: 13px; }
|
||||
.load-row .row-between .subtle { display: inline-flex; align-items: center; gap: 6px; }
|
||||
.load-row .meter { margin-top: 0; }
|
||||
.disk-resize { display: flex; align-items: center; gap: 8px; flex: none; }
|
||||
.disk-resize .input { width: 84px; height: 32px; padding: 0 10px; border-radius: 8px 0 0 8px; font-size: 13px; }
|
||||
.disk-resize .addon { padding: 0 9px; border-radius: 0 8px 8px 0; font-size: 12px; }
|
||||
.disk-footer { display: block; }
|
||||
.disk-footer p { margin: 0; line-height: 1.5; }
|
||||
textarea.input { height: auto; min-height: 96px; padding: 9px 12px; resize: vertical; line-height: 1.45; }
|
||||
textarea.input:focus { border-color: var(--brand); outline: none; box-shadow: 0 0 0 4px var(--focus); }
|
||||
@media (max-width: 640px) {
|
||||
.list-item.disk-item { flex-wrap: wrap; }
|
||||
.disk-resize { width: 100%; justify-content: flex-end; }
|
||||
}
|
||||
|
||||
@@ -59,4 +59,6 @@
|
||||
<symbol id="i-plug" viewBox="0 0 24 24"><path d="M12 22v-5" /><path d="M15 8V2" /><path d="M17 8a1 1 0 0 1 1 1v4a4 4 0 0 1-4 4h-4a4 4 0 0 1-4-4V9a1 1 0 0 1 1-1z" /><path d="M9 8V2" /></symbol>
|
||||
<symbol id="i-camera" viewBox="0 0 24 24"><path d="M13.997 4a2 2 0 0 1 1.76 1.05l.486.9A2 2 0 0 0 18.003 7H20a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V9a2 2 0 0 1 2-2h1.997a2 2 0 0 0 1.759-1.048l.489-.904A2 2 0 0 1 10.004 4z" /><circle cx="12" cy="13" r="3" /></symbol>
|
||||
<symbol id="i-history" viewBox="0 0 24 24"><path d="M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8" /><path d="M3 3v5h5" /><path d="M12 7v5l4 2" /></symbol>
|
||||
<symbol id="i-notebook-pen" viewBox="0 0 24 24"><path d="M13.4 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2v-7.4" /><path d="M2 6h4" /><path d="M2 10h4" /><path d="M2 14h4" /><path d="M2 18h4" /><path d="M21.378 5.626a1 1 0 1 0-3.004-3.004l-5.01 5.012a2 2 0 0 0-.506.854l-.837 2.87a.5.5 0 0 0 .62.62l2.87-.837a2 2 0 0 0 .854-.506z" /></symbol>
|
||||
<symbol id="i-expand" viewBox="0 0 24 24"><path d="m15 15 6 6" /><path d="m15 9 6-6" /><path d="M21 16v5h-5" /><path d="M21 8V3h-5" /><path d="M3 16v5h5" /><path d="m3 21 6-6" /><path d="M3 8V3h5" /><path d="M9 9 3 3" /></symbol>
|
||||
</svg>
|
||||
|
||||
|
До Ширина: | Высота: | Размер: 11 KiB После Ширина: | Высота: | Размер: 12 KiB |
@@ -198,6 +198,41 @@
|
||||
setInterval(refreshLive, 5000);
|
||||
}
|
||||
|
||||
/* ---------------------------------------------------- live VM load (CPU / RAM meters) */
|
||||
const levelTone = (pct) => (pct >= 90 ? 'danger' : pct >= 75 ? 'warning' : 'success');
|
||||
const formatMb = (mb) => (mb >= 1024 ? `${(mb / 1024).toFixed(mb >= 10240 ? 0 : 1)} ГБ` : `${Math.round(mb)} МБ`);
|
||||
function applyStatMeter(root, key, pct, label) {
|
||||
const bar = $(`[data-stat="${key}-bar"]`, root);
|
||||
const meter = $(`[data-stat="${key}-meter"]`, root);
|
||||
const text = $(`[data-stat="${key}"]`, root);
|
||||
if (bar) bar.style.setProperty('--value', `${pct == null ? 0 : Math.round(pct)}%`);
|
||||
if (meter) meter.className = `meter ${pct == null ? '' : levelTone(pct)}`;
|
||||
if (text) text.textContent = label;
|
||||
}
|
||||
async function refreshStats() {
|
||||
if (document.hidden) return;
|
||||
try {
|
||||
const response = await fetch('/live/stats', { cache: 'no-store', headers: { Accept: 'application/json' } });
|
||||
if (!response.ok) return;
|
||||
const payload = await response.json();
|
||||
if (!payload.ok) return;
|
||||
$$('[data-live-stats]').forEach((root) => {
|
||||
const stat = payload.stats[root.dataset.liveStats];
|
||||
root.hidden = !stat;
|
||||
if (!stat) return;
|
||||
const cpu = stat.cpu_pct == null ? null : Math.round(stat.cpu_pct);
|
||||
const memPct = stat.mem_total_mb ? Math.min(100, Math.round((stat.mem_used_mb / stat.mem_total_mb) * 100)) : null;
|
||||
applyStatMeter(root, 'cpu', cpu, cpu == null ? '…' : `${cpu}%`);
|
||||
applyStatMeter(root, 'mem', memPct, stat.mem_total_mb ? (root.classList.contains('vm-meters') ? `${memPct}%` : `${formatMb(stat.mem_used_mb)} из ${formatMb(stat.mem_total_mb)}`) : '—');
|
||||
});
|
||||
} catch (_) {}
|
||||
}
|
||||
function wireStats() {
|
||||
if (!$('[data-live-stats]')) return;
|
||||
refreshStats();
|
||||
setInterval(refreshStats, 5000);
|
||||
}
|
||||
|
||||
/* ---------------------------------------------------- uploads */
|
||||
function wireUploader(form) {
|
||||
const input = $('input[type=file]', form);
|
||||
@@ -468,6 +503,7 @@
|
||||
wireTabs();
|
||||
wireCopy();
|
||||
wireLive();
|
||||
wireStats();
|
||||
$$('form[data-uploader]').forEach(wireUploader);
|
||||
wireOperation();
|
||||
wireLogs();
|
||||
|
||||
Ссылка в новой задаче
Block a user