Compare commits
15 Commits
feature/st
...
965f677368
| Author | SHA1 | Date | |
|---|---|---|---|
| 965f677368 | |||
| 611cc0b626 | |||
| 70352be01b | |||
| bd001a71fa | |||
| c9c94d670f | |||
| f198c05063 | |||
| 6701398da7 | |||
| 08d3e3ae56 | |||
| cd682f738a | |||
| 5356c05654 | |||
| 640c241e1c | |||
| e62b68ede6 | |||
| 65e16f3502 | |||
| 8976b94c41 | |||
| 7a2d488f9c |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -10,6 +10,7 @@ lerna-debug.log*
|
|||||||
node_modules
|
node_modules
|
||||||
dist
|
dist
|
||||||
dist-ssr
|
dist-ssr
|
||||||
|
.env
|
||||||
*.local
|
*.local
|
||||||
|
|
||||||
# Editor directories and files
|
# Editor directories and files
|
||||||
|
|||||||
0
dev_error.txt
Normal file
0
dev_error.txt
Normal file
11
dev_output.txt
Normal file
11
dev_output.txt
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
|
||||||
|
> map-journal@0.0.0 dev
|
||||||
|
> vite
|
||||||
|
|
||||||
|
Port 5173 is in use, trying another one...
|
||||||
|
Port 5174 is in use, trying another one...
|
||||||
|
|
||||||
|
[32m[1mVITE[22m v8.0.15[39m [2mready in [0m[1m1792[22m[2m[0m ms[22m
|
||||||
|
|
||||||
|
[32m➜[39m [1mLocal[22m: [36mhttp://localhost:[1m5175[22m/[39m
|
||||||
|
[2m [32m➜[39m [1mNetwork[22m[2m: use [22m[1m--host[22m[2m to expose[22m
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
<link rel="icon" type="image/png" href="/logo.png" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
<title>Journi</title>
|
<title>Journi</title>
|
||||||
</head>
|
</head>
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
* Typecheck JS in `.svelte` and `.js` files by default.
|
* Typecheck JS in `.svelte` and `.js` files by default.
|
||||||
* Disable this if you'd like to use dynamic types.
|
* Disable this if you'd like to use dynamic types.
|
||||||
*/
|
*/
|
||||||
"checkJs": true
|
"checkJs": false
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
* Use global.d.ts instead of compilerOptions.types
|
* Use global.d.ts instead of compilerOptions.types
|
||||||
|
|||||||
1040
package-lock.json
generated
1040
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -15,6 +15,7 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"d3": "^7.9.0",
|
"d3": "^7.9.0",
|
||||||
|
"firebase": "^12.14.0",
|
||||||
"flag-icons": "^7.5.0",
|
"flag-icons": "^7.5.0",
|
||||||
"html-to-image": "^1.11.13",
|
"html-to-image": "^1.11.13",
|
||||||
"topojson-client": "^3.1.0",
|
"topojson-client": "^3.1.0",
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 9.3 KiB |
@@ -1,24 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg">
|
|
||||||
<symbol id="bluesky-icon" viewBox="0 0 16 17">
|
|
||||||
<g clip-path="url(#bluesky-clip)"><path fill="#08060d" d="M7.75 7.735c-.693-1.348-2.58-3.86-4.334-5.097-1.68-1.187-2.32-.981-2.74-.79C.188 2.065.1 2.812.1 3.251s.241 3.602.398 4.13c.52 1.744 2.367 2.333 4.07 2.145-2.495.37-4.71 1.278-1.805 4.512 3.196 3.309 4.38-.71 4.987-2.746.608 2.036 1.307 5.91 4.93 2.746 2.72-2.746.747-4.143-1.747-4.512 1.702.189 3.55-.4 4.07-2.145.156-.528.397-3.691.397-4.13s-.088-1.186-.575-1.406c-.42-.19-1.06-.395-2.741.79-1.755 1.24-3.64 3.752-4.334 5.099"/></g>
|
|
||||||
<defs><clipPath id="bluesky-clip"><path fill="#fff" d="M.1.85h15.3v15.3H.1z"/></clipPath></defs>
|
|
||||||
</symbol>
|
|
||||||
<symbol id="discord-icon" viewBox="0 0 20 19">
|
|
||||||
<path fill="#08060d" d="M16.224 3.768a14.5 14.5 0 0 0-3.67-1.153c-.158.286-.343.67-.47.976a13.5 13.5 0 0 0-4.067 0c-.128-.306-.317-.69-.476-.976A14.4 14.4 0 0 0 3.868 3.77C1.546 7.28.916 10.703 1.231 14.077a14.7 14.7 0 0 0 4.5 2.306q.545-.748.965-1.587a9.5 9.5 0 0 1-1.518-.74q.191-.14.372-.293c2.927 1.369 6.107 1.369 8.999 0q.183.152.372.294-.723.437-1.52.74.418.838.963 1.588a14.6 14.6 0 0 0 4.504-2.308c.37-3.911-.63-7.302-2.644-10.309m-9.13 8.234c-.878 0-1.599-.82-1.599-1.82 0-.998.705-1.82 1.6-1.82.894 0 1.614.82 1.599 1.82.001 1-.705 1.82-1.6 1.82m5.91 0c-.878 0-1.599-.82-1.599-1.82 0-.998.705-1.82 1.6-1.82.893 0 1.614.82 1.599 1.82 0 1-.706 1.82-1.6 1.82"/>
|
|
||||||
</symbol>
|
|
||||||
<symbol id="documentation-icon" viewBox="0 0 21 20">
|
|
||||||
<path fill="none" stroke="#aa3bff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.35" d="m15.5 13.333 1.533 1.322c.645.555.967.833.967 1.178s-.322.623-.967 1.179L15.5 18.333m-3.333-5-1.534 1.322c-.644.555-.966.833-.966 1.178s.322.623.966 1.179l1.534 1.321"/>
|
|
||||||
<path fill="none" stroke="#aa3bff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.35" d="M17.167 10.836v-4.32c0-1.41 0-2.117-.224-2.68-.359-.906-1.118-1.621-2.08-1.96-.599-.21-1.349-.21-2.848-.21-2.623 0-3.935 0-4.983.369-1.684.591-3.013 1.842-3.641 3.428C3 6.449 3 7.684 3 10.154v2.122c0 2.558 0 3.838.706 4.726q.306.383.713.671c.76.536 1.79.64 3.581.66"/>
|
|
||||||
<path fill="none" stroke="#aa3bff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.35" d="M3 10a2.78 2.78 0 0 1 2.778-2.778c.555 0 1.209.097 1.748-.047.48-.129.854-.503.982-.982.145-.54.048-1.194.048-1.749a2.78 2.78 0 0 1 2.777-2.777"/>
|
|
||||||
</symbol>
|
|
||||||
<symbol id="github-icon" viewBox="0 0 19 19">
|
|
||||||
<path fill="#08060d" fill-rule="evenodd" d="M9.356 1.85C5.05 1.85 1.57 5.356 1.57 9.694a7.84 7.84 0 0 0 5.324 7.44c.387.079.528-.168.528-.376 0-.182-.013-.805-.013-1.454-2.165.467-2.616-.935-2.616-.935-.349-.91-.864-1.143-.864-1.143-.71-.48.051-.48.051-.48.787.051 1.2.805 1.2.805.695 1.194 1.817.857 2.268.649.064-.507.27-.857.49-1.052-1.728-.182-3.545-.857-3.545-3.87 0-.857.31-1.558.8-2.104-.078-.195-.349-1 .077-2.078 0 0 .657-.208 2.14.805a7.5 7.5 0 0 1 1.946-.26c.657 0 1.328.092 1.946.26 1.483-1.013 2.14-.805 2.14-.805.426 1.078.155 1.883.078 2.078.502.546.799 1.247.799 2.104 0 3.013-1.818 3.675-3.558 3.87.284.247.528.714.528 1.454 0 1.052-.012 1.896-.012 2.156 0 .208.142.455.528.377a7.84 7.84 0 0 0 5.324-7.441c.013-4.338-3.48-7.844-7.773-7.844" clip-rule="evenodd"/>
|
|
||||||
</symbol>
|
|
||||||
<symbol id="social-icon" viewBox="0 0 20 20">
|
|
||||||
<path fill="none" stroke="#aa3bff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.35" d="M12.5 6.667a4.167 4.167 0 1 0-8.334 0 4.167 4.167 0 0 0 8.334 0"/>
|
|
||||||
<path fill="none" stroke="#aa3bff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.35" d="M2.5 16.667a5.833 5.833 0 0 1 8.75-5.053m3.837.474.513 1.035c.07.144.257.282.414.309l.93.155c.596.1.736.536.307.965l-.723.73a.64.64 0 0 0-.152.531l.207.903c.164.715-.213.991-.84.618l-.872-.52a.63.63 0 0 0-.577 0l-.872.52c-.624.373-1.003.094-.84-.618l.207-.903a.64.64 0 0 0-.152-.532l-.723-.729c-.426-.43-.289-.864.306-.964l.93-.156a.64.64 0 0 0 .412-.31l.513-1.034c.28-.562.735-.562 1.012 0"/>
|
|
||||||
</symbol>
|
|
||||||
<symbol id="x-icon" viewBox="0 0 19 19">
|
|
||||||
<path fill="#08060d" fill-rule="evenodd" d="M1.893 1.98c.052.072 1.245 1.769 2.653 3.77l2.892 4.114c.183.261.333.48.333.486s-.068.089-.152.183l-.522.593-.765.867-3.597 4.087c-.375.426-.734.834-.798.905a1 1 0 0 0-.118.148c0 .01.236.017.664.017h.663l.729-.83c.4-.457.796-.906.879-.999a692 692 0 0 0 1.794-2.038c.034-.037.301-.34.594-.675l.551-.624.345-.392a7 7 0 0 1 .34-.374c.006 0 .93 1.306 2.052 2.903l2.084 2.965.045.063h2.275c1.87 0 2.273-.003 2.266-.021-.008-.02-1.098-1.572-3.894-5.547-2.013-2.862-2.28-3.246-2.273-3.266.008-.019.282-.332 2.085-2.38l2-2.274 1.567-1.782c.022-.028-.016-.03-.65-.03h-.674l-.3.342a871 871 0 0 1-1.782 2.025c-.067.075-.405.458-.75.852a100 100 0 0 1-.803.91c-.148.172-.299.344-.99 1.127-.304.343-.32.358-.345.327-.015-.019-.904-1.282-1.976-2.808L6.365 1.85H1.8zm1.782.91 8.078 11.294c.772 1.08 1.413 1.973 1.425 1.984.016.017.241.02 1.05.017l1.03-.004-2.694-3.766L7.796 5.75 5.722 2.852l-1.039-.004-1.039-.004z" clip-rule="evenodd"/>
|
|
||||||
</symbol>
|
|
||||||
</svg>
|
|
||||||
|
Before Width: | Height: | Size: 4.9 KiB |
BIN
public/logo.png
Normal file
BIN
public/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 963 KiB |
BIN
public/plane.webp
Normal file
BIN
public/plane.webp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.1 KiB |
BIN
public/profile.jpg
Normal file
BIN
public/profile.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 36 KiB |
122
src/App.svelte
122
src/App.svelte
@@ -1,37 +1,100 @@
|
|||||||
<script>
|
<script>
|
||||||
|
import { initAuth, getLoading, getUser, getNeedsCountry } from './lib/auth/userStore.svelte.js';
|
||||||
|
import LoginOverlay from './lib/auth/LoginOverlay.svelte';
|
||||||
|
import CountryPicker from './lib/auth/CountryPicker.svelte';
|
||||||
import Layout from './lib/layout/Layout.svelte';
|
import Layout from './lib/layout/Layout.svelte';
|
||||||
import WorldMap from './lib/world-map/WorldMap.svelte';
|
import WorldMap from './lib/world-map/WorldMap.svelte';
|
||||||
|
import JourneyView from './lib/world-map/JourneyView.svelte';
|
||||||
import StatsPanel from './lib/world-map/StatsPanel.svelte';
|
import StatsPanel from './lib/world-map/StatsPanel.svelte';
|
||||||
import TimelineView from './lib/timeline/TimelineView.svelte';
|
import TimelineView from './lib/timeline/TimelineView.svelte';
|
||||||
|
|
||||||
let screen = $state('worldmap');
|
let screen = $state('worldmap');
|
||||||
|
let journeyActive = $state(false);
|
||||||
|
let journeyProgress = $state(null);
|
||||||
let inDetail = $state(false);
|
let inDetail = $state(false);
|
||||||
let pendingCountry = $state('');
|
let pendingCountry = $state('');
|
||||||
|
|
||||||
|
function onNavigate(s) {
|
||||||
|
screen = s;
|
||||||
|
}
|
||||||
|
|
||||||
|
function startJourney() {
|
||||||
|
journeyActive = true;
|
||||||
|
journeyProgress = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function endJourney() {
|
||||||
|
journeyActive = false;
|
||||||
|
journeyProgress = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function onJourneyProgress(p) {
|
||||||
|
journeyProgress = p;
|
||||||
|
}
|
||||||
|
|
||||||
function handleCountryClick(name) {
|
function handleCountryClick(name) {
|
||||||
pendingCountry = name;
|
pendingCountry = name;
|
||||||
screen = 'timeline';
|
screen = 'timeline';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$effect(() => {
|
||||||
|
initAuth();
|
||||||
|
});
|
||||||
|
|
||||||
|
let loading = $derived(getLoading());
|
||||||
|
let user = $derived(getUser());
|
||||||
|
let needsCountry = $derived(getNeedsCountry());
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<Layout {screen} onNavigate={(s) => (screen = s)} hideTopBar={inDetail}>
|
{#if loading}
|
||||||
{#if screen === 'worldmap'}
|
<div class="loading-screen">
|
||||||
<div class="worldmap-page">
|
<span class="loading-text">Loading...</span>
|
||||||
<div class="map-area">
|
</div>
|
||||||
<WorldMap onCountryClick={handleCountryClick} />
|
{:else}
|
||||||
|
<Layout {screen} {onNavigate} hideTopBar={inDetail}>
|
||||||
|
{#if screen === 'worldmap'}
|
||||||
|
<div class="worldmap-page">
|
||||||
|
<div class="map-area">
|
||||||
|
{#if journeyActive}
|
||||||
|
<JourneyView onclose={endJourney} onprogress={onJourneyProgress} />
|
||||||
|
{:else}
|
||||||
|
<WorldMap onCountryClick={handleCountryClick} />
|
||||||
|
<button class="journey-play-btn" onclick={startJourney}>▶</button>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
<StatsPanel />
|
||||||
</div>
|
</div>
|
||||||
<StatsPanel />
|
{:else}
|
||||||
</div>
|
<TimelineView
|
||||||
{:else}
|
onDetailChange={(v) => (inDetail = v)}
|
||||||
<TimelineView
|
{pendingCountry}
|
||||||
onDetailChange={(v) => (inDetail = v)}
|
onNewEntryClear={() => (pendingCountry = '')}
|
||||||
{pendingCountry}
|
/>
|
||||||
onNewEntryClear={() => (pendingCountry = '')}
|
{/if}
|
||||||
/>
|
</Layout>
|
||||||
|
|
||||||
|
{#if !user}
|
||||||
|
<LoginOverlay />
|
||||||
|
{:else if needsCountry}
|
||||||
|
<CountryPicker />
|
||||||
{/if}
|
{/if}
|
||||||
</Layout>
|
{/if}
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
|
.loading-screen {
|
||||||
|
width: 100vw;
|
||||||
|
height: 100vh;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
background: #0f172a;
|
||||||
|
}
|
||||||
|
|
||||||
|
.loading-text {
|
||||||
|
font: 400 18px/1.4 sans-serif;
|
||||||
|
color: #94a3b8;
|
||||||
|
}
|
||||||
|
|
||||||
.worldmap-page {
|
.worldmap-page {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -43,5 +106,36 @@
|
|||||||
.map-area {
|
.map-area {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.journey-play-btn {
|
||||||
|
position: absolute;
|
||||||
|
bottom: 24px;
|
||||||
|
right: 24px;
|
||||||
|
z-index: 10;
|
||||||
|
width: 44px;
|
||||||
|
height: 44px;
|
||||||
|
border-radius: 50%;
|
||||||
|
border: none;
|
||||||
|
background: #8b5cf6;
|
||||||
|
color: #fff;
|
||||||
|
font-size: 20px;
|
||||||
|
line-height: 1;
|
||||||
|
cursor: pointer;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
box-shadow: 0 2px 12px rgba(139, 92, 246, 0.4);
|
||||||
|
transition: background 0.15s ease, transform 0.1s ease, box-shadow 0.15s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.journey-play-btn:hover {
|
||||||
|
background: #7c3aed;
|
||||||
|
box-shadow: 0 4px 18px rgba(139, 92, 246, 0.55);
|
||||||
|
}
|
||||||
|
|
||||||
|
.journey-play-btn:active {
|
||||||
|
transform: scale(0.92);
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
@@ -1 +0,0 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="26.6" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 308"><path fill="#FF3E00" d="M239.682 40.707C211.113-.182 154.69-12.301 113.895 13.69L42.247 59.356a82.198 82.198 0 0 0-37.135 55.056a86.566 86.566 0 0 0 8.536 55.576a82.425 82.425 0 0 0-12.296 30.719a87.596 87.596 0 0 0 14.964 66.244c28.574 40.893 84.997 53.007 125.787 27.016l71.648-45.664a82.182 82.182 0 0 0 37.135-55.057a86.601 86.601 0 0 0-8.53-55.577a82.409 82.409 0 0 0 12.29-30.718a87.573 87.573 0 0 0-14.963-66.244"></path><path fill="#FFF" d="M106.889 270.841c-23.102 6.007-47.497-3.036-61.103-22.648a52.685 52.685 0 0 1-9.003-39.85a49.978 49.978 0 0 1 1.713-6.693l1.35-4.115l3.671 2.697a92.447 92.447 0 0 0 28.036 14.007l2.663.808l-.245 2.659a16.067 16.067 0 0 0 2.89 10.656a17.143 17.143 0 0 0 18.397 6.828a15.786 15.786 0 0 0 4.403-1.935l71.67-45.672a14.922 14.922 0 0 0 6.734-9.977a15.923 15.923 0 0 0-2.713-12.011a17.156 17.156 0 0 0-18.404-6.832a15.78 15.78 0 0 0-4.396 1.933l-27.35 17.434a52.298 52.298 0 0 1-14.553 6.391c-23.101 6.007-47.497-3.036-61.101-22.649a52.681 52.681 0 0 1-9.004-39.849a49.428 49.428 0 0 1 22.34-33.114l71.664-45.677a52.218 52.218 0 0 1 14.563-6.398c23.101-6.007 47.497 3.036 61.101 22.648a52.685 52.685 0 0 1 9.004 39.85a50.559 50.559 0 0 1-1.713 6.692l-1.35 4.116l-3.67-2.693a92.373 92.373 0 0 0-28.037-14.013l-2.664-.809l.246-2.658a16.099 16.099 0 0 0-2.89-10.656a17.143 17.143 0 0 0-18.398-6.828a15.786 15.786 0 0 0-4.402 1.935l-71.67 45.674a14.898 14.898 0 0 0-6.73 9.975a15.9 15.9 0 0 0 2.709 12.012a17.156 17.156 0 0 0 18.404 6.832a15.841 15.841 0 0 0 4.402-1.935l27.345-17.427a52.147 52.147 0 0 1 14.552-6.397c23.101-6.006 47.497 3.037 61.102 22.65a52.681 52.681 0 0 1 9.003 39.848a49.453 49.453 0 0 1-22.34 33.12l-71.664 45.673a52.218 52.218 0 0 1-14.563 6.398"></path></svg>
|
|
||||||
|
Before Width: | Height: | Size: 1.9 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 8.5 KiB |
208
src/lib/auth/CountryPicker.svelte
Normal file
208
src/lib/auth/CountryPicker.svelte
Normal file
@@ -0,0 +1,208 @@
|
|||||||
|
<script>
|
||||||
|
import { getUser, getUserProfile, setHomeCountry } from './userStore.svelte.js';
|
||||||
|
import worldData from 'world-atlas/countries-50m.json';
|
||||||
|
|
||||||
|
let user = $derived(getUser());
|
||||||
|
let profile = $derived(getUserProfile());
|
||||||
|
|
||||||
|
const countries = $derived.by(() => {
|
||||||
|
if (!worldData?.objects?.countries?.geometries) return [];
|
||||||
|
return worldData.objects.countries.geometries
|
||||||
|
.map(g => ({ name: g.properties?.name, code: g.id }))
|
||||||
|
.filter(c => c.name && c.code)
|
||||||
|
.sort((a, b) => a.name.localeCompare(b.name));
|
||||||
|
});
|
||||||
|
|
||||||
|
let search = $state('');
|
||||||
|
let selectedCountry = $state(null);
|
||||||
|
|
||||||
|
let filtered = $derived(
|
||||||
|
search
|
||||||
|
? countries.filter(c => c.name.toLowerCase().includes(search.toLowerCase()))
|
||||||
|
: countries
|
||||||
|
);
|
||||||
|
|
||||||
|
let open = $state(false);
|
||||||
|
|
||||||
|
function select(c) {
|
||||||
|
selectedCountry = c;
|
||||||
|
search = c.name;
|
||||||
|
open = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleSubmit() {
|
||||||
|
if (selectedCountry) {
|
||||||
|
setHomeCountry(selectedCountry.name, selectedCountry.code);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleKeydown(e) {
|
||||||
|
if (e.key === 'Enter' && selectedCountry) {
|
||||||
|
handleSubmit();
|
||||||
|
}
|
||||||
|
if (e.key === 'Escape') {
|
||||||
|
open = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="overlay">
|
||||||
|
<div class="card">
|
||||||
|
<h1 class="heading">Welcome, {profile?.displayName || 'Traveler'}!</h1>
|
||||||
|
<p class="subtitle">Select your home country to get started</p>
|
||||||
|
|
||||||
|
<div class="dropdown" class:open>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
placeholder="Search for a country..."
|
||||||
|
bind:value={search}
|
||||||
|
onfocus={() => { open = true; }}
|
||||||
|
oninput={() => { open = true; selectedCountry = null; }}
|
||||||
|
onkeydown={handleKeydown}
|
||||||
|
class="search-input"
|
||||||
|
/>
|
||||||
|
{#if open}
|
||||||
|
<ul class="list" role="listbox">
|
||||||
|
{#each filtered as country}
|
||||||
|
<li
|
||||||
|
role="option"
|
||||||
|
aria-selected={selectedCountry?.name === country.name}
|
||||||
|
class:selected={selectedCountry?.name === country.name}
|
||||||
|
onclick={() => select(country)}
|
||||||
|
onkeydown={(e) => { if (e.key === 'Enter') select(country); }}
|
||||||
|
tabindex="0"
|
||||||
|
>
|
||||||
|
{country.name}
|
||||||
|
</li>
|
||||||
|
{/each}
|
||||||
|
{#if filtered.length === 0}
|
||||||
|
<li class="no-results">No countries found</li>
|
||||||
|
{/if}
|
||||||
|
</ul>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button
|
||||||
|
class="continue-btn"
|
||||||
|
disabled={!selectedCountry}
|
||||||
|
onclick={handleSubmit}
|
||||||
|
>
|
||||||
|
Continue
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.overlay {
|
||||||
|
position: fixed;
|
||||||
|
inset: 0;
|
||||||
|
background: rgba(15, 23, 42, 0.85);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
z-index: 100;
|
||||||
|
backdrop-filter: blur(4px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.card {
|
||||||
|
background: #1e2937;
|
||||||
|
border-radius: 16px;
|
||||||
|
padding: 40px 36px;
|
||||||
|
text-align: center;
|
||||||
|
box-shadow: 0 20px 60px rgba(0, 0, 0, 0.5);
|
||||||
|
max-width: 420px;
|
||||||
|
width: 90%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.heading {
|
||||||
|
font: 700 24px/1.3 sans-serif;
|
||||||
|
color: #f1f5f9;
|
||||||
|
margin-bottom: 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.subtitle {
|
||||||
|
font: 400 15px/1.4 sans-serif;
|
||||||
|
color: #94a3b8;
|
||||||
|
margin-bottom: 28px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dropdown {
|
||||||
|
position: relative;
|
||||||
|
margin-bottom: 24px;
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
.search-input {
|
||||||
|
width: 100%;
|
||||||
|
padding: 12px 16px;
|
||||||
|
border: 1px solid #475569;
|
||||||
|
border-radius: 8px;
|
||||||
|
background: #0f172a;
|
||||||
|
color: #f1f5f9;
|
||||||
|
font: 400 15px/1.4 sans-serif;
|
||||||
|
outline: none;
|
||||||
|
transition: border-color 0.2s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.search-input:focus {
|
||||||
|
border-color: #3b82f6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.search-input::placeholder {
|
||||||
|
color: #64748b;
|
||||||
|
}
|
||||||
|
|
||||||
|
.list {
|
||||||
|
position: absolute;
|
||||||
|
top: calc(100% + 4px);
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
max-height: 240px;
|
||||||
|
overflow-y: auto;
|
||||||
|
background: #0f172a;
|
||||||
|
border: 1px solid #475569;
|
||||||
|
border-radius: 8px;
|
||||||
|
list-style: none;
|
||||||
|
z-index: 10;
|
||||||
|
}
|
||||||
|
|
||||||
|
.list li {
|
||||||
|
padding: 10px 16px;
|
||||||
|
cursor: pointer;
|
||||||
|
color: #cbd5e1;
|
||||||
|
font: 400 14px/1.4 sans-serif;
|
||||||
|
transition: background 0.15s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.list li:hover,
|
||||||
|
.list li.selected {
|
||||||
|
background: #1e3a5f;
|
||||||
|
color: #f1f5f9;
|
||||||
|
}
|
||||||
|
|
||||||
|
.no-results {
|
||||||
|
color: #64748b;
|
||||||
|
cursor: default;
|
||||||
|
}
|
||||||
|
|
||||||
|
.continue-btn {
|
||||||
|
width: 100%;
|
||||||
|
padding: 12px 24px;
|
||||||
|
border: none;
|
||||||
|
border-radius: 8px;
|
||||||
|
background: #3b82f6;
|
||||||
|
color: #fff;
|
||||||
|
font: 600 16px/1.4 sans-serif;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: background 0.2s, opacity 0.2s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.continue-btn:hover:not(:disabled) {
|
||||||
|
background: #2563eb;
|
||||||
|
}
|
||||||
|
|
||||||
|
.continue-btn:disabled {
|
||||||
|
opacity: 0.4;
|
||||||
|
cursor: default;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
87
src/lib/auth/LoginOverlay.svelte
Normal file
87
src/lib/auth/LoginOverlay.svelte
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
<script>
|
||||||
|
import { signInWithGoogle } from './userStore.svelte.js';
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div class="overlay">
|
||||||
|
<div class="card">
|
||||||
|
<img src="/logo.png" alt="Map Journal" class="logo" />
|
||||||
|
<h1 class="title">Map Journal</h1>
|
||||||
|
<p class="subtitle">Sign in to start your journey</p>
|
||||||
|
<button class="google-btn" onclick={signInWithGoogle}>
|
||||||
|
<svg class="google-icon" viewBox="0 0 48 48">
|
||||||
|
<path fill="#EA4335" d="M24 9.5c3.54 0 6.71 1.22 9.21 3.6l6.85-6.85C35.9 2.38 30.47 0 24 0 14.62 0 6.51 5.38 2.56 13.22l7.98 6.19C12.43 13.72 17.74 9.5 24 9.5z"/>
|
||||||
|
<path fill="#4285F4" d="M46.98 24.55c0-1.57-.15-3.09-.38-4.55H24v9.02h12.94c-.58 2.96-2.26 5.48-4.78 7.18l7.73 6c4.51-4.18 7.09-10.36 7.09-17.65z"/>
|
||||||
|
<path fill="#FBBC05" d="M10.53 28.59A14.5 14.5 0 0 1 9.5 24c0-1.59.28-3.14.76-4.59l-7.98-6.19A23.99 23.99 0 0 0 0 24c0 3.77.87 7.35 2.56 10.78l7.97-6.19z"/>
|
||||||
|
<path fill="#34A853" d="M24 48c6.48 0 11.93-2.13 15.89-5.81l-7.73-6c-2.15 1.45-4.92 2.3-8.16 2.3-6.26 0-11.57-4.22-13.47-9.91l-7.98 6.19C6.51 42.62 14.62 48 24 48z"/>
|
||||||
|
<path fill="none" d="M0 0h48v48H0z"/>
|
||||||
|
</svg>
|
||||||
|
Sign in with Google
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.overlay {
|
||||||
|
position: fixed;
|
||||||
|
inset: 0;
|
||||||
|
background: rgba(15, 23, 42, 0.85);
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
z-index: 100;
|
||||||
|
backdrop-filter: blur(4px);
|
||||||
|
}
|
||||||
|
|
||||||
|
.card {
|
||||||
|
background: #1e2937;
|
||||||
|
border-radius: 16px;
|
||||||
|
padding: 48px 40px;
|
||||||
|
text-align: center;
|
||||||
|
box-shadow: 0 20px 60px rgba(0, 0, 0, 0.5);
|
||||||
|
max-width: 400px;
|
||||||
|
width: 90%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.logo {
|
||||||
|
width: 80px;
|
||||||
|
height: 80px;
|
||||||
|
border-radius: 12px;
|
||||||
|
margin-bottom: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.title {
|
||||||
|
font: 700 28px/1.2 sans-serif;
|
||||||
|
color: #f1f5f9;
|
||||||
|
margin-bottom: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.subtitle {
|
||||||
|
font: 400 15px/1.4 sans-serif;
|
||||||
|
color: #94a3b8;
|
||||||
|
margin-bottom: 32px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.google-btn {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 12px;
|
||||||
|
padding: 12px 28px;
|
||||||
|
border: 1px solid rgba(255,255,255,0.15);
|
||||||
|
border-radius: 8px;
|
||||||
|
background: #334155;
|
||||||
|
color: #f1f5f9;
|
||||||
|
font: 500 16px/1.4 sans-serif;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: background 0.2s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.google-btn:hover {
|
||||||
|
background: #475569;
|
||||||
|
}
|
||||||
|
|
||||||
|
.google-icon {
|
||||||
|
width: 22px;
|
||||||
|
height: 22px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
73
src/lib/auth/userStore.svelte.js
Normal file
73
src/lib/auth/userStore.svelte.js
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
import { auth, db, googleProvider } from '../firebase.js';
|
||||||
|
import { onAuthStateChanged, signInWithPopup, signOut as fbSignOut } from 'firebase/auth';
|
||||||
|
import { doc, getDoc, setDoc, serverTimestamp } from 'firebase/firestore';
|
||||||
|
import { initSelectionListener } from '../layout/selection.svelte.js';
|
||||||
|
import { initEntriesListener } from '../stores/entriesStore.svelte.js';
|
||||||
|
|
||||||
|
let _initialized = false;
|
||||||
|
|
||||||
|
let user = $state(null);
|
||||||
|
let userProfile = $state(null);
|
||||||
|
let loading = $state(true);
|
||||||
|
let needsCountry = $state(false);
|
||||||
|
|
||||||
|
export function getUser() { return user; }
|
||||||
|
export function getUserProfile() { return userProfile; }
|
||||||
|
export function getLoading() { return loading; }
|
||||||
|
export function getNeedsCountry() { return needsCountry; }
|
||||||
|
|
||||||
|
export async function signInWithGoogle() {
|
||||||
|
await signInWithPopup(auth, googleProvider);
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function signOut() {
|
||||||
|
await fbSignOut(auth);
|
||||||
|
user = null;
|
||||||
|
userProfile = null;
|
||||||
|
needsCountry = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function setHomeCountry(name, code) {
|
||||||
|
if (!user) return;
|
||||||
|
await setDoc(doc(db, 'users', user.uid), {
|
||||||
|
displayName: user.displayName,
|
||||||
|
photoURL: user.photoURL,
|
||||||
|
email: user.email,
|
||||||
|
homeCountry: name,
|
||||||
|
homeCountryCode: code,
|
||||||
|
visitedCountries: [code],
|
||||||
|
createdAt: serverTimestamp(),
|
||||||
|
});
|
||||||
|
userProfile = { ...userProfile, homeCountry: name, homeCountryCode: code, visitedCountries: [code] };
|
||||||
|
needsCountry = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function initAuth() {
|
||||||
|
if (_initialized) return;
|
||||||
|
_initialized = true;
|
||||||
|
onAuthStateChanged(auth, async (fbUser) => {
|
||||||
|
if (fbUser) {
|
||||||
|
user = fbUser;
|
||||||
|
initSelectionListener(fbUser.uid);
|
||||||
|
initEntriesListener(fbUser.uid);
|
||||||
|
const docRef = doc(db, 'users', fbUser.uid);
|
||||||
|
const docSnap = await getDoc(docRef);
|
||||||
|
if (docSnap.exists()) {
|
||||||
|
userProfile = docSnap.data();
|
||||||
|
needsCountry = false;
|
||||||
|
} else {
|
||||||
|
userProfile = {
|
||||||
|
displayName: fbUser.displayName,
|
||||||
|
photoURL: fbUser.photoURL,
|
||||||
|
email: fbUser.email,
|
||||||
|
};
|
||||||
|
needsCountry = true;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
user = null;
|
||||||
|
userProfile = null;
|
||||||
|
needsCountry = false;
|
||||||
|
}
|
||||||
|
loading = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
18
src/lib/firebase.js
Normal file
18
src/lib/firebase.js
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
import { initializeApp } from "firebase/app";
|
||||||
|
import { getAuth, GoogleAuthProvider } from "firebase/auth";
|
||||||
|
import { getFirestore } from "firebase/firestore";
|
||||||
|
|
||||||
|
const firebaseConfig = {
|
||||||
|
apiKey: import.meta.env.VITE_FIREBASE_API_KEY,
|
||||||
|
authDomain: import.meta.env.VITE_FIREBASE_AUTH_DOMAIN,
|
||||||
|
projectId: import.meta.env.VITE_FIREBASE_PROJECT_ID,
|
||||||
|
storageBucket: import.meta.env.VITE_FIREBASE_STORAGE_BUCKET,
|
||||||
|
messagingSenderId: import.meta.env.VITE_FIREBASE_MESSAGING_SENDER_ID,
|
||||||
|
appId: import.meta.env.VITE_FIREBASE_APP_ID,
|
||||||
|
};
|
||||||
|
|
||||||
|
const app = initializeApp(firebaseConfig);
|
||||||
|
|
||||||
|
export const auth = getAuth(app);
|
||||||
|
export const db = getFirestore(app);
|
||||||
|
export const googleProvider = new GoogleAuthProvider();
|
||||||
@@ -1,73 +1,223 @@
|
|||||||
<script>
|
<script>
|
||||||
|
import { getUser, getUserProfile, signOut } from '../auth/userStore.svelte.js';
|
||||||
|
|
||||||
let { screen, onNavigate } = $props();
|
let { screen, onNavigate } = $props();
|
||||||
|
|
||||||
|
let user = $derived(getUser());
|
||||||
|
let profile = $derived(getUserProfile());
|
||||||
|
|
||||||
|
let menuOpen = $state(false);
|
||||||
|
|
||||||
|
function toggleMenu() {
|
||||||
|
menuOpen = !menuOpen;
|
||||||
|
}
|
||||||
|
|
||||||
|
function handleSignOut() {
|
||||||
|
menuOpen = false;
|
||||||
|
signOut();
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<nav class="topbar">
|
<div class="topbar">
|
||||||
<div class="logo-area">
|
<div class="left">
|
||||||
<span class="logo">Journi</span>
|
<span class="app-name">Journi</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="nav-links">
|
|
||||||
<button class="nav-btn" class:active={screen === 'worldmap'} onclick={() => onNavigate('worldmap')}>Map</button>
|
<div class="center">
|
||||||
<button class="nav-btn" class:active={screen === 'timeline'} onclick={() => onNavigate('timeline')}>Journal</button>
|
<div class="segmented">
|
||||||
|
<div
|
||||||
|
class="slider"
|
||||||
|
style="transform: translateX({screen === 'worldmap' ? 0 : 100}%);"
|
||||||
|
></div>
|
||||||
|
<button onclick={() => onNavigate('worldmap')}>Worldmap</button>
|
||||||
|
<button onclick={() => onNavigate('timeline')}>Timeline</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
|
||||||
|
<div class="right">
|
||||||
|
{#if user}
|
||||||
|
<div class="avatar-wrapper">
|
||||||
|
<button class="avatar-btn" onclick={toggleMenu} onkeydown={(e) => { if (e.key === 'Enter') toggleMenu(); }}>
|
||||||
|
<img
|
||||||
|
src={user.photoURL || '/profile.jpg'}
|
||||||
|
alt="Profile"
|
||||||
|
class="avatar"
|
||||||
|
/>
|
||||||
|
</button>
|
||||||
|
{#if menuOpen}
|
||||||
|
<div class="dropdown-menu">
|
||||||
|
<div class="menu-header">
|
||||||
|
<span class="menu-name">{profile?.displayName || user.displayName}</span>
|
||||||
|
<span class="menu-email">{user.email}</span>
|
||||||
|
</div>
|
||||||
|
<div class="divider"></div>
|
||||||
|
<button class="menu-item" onclick={handleSignOut}>Sign out</button>
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{#if menuOpen}
|
||||||
|
<button class="backdrop" aria-label="Close menu" onclick={() => { menuOpen = false; }}></button>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
.topbar {
|
.topbar {
|
||||||
position: relative;
|
height: 52px;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding: 0 32px;
|
padding: 0 32px;
|
||||||
height: 52px;
|
gap: 16px;
|
||||||
|
position: relative;
|
||||||
|
z-index: 10;
|
||||||
border-bottom: 1px solid var(--border);
|
border-bottom: 1px solid var(--border);
|
||||||
background: var(--bg);
|
background: var(--bg);
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
z-index: 10;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.logo-area {
|
.left {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 8px;
|
gap: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.logo {
|
.app-name {
|
||||||
font-family: var(--heading);
|
font-family: var(--heading);
|
||||||
font-size: 22px;
|
font-size: 22px;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
color: var(--text-h);
|
color: var(--text-h);
|
||||||
|
white-space: nowrap;
|
||||||
letter-spacing: -0.5px;
|
letter-spacing: -0.5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.nav-links {
|
.center {
|
||||||
|
flex: 1;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.segmented {
|
||||||
|
position: relative;
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 2px;
|
|
||||||
position: absolute;
|
|
||||||
left: 50%;
|
|
||||||
transform: translateX(-50%);
|
|
||||||
background: var(--bg-subtle);
|
background: var(--bg-subtle);
|
||||||
border: 1px solid var(--border);
|
border: 1px solid var(--border);
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
padding: 3px;
|
padding: 3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.nav-btn {
|
.slider {
|
||||||
|
position: absolute;
|
||||||
|
top: 3px;
|
||||||
|
left: 3px;
|
||||||
|
width: calc(50% - 3px);
|
||||||
|
height: calc(100% - 6px);
|
||||||
|
background: var(--bg);
|
||||||
|
border-radius: 6px;
|
||||||
|
box-shadow: 0 1px 4px rgba(0,0,0,0.08);
|
||||||
|
transition: transform 0.25s ease;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.segmented button {
|
||||||
|
position: relative;
|
||||||
|
z-index: 1;
|
||||||
|
flex: 1;
|
||||||
|
padding: 4px 18px;
|
||||||
|
border: none;
|
||||||
|
background: none;
|
||||||
|
cursor: pointer;
|
||||||
font-family: var(--sans);
|
font-family: var(--sans);
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-weight: 300;
|
font-weight: 300;
|
||||||
padding: 4px 18px;
|
|
||||||
border-radius: 6px;
|
|
||||||
border: none;
|
|
||||||
background: none;
|
|
||||||
color: var(--text);
|
color: var(--text);
|
||||||
cursor: pointer;
|
|
||||||
transition: background 0.15s, color 0.15s;
|
|
||||||
letter-spacing: 0.01em;
|
letter-spacing: 0.01em;
|
||||||
}
|
}
|
||||||
.nav-btn:hover { color: var(--text-h); }
|
.right {
|
||||||
.nav-btn.active {
|
display: flex;
|
||||||
background: #7c3aed;
|
align-items: center;
|
||||||
color: #fff;
|
}
|
||||||
box-shadow: 0 1px 4px rgba(124,58,237,0.25);
|
|
||||||
|
.avatar-wrapper {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.avatar-btn {
|
||||||
|
display: flex;
|
||||||
|
padding: 0;
|
||||||
|
border: none;
|
||||||
|
background: none;
|
||||||
|
cursor: pointer;
|
||||||
|
border-radius: 50%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.avatar {
|
||||||
|
width: 32px;
|
||||||
|
height: 32px;
|
||||||
|
border-radius: 50%;
|
||||||
|
object-fit: cover;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dropdown-menu {
|
||||||
|
position: absolute;
|
||||||
|
top: calc(100% + 8px);
|
||||||
|
right: 0;
|
||||||
|
background: var(--bg);
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
border-radius: 10px;
|
||||||
|
padding: 8px 0;
|
||||||
|
min-width: 200px;
|
||||||
|
box-shadow: var(--shadow);
|
||||||
|
z-index: 50;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu-header {
|
||||||
|
padding: 8px 16px;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu-name {
|
||||||
|
font: 600 14px/1.3 sans-serif;
|
||||||
|
color: var(--text-h);
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu-email {
|
||||||
|
font: 400 12px/1.3 sans-serif;
|
||||||
|
color: var(--text-sub);
|
||||||
|
}
|
||||||
|
|
||||||
|
.divider {
|
||||||
|
height: 1px;
|
||||||
|
background: var(--border);
|
||||||
|
margin: 6px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu-item {
|
||||||
|
width: 100%;
|
||||||
|
padding: 8px 16px;
|
||||||
|
border: none;
|
||||||
|
background: none;
|
||||||
|
text-align: left;
|
||||||
|
font: 400 14px/1.4 sans-serif;
|
||||||
|
color: #ef4444;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: background 0.15s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu-item:hover {
|
||||||
|
background: var(--bg-subtle);
|
||||||
|
}
|
||||||
|
|
||||||
|
.backdrop {
|
||||||
|
position: fixed;
|
||||||
|
inset: 0;
|
||||||
|
z-index: 30;
|
||||||
|
border: none;
|
||||||
|
background: transparent;
|
||||||
|
cursor: default;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -1,18 +1,48 @@
|
|||||||
|
import { db } from '../firebase.js';
|
||||||
|
import { doc, onSnapshot, updateDoc, arrayUnion, arrayRemove } from 'firebase/firestore';
|
||||||
|
|
||||||
let selected = $state(new Set());
|
let selected = $state(new Set());
|
||||||
let totalCountries = $state(0);
|
let totalCountries = $state(0);
|
||||||
|
let homeCountryCode = $state(null);
|
||||||
|
let _uid = null;
|
||||||
|
let _unsubscribe = null;
|
||||||
|
|
||||||
|
export function initSelectionListener(uid) {
|
||||||
|
if (_unsubscribe) _unsubscribe();
|
||||||
|
_uid = uid;
|
||||||
|
const userRef = doc(db, 'users', uid);
|
||||||
|
_unsubscribe = onSnapshot(userRef, (snap) => {
|
||||||
|
if (snap.exists()) {
|
||||||
|
const codes = snap.data().visitedCountries || [];
|
||||||
|
selected = new Set(codes);
|
||||||
|
homeCountryCode = snap.data().homeCountryCode || null;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
export function toggle(id) {
|
export function toggle(id) {
|
||||||
|
if (!_uid) return;
|
||||||
|
const was = selected.has(id);
|
||||||
const next = new Set(selected);
|
const next = new Set(selected);
|
||||||
if (next.has(id)) {
|
if (was) {
|
||||||
next.delete(id);
|
next.delete(id);
|
||||||
} else {
|
} else {
|
||||||
next.add(id);
|
next.add(id);
|
||||||
}
|
}
|
||||||
selected = next;
|
selected = next;
|
||||||
|
const userRef = doc(db, 'users', _uid);
|
||||||
|
if (was) {
|
||||||
|
updateDoc(userRef, { visitedCountries: arrayRemove(id) });
|
||||||
|
} else {
|
||||||
|
updateDoc(userRef, { visitedCountries: arrayUnion(id) });
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function clearAll() {
|
export function clearAll() {
|
||||||
|
if (!_uid) return;
|
||||||
selected = new Set();
|
selected = new Set();
|
||||||
|
const userRef = doc(db, 'users', _uid);
|
||||||
|
updateDoc(userRef, { visitedCountries: [] });
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getSelected() {
|
export function getSelected() {
|
||||||
@@ -26,3 +56,7 @@ export function setTotalCount(n) {
|
|||||||
export function getTotalCount() {
|
export function getTotalCount() {
|
||||||
return totalCountries;
|
return totalCountries;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function getHomeCountryCode() {
|
||||||
|
return homeCountryCode;
|
||||||
|
}
|
||||||
|
|||||||
45
src/lib/stores/entriesStore.svelte.js
Normal file
45
src/lib/stores/entriesStore.svelte.js
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
import { db } from '../firebase.js';
|
||||||
|
import { collection, doc, onSnapshot, query, orderBy, addDoc, updateDoc, deleteDoc, serverTimestamp } from 'firebase/firestore';
|
||||||
|
|
||||||
|
let entries = $state([]);
|
||||||
|
let _uid = null;
|
||||||
|
let _unsubscribe = null;
|
||||||
|
|
||||||
|
export function getEntries() {
|
||||||
|
return entries;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function initEntriesListener(uid) {
|
||||||
|
if (_unsubscribe) _unsubscribe();
|
||||||
|
_uid = uid;
|
||||||
|
const q = query(
|
||||||
|
collection(db, 'users', uid, 'entries'),
|
||||||
|
orderBy('createdAt', 'desc')
|
||||||
|
);
|
||||||
|
_unsubscribe = onSnapshot(q, (snap) => {
|
||||||
|
entries = snap.docs.map((d) => ({ id: d.id, ...d.data() }));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function addEntry(data) {
|
||||||
|
if (!_uid) return null;
|
||||||
|
const ref = await addDoc(collection(db, 'users', _uid, 'entries'), {
|
||||||
|
...data,
|
||||||
|
createdAt: serverTimestamp(),
|
||||||
|
updatedAt: serverTimestamp(),
|
||||||
|
});
|
||||||
|
return ref.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function updateEntry(id, data) {
|
||||||
|
if (!_uid) return;
|
||||||
|
await updateDoc(doc(db, 'users', _uid, 'entries', id), {
|
||||||
|
...data,
|
||||||
|
updatedAt: serverTimestamp(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function removeEntry(id) {
|
||||||
|
if (!_uid) return;
|
||||||
|
await deleteDoc(doc(db, 'users', _uid, 'entries', id));
|
||||||
|
}
|
||||||
391
src/lib/world-map/JourneyView.svelte
Normal file
391
src/lib/world-map/JourneyView.svelte
Normal file
@@ -0,0 +1,391 @@
|
|||||||
|
<script>
|
||||||
|
import { onMount, onDestroy } from 'svelte';
|
||||||
|
import * as d3 from 'd3';
|
||||||
|
import { feature } from 'topojson-client';
|
||||||
|
import worldData from 'world-atlas/countries-50m.json';
|
||||||
|
|
||||||
|
let { onclose, onprogress } = $props();
|
||||||
|
|
||||||
|
const HOME_CODE = '203';
|
||||||
|
|
||||||
|
const MOCK_TRIPS = [
|
||||||
|
{ countryName: 'Japan', countryCode: '392', date: '2024-03-15', city: 'Tokyo' },
|
||||||
|
{ countryName: 'France', countryCode: '191', date: '2024-06-20', city: 'Paris' },
|
||||||
|
{ countryName: 'Spain', countryCode: '724', date: '2024-09-10', city: 'Barcelona' },
|
||||||
|
{ countryName: 'United States', countryCode: '840', date: '2025-01-05', city: 'New York' },
|
||||||
|
{ countryName: 'Thailand', countryCode: '764', date: '2025-04-18', city: 'Bangkok' },
|
||||||
|
{ countryName: 'Australia', countryCode: '036', date: '2025-08-22', city: 'Sydney' },
|
||||||
|
];
|
||||||
|
|
||||||
|
const HOME_COLOR = '#8b5cf6';
|
||||||
|
const VISITED_COLOR = '#22c55e';
|
||||||
|
const ARC_COLOR = '#000000';
|
||||||
|
const PLANE_COLOR = '#7c3aed';
|
||||||
|
const PLANE_PATH = 'M14,0 L4,-3 L0,-7 L-3,-5 L0,-2 L-5,-1 L-9,-5 L-11,-4 L-7,0 L-11,4 L-9,5 L-5,1 L0,2 L-3,5 L0,7 L4,3 Z';
|
||||||
|
const UNVISITED = '#ffffff';
|
||||||
|
|
||||||
|
const TERRITORY_PARENT = {
|
||||||
|
'016': '840', '060': '826', '086': '826', '092': '826', '136': '826',
|
||||||
|
'184': '554', '234': '208', '238': '826', '239': '826', '248': '246',
|
||||||
|
'258': '250', '260': '250', '304': '208', '316': '840', '334': '036',
|
||||||
|
'446': '156', '500': '826', '531': '528', '533': '528', '534': '528',
|
||||||
|
'540': '250', '570': '554', '574': '036', '580': '840', '612': '826',
|
||||||
|
'630': '840', '652': '250', '654': '826', '660': '826', '663': '250',
|
||||||
|
'666': '250', '796': '826', '831': '826', '832': '826', '833': '826',
|
||||||
|
'850': '840', '876': '250',
|
||||||
|
};
|
||||||
|
|
||||||
|
function effId(d) {
|
||||||
|
return TERRITORY_PARENT[d.id] || d.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
let frameEl;
|
||||||
|
let svg, g, pathFn, projection;
|
||||||
|
let countryPaths;
|
||||||
|
let homeFeature;
|
||||||
|
let featuresById = {};
|
||||||
|
let isCancelled = false;
|
||||||
|
let isPlaying = $state(false);
|
||||||
|
let isFinished = $state(false);
|
||||||
|
|
||||||
|
function fitProjection(proj, w, h) {
|
||||||
|
proj.fitSize([w, h], { type: 'Sphere' });
|
||||||
|
const s = proj.scale() * 1.5;
|
||||||
|
proj.scale(s).translate([w / 2, h * 0.70]);
|
||||||
|
}
|
||||||
|
|
||||||
|
function computeArc(p1, p2) {
|
||||||
|
const interp = d3.geoInterpolate(p1, p2);
|
||||||
|
const steps = 80;
|
||||||
|
const raw = [];
|
||||||
|
|
||||||
|
for (let i = 0; i <= steps; i++) {
|
||||||
|
const t = i / steps;
|
||||||
|
const geo = interp(t);
|
||||||
|
const pt = projection(geo);
|
||||||
|
if (!pt) continue;
|
||||||
|
raw.push({ t, x: pt[0], y: pt[1] });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (raw.length < 2) return [];
|
||||||
|
|
||||||
|
const first = raw[0];
|
||||||
|
const last = raw[raw.length - 1];
|
||||||
|
const dx = last.x - first.x;
|
||||||
|
const dy = last.y - first.y;
|
||||||
|
const dist = Math.sqrt(dx * dx + dy * dy);
|
||||||
|
const arcH = Math.max(40, Math.min(200, dist * 0.22));
|
||||||
|
|
||||||
|
return raw.map(p => [p.x, p.y - arcH * Math.sin(Math.PI * p.t)]);
|
||||||
|
}
|
||||||
|
|
||||||
|
function getAngleAtLength(node, len) {
|
||||||
|
const d = 0.5;
|
||||||
|
const total = node.getTotalLength();
|
||||||
|
const p1 = node.getPointAtLength(Math.max(0, len - d));
|
||||||
|
const p2 = node.getPointAtLength(Math.min(total, len + d));
|
||||||
|
return Math.atan2(p2.y - p1.y, p2.x - p1.x) * 180 / Math.PI;
|
||||||
|
}
|
||||||
|
|
||||||
|
function animateStroke(pathEl, tipEl, startOffset, endOffset, duration) {
|
||||||
|
return new Promise((resolve) => {
|
||||||
|
const node = pathEl.node();
|
||||||
|
if (!node) { resolve(); return; }
|
||||||
|
const totalLength = node.getTotalLength();
|
||||||
|
|
||||||
|
if (totalLength === 0) { resolve(); return; }
|
||||||
|
|
||||||
|
d3.timer(elapsed => {
|
||||||
|
if (isCancelled) { resolve(); return true; }
|
||||||
|
|
||||||
|
const t = Math.min(elapsed / duration, 1);
|
||||||
|
const offset = startOffset + (endOffset - startOffset) * t;
|
||||||
|
|
||||||
|
pathEl.attr('stroke-dashoffset', offset);
|
||||||
|
|
||||||
|
const drawn = totalLength - offset;
|
||||||
|
const clamped = Math.max(0, Math.min(drawn, totalLength));
|
||||||
|
try {
|
||||||
|
const pt = node.getPointAtLength(clamped);
|
||||||
|
const angle = getAngleAtLength(node, clamped);
|
||||||
|
tipEl.attr('transform', `translate(${pt.x}, ${pt.y}) rotate(${angle}) scale(1.4)`).attr('opacity', 1);
|
||||||
|
} catch (e) {
|
||||||
|
// ignore SVG errors
|
||||||
|
}
|
||||||
|
|
||||||
|
if (t >= 1) {
|
||||||
|
resolve();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function delay(ms) {
|
||||||
|
return new Promise(resolve => {
|
||||||
|
if (isCancelled) { resolve(); return; }
|
||||||
|
const id = setTimeout(resolve, ms);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function animateTrip(destCode, destFeature) {
|
||||||
|
if (!homeFeature || !destFeature) return;
|
||||||
|
|
||||||
|
const homeCentroid = d3.geoCentroid(homeFeature);
|
||||||
|
const destCentroid = d3.geoCentroid(destFeature);
|
||||||
|
|
||||||
|
const pts = computeArc(homeCentroid, destCentroid);
|
||||||
|
if (pts.length < 2) return;
|
||||||
|
|
||||||
|
const lineGen = d3.line().curve(d3.curveBasis);
|
||||||
|
const pathData = lineGen(pts);
|
||||||
|
|
||||||
|
if (!pathData) return;
|
||||||
|
|
||||||
|
function createArc(pathData) {
|
||||||
|
const el = g.append('path')
|
||||||
|
.attr('d', pathData)
|
||||||
|
.attr('fill', 'none')
|
||||||
|
.attr('stroke', ARC_COLOR)
|
||||||
|
.attr('stroke-width', 2.5)
|
||||||
|
.attr('stroke-opacity', 0.8)
|
||||||
|
.attr('stroke-linecap', 'round');
|
||||||
|
const tip = g.append('path')
|
||||||
|
.attr('d', PLANE_PATH)
|
||||||
|
.attr('fill', PLANE_COLOR)
|
||||||
|
.attr('opacity', 0);
|
||||||
|
return { el, tip };
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Outbound: home -> dest ---
|
||||||
|
let { el: outEl, tip: outTip } = createArc(pathData);
|
||||||
|
const outLen = outEl.node().getTotalLength();
|
||||||
|
outEl.attr('stroke-dasharray', outLen).attr('stroke-dashoffset', outLen);
|
||||||
|
|
||||||
|
const homeDot = g.append('circle')
|
||||||
|
.attr('r', 4)
|
||||||
|
.attr('fill', PLANE_COLOR)
|
||||||
|
.attr('cx', pts[0][0])
|
||||||
|
.attr('cy', pts[0][1])
|
||||||
|
.attr('opacity', 1);
|
||||||
|
|
||||||
|
await animateStroke(outEl, outTip, outLen, 0, 2500);
|
||||||
|
if (isCancelled) return;
|
||||||
|
|
||||||
|
outEl.remove();
|
||||||
|
outTip.remove();
|
||||||
|
homeDot.remove();
|
||||||
|
|
||||||
|
// Color the destination country
|
||||||
|
const targetPath = countryPaths.filter(d => effId(d) === destCode);
|
||||||
|
targetPath.transition().duration(500).attr('fill', VISITED_COLOR);
|
||||||
|
g.selectAll('.micro-state-j')
|
||||||
|
.filter(d => effId(d) === destCode)
|
||||||
|
.transition().duration(500)
|
||||||
|
.attr('fill', VISITED_COLOR);
|
||||||
|
|
||||||
|
await delay(800);
|
||||||
|
if (isCancelled) return;
|
||||||
|
|
||||||
|
// --- Return: dest -> home ---
|
||||||
|
const revPts = [...pts].reverse();
|
||||||
|
const revData = d3.line().curve(d3.curveBasis)(revPts);
|
||||||
|
let { el: retEl, tip: retTip } = createArc(revData);
|
||||||
|
const retLen = retEl.node().getTotalLength();
|
||||||
|
retEl.attr('stroke-dasharray', retLen).attr('stroke-dashoffset', retLen);
|
||||||
|
|
||||||
|
const destDot = g.append('circle')
|
||||||
|
.attr('r', 4)
|
||||||
|
.attr('fill', PLANE_COLOR)
|
||||||
|
.attr('cx', revPts[0][0])
|
||||||
|
.attr('cy', revPts[0][1])
|
||||||
|
.attr('opacity', 1);
|
||||||
|
|
||||||
|
await animateStroke(retEl, retTip, retLen, 0, 2200);
|
||||||
|
if (isCancelled) return;
|
||||||
|
|
||||||
|
retEl.remove();
|
||||||
|
retTip.remove();
|
||||||
|
destDot.remove();
|
||||||
|
|
||||||
|
await delay(300);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function startJourney() {
|
||||||
|
isPlaying = true;
|
||||||
|
isFinished = false;
|
||||||
|
isCancelled = false;
|
||||||
|
|
||||||
|
const trips = MOCK_TRIPS;
|
||||||
|
const total = trips.length;
|
||||||
|
|
||||||
|
for (let i = 0; i < total; i++) {
|
||||||
|
if (isCancelled) break;
|
||||||
|
|
||||||
|
const trip = trips[i];
|
||||||
|
const destFeature = featuresById[trip.countryCode];
|
||||||
|
if (!destFeature) continue;
|
||||||
|
|
||||||
|
const label = `${trip.city}, ${trip.countryName}`;
|
||||||
|
if (onprogress) onprogress({ index: i + 1, total, label });
|
||||||
|
|
||||||
|
await animateTrip(trip.countryCode, destFeature);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isCancelled) {
|
||||||
|
isFinished = true;
|
||||||
|
isPlaying = false;
|
||||||
|
if (onprogress) onprogress({ index: trips.length, total: trips.length, label: 'Journey complete!' });
|
||||||
|
} else {
|
||||||
|
isPlaying = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function stopJourney() {
|
||||||
|
isCancelled = true;
|
||||||
|
isPlaying = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
onMount(() => {
|
||||||
|
const width = frameEl.clientWidth;
|
||||||
|
const height = frameEl.clientHeight;
|
||||||
|
|
||||||
|
projection = d3.geoMercator();
|
||||||
|
fitProjection(projection, width, height);
|
||||||
|
|
||||||
|
pathFn = d3.geoPath().projection(projection);
|
||||||
|
|
||||||
|
const countries = feature(worldData, worldData.objects.countries)
|
||||||
|
.features.filter(f => (f.id || f.properties.name === 'Kosovo') && f.id !== '010');
|
||||||
|
|
||||||
|
countries.forEach(f => {
|
||||||
|
if (!f.id) f.id = 'XK';
|
||||||
|
});
|
||||||
|
|
||||||
|
for (const f of countries) {
|
||||||
|
featuresById[effId(f)] = f;
|
||||||
|
}
|
||||||
|
|
||||||
|
homeFeature = featuresById[HOME_CODE];
|
||||||
|
|
||||||
|
svg = d3.select(frameEl)
|
||||||
|
.append('svg')
|
||||||
|
.attr('width', width)
|
||||||
|
.attr('height', height)
|
||||||
|
.style('cursor', 'default');
|
||||||
|
|
||||||
|
g = svg.append('g');
|
||||||
|
|
||||||
|
countryPaths = g.selectAll('path')
|
||||||
|
.data(countries)
|
||||||
|
.join('path')
|
||||||
|
.attr('d', pathFn)
|
||||||
|
.attr('fill', d => effId(d) === HOME_CODE ? HOME_COLOR : UNVISITED)
|
||||||
|
.attr('stroke', '#d4d4d4')
|
||||||
|
.attr('stroke-width', 0.5);
|
||||||
|
|
||||||
|
function renderMicrostates() {
|
||||||
|
g.selectAll('.micro-state-j').remove();
|
||||||
|
const threshold = 4;
|
||||||
|
countryPaths.each(function (d) {
|
||||||
|
if (effId(d) !== d.id) return;
|
||||||
|
const { width, height } = this.getBBox();
|
||||||
|
if (width < threshold && height < threshold) {
|
||||||
|
const [cx, cy] = pathFn.centroid(d);
|
||||||
|
g.append('circle')
|
||||||
|
.attr('class', 'micro-state-j')
|
||||||
|
.datum(d)
|
||||||
|
.attr('cx', cx)
|
||||||
|
.attr('cy', cy)
|
||||||
|
.attr('r', 2)
|
||||||
|
.attr('fill', effId(d) === HOME_CODE ? HOME_COLOR : UNVISITED)
|
||||||
|
.attr('stroke', '#94a3b8')
|
||||||
|
.attr('stroke-width', 0.5);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
renderMicrostates();
|
||||||
|
|
||||||
|
const observer = new ResizeObserver((entries) => {
|
||||||
|
for (const entry of entries) {
|
||||||
|
const { width, height } = entry.contentRect;
|
||||||
|
svg.attr('width', width).attr('height', height);
|
||||||
|
fitProjection(projection, width, height);
|
||||||
|
countryPaths.attr('d', pathFn);
|
||||||
|
renderMicrostates();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
observer.observe(frameEl);
|
||||||
|
|
||||||
|
startJourney();
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
stopJourney();
|
||||||
|
observer.disconnect();
|
||||||
|
if (svg) svg.remove();
|
||||||
|
};
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<div bind:this={frameEl} class="journey-frame">
|
||||||
|
<button class="close-btn" onclick={() => { stopJourney(); onclose?.(); }}>✕</button>
|
||||||
|
{#if isFinished}
|
||||||
|
<div class="done-badge">Journey complete!</div>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.journey-frame {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
overflow: hidden;
|
||||||
|
position: relative;
|
||||||
|
background: #a4c8e0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.journey-frame :global(svg) {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.close-btn {
|
||||||
|
position: absolute;
|
||||||
|
top: 12px;
|
||||||
|
right: 12px;
|
||||||
|
z-index: 10;
|
||||||
|
width: 36px;
|
||||||
|
height: 36px;
|
||||||
|
border-radius: 50%;
|
||||||
|
border: none;
|
||||||
|
background: rgba(0,0,0,0.55);
|
||||||
|
color: #fff;
|
||||||
|
font-size: 18px;
|
||||||
|
line-height: 1;
|
||||||
|
cursor: pointer;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
transition: background 0.15s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.close-btn:hover {
|
||||||
|
background: rgba(0,0,0,0.75);
|
||||||
|
}
|
||||||
|
|
||||||
|
.done-badge {
|
||||||
|
position: absolute;
|
||||||
|
bottom: 24px;
|
||||||
|
left: 50%;
|
||||||
|
transform: translateX(-50%);
|
||||||
|
z-index: 10;
|
||||||
|
background: rgba(0,0,0,0.65);
|
||||||
|
color: #fff;
|
||||||
|
font-family: var(--heading, sans-serif);
|
||||||
|
font-size: 16px;
|
||||||
|
padding: 10px 24px;
|
||||||
|
border-radius: 24px;
|
||||||
|
white-space: nowrap;
|
||||||
|
letter-spacing: 0.04em;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
<script>
|
<script>
|
||||||
import { CONTINENTS, getContinent, continentTotals } from './continents.js';
|
import { CONTINENTS, getContinent, continentTotals } from './continents.js';
|
||||||
import { getSelected, getTotalCount } from '../layout/selection.svelte.js';
|
import { getSelected, getTotalCount } from '../layout/selection.svelte.js';
|
||||||
|
import worldData from 'world-atlas/countries-50m.json';
|
||||||
|
|
||||||
let collapsed = $state(false);
|
let collapsed = $state(false);
|
||||||
|
|
||||||
@@ -13,6 +14,33 @@
|
|||||||
'Oceania': '#a855f7'
|
'Oceania': '#a855f7'
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const countryNameById = $derived.by(() => {
|
||||||
|
const map = { XK: 'Kosovo' };
|
||||||
|
for (const g of worldData.objects.countries.geometries) {
|
||||||
|
map[g.id] = g.properties?.name || g.id;
|
||||||
|
}
|
||||||
|
return map;
|
||||||
|
});
|
||||||
|
|
||||||
|
let visitedCountries = $derived(
|
||||||
|
[...getSelected()].map(id => countryNameById[id]).filter(Boolean).sort()
|
||||||
|
);
|
||||||
|
|
||||||
|
let visitedByContinent = $derived.by(() => {
|
||||||
|
const map = {};
|
||||||
|
for (const id of getSelected()) {
|
||||||
|
const cont = getContinent(id);
|
||||||
|
if (cont) {
|
||||||
|
if (!map[cont]) map[cont] = [];
|
||||||
|
map[cont].push(countryNameById[id] || id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (const cont of Object.keys(map)) {
|
||||||
|
map[cont].sort();
|
||||||
|
}
|
||||||
|
return map;
|
||||||
|
});
|
||||||
|
|
||||||
let counts = $derived.by(() => {
|
let counts = $derived.by(() => {
|
||||||
const c = {};
|
const c = {};
|
||||||
for (const cont of CONTINENTS) c[cont] = 0;
|
for (const cont of CONTINENTS) c[cont] = 0;
|
||||||
@@ -83,10 +111,20 @@
|
|||||||
<span class="bar-label">by continent</span>
|
<span class="bar-label">by continent</span>
|
||||||
{#each CONTINENTS as continent}
|
{#each CONTINENTS as continent}
|
||||||
{@const contTotal = continentTotals[continent]}
|
{@const contTotal = continentTotals[continent]}
|
||||||
<div class="row">
|
<div class="row tooltip-wrap">
|
||||||
<span class="dot" style="background: {continentColors[continent]}"></span>
|
<span class="dot" style="background: {continentColors[continent]}"></span>
|
||||||
<span class="label">{continent}</span>
|
<span class="label">{continent}</span>
|
||||||
<span class="value">{counts[continent]}<span class="total">/{contTotal}</span></span>
|
<span class="value">{counts[continent]}<span class="total">/{contTotal}</span></span>
|
||||||
|
{#if visitedByContinent[continent]?.length > 0}
|
||||||
|
<div class="tooltip-list">
|
||||||
|
{#each visitedByContinent[continent].slice(0, 10) as country}
|
||||||
|
<span class="tooltip-item">{country}</span>
|
||||||
|
{/each}
|
||||||
|
{#if visitedByContinent[continent].length > 10}
|
||||||
|
<span class="tooltip-item tooltip-more">...</span>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
{/each}
|
{/each}
|
||||||
|
|
||||||
@@ -298,6 +336,41 @@
|
|||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.tooltip-wrap {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tooltip-list {
|
||||||
|
display: none;
|
||||||
|
position: absolute;
|
||||||
|
top: calc(100% + 6px);
|
||||||
|
left: 0;
|
||||||
|
background: var(--text-h);
|
||||||
|
color: var(--bg-raised);
|
||||||
|
font-family: var(--sans);
|
||||||
|
font-size: 12px;
|
||||||
|
line-height: 1.5;
|
||||||
|
padding: 8px 12px;
|
||||||
|
border-radius: 8px;
|
||||||
|
box-shadow: var(--shadow);
|
||||||
|
z-index: 20;
|
||||||
|
white-space: nowrap;
|
||||||
|
min-width: 120px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tooltip-wrap:hover .tooltip-list {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tooltip-item {
|
||||||
|
display: block;
|
||||||
|
padding: 2px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tooltip-item + .tooltip-item {
|
||||||
|
border-top: 1px solid rgba(255, 255, 255, 0.06);
|
||||||
|
}
|
||||||
|
|
||||||
.disclaimer {
|
.disclaimer {
|
||||||
font-size: var(--text-xs);
|
font-size: var(--text-xs);
|
||||||
color: var(--text-sub);
|
color: var(--text-sub);
|
||||||
|
|||||||
@@ -3,26 +3,78 @@
|
|||||||
import * as d3 from 'd3';
|
import * as d3 from 'd3';
|
||||||
import { feature } from 'topojson-client';
|
import { feature } from 'topojson-client';
|
||||||
import worldData from 'world-atlas/countries-50m.json';
|
import worldData from 'world-atlas/countries-50m.json';
|
||||||
import { getSelected, toggle, setTotalCount } from '../layout/selection.svelte.js';
|
import { getSelected, toggle, setTotalCount, getHomeCountryCode } from '../layout/selection.svelte.js';
|
||||||
|
|
||||||
let { onCountryClick = (_name) => {} } = $props();
|
let { onCountryClick = (_name) => {} } = $props();
|
||||||
|
|
||||||
const TERRITORY_PARENT = {
|
const TERRITORY_PARENT = {
|
||||||
'016': '840', '060': '826', '086': '826', '092': '826', '136': '826',
|
'016': '840', // American Samoa -> United States
|
||||||
'184': '554', '234': '208', '238': '826', '239': '826', '248': '246',
|
'060': '826', // Bermuda -> United Kingdom
|
||||||
'258': '250', '260': '250', '304': '208', '316': '840', '334': '036',
|
'086': '826', // Br. Indian Ocean Ter. -> United Kingdom
|
||||||
'446': '156', '500': '826', '531': '528', '533': '528', '534': '528',
|
'092': '826', // British Virgin Is. -> United Kingdom
|
||||||
'540': '250', '570': '554', '574': '036', '580': '840', '612': '826',
|
'136': '826', // Cayman Is. -> United Kingdom
|
||||||
'630': '840', '652': '250', '654': '826', '660': '826', '663': '250',
|
'184': '554', // Cook Is. -> New Zealand
|
||||||
'666': '250', '796': '826', '831': '826', '832': '826', '833': '826',
|
'234': '208', // Faeroe Is. -> Denmark
|
||||||
'850': '840', '876': '250',
|
'238': '826', // Falkland Is. -> United Kingdom
|
||||||
|
'239': '826', // S. Geo. and the Is. -> United Kingdom
|
||||||
|
'248': '246', // Aland -> Finland
|
||||||
|
'258': '250', // Fr. Polynesia -> France
|
||||||
|
'260': '250', // Fr. S. Antarctic Lands -> France
|
||||||
|
'304': '208', // Greenland -> Denmark
|
||||||
|
'316': '840', // Guam -> United States
|
||||||
|
'334': '036', // Heard I. and McDonald Is. -> Australia
|
||||||
|
'446': '156', // Macao -> China
|
||||||
|
'500': '826', // Montserrat -> United Kingdom
|
||||||
|
'531': '528', // Curacao -> Netherlands
|
||||||
|
'533': '528', // Aruba -> Netherlands
|
||||||
|
'534': '528', // Sint Maarten -> Netherlands
|
||||||
|
'540': '250', // New Caledonia -> France
|
||||||
|
'570': '554', // Niue -> New Zealand
|
||||||
|
'574': '036', // Norfolk Island -> Australia
|
||||||
|
'580': '840', // N. Mariana Is. -> United States
|
||||||
|
'612': '826', // Pitcairn Is. -> United Kingdom
|
||||||
|
'630': '840', // Puerto Rico -> United States
|
||||||
|
'652': '250', // St-Barthelemy -> France
|
||||||
|
'654': '826', // Saint Helena -> United Kingdom
|
||||||
|
'660': '826', // Anguilla -> United Kingdom
|
||||||
|
'663': '250', // St-Martin -> France
|
||||||
|
'666': '250', // St. Pierre and Miquelon -> France
|
||||||
|
'796': '826', // Turks and Caicos Is. -> United Kingdom
|
||||||
|
'831': '826', // Guernsey -> United Kingdom
|
||||||
|
'832': '826', // Jersey -> United Kingdom
|
||||||
|
'833': '826', // Isle of Man -> United Kingdom
|
||||||
|
'850': '840', // U.S. Virgin Is. -> United States
|
||||||
|
'876': '250', // Wallis and Futuna Is. -> France
|
||||||
};
|
};
|
||||||
|
|
||||||
function effId(d) {
|
function effId(d) {
|
||||||
return TERRITORY_PARENT[d.id] || d.id;
|
return TERRITORY_PARENT[d.id] || d.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const HOME_COLOR = '#8b5cf6';
|
||||||
|
const HOME_COLOR_HOVER = '#7c3aed';
|
||||||
|
const VISITED_COLOR = '#22c55e';
|
||||||
|
const VISITED_COLOR_HOVER = '#16a34a';
|
||||||
|
const UNVISITED_COLOR = '#ffffff';
|
||||||
|
const UNVISITED_COLOR_HOVER = '#f0f6fa';
|
||||||
|
|
||||||
|
function countryColor(d, sel, homeCode) {
|
||||||
|
const id = effId(d);
|
||||||
|
if (!sel.has(id)) return UNVISITED_COLOR;
|
||||||
|
if (id === homeCode) return HOME_COLOR;
|
||||||
|
return VISITED_COLOR;
|
||||||
|
}
|
||||||
|
|
||||||
|
function countryHoverColor(d, sel, homeCode) {
|
||||||
|
const id = effId(d);
|
||||||
|
if (!sel.has(id)) return UNVISITED_COLOR_HOVER;
|
||||||
|
if (id === homeCode) return HOME_COLOR_HOVER;
|
||||||
|
return VISITED_COLOR_HOVER;
|
||||||
|
}
|
||||||
|
|
||||||
let frameEl;
|
let frameEl;
|
||||||
|
let _paths = null;
|
||||||
|
let _g = null;
|
||||||
|
|
||||||
function fitProjection(proj, w, h) {
|
function fitProjection(proj, w, h) {
|
||||||
proj.fitSize([w, h], { type: 'Sphere' });
|
proj.fitSize([w, h], { type: 'Sphere' });
|
||||||
@@ -30,6 +82,16 @@
|
|||||||
proj.scale(s).translate([w / 2, h * 0.70]);
|
proj.scale(s).translate([w / 2, h * 0.70]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function updateAllFills() {
|
||||||
|
const sel = getSelected();
|
||||||
|
const hc = getHomeCountryCode();
|
||||||
|
if (!_paths || !_g) return;
|
||||||
|
_paths.attr('fill', d => countryColor(d, sel, hc));
|
||||||
|
_g.selectAll('.micro-state').attr('fill', d => countryColor(d, sel, hc));
|
||||||
|
}
|
||||||
|
|
||||||
|
$effect(updateAllFills);
|
||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
const width = frameEl.clientWidth;
|
const width = frameEl.clientWidth;
|
||||||
const height = frameEl.clientHeight;
|
const height = frameEl.clientHeight;
|
||||||
@@ -42,19 +104,30 @@
|
|||||||
const countries = feature(worldData, worldData.objects.countries)
|
const countries = feature(worldData, worldData.objects.countries)
|
||||||
.features.filter(f => (f.id || f.properties.name === 'Kosovo') && f.id !== '010');
|
.features.filter(f => (f.id || f.properties.name === 'Kosovo') && f.id !== '010');
|
||||||
|
|
||||||
countries.forEach(f => { if (!f.id) f.id = 'XK'; });
|
countries.forEach(f => {
|
||||||
|
if (!f.id) f.id = 'XK';
|
||||||
|
});
|
||||||
|
|
||||||
const sovereignIds = new Set(countries.map(f => effId(f)));
|
const sovereignIds = new Set(countries.map(f => effId(f)));
|
||||||
setTotalCount(sovereignIds.size);
|
setTotalCount(sovereignIds.size);
|
||||||
|
|
||||||
const svg = d3.select(frameEl).append('svg').attr('width', width).attr('height', height);
|
const svg = d3.select(frameEl)
|
||||||
const g = svg.append('g');
|
.append('svg')
|
||||||
|
.attr('width', width)
|
||||||
|
.attr('height', height);
|
||||||
|
|
||||||
const tooltip = d3.select(frameEl).append('div').attr('class', 'tooltip').style('display', 'none');
|
_g = svg.append('g');
|
||||||
|
|
||||||
|
const tooltip = d3.select(frameEl)
|
||||||
|
.append('div')
|
||||||
|
.attr('class', 'tooltip')
|
||||||
|
.style('display', 'none');
|
||||||
|
|
||||||
function updateFill(sel) {
|
function updateFill(sel) {
|
||||||
sel.attr('fill', d => getSelected().has(effId(d)) ? '#22c55e' : '#ffffff');
|
const s = getSelected();
|
||||||
g.selectAll('.micro-state').attr('fill', d => getSelected().has(effId(d)) ? '#22c55e' : '#ffffff');
|
const hc = getHomeCountryCode();
|
||||||
|
sel.attr('fill', d => countryColor(d, s, hc));
|
||||||
|
_g.selectAll('.micro-state').attr('fill', d => countryColor(d, s, hc));
|
||||||
}
|
}
|
||||||
|
|
||||||
function attachEvents(sel) {
|
function attachEvents(sel) {
|
||||||
@@ -65,7 +138,9 @@
|
|||||||
onCountryClick(d.properties.name);
|
onCountryClick(d.properties.name);
|
||||||
})
|
})
|
||||||
.on('mouseenter', (event, d) => {
|
.on('mouseenter', (event, d) => {
|
||||||
d3.select(event.currentTarget).attr('fill', getSelected().has(effId(d)) ? '#16a34a' : '#f0f6fa');
|
const s = getSelected();
|
||||||
|
const hc = getHomeCountryCode();
|
||||||
|
d3.select(event.currentTarget).attr('fill', countryHoverColor(d, s, hc));
|
||||||
tooltip.style('display', 'block').text(d.properties.name);
|
tooltip.style('display', 'block').text(d.properties.name);
|
||||||
})
|
})
|
||||||
.on('mousemove', (event) => {
|
.on('mousemove', (event) => {
|
||||||
@@ -73,27 +148,40 @@
|
|||||||
tooltip.style('left', (x + 10) + 'px').style('top', (y - 28) + 'px');
|
tooltip.style('left', (x + 10) + 'px').style('top', (y - 28) + 'px');
|
||||||
})
|
})
|
||||||
.on('mouseleave', (event, d) => {
|
.on('mouseleave', (event, d) => {
|
||||||
d3.select(event.currentTarget).attr('fill', getSelected().has(effId(d)) ? '#22c55e' : '#ffffff');
|
const s = getSelected();
|
||||||
|
const hc = getHomeCountryCode();
|
||||||
|
d3.select(event.currentTarget).attr('fill', countryColor(d, s, hc));
|
||||||
tooltip.style('display', 'none');
|
tooltip.style('display', 'none');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const paths = g.selectAll('path').data(countries).join('path')
|
_paths = _g.selectAll('path')
|
||||||
.attr('d', path).attr('fill', '#ffffff').attr('stroke', '#d4d4d4').attr('stroke-width', 0.5);
|
.data(countries)
|
||||||
attachEvents(paths);
|
.join('path')
|
||||||
|
.attr('d', path)
|
||||||
|
.attr('fill', '#ffffff')
|
||||||
|
.attr('stroke', '#d4d4d4')
|
||||||
|
.attr('stroke-width', 0.5);
|
||||||
|
attachEvents(_paths);
|
||||||
|
|
||||||
function renderMicrostates() {
|
function renderMicrostates() {
|
||||||
g.selectAll('.micro-state').remove();
|
_g.selectAll('.micro-state').remove();
|
||||||
const threshold = Math.max(4, 16 / d3.zoomTransform(svg.node()).k);
|
const threshold = Math.max(4, 16 / d3.zoomTransform(svg.node()).k);
|
||||||
paths.each(function (d) {
|
_paths.each(function (d) {
|
||||||
if (effId(d) !== d.id) return;
|
if (effId(d) !== d.id) return;
|
||||||
const { width, height } = this.getBBox();
|
const { width, height } = this.getBBox();
|
||||||
if (width < threshold && height < threshold) {
|
if (width < threshold && height < threshold) {
|
||||||
const [cx, cy] = path.centroid(d);
|
const [cx, cy] = path.centroid(d);
|
||||||
const c = g.append('circle').attr('class', 'micro-state').datum(d)
|
const hc = getHomeCountryCode();
|
||||||
.attr('cx', cx).attr('cy', cy).attr('r', 2)
|
const c = _g.append('circle')
|
||||||
.attr('fill', getSelected().has(effId(d)) ? '#22c55e' : '#ffffff')
|
.attr('class', 'micro-state')
|
||||||
.attr('stroke', '#94a3b8').attr('stroke-width', 0.5);
|
.datum(d)
|
||||||
|
.attr('cx', cx)
|
||||||
|
.attr('cy', cy)
|
||||||
|
.attr('r', 2)
|
||||||
|
.attr('fill', countryColor(d, getSelected(), hc))
|
||||||
|
.attr('stroke', '#94a3b8')
|
||||||
|
.attr('stroke-width', 0.5);
|
||||||
attachEvents(c);
|
attachEvents(c);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -101,12 +189,15 @@
|
|||||||
|
|
||||||
renderMicrostates();
|
renderMicrostates();
|
||||||
|
|
||||||
const zoom = d3.zoom().scaleExtent([1, 32]).on('zoom', (event) => {
|
const zoom = d3.zoom()
|
||||||
g.attr('transform', event.transform);
|
.scaleExtent([1, 32])
|
||||||
renderMicrostates();
|
.on('zoom', (event) => {
|
||||||
});
|
_g.attr('transform', event.transform);
|
||||||
|
renderMicrostates();
|
||||||
|
});
|
||||||
|
|
||||||
svg.call(zoom);
|
svg.call(zoom);
|
||||||
|
|
||||||
svg.on('dblclick.zoom', null);
|
svg.on('dblclick.zoom', null);
|
||||||
svg.on('dblclick', (event) => {
|
svg.on('dblclick', (event) => {
|
||||||
const [x, y] = d3.pointer(event);
|
const [x, y] = d3.pointer(event);
|
||||||
@@ -118,7 +209,7 @@
|
|||||||
const { width, height } = entry.contentRect;
|
const { width, height } = entry.contentRect;
|
||||||
svg.attr('width', width).attr('height', height);
|
svg.attr('width', width).attr('height', height);
|
||||||
fitProjection(projection, width, height);
|
fitProjection(projection, width, height);
|
||||||
const countryPaths = g.selectAll('path');
|
const countryPaths = _g.selectAll('path');
|
||||||
countryPaths.attr('d', path);
|
countryPaths.attr('d', path);
|
||||||
updateFill(countryPaths);
|
updateFill(countryPaths);
|
||||||
renderMicrostates();
|
renderMicrostates();
|
||||||
@@ -145,9 +236,18 @@
|
|||||||
background: #a4c8e0;
|
background: #a4c8e0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.map-frame :global(svg) { display: block; cursor: grab; }
|
.map-frame :global(svg) {
|
||||||
.map-frame :global(svg:active) { cursor: grabbing; }
|
display: block;
|
||||||
.map-frame :global(svg path) { cursor: pointer; }
|
cursor: grab;
|
||||||
|
}
|
||||||
|
|
||||||
|
.map-frame :global(svg:active) {
|
||||||
|
cursor: grabbing;
|
||||||
|
}
|
||||||
|
|
||||||
|
.map-frame :global(svg path) {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
.map-frame :global(.tooltip) {
|
.map-frame :global(.tooltip) {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|||||||
Reference in New Issue
Block a user