From 926a5c3d869cc8dd7f817f32bc9985173b4b821d Mon Sep 17 00:00:00 2001 From: uku Date: Fri, 29 Nov 2024 16:45:33 +0100 Subject: [PATCH 1/4] chore(deps): update --- bun.lockb | Bin 140608 -> 153552 bytes package.json | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bun.lockb b/bun.lockb index 822d29c37e803a45579d140f46440875de8807f7..93a2052a2883af0f0de1aa1438abc4947497371d 100755 GIT binary patch delta 30918 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 diff --git a/package.json b/package.json index 9f56b94..cd77f9f 100644 --- a/package.json +++ b/package.json @@ -21,10 +21,10 @@ "leaflet-defaulticon-compatibility": "^0.1.2" }, "devDependencies": { - "@cloudflare/workers-types": "^4.20241112.0", + "@cloudflare/workers-types": "^4.20241127.0", "@sveltejs/adapter-cloudflare": "^4.7.4", - "@sveltejs/kit": "^2.8.4", - "@sveltejs/vite-plugin-svelte": "^4.0.2", + "@sveltejs/kit": "^2.8.5", + "@sveltejs/vite-plugin-svelte": "^5.0.1", "@types/eslint": "^9.6.1", "@types/leaflet": "^1.9.14", "eslint": "^9.15.0", @@ -33,11 +33,11 @@ "globals": "^15.12.0", "prettier": "^3.4.1", "prettier-plugin-svelte": "^3.3.2", - "svelte": "^5.2.8", + "svelte": "^5.2.11", "svelte-check": "^4.1.0", "typescript": "^5.7.2", "typescript-eslint": "^8.16.0", - "vite": "^5.4.11" + "vite": "^6.0.1" }, "type": "module", "patchedDependencies": { From 999e912021822444ebdeed207025ba6058282ddc Mon Sep 17 00:00:00 2001 From: uku Date: Fri, 29 Nov 2024 17:01:18 +0100 Subject: [PATCH 2/4] feat: add metro and tram icons for easy mode --- src/routes/game/+page.svelte | 7 ++++++- static/metro.svg | 21 +++++++++++++++++++++ static/tram.svg | 21 +++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 static/metro.svg create mode 100644 static/tram.svg diff --git a/src/routes/game/+page.svelte b/src/routes/game/+page.svelte index 4657ecd..0a415a4 100644 --- a/src/routes/game/+page.svelte +++ b/src/routes/game/+page.svelte @@ -11,6 +11,9 @@ const zoom = 13; const center: [number, number] = [45.742858495, 4.86163814]; + const metroIcon = new L.Icon({ iconUrl: "/metro.svg", iconSize: [29, 15] }); + const tramIcon = new L.Icon({ iconUrl: "/tram.svg", iconSize: [29, 15] }); + let mapPromise = $state(fetchMap()); let gamePromise = $state(fetchGame()); let isChecking = $state(false); @@ -53,8 +56,10 @@ mapData.lines.forEach(([feature, color]) => { L.geoJSON(feature, { style: { color } }).addTo(map!); }); + + const icon = $page.url.searchParams.get("stops_type") === "tram" ? tramIcon : metroIcon; mapData.stops.forEach((coords) => { - const marker = L.marker(coords).addTo(map!); + const marker = L.marker(coords, { icon }).addTo(map!); marker.on("click", (e) => setMarker(e.latlng)); }); diff --git a/static/metro.svg b/static/metro.svg new file mode 100644 index 0000000..bf20a34 --- /dev/null +++ b/static/metro.svg @@ -0,0 +1,21 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + \ No newline at end of file diff --git a/static/tram.svg b/static/tram.svg new file mode 100644 index 0000000..bd8affd --- /dev/null +++ b/static/tram.svg @@ -0,0 +1,21 @@ + + + + + + + + + image/svg+xml + + + + + + + + + + + + \ No newline at end of file From 18c7ccd084c72d971df79571714c6403f27b9cf6 Mon Sep 17 00:00:00 2001 From: uku Date: Fri, 29 Nov 2024 17:05:24 +0100 Subject: [PATCH 3/4] feat: add css for dark mode --- src/app.css | 22 ++++++++++++++++++++++ src/routes/results/+page.svelte | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/app.css b/src/app.css index 677f3ac..1a0525c 100644 --- a/src/app.css +++ b/src/app.css @@ -1,8 +1,30 @@ @import "@fontsource-variable/inter"; @import "@fontsource-variable/inter/wght-italic.css"; +:root { + --background-color: white; + --text-color: black; + --accent-color: #0077b8; + color-scheme: light; +} + +@media (prefers-color-scheme: dark) { + :root { + --background-color: #16191d; + --text-color: #f8f9fa; + --accent-color: #a5d8ff; + color-scheme: dark; + } +} + body { font-family: "Inter Variable", sans-serif; + background-color: var(--background-color); + color: var(--text-color); +} + +a { + color: var(--accent-color); } .contents { diff --git a/src/routes/results/+page.svelte b/src/routes/results/+page.svelte index 3c63647..87ee4d3 100644 --- a/src/routes/results/+page.svelte +++ b/src/routes/results/+page.svelte @@ -56,7 +56,7 @@