diff --git a/VERSION.properties b/VERSION.properties index 0a1ce67..e7a1d09 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.2.225 -server.version=1.2.211 +client.version=1.2.226 +server.version=1.2.212 diff --git a/shine-UI/js/pages/login-other-device-view.js b/shine-UI/js/pages/login-other-device-view.js index 8211c7a..13f1b1b 100644 --- a/shine-UI/js/pages/login-other-device-view.js +++ b/shine-UI/js/pages/login-other-device-view.js @@ -60,7 +60,7 @@ function resetCodeCard(resultWrap, shortCodeEl, statusHintEl, onlineHintEl, expi export function render({ navigate }) { const screen = document.createElement('section'); - screen.className = 'stack'; + screen.className = 'stack auth-screen auth-screen--lower'; let pollTimer = 0; let countdownTimer = 0; let activePairingId = ''; @@ -77,6 +77,10 @@ export function render({ navigate }) { }), ); + const panel = document.createElement('section'); + panel.className = 'login-panel login-panel--wide stack'; + panel.innerHTML = '

Войти через другое устройство

'; + const formCard = document.createElement('div'); formCard.className = 'card stack'; formCard.innerHTML = ` @@ -387,6 +391,7 @@ export function render({ navigate }) { resultActions.append(cancelBtn); resultWrap.append(resultActions); - screen.append(formCard, status, resultWrap); + panel.append(formCard, status, resultWrap); + screen.append(panel); return screen; } diff --git a/shine-UI/js/pages/login-view.js b/shine-UI/js/pages/login-view.js index 6674476..06e9a9c 100644 --- a/shine-UI/js/pages/login-view.js +++ b/shine-UI/js/pages/login-view.js @@ -4,29 +4,23 @@ export const pageMeta = { id: 'login-view', title: 'Войти', showAppChrome: export function render({ navigate }) { const screen = document.createElement('section'); - screen.className = 'stack'; - - const cameraButton = document.createElement('button'); - cameraButton.className = 'primary-btn'; - cameraButton.type = 'button'; - cameraButton.textContent = 'Отсканировать QR-код'; - cameraButton.addEventListener('click', () => navigate('login-camera-view')); + screen.className = 'stack auth-screen auth-screen--lower'; const loginButton = document.createElement('button'); loginButton.className = 'ghost-btn'; loginButton.type = 'button'; - loginButton.textContent = 'Войти по логину'; + loginButton.textContent = 'Войти по паролю'; loginButton.addEventListener('click', () => navigate('login-password-view')); const otherDeviceButton = document.createElement('button'); - otherDeviceButton.className = 'text-btn'; + otherDeviceButton.className = 'ghost-btn'; otherDeviceButton.type = 'button'; otherDeviceButton.textContent = 'Войти через другое устройство'; otherDeviceButton.addEventListener('click', () => navigate('login-other-device-view')); const actions = document.createElement('div'); actions.className = 'auth-actions login-actions-wide'; - actions.append(cameraButton, loginButton, otherDeviceButton); + actions.append(loginButton, otherDeviceButton); const backButton = document.createElement('button'); backButton.className = 'ghost-btn'; @@ -34,13 +28,17 @@ export function render({ navigate }) { backButton.textContent = 'Назад'; backButton.addEventListener('click', () => navigate('start-view')); + const panel = document.createElement('section'); + panel.className = 'login-panel stack'; + panel.innerHTML = '

Войти

'; + panel.append(actions, backButton); + screen.append( renderHeader({ title: 'Войти', leftAction: { label: '←', onClick: () => navigate('start-view') }, }), - actions, - backButton, + panel, ); return screen;