merge remote main: keep our journal-driven selection and transport animation

This commit is contained in:
haerikimmm
2026-06-16 17:32:11 +09:00
16 changed files with 573 additions and 263 deletions

View File

@@ -13,6 +13,7 @@
let journeyProgress = $state(null);
let inDetail = $state(false);
let pendingCountry = $state('');
let journeyMode = $state('map');
function onNavigate(s) {
screen = s;
@@ -56,10 +57,10 @@
<div class="worldmap-page">
<div class="map-area">
{#if journeyActive}
<JourneyView onclose={endJourney} onprogress={onJourneyProgress} />
<JourneyView onclose={endJourney} onprogress={onJourneyProgress} mode={journeyMode} onmodechange={(m) => journeyMode = m} />
{:else}
<WorldMap onCountryClick={handleCountryClick} />
<button class="journey-play-btn" onclick={startJourney}></button>
<button class="journey-play-btn" onclick={startJourney}> Replay My Trips</button>
{/if}
</div>
{#if !journeyActive}<StatsPanel />{/if}
@@ -116,14 +117,14 @@
bottom: 24px;
right: 24px;
z-index: 10;
width: 44px;
height: 44px;
border-radius: 50%;
padding: 12px 28px;
border-radius: 24px;
border: none;
background: #8b5cf6;
color: #fff;
font-size: 20px;
line-height: 1;
font-size: 15px;
font-weight: 600;
gap: 6px;
cursor: pointer;
display: flex;
align-items: center;