fc1261e078
CI / changes (pull_request) Successful in 1s
CI / unit (pull_request) Has been skipped
CI / integration (pull_request) Has been skipped
CI / ui (pull_request) Successful in 39s
CI / gate (pull_request) Successful in 0s
CI / deploy (pull_request) Successful in 59s
Replace Menu.svelte (hamburger) everywhere with tab-bar navigation: - Settings hub (SettingsHub) from the lobby ⚙️ tab: Settings/Profile/ Friends/About as in-place tabs, back → lobby; the lobby ⚙️ badge counts incoming friend requests (invitations keep their own lobby section). - Comms hub (CommsHub) from the move-history 💬: Chat/Dictionary tabs, back → game; Dictionary only while the game is active. - Game menu items relocate into the open history: 🏁 leave / 📤 export in the header, 🤝 add-friend per opponent card, 💬 comms; unread chat is badged on the score bar + the 💬. - TapConfirm (tap → fading ✅ → tap) replaces the Skip/Hint press-and-hold popovers and drives the add-friend confirm. - Fix the move-history "jump": the slid board is inert and the stage can't scroll, so a swipe up genuinely closes the history. Remove Menu.svelte + HoldConfirm.svelte. Docs: UI_DESIGN, FUNCTIONAL(+ru), PRERELEASE. UI check/unit/build/bundle/e2e (Chromium+WebKit) all green.
122 lines
4.7 KiB
Svelte
122 lines
4.7 KiB
Svelte
<script lang="ts">
|
|
import { onMount } from 'svelte';
|
|
import { cubicOut } from 'svelte/easing';
|
|
import { app, bootstrap } from './lib/app.svelte';
|
|
import { navigate, router, type RouteName } from './lib/router.svelte';
|
|
import { t } from './lib/i18n/index.svelte';
|
|
import { insideTelegram, telegramBackButton } from './lib/telegram';
|
|
import Toast from './components/Toast.svelte';
|
|
import Login from './screens/Login.svelte';
|
|
import Lobby from './screens/Lobby.svelte';
|
|
import NewGame from './screens/NewGame.svelte';
|
|
import SettingsHub from './screens/SettingsHub.svelte';
|
|
import Stats from './screens/Stats.svelte';
|
|
import Game from './game/Game.svelte';
|
|
import CommsHub from './game/CommsHub.svelte';
|
|
|
|
onMount(() => {
|
|
void bootstrap();
|
|
});
|
|
|
|
// Inside Telegram, drive its native header back button: show it on any sub-screen
|
|
// (everything returns to the lobby root), hide it on the lobby/login. The app's own
|
|
// back chevron is hidden in Telegram (Header.svelte) so only the native one shows.
|
|
$effect(() => {
|
|
if (!insideTelegram()) return;
|
|
const r = router.route;
|
|
// The chat / check sub-screens step back to their game; every other sub-screen to the lobby.
|
|
const sub = r.name === 'gameChat' || r.name === 'gameCheck';
|
|
const target = sub ? `/game/${r.params.id}` : '/';
|
|
telegramBackButton(r.name !== 'lobby' && r.name !== 'login', () => navigate(target));
|
|
});
|
|
|
|
// Screen transitions: the lobby is the navigation root. Entering a screen from the
|
|
// lobby slides it in from the right (forward); returning to the lobby slides the
|
|
// screen out to the right and reveals the lobby (back). Transitions are local, so
|
|
// they do not play on the initial mount, and collapse to nothing under reduce-motion.
|
|
// Slide direction by route depth: going deeper (lobby → game → chat/check) slides forward,
|
|
// returning to a shallower screen slides back. A plain "lobby is back" rule slid the chat/check
|
|
// back-to-the-game the wrong way. dir is read with the previous depth (the effect updates it
|
|
// only after the transition has captured its sign).
|
|
function routeDepth(name: RouteName): number {
|
|
if (name === 'gameChat' || name === 'gameCheck') return 2;
|
|
if (name === 'lobby' || name === 'login') return 0;
|
|
return 1;
|
|
}
|
|
const curDepth = $derived(routeDepth(router.route.name));
|
|
let prevDepth = $state(routeDepth(router.route.name));
|
|
const dir = $derived(curDepth < prevDepth ? 'back' : 'forward');
|
|
$effect(() => {
|
|
prevDepth = curDepth;
|
|
});
|
|
const enterSign = $derived(dir === 'forward' ? 1 : -1);
|
|
const leaveSign = $derived(dir === 'forward' ? -1 : 1);
|
|
const routeKey = $derived(router.route.name + (router.route.params.id ?? ''));
|
|
const animMs = $derived(app.reduceMotion ? 0 : 260);
|
|
|
|
// slideX slides a pane horizontally by a full width. sign>0 enters from / exits to
|
|
// the right; sign<0 the left. Percentage keeps it viewport-relative without reading
|
|
// innerWidth, and the .router clips the off-screen pane.
|
|
function slideX(_node: Element, { duration, sign }: { duration: number; sign: number }) {
|
|
return {
|
|
duration,
|
|
easing: cubicOut,
|
|
css: (tt: number) => `transform: translateX(${(1 - tt) * sign * 100}%)`,
|
|
};
|
|
}
|
|
</script>
|
|
|
|
{#if !app.ready}
|
|
<div class="splash">{t('common.loading')}</div>
|
|
{:else}
|
|
<div class="router">
|
|
{#key routeKey}
|
|
<div class="pane" in:slideX={{ duration: animMs, sign: enterSign }} out:slideX={{ duration: animMs, sign: leaveSign }}>
|
|
{#if router.route.name === 'login'}
|
|
<Login />
|
|
{:else if router.route.name === 'new'}
|
|
<NewGame />
|
|
{:else if router.route.name === 'game'}
|
|
<Game id={router.route.params.id} />
|
|
{:else if router.route.name === 'gameChat'}
|
|
<CommsHub id={router.route.params.id} initialTab="chat" />
|
|
{:else if router.route.name === 'gameCheck'}
|
|
<CommsHub id={router.route.params.id} initialTab="dictionary" />
|
|
{:else if router.route.name === 'profile'}
|
|
<SettingsHub initialTab="profile" />
|
|
{:else if router.route.name === 'settings'}
|
|
<SettingsHub initialTab="settings" />
|
|
{:else if router.route.name === 'about'}
|
|
<SettingsHub initialTab="about" />
|
|
{:else if router.route.name === 'friends'}
|
|
<SettingsHub initialTab="friends" />
|
|
{:else if router.route.name === 'stats'}
|
|
<Stats />
|
|
{:else}
|
|
<Lobby />
|
|
{/if}
|
|
</div>
|
|
{/key}
|
|
</div>
|
|
{/if}
|
|
|
|
<Toast />
|
|
|
|
<style>
|
|
.splash {
|
|
height: 100%;
|
|
display: grid;
|
|
place-items: center;
|
|
color: var(--text-muted);
|
|
}
|
|
.router {
|
|
position: relative;
|
|
height: 100%;
|
|
overflow: hidden;
|
|
}
|
|
.pane {
|
|
position: absolute;
|
|
inset: 0;
|
|
}
|
|
</style>
|