work-license-server 1.0.15 → 1.0.17

package/assets/admin.js

@@ -16,28 +16,44 @@
     let activeTab = 'servers';
     let admCountdownTimer = null;
 
+    function readCookieSession() {
+        try {
+            const m = String(document.cookie || '').match(/(?:^|;\s*)odant_work_session=([^;]+)/);
+            return m?.[1] ? decodeURIComponent(m[1].trim()) : '';
+        }
+        catch { return ''; }
+    }
+
     function getStoredToken() {
         try {
-            return sessionStorage.getItem(TOKEN_KEY)
+            return localStorage.getItem('odant_work_session')
                 || localStorage.getItem(TOKEN_KEY)
-                || localStorage.getItem('odant_work_session')
+                || sessionStorage.getItem(TOKEN_KEY)
+                || sessionStorage.getItem('odant_work_session')
+                || readCookieSession()
                 || '';
         }
-        catch { return ''; }
+        catch { return readCookieSession(); }
     }
-    function setStoredToken(tok) {
+    function setStoredToken(tok, email = '') {
         adminToken = tok || '';
         try {
             if (tok) {
                 sessionStorage.setItem(TOKEN_KEY, tok);
                 localStorage.setItem(TOKEN_KEY, tok);
-                if (tok.startsWith('wks_')) {
-                    localStorage.setItem('odant_work_session', tok);
-                }
+                localStorage.setItem('odant_work_session', tok);
+                sessionStorage.setItem('odant_work_session', tok);
+                document.cookie = `odant_work_session=${encodeURIComponent(tok)}; path=/; max-age=31536000; SameSite=Lax`;
             }
             else {
                 sessionStorage.removeItem(TOKEN_KEY);
                 localStorage.removeItem(TOKEN_KEY);
+                localStorage.removeItem('odant_work_session');
+                sessionStorage.removeItem('odant_work_session');
+                document.cookie = 'odant_work_session=; path=/; max-age=0; SameSite=Lax';
+            }
+            if (email) {
+                localStorage.setItem('odant_work_email', email);
             }
         }
         catch { /* приватный режим */ }
@@ -78,6 +94,13 @@
         $('#adminLoginScreen').style.display = '';
         $('#adminAppShell').style.display = 'none';
         if ($('#admLoginError')) $('#admLoginError').textContent = errMsg;
+        try {
+            const savedEmail = localStorage.getItem('odant_work_email') || '';
+            if (savedEmail && $('#admLoginEmail') && !$('#admLoginEmail').value) {
+                $('#admLoginEmail').value = savedEmail;
+            }
+        }
+        catch { /* ignore */ }
         setTimeout(() => $('#admLoginEmail')?.focus(), 50);
     }
 
@@ -89,10 +112,21 @@
         setTimeout(() => $('#admLoginEmail')?.focus(), 50);
     }
 
+    function moveIndicator() {
+        const active = $('#tabs .tab.active');
+        const ind = $('#tabInd');
+        if (!ind) return;
+        if (!active) { ind.style.width = '0px'; return; }
+        ind.style.left = active.offsetLeft + 'px';
+        ind.style.width = active.offsetWidth + 'px';
+    }
+
     function showAdminApp(login = 'BOSS') {
         $('#adminLoginScreen').style.display = 'none';
         $('#adminAppShell').style.display = '';
-        if ($('#admUserLabel')) $('#admUserLabel').textContent = `Выйти (${login})`;
+        if ($('#admUserLabel')) $('#admUserLabel').textContent = login;
+        if ($('#admProfileEmail')) $('#admProfileEmail').textContent = login;
+        requestAnimationFrame(moveIndicator);
     }
 
     async function sendAdminOtpCode() {
@@ -155,7 +189,7 @@
             if (!user.isAdmin) {
                 throw new Error(`Аккаунт ${user.email} не обладает правами администратора (BOSS) сервера лицензирования.`);
             }
-            setStoredToken(user.sessionKey);
+            setStoredToken(user.sessionKey, user.email);
             resetAdmStep();
             showAdminApp(user.email);
             await refreshRegistry();
@@ -169,9 +203,9 @@
     }
 
     async function logoutAdmin() {
+        $('#admProfileModal')?.classList.remove('open');
         try { await api('/api/admin/logout', {}); } catch { /* ignore */ }
         setStoredToken('');
-        try { localStorage.removeItem('odant_work_session'); } catch { /* ignore */ }
         resetAdmStep();
         showLoginGate('');
     }
