diff --git a/README.md b/README.md index 239a219..6f12b13 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,17 @@ Xray и недоступном SSH-туннеле, если агент прод Локальная установка, проверка и откат.

+

+Карточки роутеров: кнопки «Открыть данные» и «Скрыть данные» на ПК и телефоне. +На ПК данные плавно раскрываются поверх сетки, сохраняя положение остальных карточек. +Поведение, установка и откат. +

+ +

+Поддержка проекта: кнопка «Сказать спасибо ❤️ Donate 💲» открывает отдельную +страницу с основной и резервной ссылками для доната. Страница использует выбранный дизайн Hub. +

+ diff --git a/docs/ROUTER_CARD_DETAILS.md b/docs/ROUTER_CARD_DETAILS.md new file mode 100644 index 0000000..3a1e302 --- /dev/null +++ b/docs/ROUTER_CARD_DETAILS.md @@ -0,0 +1,40 @@ +# Раскрытие данных карточек роутеров + +На ПК и телефоне карточки открываются кнопками «Открыть данные» и «Скрыть данные». +На ПК подробности раскрываются поверх сетки. Место компактной карточки сохраняется, +поэтому соседние карточки, следующие ряды и высота страницы не меняются. +Одновременно открыта одна карточка. Закрыть её можно кнопкой, Escape или нажатием +снаружи. Длинное содержимое прокручивается внутри раскрытой карточки. + +Раскрытие занимает 230 мс. В облегчённом дизайне и при системной настройке уменьшения +анимации переход выполняется сразу. На мобильном сохраняется раскрытие внутри +страницы. Обновление статусов сохраняет открытые данные и их прокрутку. + +## Локальная установка на VPS + +Из PowerShell Windows 11: + +```powershell +$Fix = Join-Path $env:USERPROFILE 'Documents\openwrt overlay\vps\deploy-router-card-details.ps1' +powershell.exe -NoProfile -ExecutionPolicy Bypass -File $Fix -Vps root@YOUR_VPS_IP -Action Install +``` + +Скрипт проверяет Python, сохраняет исходный Hub в +`/root/owrt-remote-backup-before-router-card-details-v122/hub.py`, атомарно заменяет +файл, перезапускает Hub и проверяет SHA256 работающего процесса через `/health`. +При ошибке восстанавливает файл, который был установлен до текущей попытки. +После установки обновите страницу панели через Ctrl+F5. + +Откат к сохранённой копии: + +```powershell +powershell.exe -NoProfile -ExecutionPolicy Bypass -File $Fix -Vps root@YOUR_VPS_IP -Action Rollback +``` + +## Проверка интерфейса + +`tests/test_router_card_details.cjs` использует настоящий HTML/JS панели и +Playwright с установленным Chrome. Проверяет координаты сетки во время анимации, +раскрытие/закрытие, границы экрана, быстрые повторные клики, обновление статусов, +прокрутку, фокус клавиатуры и переход с ПК на мобильный размер. Сценарии включают +три дизайна, уменьшенную анимацию, две колонки и обе ориентации телефона. diff --git a/tests/test_host_policy_ui.cjs b/tests/test_host_policy_ui.cjs index a9c5e61..70f48af 100644 --- a/tests/test_host_policy_ui.cjs +++ b/tests/test_host_policy_ui.cjs @@ -73,9 +73,9 @@ const eventFor = (selector, node) => ({target: {closest(wanted) { return wanted expandedActionPanels: new Set(), expandedCardDetails: new Set(), expandedGroupPickers: new Set(), openRouterGroups: new Set(['__ungrouped__']), mobileCardsMq: {matches: false}, authIsOwner: () => true, groupPickerButtonsHtml: empty, - renderModelMetric: empty, modelGetsLegendBadge: () => false, metric: empty, + renderModelMetric: empty, modelGetsLegendBadge: () => false, metric: empty, renderTachyon: empty, statusRu: identity, ago: empty, metricHtml: empty, formatMemoryHtml: empty, - memoryClass: empty, formatFlashHtml: empty, flashClass: empty, + memoryClass: empty, formatFlashHtml: empty, flashClass: empty, syncCardDetails: empty, formatTemperatureHtml: empty, tempClass: empty, syncActionToggleStates: empty, }); vm.runInContext(source.slice(renderBegin, renderEnd), context); diff --git a/tests/test_router_card_details.cjs b/tests/test_router_card_details.cjs new file mode 100644 index 0000000..c110858 --- /dev/null +++ b/tests/test_router_card_details.cjs @@ -0,0 +1,159 @@ +// Run with Playwright available in NODE_PATH. Uses the actual dashboard HTML/JS. +const assert = require('node:assert/strict'); +const fs = require('node:fs'); +const path = require('node:path'); +const {execFileSync} = require('node:child_process'); +const {chromium} = require('playwright'); +const output = path.resolve('.test-output/card-details'); +fs.mkdirSync(output, {recursive:true}); +execFileSync(process.env.TEST_PYTHON || 'python', ['-c', String.raw` +import importlib.util, os, sys, tempfile +from pathlib import Path +with tempfile.TemporaryDirectory(prefix='card-details-preview-') as state: + os.environ['OWRT_REMOTE_STATE_DIR'] = state + spec = importlib.util.spec_from_file_location('card_details_hub', 'vps/owrt-remote-hub.py') + hub = importlib.util.module_from_spec(spec); sys.modules[spec.name] = hub; spec.loader.exec_module(hub) + routers = [{ + 'id': 'node-' + str(i), 'name': 'Router ' + str(i), 'online': i != 8, + 'role': 'node', 'group_id': '', 'last_seen_iso': '2026-11-22T00:00:00Z', + 'status': {'model': 'Xiaomi Mi Router AX3000T (OpenWrt U-Boot layout)', + 'release': 'OpenWrt 25.12.5', 'xray': 'running', 'ssh': 'running', + 'memory': '64 MB free / 234 MB', 'flash': '30 MB free / 60 MB', + 'uptime': '1000', 'load': '0.1 0.2 0.3', 'temperature': '55'}, + 'permissions': {p: True for p in ('owner','manage','admin','ssh','config','delete','logs')}, + 'ssh_entry_port': 19180 + i, 'admin_url': '/r/node-' + str(i) + '/', + 'ssh_url': '/ssh/node-' + str(i) + '/', 'config_url': '/config/node-' + str(i), + 'tachyon': {'installed': True, 'online': True, 'version': '2.0.0-beta.15', 'url': '/tachyon/node-' + str(i) + '/'} + } for i in range(1,10)] + page = hub.dashboard_html(routers, 'owner', auth_bootstrap={'username':'owner','is_owner':True}) + Path('.test-output/card-details/dashboard.html').write_text(page, encoding='utf-8') +`], {cwd:path.resolve(__dirname, '..')}); +const html = fs.readFileSync(path.join(output, 'dashboard.html'), 'utf8'); +const routers = JSON.parse(html.match(/window\.ROUTERS = (\[.*\]);/)[1]); +const geometry = page => page.locator('.routerCardSlot').evaluateAll(slots => slots.map(el => { + const r = el.getBoundingClientRect(); + return {x:r.x,y:r.y,width:r.width,height:r.height}; +})); +function sameGrid(before, after, label) { + assert.equal(after.length, before.length); + for (let i=0; i page.waitForFunction(() => cardDetailsAnimations.size === 0); +async function fitsViewport(page) { + const r = await page.locator('.isFloating>.card').evaluate(el => { + const r=el.getBoundingClientRect(); + return {left:r.left,right:r.right,top:r.top,bottom:r.bottom,w:innerWidth,h:innerHeight}; + }); + assert(r.left>=11 && r.right<=r.w-11 && r.top>=11 && r.bottom<=r.h-11, JSON.stringify(r)); + assert(await page.evaluate(() => document.documentElement.scrollWidth<=innerWidth)); +} +(async () => { + const browser = await chromium.launch({headless:true, channel:'chrome'}); + let count=0; + try { + for (const scenario of [ + {name:'desktop', width:1280,height:900}, + {name:'two-columns',width:900,height:700}, + {name:'winter',width:1280,height:900,design:'winter'}, + {name:'lite',width:1280,height:900,design:'lite',noMotion:true}, + {name:'reduced-motion',width:1280,height:900,reducedMotion:'reduce',noMotion:true}, + {name:'portrait',width:390,height:844,mobile:true}, + {name:'landscape',width:844,height:390,mobile:true}, + ]) { + const context=await browser.newContext({viewport:{width:scenario.width,height:scenario.height}, + hasTouch:!!scenario.mobile,isMobile:!!scenario.mobile,reducedMotion:scenario.reducedMotion || 'no-preference'}); + try { + await context.addInitScript(design => { + localStorage.setItem('owrtRemote:hubDesign',design); + localStorage.setItem('owrtRemote:seasonEffectMode','off'); + },scenario.design || 'default'); + await context.route('**/*', async route => { + const u=new URL(route.request().url()); + if (u.pathname === '/') return route.fulfill({contentType:'text/html; charset=utf-8',body:html}); + if (u.pathname === '/api/routers') return route.fulfill({json:{routers}}); + if (u.pathname === '/api/auth/meta') return route.fulfill({json:{ok:true,auth:{username:'owner',is_owner:true}}}); + if (u.pathname === '/api/notifications/wait') return route.abort(); + if (u.pathname.startsWith('/api/')) return route.fulfill({json:{ok:true,groups:[],notifications:[]}}); + return route.abort(); + }); + const page=await context.newPage(); + const errors=[];page.on('pageerror', e=>errors.push(e.message)); + await page.goto('http://hub.test/',{waitUntil:'domcontentloaded'}); + await page.locator('.routerCardSlot').nth(8).waitFor(); + const toggles=page.locator('[data-card-toggle]'); + assert.equal(await toggles.count(),9,scenario.name); + assert.equal(await page.locator('.cardBody:visible').count(),0,'compact at entry'); + await toggles.first().scrollIntoViewIfNeeded(); + await page.waitForTimeout(50); + const before=await geometry(page); + const docHeight=await page.evaluate(()=>document.documentElement.scrollHeight); + await toggles.first().click(); + assert.equal(await toggles.first().getAttribute('aria-expanded'),'true'); + if (!scenario.mobile) { + assert.equal(await page.locator('.isFloating').count(),1); + assert.equal(await page.evaluate(()=>cardDetailsAnimations.size>0),!scenario.noMotion,scenario.name+' animation policy'); + sameGrid(before,await geometry(page),scenario.name+' during animation'); + await settled(page); + sameGrid(before,await geometry(page),scenario.name+' open'); + if (scenario.height-before[0].y-12>=400) { + assert(Math.abs((await page.locator('.isFloating>.card').boundingBox()).y-before[0].y)<1,'expansion stays anchored when there is room'); + } + assert.equal(await page.evaluate(()=>document.documentElement.scrollHeight),docHeight,'page height stable'); + await fitsViewport(page); + const body=page.locator('.isFloating .cardBody'); + const scrolled=await body.evaluate(el=>{el.scrollTop=80;return el.scrollTop;}); + await page.evaluate(()=>loadRouters()); + await page.waitForTimeout(60); + assert.equal(await page.locator('.isFloating .cardBody').evaluate(el=>el.scrollTop),scrolled,'poll preserves scroll'); + sameGrid(before,await geometry(page),scenario.name+' polling'); + await toggles.first().focus(); + await page.evaluate(()=>loadRouters()); + assert.equal(await toggles.first().evaluate(el=>el===document.activeElement),true,'poll preserves keyboard focus'); + await toggles.nth(1).click(); + await settled(page); + assert.equal(await page.locator('.isFloating').count(),1,'one desktop expansion'); + assert.equal(await toggles.first().getAttribute('aria-expanded'),'false'); + sameGrid(before,await geometry(page),scenario.name+' switch'); + await page.screenshot({path:path.join(output,scenario.name+'.png'),fullPage:false}); + await page.keyboard.press('Escape'); + await settled(page); + assert.equal(await page.locator('.isFloating').count(),0,'Escape closes'); + sameGrid(before,await geometry(page),scenario.name+' close'); + await toggles.last().scrollIntoViewIfNeeded(); + await toggles.last().click();await settled(page);await fitsViewport(page); + await page.locator('#routerStats').evaluate(el=>el.dispatchEvent(new PointerEvent('pointerdown',{bubbles:true}))); + await settled(page); + assert.equal(await page.locator('.isFloating').count(),0,'outside pointer closes'); + await page.evaluate(()=>{ + const toggle=document.querySelector('[data-card-toggle]'); + toggle.click();toggle.click();toggle.click(); + }); + await settled(page); + assert.equal(await toggles.first().getAttribute('aria-expanded'),'true','rapid clicks finish open'); + await toggles.first().click();await settled(page); + assert.equal(await page.locator('.isFloating').count(),0,'toggle closes'); + await toggles.first().scrollIntoViewIfNeeded(); + await toggles.first().click();await settled(page); + await page.setViewportSize({width:390,height:844}); + await page.waitForFunction(()=>mobileCardsMq.matches && !document.querySelector('.isFloating')); + assert.equal(await toggles.first().getAttribute('aria-expanded'),'true','resizing to mobile keeps data open'); + assert(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth),'resize has no overflow'); + } else { + assert.equal(await page.locator('.isFloating').count(),0,'mobile stays inline'); + assert.equal(await page.locator('.cardBody:visible').count(),1); + await page.evaluate(()=>loadRouters()); + assert.equal(await toggles.first().getAttribute('aria-expanded'),'true','mobile poll preserves state'); + await page.screenshot({path:path.join(output,scenario.name+'.png'),fullPage:false}); + await toggles.first().click(); + assert.equal(await page.locator('.cardBody:visible').count(),0); + assert(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth)); + } + assert.deepEqual(errors,[],scenario.name+' browser errors'); + count++;console.log('CARD_DETAILS_OK',scenario.name); + } finally {await context.close();} + } + } finally {await browser.close();} + console.log('CARD_DETAILS_BROWSER_OK:',count,'scenarios'); +})().catch(e=>{console.error(e);process.exitCode=1;}); diff --git a/tests/test_tachyon_ui.cjs b/tests/test_tachyon_ui.cjs index 487019f..d015a36 100644 --- a/tests/test_tachyon_ui.cjs +++ b/tests/test_tachyon_ui.cjs @@ -18,7 +18,8 @@ assert(html.includes('Online')); assert(html.includes('href="/tachyon/a/"')); assert(html.includes('tachyonMeta')); assert(html.includes('tachyonAction')); -assert(context.renderTachyon({permissions:{admin:true}, tachyon:{installed:true, online:true, url:'/tachyon/a/'}}).includes('Tachyon')); +const withoutVersion = context.renderTachyon({permissions:{admin:true}, tachyon:{installed:true, online:true, url:'/tachyon/a/'}}); +assert.match(withoutVersion.replace(/<[^>]*>/g, ''), /Tachyon\s*Online/); router.tachyon.online = false; assert(context.renderTachyon(router).includes('Offline')); router.permissions.admin = false; diff --git a/vps/deploy-donate-ui.ps1 b/vps/deploy-donate-ui.ps1 new file mode 100644 index 0000000..9242859 --- /dev/null +++ b/vps/deploy-donate-ui.ps1 @@ -0,0 +1,10 @@ +param( + [string]$Vps = 'root@132.243.19.232', + [ValidateSet('Install', 'Rollback')][string]$Action = 'Install', + [switch]$PrepareOnly +) + +$ErrorActionPreference = 'Stop' +& (Join-Path $PSScriptRoot 'deploy-tachyon.ps1') -Vps $Vps -Action $Action ` + -BackupName donate-ui -BackupVersion v122 -PrepareOnly:$PrepareOnly +if (-not $PrepareOnly) { Write-Host "Donate UI $Action finished successfully." } diff --git a/vps/deploy-router-card-details.ps1 b/vps/deploy-router-card-details.ps1 new file mode 100644 index 0000000..97d4a25 --- /dev/null +++ b/vps/deploy-router-card-details.ps1 @@ -0,0 +1,12 @@ +param( + [string]$Vps = 'root@132.243.19.232', + [ValidateSet('Install', 'Rollback')][string]$Action = 'Install', + [switch]$PrepareOnly +) + +$ErrorActionPreference = 'Stop' +# The shared VPS installer validates the source, keeps an independent backup, +# replaces Hub atomically and verifies the running source revision after restart. +& (Join-Path $PSScriptRoot 'deploy-tachyon.ps1') -Vps $Vps -Action $Action ` + -BackupName router-card-details -BackupVersion v122 -PrepareOnly:$PrepareOnly +if (-not $PrepareOnly) { Write-Host "Router card details $Action finished successfully." } diff --git a/vps/deploy-tachyon.ps1 b/vps/deploy-tachyon.ps1 index fda80f9..8b26ebb 100644 --- a/vps/deploy-tachyon.ps1 +++ b/vps/deploy-tachyon.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory = $true, ParameterSetName = 'Vps')][string]$Vps, [Parameter(Mandatory = $true, ParameterSetName = 'Router')][string]$Router, [ValidateSet('Install', 'Rollback')][string]$Action = 'Install', - [ValidateSet('tachyon-integration', 'tachyon-layout', 'tachyon-detection')][string]$BackupName = 'tachyon-integration', + [ValidateSet('tachyon-integration', 'tachyon-layout', 'tachyon-detection', 'router-card-details', 'donate-ui')][string]$BackupName = 'tachyon-integration', [ValidateSet('v121', 'v122')][string]$BackupVersion = 'v121', [ValidateRange(1, 65535)][int]$Port = 22, [string]$JumpHost = '', diff --git a/vps/owrt-remote-hub.py b/vps/owrt-remote-hub.py index 61f64bb..23d9fbe 100644 --- a/vps/owrt-remote-hub.py +++ b/vps/owrt-remote-hub.py @@ -6372,6 +6372,76 @@ def inject_hub_appearance(path, body, content_type): return text.encode("utf-8") +def donate_payment_logos_html(): + # Small inline vector marks keep the thank-you page self-contained. + return '''
+ +
''' + + +def donate_html(): + return f""" + + + + +Сказать спасибо — OpenWrt Remote Hub +{branding_head_tags()} + +{hub_design_head()} + + +
+
OpenWrt Remote Hub

Сказать спасибо ❤️ Donate 💲

+ +
+

Буду искренне благодарен за любой донат!

+

Совершенно не важно, какая сумма - важна ваша поддержка. Даже небольшой вклад помогает развивать проект и двигаться дальше.

+

Спасибо каждому, кто рядом! Всех обнял! 🤝🚀

+
+ {donate_payment_logos_html()} + +
+ +""" + + def dashboard_html(routers, username, sessions=None, notifications=None, auth_bootstrap=None, vps_resources=None): routers_json = json.dumps(routers, ensure_ascii=False) sessions_json = json.dumps(sessions or [], ensure_ascii=False) @@ -6432,6 +6502,19 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding @media(max-width:680px),(max-width:1024px) and (orientation:landscape) and (pointer:coarse){{body{{font-size:13px;background-attachment:scroll}}.wrap{{padding:10px}}.top{{gap:12px;padding:14px 0;align-items:flex-start}}.brand,.brand>div{{width:100%}}h1{{font-size:22px;line-height:1.18}}.appBanner{{width:auto;max-width:100%;justify-content:center;min-height:36px;padding:8px 12px}}.links,.headerActions,.summary,.mobileOwnerTools{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));width:100%;gap:8px;max-width:none}}.links{{margin-top:10px}}.links a,.badge,.headerActions .btn,.mobileOwnerTools .btn,.mobileOwnerTools .badge,.miniStat{{width:100%;min-width:0;padding:9px 10px;font-size:12px}}.headerStack{{margin-top:0;width:100%;min-width:0}}.headerStack .badge{{width:100%;min-width:0}}.authMenu{{position:fixed;left:10px;right:10px;top:74px;width:auto;max-height:calc(100svh - 90px);overflow:auto}}.authMenuHead{{min-height:40px;padding:0 104px 8px 0}}.authMenu h2{{margin:2px 104px 0 0;line-height:1.2}}.authMenuClose{{display:inline-flex;top:0;right:0;min-height:32px;padding:6px 12px}}.cards,.routerGroupCards,.toolbar,.authGrid{{grid-template-columns:1fr}}.authRow{{grid-template-columns:1fr;gap:7px;padding:8px}}.authRowTitle{{font-size:13px}}.authRowMeta{{font-size:11px;line-height:1.3}}.authRouterFlags{{justify-content:flex-start;gap:6px}}.authFlagPill{{min-height:25px;padding:3px 7px;gap:5px}}.authFlagPill input{{width:12px;height:12px;flex-basis:12px}}.authFlagPill span{{font-size:10px}}.routerStats{{grid-template-columns:repeat(3,minmax(0,1fr));gap:5px;margin-bottom:7px}}.statCard{{min-height:52px;padding:7px 6px}}.statCard span{{font-size:8px;letter-spacing:.015em}}.statCard strong{{font-size:20px}}.statCard em{{display:none}}.statCardHead{{min-height:16px}}.statValueRow,.offlineStatRow{{min-height:20px;margin-top:4px}}.offlineMoreBtn{{right:2px;min-height:16px;padding:0 5px;font-size:7px}}.offlinePopover{{right:3px;width:min(230px,calc(100vw - 20px));padding:8px}}.offlineItem{{padding:6px 7px}}.offlineName{{font-size:10px}}.toolbar{{padding:10px;margin:12px 0}}.card.main{{grid-column:span 1}}.card{{padding:12px;min-height:0}}.card>.metaLine,.card>.tagRow{{display:none}}.nameRow{{gap:6px;margin-top:10px}}.nameRow::before{{flex-basis:26px;width:26px;height:26px}}.name{{font-size:12px;max-width:190px}}.nameEditBtn{{flex-basis:26px;width:26px;height:26px}}.mobilePanelToggle,.routerFormToggle{{display:inline-flex}}.routerSearchDock{{width:100%}}.seasonDock{{width:100%}}#mobileSeasonDock{{width:100%;min-width:0;max-width:none;padding:0;border:0;background:none;box-shadow:none;backdrop-filter:none}}.routerSearchToggle,.seasonToggle{{width:100%}}.routerSearchPanel,.seasonPanel{{position:static;width:100%;margin-top:8px}}.routerSearchCard,.seasonCard{{width:100%;min-height:0;padding:10px 11px;border-radius:16px}}.routerSearchTitle{{font-size:11px}}.routerSearchField{{min-height:36px}}.routerSearchMeta{{text-align:center}}.metrics{{grid-template-columns:repeat(2,minmax(0,1fr));gap:7px}}.metric{{padding:8px}}.diagnosticPanel{{padding:12px}}.diagnosticTop{{gap:8px}}.diagnosticTop h2{{font-size:17px}}.diagnosticLead{{font-size:11px}}.diagnosticGrid{{grid-template-columns:1fr;gap:10px}}.diagnosticGrid label{{font-size:13px}}.diagnosticGrid textarea{{min-height:118px;padding:12px 13px;font-size:15px;line-height:1.35}}.diagBlock{{padding:11px}}.actions{{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:8px}}.actions .btn,.actions button{{width:100%;min-width:0;padding:9px 8px;font-size:12px}}.wolControls,.trafficControls{{grid-template-columns:1fr}}.wolField span,.wolMeta{{text-align:center}}.wolControls .btn,.wolControls button,.trafficControls .btn,.trafficControls button{{width:100%}}.trafficSummary{{justify-content:center}}.trafficViewport{{max-height:360px;padding-right:0}}.trafficRowTop{{grid-template-columns:1fr}}.trafficTotalBadge{{min-width:0;text-align:left}}}} @media(max-width:680px),(max-width:1024px) and (orientation:landscape) and (pointer:coarse){{.desktopHeader{{display:none}}#hubMenuPanelHost{{display:block;width:100%}}#hubMenuPanelHost:empty{{display:none}}.mobileOwnerTools{{display:grid;margin:0 0 8px}}.mobileOwnerTools[hidden]{{display:none!important}}.top{{padding:6px 0 0;gap:0}}.mobileSearchDock{{display:block;margin:0}}.mobilePanelToggle,.routerFormToggle,.actionToggle{{width:100%;min-height:38px;margin:7px 0;padding:9px 12px;border-radius:999px;font-size:12px;line-height:1}}.actionToggle{{display:inline-flex}}body.preload-mobile-panels .headerActions,body.preload-mobile-panels .routerFormWrap,body.preload-mobile-panels .mobileOwnerTools{{display:none!important}}.card .actions.mobileCollapsed:not(.open){{display:none}}.cardTop{{gap:0}}}} @media(max-width:680px),(max-width:1024px) and (orientation:landscape) and (pointer:coarse){{.headerActions .badge,.headerActions .btn,.mobileOwnerTools .badge,.mobileOwnerTools .btn{{width:100%;min-width:0;max-width:none}}}} +.routerCardSlot{{position:relative;min-width:0;align-self:start}} +.routerCardSlot>.card{{min-height:0;width:100%}} +.cardDetailsToggle{{display:flex;align-items:center;justify-content:center;gap:9px;width:100%;min-height:36px;margin-top:12px;padding:9px 12px;color:var(--text);border:1px solid var(--line);background:rgba(255,255,255,.08)}} +.cardDetailsToggle::after{{content:"";width:7px;height:7px;border-right:2px solid currentColor;border-bottom:2px solid currentColor;transform:translateY(-2px) rotate(45deg);transition:transform .2s ease}} +.cardDetailsToggle[aria-expanded="true"]::after{{transform:translateY(2px) rotate(225deg)}} +.cardDetailsToggle:focus-visible{{outline:2px solid var(--cyan);outline-offset:3px}} +.cardBody{{margin-top:10px;min-width:0}} +.routerCardSlot.isFloating{{z-index:45}} +.routerCardSlot.isFloating>.card{{position:fixed;display:flex;flex-direction:column;max-height:calc(100vh - 24px);max-height:calc(100dvh - 24px);margin:0;overflow:hidden;background:var(--panel);box-shadow:0 24px 64px rgba(0,0,0,.45)}} +.routerCardSlot.isFloating>.card>.cardTop,.routerCardSlot.isFloating>.card>.nameRow,.routerCardSlot.isFloating>.card>.routerCardGroup,.routerCardSlot.isFloating>.card>.cardDetailsToggle{{flex-shrink:0}} +.routerCardSlot.isFloating>.card>.nameRow{{align-self:center}} +.routerCardSlot.isFloating .cardBody{{min-height:0;overflow:auto;overscroll-behavior:contain;scrollbar-width:thin;scrollbar-gutter:stable;padding:0 3px 3px}} +@media(prefers-reduced-motion:reduce){{.cardDetailsToggle::after{{transition:none}}}} @media(max-width:420px){{.links,.headerActions,.summary,.actions,.mobileOwnerTools{{grid-template-columns:1fr}}.metrics{{grid-template-columns:1fr}}.metric.span2{{grid-column:span 1}}}} @media(max-width:680px),(max-width:1024px) and (orientation:landscape) and (pointer:coarse){{.desktopHeader{{width:100%}}.summary{{justify-content:center}}}} @media(min-width:681px){{.trafficPanel{{width:min(100%,332px);justify-self:center;padding:9px 9px 8px;border-radius:10px;gap:9px}}.trafficControls{{grid-template-columns:repeat(2,minmax(0,1fr))!important;gap:6px}}.trafficPanel .wolField{{gap:4px;font-size:11px}}.trafficPanel .wolField span{{text-align:center}}.trafficPanel .wolField input{{min-height:32px;padding:0 9px;font-size:13px}}.trafficStatusField .wolMeta{{min-height:32px;font-size:11px;line-height:1.18;text-align:center}}.trafficPanel .btn{{min-height:32px;padding:6px 7px;font-size:11px}}.trafficSummary{{justify-content:center}}.trafficSummaryChip{{min-height:20px;padding:0 7px;font-size:9.5px}}.trafficViewport{{max-height:min(42svh,350px)}}.trafficList{{gap:6px}}.trafficRow{{gap:6px;padding:8px}}.trafficRowTop{{grid-template-columns:1fr;gap:7px}}.trafficIdentity{{text-align:center!important}}.trafficName{{display:block;width:100%;font-size:13px;text-align:center!important}}.trafficMetaLine{{font-size:10px;line-height:1.32;text-align:center!important}}.trafficTotalBadge{{display:grid;width:fit-content;min-width:136px;max-width:186px;justify-self:center!important;margin:0 auto;place-self:center;padding:6px 10px;text-align:center!important}}.trafficTotalBadge span{{font-size:9px}}.trafficTotalBadge strong{{font-size:12px}}.trafficStat{{padding:6px 5px}}.trafficStat span{{font-size:9px}}.trafficStat strong{{font-size:11px}}}} @@ -6501,6 +6584,11 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding .hubUpdateConfirmActions{{gap:8px;margin-top:14px}} .hubUpdateConfirmActions button{{min-height:44px;padding:9px 8px;font-size:12px}} }} +.desktopHeader .links .donateLink{{grid-column:1/span 2;min-width:0;max-width:none;min-height:36px;padding:8px 14px;font-size:13px;font-weight:800;line-height:1;white-space:normal;text-align:center}} +.links a.appBanner{{border-color:rgba(34,211,238,.38);background:linear-gradient(110deg,rgba(34,211,238,.14),rgba(124,58,237,.24),rgba(236,72,153,.14));box-shadow:0 10px 24px rgba(124,58,237,.16),inset 0 1px 0 rgba(255,255,255,.10)}} +.headerActions .donateLinkMobile{{display:none}} +@media(min-width:681px) and (max-width:1100px){{.desktopHeaderBottom{{width:100%;grid-template-columns:repeat(4,minmax(0,1fr))}}.desktopHeader .links{{grid-column:1/-1;grid-template-columns:repeat(4,minmax(0,1fr))}}.desktopHeader .links .nethavenTop{{grid-column:3/span 2}}.desktopHeaderBottom>.headerActions{{grid-column:1/-1;grid-template-columns:repeat(5,minmax(0,1fr))}}}} +@media(max-width:680px),(max-width:1024px) and (orientation:landscape) and (pointer:coarse){{.headerActions .donateLinkMobile{{display:flex;grid-column:1/-1;min-height:36px;padding:8px 12px;font-size:13px;font-weight:800;line-height:1}}}} {hub_design_head()} @@ -6573,14 +6661,14 @@ input,select{{min-width:0;border:1px solid var(--line);border-radius:8px;padding
Терминал VPS + Сказать спасибо ❤️ Donate 💲 Выйти `; }}).join(''); syncActionToggleStates(); + syncCardDetails(); }} function escapeHtml(s) {{ @@ -8724,7 +8938,7 @@ render = function(list) {{ const actionsId = actionPanelId(r.id); const actionsOpen = expandedActionPanels.has(actionsId); const detailsId = 'router-details-' + String(r.id).replace(/[^a-zA-Z0-9_-]/g, '-'); - const collapseCards = mobileCardsMq.matches && !expandedCardDetails.has(detailsId); + const collapseCards = !expandedCardDetails.has(detailsId); const routerKey = String(r.id || ''); const groupPickerOpen = expandedGroupPickers.has(routerKey); const selectedGroupName = groupName(r.group_id); @@ -8755,14 +8969,14 @@ render = function(list) {{ metricHtml('Температура', formatTemperatureHtml(temperature), tempClass(temperature)), metric('Нагрузка', load, 'span2') ].join(''); - return `${{groupStart}}
+ return `${{groupStart}}
${{stateText}}
${{escapeHtml(r.name)}}
${{renameButton}}
${{groupSelectHtml}} - ${{mobileCardsMq.matches ? `` : ''}} -
+ +
${{notesPreview ? `
Заметки: ${{escapeHtml(notesPreview)}}
` : ''}}
${{metricsHtml}} @@ -8781,14 +8995,18 @@ render = function(list) {{
${{wolReady ? renderWolPanelResponsive(r) : ''}}
-
${{groupEnd}}`; +
${{groupEnd}}`; }}).join(''); syncActionToggleStates(); + syncCardDetails(); }}; function renderRouterView() {{ const pageScrollX = window.scrollX || window.pageXOffset || 0; const pageScrollY = window.scrollY || window.pageYOffset || 0; + const cardDetailsScrollTops = new Map(); + cards.querySelectorAll('.cardBody').forEach(body => cardDetailsScrollTops.set(body.id, body.scrollTop)); + const focusedCardToggle = document.activeElement?.dataset?.cardToggle; const wolPickerScrollTops = new Map(); document.querySelectorAll('[data-wol-picker-list]').forEach((list) => {{ const routerId = String(list.dataset.wolPickerList || ''); @@ -8805,6 +9023,14 @@ function renderRouterView() {{ return; }} render(visibleRouters); + cardDetailsScrollTops.forEach((scrollTop, id) => {{ + const body = document.getElementById(id); + if (body) body.scrollTop = scrollTop; + }}); + if (focusedCardToggle) {{ + const body = document.getElementById(focusedCardToggle); + body?.closest('.card').querySelector('[data-card-toggle]')?.focus({{preventScroll: true}}); + }} if (pendingRouterViewRestore) {{ window.cancelAnimationFrame(pendingRouterViewRestore); pendingRouterViewRestore = 0; @@ -8816,6 +9042,7 @@ function renderRouterView() {{ if (list) list.scrollTop = scrollTop; }}); pendingRouterViewRestore = 0; + scheduleCardDetailsPosition(); }}); }} @@ -9608,15 +9835,11 @@ cards.addEventListener('click', async (ev) => {{ ev.stopPropagation(); return; }} - const toggleId = ev.target?.dataset?.cardToggle; + const toggleId = ev.target.closest('[data-card-toggle]')?.dataset.cardToggle; if (toggleId) {{ const body = document.getElementById(toggleId); if (!body) return; - body.hidden = !body.hidden; - if (body.hidden) expandedCardDetails.delete(toggleId); - else expandedCardDetails.add(toggleId); - ev.target.setAttribute('aria-expanded', body.hidden ? 'false' : 'true'); - ev.target.textContent = body.hidden ? 'Открыть данные' : 'Скрыть данные'; + setCardDetailsExpanded(body, !expandedCardDetails.has(toggleId)); return; }} const actionsToggleId = ev.target?.dataset?.actionsToggle; @@ -19907,6 +20130,9 @@ exit 127 if path == "/ssh-key-manual/": self.send_bytes(200, ssh_key_manual_html().encode("utf-8"), "text/html; charset=utf-8") return + if path in ("/donate", "/donate/"): + self.send_bytes(200, donate_html().encode("utf-8"), "text/html; charset=utf-8") + return if path == "/logout": revoke_hub_session(token=self.current_session_token()) self.redirect("/login", [("Set-Cookie", self.clear_session_cookie())])