diff --git a/tests/ROUTER_UPDATES.md b/tests/ROUTER_UPDATES.md index 59193b0..9ad21d2 100644 --- a/tests/ROUTER_UPDATES.md +++ b/tests/ROUTER_UPDATES.md @@ -80,6 +80,10 @@ storage. Из вывода удаляются пароль и строки с и кнопки идут одной колонкой, карточки статистики — двумя, поля ввода имеют шрифт 16 px, длинные имена, ID, команды и причины переносятся в своих блоках. Списки и вывод команды ограничены по высоте; предусмотрены отступы safe area. +На ПК сохраняется прежняя центрированная колонка шириной до 1100 px: +ограничения для длинного текста не растягивают её на весь экран. +Заголовки и числа всех восьми карточек статистики, включая кнопки +«Подробнее», выровнены по центру на ПК и мобильном экране. Рядом с «Вернуться в Hub» есть «Обновить список роутеров»: после завершения очереди кнопка убирает её результаты и получает текущий список, имена и статусы. Во время работающей очереди она только обновляет статусы, не удаляя задачу. @@ -106,7 +110,7 @@ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\ powershell.exe -NoProfile -ExecutionPolicy Bypass -File "C:\Users\k.zolotarev95\Documents\openwrt overlay\vps\deploy-router-updates.ps1" -Vps "root@193.233.82.38" -Action Rollback ``` -Резервная копия: `/opt/owrt-remote/owrt-remote-hub.py.bak-before-router-updates-mobile-v117`. +Резервная копия: `/opt/owrt-remote/owrt-remote-hub.py.bak-before-router-updates-desktop-width-v117`. Не устанавливай/не откатывай Hub, пока его очередь работает. ## Проверки @@ -128,3 +132,5 @@ Dropbear и обновление физического OpenWrt требуют сброс списка при обновлении роутеров. Дополнительно проверяются мобильные ширины 320/360/390/430 px, альбомный режим, сохранение настоящей ширины viewport при длинном тексте, размеры полей/кнопок и отсутствие горизонтального выезда. +Для ПК проверяется центрирование и ограничение ширины 1100 px на экранах +1280/1440/1920 px, а также прежнее расположение кнопок и полей. diff --git a/tests/test_router_updates_deploy.py b/tests/test_router_updates_deploy.py index 62b09b2..4ac2d4e 100644 --- a/tests/test_router_updates_deploy.py +++ b/tests/test_router_updates_deploy.py @@ -21,7 +21,7 @@ class RouterUpdatesDeployTests(unittest.TestCase): self.target = self.root / 'hub.py' self.previous = b'print("previous Hub")\n' self.target.write_bytes(self.previous) - self.backup = self.root / 'hub.py.bak-before-router-updates-mobile-v117' + self.backup = self.root / 'hub.py.bak-before-router-updates-desktop-width-v117' source = (ROOT / 'vps/deploy-router-updates.ps1').read_text(encoding='utf-8') self.script = source.split("$RemoteScript = @'\n", 1)[1].split("\n'@", 1)[0] self.script = self.script.replace('/opt/owrt-remote/owrt-remote-hub.py', self.target.as_posix()) diff --git a/tests/test_router_updates_ui.cjs b/tests/test_router_updates_ui.cjs index 44e62a9..23842d8 100644 --- a/tests/test_router_updates_ui.cjs +++ b/tests/test_router_updates_ui.cjs @@ -214,6 +214,23 @@ const server = http.createServer((req,res)=>{ await page.screenshot({path:path.join(root,'mobile-layout-'+viewport.width+'.png'),fullPage:true}); assert.deepEqual(errors,[]);await page.close(); } + // Mobile wrapping rules must preserve the original centered desktop column. + job=null;routers=[{id:'node-5',name:'АНТОН ВПН',online:true,last_seen:0,xray:'running'}]; + for(const width of [1280,1440,1920]) { + const page=await browser.newPage({viewport:{width,height:900}}); + await page.goto(`http://127.0.0.1:${server.address().port}/router-updates/`); + await page.waitForFunction(()=>!document.querySelector('#start').disabled); + const layout=await page.evaluate(()=>{const wrap=document.querySelector('.wrap').getBoundingClientRect(),input=document.querySelector('#sshPassword').getBoundingClientRect(),start=document.querySelector('#start').getBoundingClientRect(),cancel=document.querySelector('#cancel').getBoundingClientRect(),refresh=document.querySelector('#refreshRouters').getBoundingClientRect(),back=document.querySelector('.head-actions a').getBoundingClientRect();return {left:wrap.left,right:wrap.right,width:wrap.width,viewport:innerWidth,inputWidth:input.width,inputFont:getComputedStyle(document.querySelector('#sshPassword')).fontSize,actionRow:Math.abs(start.top-cancel.top)<1,headerRow:Math.abs(refresh.top-back.top)<1,columns:getComputedStyle(document.querySelector('.metrics')).gridTemplateColumns.split(' ').length};}); + assert.equal(layout.width,1100,JSON.stringify(layout)); + assert.ok(Math.abs(layout.left-(width-layout.right))<1,JSON.stringify(layout)); + assert.equal(layout.inputWidth,480); + assert.equal(layout.inputFont,'14px'); + assert.equal(layout.actionRow,true); + assert.equal(layout.headerRow,true); + assert.equal(layout.columns,4); + await page.screenshot({path:path.join(root,'desktop-layout-'+width+'.png'),fullPage:true}); + await page.close(); + } job=null;routers=[]; const dashboard=await browser.newPage(); await dashboard.goto(`http://127.0.0.1:${server.address().port}/`); @@ -222,6 +239,6 @@ const server = http.createServer((req,res)=>{ assert.equal(await link.getAttribute('href'),'/router-updates/'); assert.match(await link.getAttribute('rel'),/noopener/); await dashboard.close(); - console.log('Router updates desktop/mobile dashboard, outcome lists, 320/360/390/430px and landscape layouts, live statuses, refresh, polling, reload, privacy and new-tab link: PASS'); + console.log('Router updates desktop/mobile dashboard, centered desktop widths, outcome lists, 320/360/390/430px and landscape layouts, live statuses, refresh, polling, reload, privacy and new-tab link: PASS'); } finally {await browser.close();await new Promise(resolve=>server.close(resolve));} })().catch(error=>{console.error(error);process.exitCode=1;}); diff --git a/vps/deploy-router-updates.ps1 b/vps/deploy-router-updates.ps1 index dbcce89..7fe564b 100644 --- a/vps/deploy-router-updates.ps1 +++ b/vps/deploy-router-updates.ps1 @@ -15,7 +15,7 @@ $RemoteScript = @' set -eu stage=/tmp/__UPLOAD_NAME__ target=/opt/owrt-remote/owrt-remote-hub.py -backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-router-updates-mobile-v117 +backup=/opt/owrt-remote/owrt-remote-hub.py.bak-before-router-updates-desktop-width-v117 candidate=$target.new-__UPLOAD_NAME__ changed=0 diff --git a/vps/owrt-remote-hub.py b/vps/owrt-remote-hub.py index 3b31eda..181e697 100644 --- a/vps/owrt-remote-hub.py +++ b/vps/owrt-remote-hub.py @@ -12225,9 +12225,9 @@ def router_updates_html(csrf): *{box-sizing:border-box}body{min-height:100vh;margin:0;background:#07040f;background-image:radial-gradient(circle at 16% 10%,#a855f740,transparent 35%),linear-gradient(145deg,#07040f,#120a24 54%,#05030a);background-attachment:fixed;color:#f7f2ff;font:14px/1.5 system-ui,sans-serif} .wrap{max-width:1100px;margin:auto;padding:20px}.panel{margin-bottom:14px;padding:18px;border:1px solid var(--line);border-radius:12px;background:#191226e8}.head,.actions{display:flex;align-items:center;justify-content:space-between;gap:10px;flex-wrap:wrap}h1{font-size:22px;margin:0}h2{font-size:16px;margin:0 0 10px}.hint{color:var(--muted);font-size:13px}.note{margin:14px 0;padding:10px 12px;border:1px solid #f59e0b70;border-left:3px solid #f59e0b;border-radius:8px;background:#f59e0b12;color:#fde68a} label{display:block;margin:14px 0 6px;font-weight:700}textarea,input{display:block;width:100%;min-width:0;border:1px solid var(--line);border-radius:8px;background:#0d0917;color:#f7f2ff;padding:11px;font:14px/1.5 ui-monospace,Consolas,monospace}textarea{min-height:110px;resize:vertical}input{max-width:480px}button,.btn{display:inline-flex;align-items:center;justify-content:center;min-height:42px;border:1px solid var(--line);border-radius:8px;padding:9px 14px;background:#393044;color:#f7f2ff;font:700 13px system-ui;cursor:pointer;text-decoration:none}.primary{background:#7c3aed}button:disabled{opacity:.5;cursor:default}.actions{justify-content:flex-start;margin-top:16px}.ok{color:#86efac}.error{color:#fda4af}.warn{color:#fde68a}#status{margin:12px 0;overflow-wrap:anywhere}.router{border-top:1px solid var(--line);padding:13px 0}.router:first-child{border-top:0}.router strong{display:block;overflow-wrap:anywhere}.router p{margin:5px 0;overflow-wrap:anywhere}.router small{color:var(--muted)}pre{max-height:260px;overflow:auto;white-space:pre-wrap;overflow-wrap:anywhere;background:#0d0917;border:1px solid var(--line);border-radius:8px;padding:10px;font:12px/1.5 ui-monospace,Consolas,monospace}summary{cursor:pointer;color:var(--muted)} -.head-actions{display:flex;gap:8px;flex-wrap:wrap}.queue-dashboard{margin:18px 0 14px;padding:18px;border:1px solid var(--line);border-radius:12px;background:linear-gradient(120deg,#30203e90,#141521b0)}.queue-heading{display:flex;align-items:center;justify-content:space-between;gap:12px;margin-bottom:12px}.queue-heading h2{margin:0;font-size:17px}.queue-badge{padding:4px 10px;border:1px solid #a78bfa50;border-radius:20px;background:#a78bfa12;color:#d8c8ff;font-size:12px;font-weight:700}.progress-label{display:flex;justify-content:space-between;gap:12px;margin-bottom:7px;color:var(--muted);font-size:12px}.progress-track{height:7px;overflow:hidden;border-radius:8px;background:#ffffff0b}.progress-fill{height:100%;width:0;background:linear-gradient(90deg,#8b5cf6,#38bdf8);border-radius:8px;transition:width .25s}.metrics{display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:10px;margin-top:16px}.metric{--accent:#c4b5fd;min-width:0;padding:13px 12px;border:1px solid #ffffff12;border-top:2px solid var(--accent);border-radius:9px;background:#100b1b90}.metric[data-state=success]{--accent:#86efac}.metric[data-state=error]{--accent:#fda4af}.metric[data-state=unknown]{--accent:#fcd34d}.metric[data-state=cancelled]{--accent:#fdba74}.metric[data-state=skipped]{--accent:#b9adc9}.metric[data-state=active]{--accent:#7dd3fc}.metric span{display:block;color:var(--muted);font-size:12px;overflow-wrap:anywhere}.metric strong{display:block;margin-top:5px;color:var(--accent);font-size:27px;line-height:1.1;font-variant-numeric:tabular-nums}.router-live{display:flex;align-items:center;gap:7px;flex-wrap:wrap;margin:7px 0;color:var(--muted);font-size:12px}.live-badge{padding:2px 8px;border-radius:20px;background:#ffffff08;border:1px solid #ffffff16}.live-badge.online{color:#86efac;border-color:#86efac40;background:#86efac0a}.live-badge.offline{color:#fda4af;border-color:#fda4af40;background:#fda4af0a} -.metrics{grid-auto-rows:1fr}.metric.outcome-toggle{display:block;width:100%;text-align:left;font:inherit}.outcome-toggle::after{content:'Подробнее ›';display:block;margin-top:7px;color:var(--muted);font-size:11px}.outcome-toggle:hover,.outcome-toggle[aria-pressed=true]{background:#ffffff0c;border-color:var(--accent)}.outcome-toggle:focus-visible{outline:2px solid var(--accent);outline-offset:3px}.queue-outcomes{margin-top:16px;padding-top:16px;border-top:1px solid var(--line)}.outcome-heading{display:flex;align-items:center;justify-content:space-between;gap:10px;flex-wrap:wrap}.outcome-heading h3{margin:0;font-size:15px}.outcome-list{max-height:440px;overflow:auto;scrollbar-gutter:stable;margin-top:10px}.outcome-router{padding:12px;border:1px solid var(--line);border-radius:8px;background:#100b1b70}.outcome-router+.outcome-router{margin-top:8px}.outcome-title{display:flex;align-items:center;gap:8px;justify-content:space-between;flex-wrap:wrap}.outcome-title strong{min-width:0;overflow-wrap:anywhere}.outcome-badge{flex-shrink:0;font-size:12px}.outcome-router small{display:block;color:var(--muted);overflow-wrap:anywhere}.outcome-reason{margin:7px 0 0;white-space:pre-wrap;overflow-wrap:anywhere}.outcome-router details{margin-top:7px}.outcome-empty{margin:8px 0;color:var(--muted)}[hidden]{display:none!important} -.wrap,.panel,form,.head,.head-actions,.actions,.queue-dashboard,.queue-heading,.queue-outcomes,.outcome-heading,.outcome-list,.router,.outcome-router{min-width:0;max-width:100%}.head>*{min-width:0}h1,h2,h3,.hint,.note,.router small,.router-live span,.outcome-badge{overflow-wrap:anywhere}button,.btn{white-space:normal;overflow-wrap:anywhere}textarea{white-space:pre-wrap;overflow-wrap:anywhere}pre{max-width:100%;min-width:0}.outcome-title strong{flex:1 1 160px}.outcome-badge{max-width:100%} +.head-actions{display:flex;gap:8px;flex-wrap:wrap}.queue-dashboard{margin:18px 0 14px;padding:18px;border:1px solid var(--line);border-radius:12px;background:linear-gradient(120deg,#30203e90,#141521b0)}.queue-heading{display:flex;align-items:center;justify-content:space-between;gap:12px;margin-bottom:12px}.queue-heading h2{margin:0;font-size:17px}.queue-badge{padding:4px 10px;border:1px solid #a78bfa50;border-radius:20px;background:#a78bfa12;color:#d8c8ff;font-size:12px;font-weight:700}.progress-label{display:flex;justify-content:space-between;gap:12px;margin-bottom:7px;color:var(--muted);font-size:12px}.progress-track{height:7px;overflow:hidden;border-radius:8px;background:#ffffff0b}.progress-fill{height:100%;width:0;background:linear-gradient(90deg,#8b5cf6,#38bdf8);border-radius:8px;transition:width .25s}.metrics{display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:10px;margin-top:16px}.metric{--accent:#c4b5fd;min-width:0;text-align:center;padding:13px 12px;border:1px solid #ffffff12;border-top:2px solid var(--accent);border-radius:9px;background:#100b1b90}.metric[data-state=success]{--accent:#86efac}.metric[data-state=error]{--accent:#fda4af}.metric[data-state=unknown]{--accent:#fcd34d}.metric[data-state=cancelled]{--accent:#fdba74}.metric[data-state=skipped]{--accent:#b9adc9}.metric[data-state=active]{--accent:#7dd3fc}.metric span{display:block;color:var(--muted);font-size:12px;overflow-wrap:anywhere}.metric strong{display:block;margin-top:5px;color:var(--accent);font-size:27px;line-height:1.1;font-variant-numeric:tabular-nums}.router-live{display:flex;align-items:center;gap:7px;flex-wrap:wrap;margin:7px 0;color:var(--muted);font-size:12px}.live-badge{padding:2px 8px;border-radius:20px;background:#ffffff08;border:1px solid #ffffff16}.live-badge.online{color:#86efac;border-color:#86efac40;background:#86efac0a}.live-badge.offline{color:#fda4af;border-color:#fda4af40;background:#fda4af0a} +.metrics{grid-auto-rows:1fr}.metric.outcome-toggle{display:block;width:100%;text-align:center;font:inherit}.outcome-toggle::after{content:'Подробнее ›';display:block;margin-top:7px;color:var(--muted);font-size:11px}.outcome-toggle:hover,.outcome-toggle[aria-pressed=true]{background:#ffffff0c;border-color:var(--accent)}.outcome-toggle:focus-visible{outline:2px solid var(--accent);outline-offset:3px}.queue-outcomes{margin-top:16px;padding-top:16px;border-top:1px solid var(--line)}.outcome-heading{display:flex;align-items:center;justify-content:space-between;gap:10px;flex-wrap:wrap}.outcome-heading h3{margin:0;font-size:15px}.outcome-list{max-height:440px;overflow:auto;scrollbar-gutter:stable;margin-top:10px}.outcome-router{padding:12px;border:1px solid var(--line);border-radius:8px;background:#100b1b70}.outcome-router+.outcome-router{margin-top:8px}.outcome-title{display:flex;align-items:center;gap:8px;justify-content:space-between;flex-wrap:wrap}.outcome-title strong{min-width:0;overflow-wrap:anywhere}.outcome-badge{flex-shrink:0;font-size:12px}.outcome-router small{display:block;color:var(--muted);overflow-wrap:anywhere}.outcome-reason{margin:7px 0 0;white-space:pre-wrap;overflow-wrap:anywhere}.outcome-router details{margin-top:7px}.outcome-empty{margin:8px 0;color:var(--muted)}[hidden]{display:none!important} +.wrap{min-width:0}.panel,form,.head,.head-actions,.actions,.queue-dashboard,.queue-heading,.queue-outcomes,.outcome-heading,.outcome-list,.router,.outcome-router{min-width:0;max-width:100%}.head>*{min-width:0}h1,h2,h3,.hint,.note,.router small,.router-live span,.outcome-badge{overflow-wrap:anywhere}button,.btn{white-space:normal;overflow-wrap:anywhere}textarea{white-space:pre-wrap;overflow-wrap:anywhere}pre{max-width:100%;min-width:0}.outcome-title strong{flex:1 1 160px}.outcome-badge{max-width:100%} @media(max-width:680px){body{background-attachment:scroll;-webkit-text-size-adjust:100%;text-size-adjust:100%}.wrap{width:100%;padding:10px;padding-top:max(10px,env(safe-area-inset-top,0px));padding-right:max(10px,env(safe-area-inset-right,0px));padding-bottom:max(10px,env(safe-area-inset-bottom,0px));padding-left:max(10px,env(safe-area-inset-left,0px))}.panel{padding:12px}.head{align-items:stretch;flex-direction:column;gap:12px}h1{font-size:19px;line-height:1.35}.actions,.head-actions{display:grid;grid-template-columns:minmax(0,1fr);width:100%;gap:8px}.btn,button{width:100%;min-height:44px;padding:11px 12px}.head-actions .btn,.head-actions button,.actions button{font-size:14px}textarea,input{max-width:100%;font-size:16px;line-height:1.5}textarea{min-height:150px}input{max-width:none;min-height:46px}.note{margin:14px 0;padding:10px 12px;font-size:12px}.hint{font-size:12px}label{line-height:1.4}.queue-dashboard{padding:12px}.queue-heading{align-items:flex-start;flex-wrap:wrap;gap:8px}.queue-heading h2{font-size:16px;flex:1 1 160px}.queue-badge{max-width:100%;overflow-wrap:anywhere}.progress-label{font-size:11px}.progress-label>:first-child{min-width:0;overflow-wrap:anywhere}#progressPercent{flex-shrink:0}.metrics{grid-template-columns:repeat(2,minmax(0,1fr));gap:8px}.metric{padding:12px 10px}.metric span{font-size:12px;line-height:1.4}.metric strong{font-size:26px}.outcome-heading{align-items:stretch}.outcome-heading h3{width:100%;line-height:1.4}.outcome-list{max-height:min(440px,60vh);-webkit-overflow-scrolling:touch}.outcome-router{padding:10px}.outcome-title{align-items:flex-start}.outcome-badge{flex-shrink:1;text-align:left}summary{min-height:44px;padding:10px 0;line-height:1.5}.router{padding:14px 0}.router-live{align-items:flex-start;gap:6px}.router-live span{max-width:100%}pre{max-height:240px;padding:9px;font-size:12px}.outcome-reason{font-size:13px}}

Обновить все роутеры разом

Вернуться в Hub