@@ -186,6 +220,7 @@
         try {
             const me = await api('/api/admin/me');
             if (me.authenticated) {
+                setStoredToken(saved, me.email || me.login || '');
                 showAdminApp(me.login || 'admin');
                 await refreshRegistry();
             }
@@ -201,7 +236,7 @@
     /* ================= Вкладки и форматирование ================= */
     function setTab(tab) {
         activeTab = tab || 'servers';
-        $$('#admTopTabs [data-adm-tab]').forEach(b => b.classList.toggle('active', b.dataset.admTab === activeTab));
+        $$('[data-adm-tab]').forEach(b => b.classList.toggle('active', b.dataset.admTab === activeTab));
         $$('[data-adm-sec]').forEach(sec => {
             sec.style.display = sec.dataset.admSec === activeTab ? '' : 'none';
         });
@@ -265,34 +300,13 @@
         const users = data.users || [];
 
         const activeFranchises = franchises.filter(f => f && f.status !== 'canceled' && f.status !== 'expired');
-        const totalSeats = licenses.reduce((s, l) => s + (l.totalSeats || 0), 0);
-        const paidOrders = orders.filter(o => o.status === 'paid');
-        const pendingOrders = orders.filter(o => o.status === 'pending' || o.status === 'awaiting_invoice');
-        const paidRub = paidOrders.reduce((s, o) => s + (Number(o.amountRub) || 0), 0);
-        const pendingRub = pendingOrders.reduce((s, o) => s + (Number(o.amountRub) || 0), 0);
         const openTickets = tickets.filter(t => t.status !== 'answered' && t.status !== 'closed');
 
-        if ($('#tabCntServers')) $('#tabCntServers').textContent = String(licenses.length);
-        if ($('#tabCntFranchises')) $('#tabCntFranchises').textContent = String(activeFranchises.length);
-        if ($('#tabCntOrders')) $('#tabCntOrders').textContent = String(orders.length);
-        if ($('#tabCntUsers')) $('#tabCntUsers').textContent = String(users.length);
-        if ($('#tabCntTickets')) $('#tabCntTickets').textContent = String(openTickets.length);
-
-        if ($('#admStatLic')) {
-            $('#admStatLic').textContent = String(licenses.length);
-            $('#admStatLicSub').textContent = `серверов · ${totalSeats} мест`;
-            $('#admStatFranchises').textContent = String(activeFranchises.length);
-            const overdueCnt = activeFranchises.filter(f => (f.overdueMonthsCount || 0) > 0).length;
-            $('#admStatFranchisesSub').textContent = overdueCnt > 0 ? `просрочек: ${overdueCnt}` : 'активных франшиз';
-            $('#admStatPaid').textContent = rub(paidRub);
-            $('#admStatPaidSub').textContent = `оплачено заказов: ${paidOrders.length}`;
-            $('#admStatPending').textContent = rub(pendingRub);
-            $('#admStatPendingSub').textContent = `ожидают оплаты: ${pendingOrders.length}`;
-            $('#admStatUsers').textContent = String(users.length);
-            $('#admStatUsersSub').textContent = `админов BOSS: ${users.filter(u => u.isAdmin).length}`;
-            $('#admStatTickets').textContent = String(openTickets.length);
-            $('#admStatTicketsSub').textContent = `открытых из ${tickets.length}`;
-        }
+        if ($('#navAdmServers')) $('#navAdmServers').textContent = `Серверы и лицензии (${licenses.length})`;
+        if ($('#navAdmFranchises')) $('#navAdmFranchises').textContent = `Франшизы (${activeFranchises.length})`;
+        if ($('#navAdmOrders')) $('#navAdmOrders').textContent = `Заказы и счета (${orders.length})`;
+        if ($('#navAdmUsers')) $('#navAdmUsers').textContent = `Клиенты и роли (${users.length})`;
+        if ($('#navAdmTickets')) $('#navAdmTickets').textContent = `Тикеты поддержки (${openTickets.length})`;
 
         renderServersTable(licenses);
         renderFranchisesTable(franchises);
@@ -364,10 +378,8 @@
                         <button class="btn btn-ghost btn-sm" style="padding:3px 8px;font-size:11.5px" data-adm-open-grant="${esc(lid)}" data-srv-name="${esc(srvName)}">+ Начислить доп. места</button>
                     </div>
                 </td>
-                <td>
-                    <div style="display:flex;flex-direction:column;gap:6px;align-items:flex-start">
-                        <button class="btn btn-primary btn-sm" data-cert="${esc(lid)}">Файлы .lic.json (${(l.licenseFiles || []).length})</button>
-                    </div>
+                <td style="text-align:right">
+                    <button class="btn btn-primary btn-sm" style="padding:6px 10px;font-size:12px" data-cert="${esc(lid)}">.lic.json (${(l.licenseFiles || []).length})</button>
                 </td>
             </tr>`;
         }).join('') || '<tr><td colspan="6" class="muted">Серверов по заданному фильтру не найдено</td></tr>';
@@ -913,6 +925,8 @@
                 case 'adm-send-code': sendAdminOtpCode(); break;
                 case 'adm-verify-code': verifyAdminOtpCode(); break;
                 case 'adm-reset-step': resetAdmStep(); break;
+                case 'open-adm-profile': $('#admProfileModal')?.classList.add('open'); break;
+                case 'close-adm-profile': $('#admProfileModal')?.classList.remove('open'); break;
                 case 'admin-logout': logoutAdmin(); break;
                 case 'registry': refreshRegistry(); break;
                 case 'open-create-server-modal': $('#admCreateServerModal')?.classList.add('open'); break;
@@ -949,12 +963,14 @@
                 $$('.modal.open').forEach(m => m.classList.remove('open'));
             }
         });
+        window.addEventListener('resize', moveIndicator);
     }
 
     function start() {
         applyTheme(document.documentElement.getAttribute('data-theme') || 'dark');
         bind();
         setTab('servers');
+        if (document.fonts?.ready) document.fonts.ready.then(moveIndicator);
         checkAdminSession();
     }
 

package/assets/landing.css

@@ -614,6 +614,156 @@ body[data-stage="admin"] .ai-fab { display: none; }
     .admin-left { position: static; }
 }
 
+/* ---------- Двухколоночная навигация по разделам (эталон Скрина 1: Личный кабинет и Админ-панель) ---------- */
+.sec-layout {
+    display: grid;
+    grid-template-columns: 230px minmax(0, 1fr);
+    gap: 28px;
+    align-items: start;
+    margin-top: 4px;
+}
+@media (max-width: 920px) {
+    .sec-layout { grid-template-columns: 1fr; gap: 16px; }
+}
+.sec-nav {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+    position: sticky;
+    top: 84px;
+}
+.sec-nav-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    padding: 9px 14px;
+    border-radius: 8px;
+    border: 1.5px solid transparent;
+    background: transparent;
+    color: var(--text-2);
+    font-size: 14px;
+    font-weight: 500;
+    text-align: left;
+    cursor: pointer;
+    transition: background .15s ease, border-color .15s ease, color .15s ease;
+}
+.sec-nav-item:hover {
+    background: color-mix(in srgb, var(--brand) 6%, transparent);
+    color: var(--text);
+}
+.sec-nav-item.active {
+    border-color: #3b82f6;
+    background: rgba(59, 130, 246, 0.08);
+    color: #1d4ed8;
+    font-weight: 600;
+}
+html[data-theme="dark"] .sec-nav-item.active {
+    border-color: #3b82f6;
+    background: rgba(59, 130, 246, 0.16);
+    color: #60a5fa;
+}
+.sec-nav-sep {
+    height: 1px;
+    background: var(--line);
+    margin: 6px 4px;
+}
+.sec-main {
+    min-width: 0;
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+}
+.sec-bar {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 12px;
+    flex-wrap: wrap;
+    min-height: 36px;
+}
+.sec-title {
+    margin: 0;
+    font-size: 16px;
+    font-weight: 700;
+    color: var(--text);
+}
+.sec-controls {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    flex-wrap: wrap;
+}
+.sec-controls input[type="text"],
+.sec-controls input[type="search"],
+.sec-controls select {
+    width: auto !important;
+    min-width: 0;
+    height: 34px;
+    padding: 6px 12px;
+    font-size: 13px;
+    border-radius: 8px;
+    border: 1px solid var(--line-strong);
+    background: var(--panel-solid);
+    color: var(--text);
+}
+.sec-controls input[type="search"],
+.sec-controls input[type="text"] {
+    width: 230px !important;
+}
+.sec-controls select {
+    width: 185px !important;
+}
+.sec-controls .btn {
+    height: 34px;
+    padding: 0 13px;
+    font-size: 13px;
+    border-radius: 8px;
+}
+.sec-box {
+    background: var(--panel-solid);
+    border: 1px solid var(--line-strong);
+    border-radius: 12px;
+    padding: 16px 20px;
+    box-shadow: 0 1px 3px rgba(15, 23, 42, 0.04);
+    overflow: hidden;
+}
+.sec-table {
+    width: 100%;
+    border-collapse: collapse;
+    font-size: 13.5px;
+}
+.sec-table th,
+.sec-table td {
+    padding: 10px 10px;
+    text-align: left;
+    border-bottom: 1px solid var(--line);
+    vertical-align: middle;
+    white-space: normal;
+    word-break: break-word;
+}
+.sec-table th {
+    color: var(--muted);
+    font-size: 11px;
+    font-weight: 700;
+    letter-spacing: .05em;
+    text-transform: uppercase;
+    padding-top: 4px;
+    padding-bottom: 8px;
+}
+.sec-table tbody tr:last-child td {
+    border-bottom: 0;
+}
+.sec-table tbody tr:hover {
+    background: color-mix(in srgb, var(--brand) 4%, transparent);
+}
+.sec-item {
+    padding: 14px 0;
+    border-bottom: 1px solid var(--line);
+}
+.sec-item:first-child { padding-top: 2px; }
+.sec-item:last-child { border-bottom: 0; padding-bottom: 2px; }
+
 /* ---------- Оферта и вход администратора ---------- */
 .oferta-banner {
     padding: 16px 22px;