diff --git a/VERSION.properties b/VERSION.properties index b2293063..d828d189 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.15.3 +client.version=1.15.4 server.version=1.13.0 diff --git a/shine-UI/js/app.js b/shine-UI/js/app.js index ed010e88..63425284 100644 --- a/shine-UI/js/app.js +++ b/shine-UI/js/app.js @@ -72,9 +72,12 @@ import * as profileEditView from './pages/profile-edit-view.js'; import * as profilesView from './pages/profiles-view.js'; import * as walletView from './pages/wallet-view.js?v=202609260900'; import * as settingsView from './pages/settings-view.js'; +import * as accessKeysView from './pages/access-keys-view.js'; import * as myBlockchainView from './pages/my-blockchain-view.js'; +import * as myBlockchainHistoryView from './pages/my-blockchain-history-view.js'; import * as keyRotationView from './pages/key-rotation-view.js'; import * as accessServersView from './pages/access-servers-view.js'; +import * as settingsServersView from './pages/settings-servers-view.js'; import * as developerSettingsView from './pages/developer-settings-view.js'; import * as advancedSettingsView from './pages/advanced-settings-view.js'; import * as serverSettingsView from './pages/server-settings-view.js?v=202609260900'; @@ -141,9 +144,12 @@ const routes = { 'profiles-view': profilesView, 'wallet-view': walletView, 'settings-view': settingsView, + 'access-keys-view': accessKeysView, 'my-blockchain-view': myBlockchainView, + 'my-blockchain-history-view': myBlockchainHistoryView, 'key-rotation-view': keyRotationView, 'access-servers-view': accessServersView, + 'settings-servers-view': settingsServersView, 'developer-settings-view': developerSettingsView, 'advanced-settings-view': advancedSettingsView, 'server-settings-view': serverSettingsView, @@ -228,6 +234,7 @@ const FILLED_ACTION_BUTTON_PAGE_IDS = new Set([ const SETTINGS_BORDERED_ACTION_PAGE_IDS = new Set([ 'access-servers-view', + 'settings-servers-view', 'server-settings-view', 'arweave-uploads-view', 'developer-settings-view', diff --git a/shine-UI/js/pages/access-keys-view.js b/shine-UI/js/pages/access-keys-view.js new file mode 100644 index 00000000..b72f8e07 --- /dev/null +++ b/shine-UI/js/pages/access-keys-view.js @@ -0,0 +1,19 @@ +import { createTopBar } from '../components/topbar.js'; + +export const pageMeta = { id: 'access-keys-view', title: 'Ключи доступа' }; + +export function render({ navigate, chrome }) { + const screen = document.createElement('section'); + screen.className = 'stack'; + chrome?.setTopbar(createTopBar({ title: 'Ключи доступа', back: { label: '←', onClick: () => navigate('settings-view') } })); + const actions = document.createElement('div'); + actions.className = 'nav-list'; + actions.innerHTML = ` + + + `; + actions.querySelector('#access-keys-show').addEventListener('click', () => navigate('show-keys-view')); + actions.querySelector('#access-keys-rotate').addEventListener('click', () => navigate('key-rotation-view')); + screen.append(actions); + return screen; +} diff --git a/shine-UI/js/pages/access-servers-view.js b/shine-UI/js/pages/access-servers-view.js index b4bf41ab..1e07a4f3 100644 --- a/shine-UI/js/pages/access-servers-view.js +++ b/shine-UI/js/pages/access-servers-view.js @@ -265,7 +265,9 @@ export function render({navigate, chrome}) { const introCard = document.createElement('div'); introCard.className = 'settings-intro'; introCard.innerHTML = ` -
+ Мой сервер доступа + + `; const listCard = document.createElement('div'); @@ -292,7 +294,7 @@ export function render({navigate, chrome}) { addTitle.textContent = 'Сменить сервер доступа'; const addHint = document.createElement('p'); addHint.className = 'meta-muted'; - addHint.textContent = 'Введите логин нового сервера или несколько первых букв, затем выберите сервер из подсказок. Новый сервер заменит текущий.'; + addHint.textContent = 'Тестовая функция веб-версии. Для обычной смены сервера доступа необходимо открыть новый сервер и выполнить смену оттуда. Здесь можно указать новый сервер напрямую; переписка автоматически не переносится.'; const addInput = document.createElement('input'); addInput.className = 'input'; addInput.type = 'text'; @@ -310,6 +312,16 @@ export function render({navigate, chrome}) { addButton.textContent = 'Сменить сервер'; addButton.disabled = true; addCard.append(addTitle, addHint, addInput, suggestEl, addStatus, addButton); + addCard.hidden = true; + const changeServerToggle = document.createElement('button'); + changeServerToggle.type = 'button'; + changeServerToggle.className = 'secondary-btn'; + changeServerToggle.textContent = 'Сменить сервер доступа (тестовая функция)'; + changeServerToggle.setAttribute('aria-expanded', 'false'); + changeServerToggle.addEventListener('click', () => { + addCard.hidden = !addCard.hidden; + changeServerToggle.setAttribute('aria-expanded', String(!addCard.hidden)); + }); const refreshAddButton = () => { addButton.disabled = operationBusy @@ -613,12 +625,13 @@ export function render({navigate, chrome}) { }); chrome?.setTopbar(createTopBar({ - title: 'Сервер доступа', - back: { label: '←', onClick: () => navigate('settings-view') }, + title: 'Мой сервер доступа', + back: { label: '←', onClick: () => navigate('settings-servers-view') }, })); screen.append( introCard, listCard, + changeServerToggle, addCard, ); diff --git a/shine-UI/js/pages/arweave-uploads-view.js b/shine-UI/js/pages/arweave-uploads-view.js index ff42c427..1620f59e 100644 --- a/shine-UI/js/pages/arweave-uploads-view.js +++ b/shine-UI/js/pages/arweave-uploads-view.js @@ -110,7 +110,7 @@ export function render({navigate, chrome}) { const topbar = createTopBar({ title: 'Файлы в блокчейне', - back: { onClick: () => navigate('settings-view') }, + back: { onClick: () => navigate('my-blockchain-view') }, actions: [ { icon: 'plus', diff --git a/shine-UI/js/pages/developer-settings-view.js b/shine-UI/js/pages/developer-settings-view.js index 1dc11550..877a154a 100644 --- a/shine-UI/js/pages/developer-settings-view.js +++ b/shine-UI/js/pages/developer-settings-view.js @@ -1,3 +1,5 @@ +import { openPaletteEditor } from '../components/palette-editor.js'; +import { resolveThemeMode } from '../services/theme-service.js'; import { createTopBar } from '../components/topbar.js'; import { addAppLogEntry, authService, state } from '../state.js'; import { @@ -258,6 +260,7 @@ export function render({navigate, chrome}) { const card = document.createElement('div'); card.className = 'nav-list settings-developer-card'; card.innerHTML = ` + @@ -269,6 +272,7 @@ export function render({navigate, chrome}) { `; + card.querySelector('#settings-theme-editor').addEventListener('click', () => openPaletteEditor({ theme: resolveThemeMode() })); const appLogBtn = card.querySelector('#settings-app-log'); const diagnosticsBtn = card.querySelector('#settings-pwa-diagnostics'); const pwaInstallBtn = card.querySelector('#settings-pwa-install'); diff --git a/shine-UI/js/pages/device-view.js b/shine-UI/js/pages/device-view.js index ac048809..9c864c68 100644 --- a/shine-UI/js/pages/device-view.js +++ b/shine-UI/js/pages/device-view.js @@ -81,11 +81,9 @@ export function render({navigate, chrome}) { actions.className = 'nav-list'; actions.innerHTML = ` - `; actions.querySelector('#pair-by-code-btn').addEventListener('click', () => navigate('device-pairing-view')); - actions.querySelector('#show-keys-btn').addEventListener('click', () => navigate('show-keys-view')); const sessionsBlock = document.createElement('div'); sessionsBlock.className = 'stack device-sessions'; diff --git a/shine-UI/js/pages/key-rotation-view.js b/shine-UI/js/pages/key-rotation-view.js index f4cfab34..479e7531 100644 --- a/shine-UI/js/pages/key-rotation-view.js +++ b/shine-UI/js/pages/key-rotation-view.js @@ -15,7 +15,7 @@ function input(label,type='password'){const wrap=document.createElement('label') export function render({navigate,chrome}){ const screen=document.createElement('section');screen.className='stack'; - chrome?.setTopbar(createTopBar({title:'Смена ключей',back:{label:'←',onClick:()=>navigate('my-blockchain-view')}})); + chrome?.setTopbar(createTopBar({title:'Смена ключей',back:{label:'←',onClick:()=>navigate('access-keys-view')}})); const root=document.createElement('div');root.className='stack';screen.append(root); const client=new KeyRotationClient(authService);let disposed=false;let timer=null;let cachedOldBundle=null;let cachedNewBundle=null; const login=String(state.session.login||'').trim(); const storagePwd=String(state.session.storagePwdInMemory||'').trim(); @@ -119,12 +119,12 @@ export function render({navigate,chrome}){ }catch(e){err.textContent=e?.message||String(e);transfer.disabled=false;skip.disabled=false;}finally{refreshBalance.disabled=false;}}); continueButton.addEventListener('click',async()=>{continueButton.disabled=true;refreshBalance.disabled=true;err.textContent='';try{ const next=await client.continueRotation({walletMigrationStatus:'COMPLETE'}); - if(String(next?.rotationStatus||'')==='COMPLETE'){navigate('my-blockchain-view');return;} + if(String(next?.rotationStatus||'')==='COMPLETE'){navigate('access-keys-view');return;} await refresh(); }catch(e){err.textContent=e?.message||String(e);continueButton.disabled=false;refreshBalance.disabled=false;}}); skip.addEventListener('click',async()=>{skip.disabled=true;transfer.disabled=true;refreshBalance.disabled=true;err.textContent='';try{ const next=await client.continueRotation({walletMigrationStatus:'SKIPPED'}); - if(String(next?.rotationStatus||'')==='COMPLETE'){navigate('my-blockchain-view');return;} + if(String(next?.rotationStatus||'')==='COMPLETE'){navigate('access-keys-view');return;} await refresh(); }catch(e){err.textContent=e?.message||String(e);skip.disabled=false;transfer.disabled=!oldWallet;refreshBalance.disabled=false;}}); @@ -172,7 +172,7 @@ export function render({navigate,chrome}){ } } const next=await client.continueRotation({}); - if(String(next?.rotationStatus||'')==='COMPLETE'){navigate('my-blockchain-view');return;} + if(String(next?.rotationStatus||'')==='COMPLETE'){navigate('access-keys-view');return;} await refresh(); }; go.addEventListener('click',()=>void run().catch(e=>{err.textContent=e?.message||String(e);go.disabled=false;})); @@ -180,6 +180,6 @@ export function render({navigate,chrome}){ if(cachedOldBundle&&cachedNewBundle)void run().catch(e=>{err.textContent=e?.message||String(e);go.disabled=false;}); } - async function refresh(){if(disposed)return;if(timer){clearTimeout(timer);timer=null;}try{const s=await client.status();const st=String(s.rotationStatus||'NONE');if(st==='NONE'){await renderNone();return;}if(st==='COPYING_CHAIN'){if(cachedNewBundle)await runCopy(s);else await askNewPasswordAndCopy(s);return;}if(st==='CHAIN_READY'){await renderChainReady(s);return;}if(['ROTATING_PDA','PDA_ROTATED','REBUILDING_SERVER'].includes(st)){pollView(s);return;}if(st==='WALLET_MIGRATION'){await renderWalletMigration(s);return;}if(st==='MESSAGE_MIGRATION'){await renderMessageMigration(s);return;}if(st==='FINALIZING'){const next=await client.continueRotation({});if(String(next?.rotationStatus||'')==='COMPLETE'){navigate('my-blockchain-view');return;}await refresh();return;}if(st==='COMPLETE'){setRoot(note('Смена ключей завершена.'));return;}setRoot(note(`Неизвестное состояние ротации: ${st}`));}catch(e){setRoot(note(`Не удалось прочитать состояние смены ключей: ${e?.message||e}`));}} + async function refresh(){if(disposed)return;if(timer){clearTimeout(timer);timer=null;}try{const s=await client.status();const st=String(s.rotationStatus||'NONE');if(st==='NONE'){await renderNone();return;}if(st==='COPYING_CHAIN'){if(cachedNewBundle)await runCopy(s);else await askNewPasswordAndCopy(s);return;}if(st==='CHAIN_READY'){await renderChainReady(s);return;}if(['ROTATING_PDA','PDA_ROTATED','REBUILDING_SERVER'].includes(st)){pollView(s);return;}if(st==='WALLET_MIGRATION'){await renderWalletMigration(s);return;}if(st==='MESSAGE_MIGRATION'){await renderMessageMigration(s);return;}if(st==='FINALIZING'){const next=await client.continueRotation({});if(String(next?.rotationStatus||'')==='COMPLETE'){navigate('access-keys-view');return;}await refresh();return;}if(st==='COMPLETE'){setRoot(note('Смена ключей завершена.'));return;}setRoot(note(`Неизвестное состояние ротации: ${st}`));}catch(e){setRoot(note(`Не удалось прочитать состояние смены ключей: ${e?.message||e}`));}} void refresh();screen.cleanup=()=>{disposed=true;if(timer)clearTimeout(timer);};return screen; } diff --git a/shine-UI/js/pages/my-blockchain-history-view.js b/shine-UI/js/pages/my-blockchain-history-view.js new file mode 100644 index 00000000..7bdf97f3 --- /dev/null +++ b/shine-UI/js/pages/my-blockchain-history-view.js @@ -0,0 +1,6 @@ +import { render as renderBlockchain } from './my-blockchain-view.js'; + +export const pageMeta = { id: 'my-blockchain-history-view', title: 'История моего блокчейна' }; +export function render(context) { + return renderBlockchain(context, { historyOnly: true }); +} diff --git a/shine-UI/js/pages/my-blockchain-view.js b/shine-UI/js/pages/my-blockchain-view.js index 7b97ada6..c97209a9 100644 --- a/shine-UI/js/pages/my-blockchain-view.js +++ b/shine-UI/js/pages/my-blockchain-view.js @@ -481,24 +481,40 @@ function createEntryCard({ item, inspection, parseError, channelNames, blockchai return card; } -export function render({ navigate, chrome }) { +export function render({ navigate, chrome }, { historyOnly = false } = {}) { const screen = document.createElement('section'); screen.className = 'stack my-blockchain-screen'; - chrome?.setTopbar(createTopBar({ title: 'Мой блокчейн', back: { label: '←', onClick: () => navigate('settings-view') } })); + chrome?.setTopbar(createTopBar({ + title: historyOnly ? 'История моего блокчейна' : 'Мой блокчейн', + back: { label: '←', onClick: () => navigate(historyOnly ? 'my-blockchain-view' : 'settings-view') }, + })); - const intro = document.createElement('div'); - intro.className = 'card stack'; - intro.innerHTML = 'История ваших действий'; - const rotate = document.createElement('button'); - rotate.type = 'button'; - rotate.className = 'primary-btn'; - rotate.textContent = 'Сменить пароль / ключи'; - rotate.addEventListener('click', () => navigate('key-rotation-view')); - intro.append(rotate); - screen.append(intro); + if (!historyOnly) { + const intro = document.createElement('div'); + intro.className = 'card stack'; + const historyButton = document.createElement('button'); + historyButton.type = 'button'; + historyButton.className = 'nav-row'; + historyButton.textContent = 'Показать историю моего блокчейна'; + historyButton.addEventListener('click', () => navigate('my-blockchain-history-view')); + const filesButton = document.createElement('button'); + filesButton.type = 'button'; + filesButton.className = 'nav-row'; + filesButton.textContent = 'Файлы в блокчейне'; + filesButton.addEventListener('click', () => navigate('arweave-uploads-view')); + const remoteButton = document.createElement('button'); + remoteButton.type = 'button'; + remoteButton.className = 'nav-row'; + remoteButton.textContent = 'Использовать ключ блокчейна с внешнего устройства'; + remoteButton.addEventListener('click', () => navigate('remote-addblock-session-view')); + intro.append(historyButton, filesButton, remoteButton); + screen.append(intro); + return screen; + } const list = document.createElement('div'); list.className = 'stack my-blockchain-list'; + list.hidden = false; screen.append(list); const more = document.createElement('button'); more.type = 'button'; diff --git a/shine-UI/js/pages/remote-addblock-session-view.js b/shine-UI/js/pages/remote-addblock-session-view.js index 0411e117..64ff32fd 100644 --- a/shine-UI/js/pages/remote-addblock-session-view.js +++ b/shine-UI/js/pages/remote-addblock-session-view.js @@ -35,7 +35,7 @@ export function render({navigate, chrome}) { chrome?.setTopbar(createTopBar({ title: 'AddBlock через homeserver', - back: { label: '←', onClick: () => navigate('settings-view') }, + back: { label: '←', onClick: () => navigate('my-blockchain-view') }, })); const actions = document.createElement('div'); diff --git a/shine-UI/js/pages/server-settings-view.js b/shine-UI/js/pages/server-settings-view.js index 4cc4fa5e..0fa4aa2c 100644 --- a/shine-UI/js/pages/server-settings-view.js +++ b/shine-UI/js/pages/server-settings-view.js @@ -163,7 +163,7 @@ export function render({navigate, chrome}) { cancelButton.className = 'ghost-btn'; cancelButton.type = 'button'; cancelButton.textContent = 'Отмена'; - cancelButton.addEventListener('click', () => navigate('settings-view')); + cancelButton.addEventListener('click', () => navigate('settings-servers-view')); const saveButton = document.createElement('button'); saveButton.className = 'primary-btn'; @@ -172,7 +172,7 @@ export function render({navigate, chrome}) { saveButton.addEventListener('click', async () => { try { await saveEntrySettings(draft); - navigate('settings-view'); + navigate('settings-servers-view'); } catch (error) { window.alert(error?.message || 'Не удалось сохранить настройки серверов блокчейнов.'); } @@ -192,7 +192,7 @@ export function render({navigate, chrome}) { chrome?.setTopbar(createTopBar({ title: 'Серверы блокчейнов', - back: { label: '←', onClick: () => navigate('settings-view') }, + back: { label: '←', onClick: () => navigate('settings-servers-view') }, })); screen.append( introCard, diff --git a/shine-UI/js/pages/settings-servers-view.js b/shine-UI/js/pages/settings-servers-view.js new file mode 100644 index 00000000..ab7ec430 --- /dev/null +++ b/shine-UI/js/pages/settings-servers-view.js @@ -0,0 +1,28 @@ +import { createTopBar } from '../components/topbar.js'; + +export const pageMeta = { id: 'settings-servers-view', title: 'Настройки серверов' }; + +export function render({ navigate, chrome }) { + const screen = document.createElement('section'); + screen.className = 'stack'; + chrome?.setTopbar(createTopBar({ + title: 'Настройки серверов', + back: { label: '←', onClick: () => navigate('settings-view') }, + })); + const list = document.createElement('div'); + list.className = 'nav-list'; + const entries = [ + ['Мой сервер доступа', 'access-servers-view'], + ['Серверы блокчейнов', 'server-settings-view'], + ]; + for (const [label, pageId] of entries) { + const button = document.createElement('button'); + button.type = 'button'; + button.className = 'nav-row'; + button.innerHTML = ``; + button.addEventListener('click', () => navigate(pageId)); + list.append(button); + } + screen.append(list); + return screen; +} diff --git a/shine-UI/js/pages/settings-view.js b/shine-UI/js/pages/settings-view.js index 98c87439..c5567365 100644 --- a/shine-UI/js/pages/settings-view.js +++ b/shine-UI/js/pages/settings-view.js @@ -2,8 +2,7 @@ import { confirmDialog } from '../components/confirm-dialog.js'; import { createTopBar } from '../components/topbar.js'; import { addAppLogEntry, authService, closeSavedProfile, state } from '../state.js'; import { isDeveloperToolsEnabled } from '../services/feature-settings.js'; -import { getThemeMode, resolveThemeMode, setThemeMode } from '../services/theme-service.js'; -import { openPaletteEditor } from '../components/palette-editor.js'; +import { getThemeMode, setThemeMode } from '../services/theme-service.js'; import { canInstallPwa, isStandalonePwaMode, @@ -44,6 +43,25 @@ export function render({navigate, chrome}) { title: 'Настройки', back: { label: '←', onClick: () => navigate('profile-view') }, }); + const themeButton = document.createElement('button'); + themeButton.type = 'button'; + themeButton.className = 'settings-theme-cycle'; + themeButton.title = 'Переключить тему оформления'; + themeButton.setAttribute('aria-label', 'Переключить тему оформления'); + const modes = ['light', 'dark', 'system']; + const themeNames = { light: '☀️ Светлая', dark: '🌙 Тёмная', system: '◐ Авто' }; + const updateThemeButton = () => { + const mode = getThemeMode(); + themeButton.textContent = themeNames[mode] || themeNames.system; + themeButton.setAttribute('aria-label', `Тема: ${themeButton.textContent}. Нажмите для переключения`); + }; + themeButton.addEventListener('click', () => { + const index = modes.indexOf(getThemeMode()); + setThemeMode(modes[(index + 1) % modes.length]); + updateThemeButton(); + }); + updateThemeButton(); + topbar.querySelector('.topbar__right')?.append(themeButton); chrome?.setTopbar(topbar); // Скрытый вход в «Дополнительные настройки»: пять быстрых нажатий на заголовок. @@ -62,56 +80,27 @@ export function render({navigate, chrome}) { card.className = 'stack settings-sections'; const row = (id, label, hint) => ``; card.innerHTML = ` -