UI: вернуть наш компактный вид регистрации, Enter-отправку и шапку «Связей»

По итогам сверки после мержа с origin/main:
- Регистрация: убрана кнопка «Проверить логин» (работает автопроверка через
  1.5 с после ввода + повторная проверка на «Далее»), убрана кнопка «Назад»
  (есть ← в шапке), убран блок «Первый сервер SHiNE»; компактные классы
  registration-screen/registration-form, статус логина скрыт пока пуст.
  Промокоды, «глаз» пароля и заглушка коротких логинов origin — не тронуты.
  Осиротевший импорт defaultServerHttp удалён.
- Чат: Enter снова отправляет сообщение, Ctrl+Enter — перенос строки
  (голосовой ввод и кнопка ➤ работают как раньше).
- Шапка «Связей»: возвращён наш вариант (absolute, width:auto).
- VERSION: client 1.2.315.

Проверено в превью: регистрация — автопроверка вернула «Логин свободен »
без кнопки, FAQ-ссылка работает; чат — Enter отправляет (поле очищается),
Ctrl+Enter вставляет перенос; консоль чистая.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Pixel
2026-07-16 13:05:33 +03:00
co-authored by Claude Opus 4.8
parent 9d1e49949a
commit cf6ca1d96b
4 changed files with 36 additions and 45 deletions
+1 -1
View File
@@ -1,2 +1,2 @@
client.version=1.2.314 client.version=1.2.315
server.version=1.2.292 server.version=1.2.292
+24 -1
View File
@@ -1252,9 +1252,32 @@ export function render({ navigate, route }) {
if (!emojiPickerOpen || form.contains(event.target)) return; if (!emojiPickerOpen || form.contains(event.target)) return;
closeEmojiPicker(); closeEmojiPicker();
}); });
// Enter — отправить; Ctrl+Enter — перенос строки.
input?.addEventListener('keydown', async (event) => { input?.addEventListener('keydown', async (event) => {
if (event.key !== 'Enter') return; if (event.key !== 'Enter') return;
window.requestAnimationFrame(() => autoResizeComposer(input)); if (event.ctrlKey) {
event.preventDefault();
const start = Number(input.selectionStart ?? input.value.length);
const end = Number(input.selectionEnd ?? input.value.length);
const value = String(input.value || '');
input.value = `${value.slice(0, start)}\n${value.slice(end)}`;
const nextPos = start + 1;
try {
input.setSelectionRange(nextPos, nextPos);
} catch {
// ignore
}
autoResizeComposer(input);
return;
}
event.preventDefault();
const text = String(input.value || '').trim();
if (!text) return;
input.value = '';
autoResizeComposer(input);
closeEmojiPicker();
await sendTextMessage(text);
focusInputToEnd();
}); });
form.querySelector('#chat-voice-input')?.addEventListener('click', async () => { form.querySelector('#chat-voice-input')?.addEventListener('click', async () => {
+8 -38
View File
@@ -14,7 +14,6 @@ import {
PASSWORD_WORDS_COUNT, PASSWORD_WORDS_COUNT,
} from '../services/password-words.js'; } from '../services/password-words.js';
import { sha256Text } from '../services/crypto-utils.js'; import { sha256Text } from '../services/crypto-utils.js';
import { defaultServerHttp } from '../deploy-config.js';
import { openRegistrationFaq } from './registration-faq-view.js'; import { openRegistrationFaq } from './registration-faq-view.js';
export const pageMeta = { id: 'register-view', title: 'Зарегистрироваться', showAppChrome: false }; export const pageMeta = { id: 'register-view', title: 'Зарегистрироваться', showAppChrome: false };
@@ -109,12 +108,12 @@ function makePasswordToggleIcons() {
export function render({ navigate }) { export function render({ navigate }) {
const screen = document.createElement('section'); const screen = document.createElement('section');
screen.className = 'stack'; screen.className = 'stack registration-screen';
clearAuthMessages(); clearAuthMessages();
const form = document.createElement('div'); const form = document.createElement('div');
form.className = 'card stack'; form.className = 'card stack registration-form';
let passwordMode = String(state.registrationDraft.passwordMode || 'single') === 'words' ? 'words' : 'single'; let passwordMode = String(state.registrationDraft.passwordMode || 'single') === 'words' ? 'words' : 'single';
let passwordWords = normalizePasswordWords(state.registrationDraft.passwordWords); let passwordWords = normalizePasswordWords(state.registrationDraft.passwordWords);
@@ -217,16 +216,9 @@ export function render({ navigate }) {
promoField.append(promoFieldLabel, promoInput, promoHint); promoField.append(promoFieldLabel, promoInput, promoHint);
const statusText = document.createElement('p'); const statusText = document.createElement('p');
statusText.className = 'status-line'; statusText.className = 'status-line registration-login-status';
statusText.style.display = 'none'; statusText.style.display = 'none';
const serverNotice = document.createElement('div');
serverNotice.className = 'card stack';
serverNotice.innerHTML = `
<p class="field-label">Первый сервер SHiNE</p>
<p class="meta-muted">При регистрации адресом вашего первого сервера будет: <strong>${state.entrySettings.shineServerHttp || defaultServerHttp}</strong>.</p>
`;
const formError = document.createElement('p'); const formError = document.createElement('p');
formError.className = 'status-line is-unavailable'; formError.className = 'status-line is-unavailable';
formError.style.display = 'none'; formError.style.display = 'none';
@@ -238,20 +230,9 @@ export function render({ navigate }) {
faqButton.textContent = 'Вопросы о регистрации'; faqButton.textContent = 'Вопросы о регистрации';
faqButton.addEventListener('click', () => openRegistrationFaq(navigate, 'key-derivation')); faqButton.addEventListener('click', () => openRegistrationFaq(navigate, 'key-derivation'));
const checkButton = document.createElement('button');
checkButton.className = 'ghost-btn';
checkButton.type = 'button';
checkButton.textContent = 'Проверить логин';
const actions = document.createElement('div'); const actions = document.createElement('div');
actions.className = 'auth-footer-actions'; actions.className = 'auth-footer-actions';
const backButton = document.createElement('button');
backButton.className = 'ghost-btn';
backButton.type = 'button';
backButton.textContent = 'Назад';
backButton.addEventListener('click', () => navigate('start-view'));
const nextButton = document.createElement('button'); const nextButton = document.createElement('button');
nextButton.className = 'primary-btn'; nextButton.className = 'primary-btn';
nextButton.type = 'button'; nextButton.type = 'button';
@@ -259,7 +240,7 @@ export function render({ navigate }) {
let passwordField = null; let passwordField = null;
const passwordLengthText = document.createElement('p'); const passwordLengthText = document.createElement('p');
passwordLengthText.className = 'status-line'; passwordLengthText.className = 'password-length-hint';
let lastCheckedLogin = ''; let lastCheckedLogin = '';
let lastCheckedFree = false; let lastCheckedFree = false;
let lastCheckedClassName = ''; let lastCheckedClassName = '';
@@ -278,7 +259,7 @@ export function render({ navigate }) {
function setStatusMessage(message, kind = '') { function setStatusMessage(message, kind = '') {
statusText.textContent = message; statusText.textContent = message;
statusText.className = kind ? `status-line ${kind}` : 'status-line'; statusText.className = kind ? `status-line registration-login-status ${kind}` : 'status-line registration-login-status';
statusText.style.display = message ? '' : 'none'; statusText.style.display = message ? '' : 'none';
} }
@@ -394,9 +375,7 @@ export function render({ navigate }) {
return lastCheckedFree && (lastCheckedClassName === 'free' || lastCheckedClassName === 'promo'); return lastCheckedFree && (lastCheckedClassName === 'free' || lastCheckedClassName === 'promo');
} }
checkButton.disabled = true; setStatusMessage('Проверяем логин...');
checkButton.textContent = 'Проверка...';
if (automatic) setStatusMessage('Проверяем логин...');
try { try {
const check = await checkLoginExistsOnSolana({ const check = await checkLoginExistsOnSolana({
login, login,
@@ -451,15 +430,9 @@ export function render({ navigate }) {
const details = formatSolanaErrorDetails(error); const details = formatSolanaErrorDetails(error);
setStatusMessage(`${base}. Детали: ${details}`, 'is-unavailable'); setStatusMessage(`${base}. Детали: ${details}`, 'is-unavailable');
return false; return false;
} finally {
if (runId === loginCheckRunId) {
checkButton.disabled = false;
checkButton.textContent = 'Проверить логин';
}
} }
} }
checkButton.addEventListener('click', () => runAvailabilityCheck());
passwordToggleButton.addEventListener('click', togglePasswordVisibility); passwordToggleButton.addEventListener('click', togglePasswordVisibility);
loginInput.addEventListener('input', () => { loginInput.addEventListener('input', () => {
@@ -561,7 +534,6 @@ export function render({ navigate }) {
}); });
function renderInputStage() { function renderInputStage() {
serverNotice.style.display = '';
form.innerHTML = ''; form.innerHTML = '';
const loginField = document.createElement('label'); const loginField = document.createElement('label');
loginField.className = 'stack'; loginField.className = 'stack';
@@ -569,20 +541,19 @@ export function render({ navigate }) {
const passwordLabel = document.createElement('label'); const passwordLabel = document.createElement('label');
passwordLabel.className = 'stack registration-password-single'; passwordLabel.className = 'stack registration-password-single';
passwordLabel.innerHTML = '<span class="field-label">Пароль</span>'; passwordLabel.innerHTML = '<span class="field-label">Пароль</span>';
form.append(loginField, statusText, checkButton, passwordLabel); form.append(loginField, statusText, passwordLabel);
passwordField = passwordLabel; passwordField = passwordLabel;
loginField.append(loginInput); loginField.append(loginInput);
passwordField.append(passwordInputRow); passwordField.append(passwordInputRow);
form.append(passwordModeToggle, promoToggle, promoField, passwordLengthText, wordsSection, formError, faqButton); form.append(passwordModeToggle, promoToggle, promoField, passwordLengthText, wordsSection, formError, faqButton);
actions.innerHTML = ''; actions.innerHTML = '';
actions.append(backButton, nextButton); actions.append(nextButton);
updatePasswordModeVisibility(); updatePasswordModeVisibility();
updatePromoVisibility(); updatePromoVisibility();
syncDraftState(); syncDraftState();
} }
async function startGenerationStage() { async function startGenerationStage() {
serverNotice.style.display = 'none';
const runId = ++generationRunId; const runId = ++generationRunId;
form.innerHTML = ''; form.innerHTML = '';
@@ -688,7 +659,6 @@ export function render({ navigate }) {
leftAction: { label: '←', onClick: () => navigate('start-view') }, leftAction: { label: '←', onClick: () => navigate('start-view') },
}), }),
form, form,
serverNotice,
actions, actions,
); );
+3 -5
View File
@@ -2136,8 +2136,8 @@ textarea.input {
} }
.network-header-overlay { .network-header-overlay {
position: sticky; position: absolute;
top: max(14px, calc(env(safe-area-inset-top) + 8px)); top: max(8px, env(safe-area-inset-top));
left: max(8px, env(safe-area-inset-left)); left: max(8px, env(safe-area-inset-left));
right: max(8px, env(safe-area-inset-right)); right: max(8px, env(safe-area-inset-right));
box-sizing: border-box; box-sizing: border-box;
@@ -2148,9 +2148,7 @@ textarea.input {
} }
.network-header-overlay.page-header { .network-header-overlay.page-header {
display: grid; width: auto;
grid-template-columns: minmax(42px, 1fr) auto minmax(58px, 1fr);
align-items: center;
margin-bottom: 0; margin-bottom: 0;
gap: 10px; gap: 10px;
} }