Сделать PWA для компьютеров под Chrome

This commit is contained in:
AidarKC
2026-10-08 00:01:07 +03:00
parent dda21a54ff
commit 74bace639c
13 changed files with 154 additions and 41 deletions
+1 -1
View File
@@ -1,2 +1,2 @@
client.version=1.14.15
client.version=1.14.16
server.version=1.12.13
+18 -9
View File
@@ -103,8 +103,9 @@ CADDY_CONFIG_PATH="$(ssh "$REMOTE_HOST" "set -e; \
ROOT_CHECK_OUTPUT="$(ssh "$REMOTE_HOST" "set -euo pipefail; \
cfg='$CADDY_CONFIG_PATH'; \
site='$EXPECTED_CADDY_SITE'; \
sudo awk -v site=\"\$site\" '
BEGIN { in_site=0; depth=0; root_line=\"\"; root_lineno=0; have_site=0; }
expected_root='$EXPECTED_CADDY_UI_ROOT'; \
sudo awk -v site=\"\$site\" -v expected_root=\"\$expected_root\" '
BEGIN { in_site=0; depth=0; roots=\"\"; have_site=0; have_expected=0; }
{
line=\$0;
trimmed=line;
@@ -119,9 +120,12 @@ ROOT_CHECK_OUTPUT="$(ssh "$REMOTE_HOST" "set -euo pipefail; \
next;
}
} else {
if (trimmed ~ /^root[[:space:]]+\\*[[:space:]]+/ && root_line == \"\") {
root_line=line;
root_lineno=NR;
if (trimmed ~ /^root[[:space:]]+\\*[[:space:]]+/) {
root_entry=NR \":\" line;
roots = roots (roots == \"\" ? \"\" : \"\\n\") root_entry;
if (line ~ expected_root) {
have_expected=1;
}
}
opens=gsub(/\\{/, \"{\", line);
closes=gsub(/\\}/, \"}\", line);
@@ -136,11 +140,15 @@ ROOT_CHECK_OUTPUT="$(ssh "$REMOTE_HOST" "set -euo pipefail; \
print \"SITE_NOT_FOUND\";
exit 0;
}
if (root_line == \"\") {
if (roots == \"\") {
print \"ROOT_NOT_FOUND\";
exit 0;
}
print root_lineno \":\" root_line;
if (have_expected) {
print \"OK\";
exit 0;
}
print roots;
}
' \"\$cfg\"")"
@@ -160,8 +168,9 @@ elif [[ "$ROOT_CHECK_OUTPUT" == "ROOT_NOT_FOUND" ]]; then
exit 1
fi
echo "WARN: proceeding due to ALLOW_CADDY_MISMATCH=1"
elif [[ "$ROOT_CHECK_OUTPUT" != *"$EXPECTED_CADDY_UI_ROOT"* ]]; then
echo "ERROR: Caddy root mismatch for site $EXPECTED_CADDY_SITE. Found: $ROOT_CHECK_OUTPUT" >&2
elif [[ "$ROOT_CHECK_OUTPUT" != "OK" ]]; then
echo "ERROR: Caddy root mismatch for site $EXPECTED_CADDY_SITE. Found roots:" >&2
echo "$ROOT_CHECK_OUTPUT" >&2
echo "Caddy config: $CADDY_CONFIG_PATH" >&2
echo "Expected path fragment: $EXPECTED_CADDY_UI_ROOT" >&2
if [[ "$ALLOW_CADDY_MISMATCH" != "1" ]]; then
Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 191 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 KiB

+1 -1
View File
@@ -39,7 +39,7 @@
}());
</script>
<script>
window.__SHINE_BUILD_HASH__ = '20261007230300';
window.__SHINE_BUILD_HASH__ = '20261007235900';
window.__SHINE_CLIENT_VERSION__ = '1.2.10';
</script>
<script>
+10 -4
View File
@@ -169,10 +169,17 @@ export function render({navigate, chrome}) {
}));
const instructionCard = document.createElement('div');
instructionCard.className = 'card stack';
instructionCard.className = 'card stack pairing-guide-card';
instructionCard.innerHTML = `
<p class="field-label">Как подключить другое устройство</p>
<p class="meta-muted">На другом устройстве введите логин и нажмите «Войти через другое устройство». Затем обновите здесь список и нажмите «Подключить» у нужной заявки. Дополнительный пароль вводить не нужно.</p>
<div class="pairing-guide__heading">
<span class="pairing-guide__eyebrow">Подключение устройства</span>
<p class="field-label pairing-guide__title">Как подключить другое устройство</p>
</div>
<ol class="pairing-guide__steps">
<li><span class="pairing-guide__step-number">1</span><span>На другом устройстве введите логин и нажмите «Войти через другое устройство».</span></li>
<li><span class="pairing-guide__step-number">2</span><span>На этом устройстве нажмите «Обновить список».</span></li>
<li><span class="pairing-guide__step-number">3</span><span>Сверьте код заявки на обоих устройствах и нажмите «Подключить» у нужной заявки.</span></li>
</ol>
`;
// UNUSED FOR NOW: UI настройки дополнительного пароля сохранён ниже в коде,
@@ -196,7 +203,6 @@ export function render({navigate, chrome}) {
<span class="field-label">Активные заявки</span>
<button class="ghost-btn" type="button" id="refresh-pairing-requests">Обновить список</button>
</div>
<p class="meta-muted">Показываются все активные заявки. Для wallet-заявки выпускается отдельная session-only сессия без передачи постоянных ключей.</p>
<div class="stack" id="pairing-requests-list"></div>
`;
@@ -29,8 +29,8 @@ import { defaultServerLogin } from '../deploy-config.js';
export const pageMeta = { id: 'registration-payment-view', title: 'Оплата регистрации', showAppChrome: false };
const MIN_REQUIRED_SOL = 0.01;
const RECOMMENDED_TOPUP_SOL = 0.2;
const TEST_TOPUP_AMOUNT_SOL = 0.2;
const RECOMMENDED_TOPUP_SOL = 0.02;
const TEST_TOPUP_AMOUNT_SOL = 0.02;
const DEVNET_ENDPOINT = 'https://api.devnet.solana.com';
const TEST_TOPUP_SENDER_PRIVATE_32_BASE58 = '6xqAuKYvA8qrCdAkcw7Y8aMgvBnYk8JLxWLma5BzbAvu';
const AUTO_LOGIN_INITIAL_DELAY_MS = 1000;
+36
View File
@@ -4,6 +4,12 @@ import { addAppLogEntry, authService, closeSavedProfile, state } from '../state.
import { isDeveloperToolsEnabled } from '../services/feature-settings.js';
import { getThemeMode, resolveThemeMode, setThemeMode } from '../services/theme-service.js';
import { openPaletteEditor } from '../components/palette-editor.js';
import {
canInstallPwa,
isStandalonePwaMode,
onPwaInstallAvailabilityChange,
promptPwaInstall,
} from '../services/pwa-install-service.js';
export const pageMeta = { id: 'settings-view', title: 'Настройки' };
@@ -75,6 +81,7 @@ export function render({navigate, chrome}) {
${row('settings-remote-addblock', 'Публикация через домашний сервер', 'Когда ключа публикаций нет на этом устройстве')}
${row('settings-language', 'Язык / Language', 'Русский')}
</div>
<div class="nav-list" id="settings-install-list" hidden></div>
<div class="nav-list">
<button class="nav-row nav-row--danger" type="button" id="settings-signout"><span class="nav-row__label">Выйти из аккаунта на этом устройстве</span></button>
</div>
@@ -110,6 +117,34 @@ export function render({navigate, chrome}) {
navigate('language-view');
});
const installList = card.querySelector('#settings-install-list');
const syncInstallAction = () => {
const available = !isStandalonePwaMode() && canInstallPwa();
installList.hidden = !available;
if (!available) {
installList.replaceChildren();
return;
}
if (installList.querySelector('#settings-install-pwa')) return;
installList.innerHTML = row(
'settings-install-pwa',
'Установить приложение',
'Открывать Сияние как отдельное приложение',
);
installList.querySelector('#settings-install-pwa')?.addEventListener('click', async (event) => {
const button = event.currentTarget;
button.disabled = true;
try {
await promptPwaInstall();
} finally {
syncInstallAction();
}
});
};
const unsubscribeInstallAvailability = onPwaInstallAvailabilityChange(syncInstallAction);
syncInstallAction();
const signOutBtn = card.querySelector('#settings-signout');
signOutBtn.addEventListener('click', async () => {
const confirmed = await confirmDialog({
@@ -192,6 +227,7 @@ export function render({navigate, chrome}) {
screen.cleanup = () => {
isDisposed = true;
unsubscribeInstallAvailability();
};
return screen;
}
+4 -3
View File
@@ -25,7 +25,7 @@ export function render({ navigate }) {
const brandBlock = document.createElement('div');
brandBlock.className = 'stack';
brandBlock.style.alignItems = 'center';
brandBlock.style.gap = '8px';
brandBlock.style.gap = '22px';
const title = document.createElement('h1');
title.className = 'auth-brand';
@@ -34,8 +34,9 @@ export function render({ navigate }) {
const siteName = document.createElement('p');
siteName.className = 'meta-muted';
siteName.style.margin = '0';
siteName.style.fontSize = '13px';
siteName.style.letterSpacing = '0.04em';
siteName.style.fontSize = '18px';
siteName.style.letterSpacing = '0.045em';
siteName.style.lineHeight = '1.25';
siteName.textContent = window.location.host || window.location.hostname || 'shineup.me';
brandBlock.append(title, siteName);
+1 -1
View File
@@ -12,7 +12,7 @@ import { loadSolanaWeb3 } from '../vendor/solana-web3-loader.js';
export const pageMeta = { id: 'topup-view', title: 'Пополнение solana счета', showAppChrome: false };
const DEVNET_ENDPOINT = 'https://api.devnet.solana.com';
const SENDER_PRIVATE_32_BASE58 = '6xqAuKYvA8qrCdAkcw7Y8aMgvBnYk8JLxWLma5BzbAvu';
const REGISTRATION_TOPUP_AMOUNT_SOL = 0.2;
const REGISTRATION_TOPUP_AMOUNT_SOL = 0.02;
// Канонический Solana-кошелёк пользователя = текущий blockchain key.
// Тот же адрес используется как fee payer для регистрации и обычных PDA update.
+22 -20
View File
@@ -1,31 +1,33 @@
{
"id": "/",
"name": "СИЯНИЕ",
"short_name": "СИЯНИЕ",
"start_url": "./index.html",
"description": "Сияние — приложение для общения и публичных данных.",
"lang": "ru",
"start_url": "/",
"scope": "/",
"display": "standalone",
"display_override": [
"standalone",
"minimal-ui"
],
"orientation": "portrait",
"background_color": "#0b1020",
"theme_color": "#0b1020",
"background_color": "#121419",
"theme_color": "#121419",
"prefer_related_applications": false,
"icons": [
{
"src": "./img/logo.jpg",
"src": "/img/pwa-icon-192.png",
"sizes": "192x192",
"type": "image/jpeg"
},
{
"src": "./img/logo.jpg",
"sizes": "512x512",
"type": "image/jpeg"
},
{
"src": "./img/shine-logo-transparent-final.png",
"sizes": "1280x1280",
"type": "image/png",
"purpose": "any maskable"
"purpose": "any"
},
{
"src": "/img/pwa-icon-512.png",
"sizes": "512x512",
"type": "image/png",
"purpose": "any"
},
{
"src": "/img/pwa-icon-maskable-512.png",
"sizes": "512x512",
"type": "image/png",
"purpose": "maskable"
}
]
}
+59
View File
@@ -335,3 +335,62 @@
.key-list > .key-card { padding: 12px 14px; border: 0; border-radius: 0; background: transparent; }
.key-list > .key-card + .key-card { border-top: 1px solid var(--border-subtle); }
.key-list .key-card__hint { font-size: var(--text-sm); }
/* Единственный видимый сценарий подключения другого устройства. */
.pairing-guide-card {
gap: 16px;
overflow: hidden;
border-color: color-mix(in srgb, var(--accent) 24%, var(--border-subtle));
background:
radial-gradient(circle at 100% 0%, color-mix(in srgb, var(--accent) 12%, transparent), transparent 42%),
var(--surface);
}
.pairing-guide__heading {
display: grid;
gap: 5px;
}
.pairing-guide__eyebrow {
color: var(--accent);
font-size: var(--text-xs);
font-weight: var(--weight-bold);
letter-spacing: .08em;
text-transform: uppercase;
}
.pairing-guide__title {
margin: 0;
font-size: var(--text-lg);
}
.pairing-guide__steps {
display: grid;
gap: 12px;
margin: 0;
padding: 0;
list-style: none;
}
.pairing-guide__steps li {
display: grid;
grid-template-columns: 30px minmax(0, 1fr);
align-items: start;
gap: 11px;
color: var(--text-secondary);
line-height: 1.45;
}
.pairing-guide__step-number {
display: grid;
place-items: center;
width: 30px;
height: 30px;
border: 1px solid color-mix(in srgb, var(--accent) 34%, var(--border-subtle));
border-radius: 999px;
color: var(--text-primary);
background: color-mix(in srgb, var(--accent) 12%, var(--surface));
font-size: var(--text-sm);
font-weight: var(--weight-bold);
}