Merge pull request #314 from seanmorley15/worldtravel-v2

WorldTravel v2

frontend/package.json

@@ -19,6 +19,7 @@
 		"@sveltejs/kit": "^2.5.17",
 		"@sveltejs/vite-plugin-svelte": "^3.1.1",
 		"@tailwindcss/typography": "^0.5.13",
+		"@types/node": "^22.5.4",
 		"autoprefixer": "^10.4.19",
 		"daisyui": "^4.12.6",
 		"postcss": "^8.4.38",

frontend/pnpm-lock.yaml

@@ -17,22 +17,25 @@ importers:
         version: 1.1.67
       '@sveltejs/adapter-auto':
         specifier: ^3.2.2
-        version: 3.2.2(@sveltejs/kit@2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1))(svelte@4.2.18)(vite@5.3.1))
+        version: 3.2.2(@sveltejs/kit@2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4)))(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4)))
       '@sveltejs/adapter-node':
         specifier: ^5.2.0
-        version: 5.2.0(@sveltejs/kit@2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1))(svelte@4.2.18)(vite@5.3.1))
+        version: 5.2.0(@sveltejs/kit@2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4)))(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4)))
       '@sveltejs/adapter-vercel':
         specifier: ^5.4.1
-        version: 5.4.1(@sveltejs/kit@2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1))(svelte@4.2.18)(vite@5.3.1))
+        version: 5.4.1(@sveltejs/kit@2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4)))(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4)))
       '@sveltejs/kit':
         specifier: ^2.5.17
-        version: 2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1))(svelte@4.2.18)(vite@5.3.1)
+        version: 2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4)))(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4))
       '@sveltejs/vite-plugin-svelte':
         specifier: ^3.1.1
-        version: 3.1.1(svelte@4.2.18)(vite@5.3.1)
+        version: 3.1.1(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4))
       '@tailwindcss/typography':
         specifier: ^0.5.13
         version: 0.5.13(tailwindcss@3.4.4)
+      '@types/node':
+        specifier: ^22.5.4
+        version: 22.5.4
       autoprefixer:
         specifier: ^10.4.19
         version: 10.4.19(postcss@8.4.38)
@@ -68,7 +71,7 @@ importers:
         version: 0.19.0
       vite:
         specifier: ^5.3.1
-        version: 5.3.1
+        version: 5.3.1(@types/node@22.5.4)
 
 packages:
 
@@ -501,6 +504,9 @@ packages:
   '@types/mapbox__vector-tile@1.3.4':
     resolution: {integrity: sha512-bpd8dRn9pr6xKvuEBQup8pwQfD4VUyqO/2deGjfpe6AwC8YRlyEipvefyRJUSiCJTZuCb8Pl1ciVV5ekqJ96Bg==}
 
+  '@types/node@22.5.4':
+    resolution: {integrity: sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==}
+
   '@types/pbf@3.0.5':
     resolution: {integrity: sha512-j3pOPiEcWZ34R6a6mN07mUkM4o4Lwf6hPNt8eilOeZhTFbxFXmKhvXl9Y28jotFPaI1bpPDJsbCprUoNke6OrA==}
 
@@ -1634,6 +1640,9 @@ packages:
   ufo@1.5.3:
     resolution: {integrity: sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==}
 
+  undici-types@6.19.8:
+    resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==}
+
   union-value@1.0.1:
     resolution: {integrity: sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==}
     engines: {node: '>=0.10.0'}
@@ -2049,31 +2058,31 @@ snapshots:
   '@rollup/rollup-win32-x64-msvc@4.18.0':
     optional: true
 
-  '@sveltejs/adapter-auto@3.2.2(@sveltejs/kit@2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1))(svelte@4.2.18)(vite@5.3.1))':
+  '@sveltejs/adapter-auto@3.2.2(@sveltejs/kit@2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4)))(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4)))':
     dependencies:
-      '@sveltejs/kit': 2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1))(svelte@4.2.18)(vite@5.3.1)
+      '@sveltejs/kit': 2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4)))(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4))
       import-meta-resolve: 4.1.0
 
-  '@sveltejs/adapter-node@5.2.0(@sveltejs/kit@2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1))(svelte@4.2.18)(vite@5.3.1))':
+  '@sveltejs/adapter-node@5.2.0(@sveltejs/kit@2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4)))(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4)))':
     dependencies:
       '@rollup/plugin-commonjs': 26.0.1(rollup@4.18.0)
       '@rollup/plugin-json': 6.1.0(rollup@4.18.0)
       '@rollup/plugin-node-resolve': 15.2.3(rollup@4.18.0)
-      '@sveltejs/kit': 2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1))(svelte@4.2.18)(vite@5.3.1)
+      '@sveltejs/kit': 2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4)))(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4))
       rollup: 4.18.0
 
-  '@sveltejs/adapter-vercel@5.4.1(@sveltejs/kit@2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1))(svelte@4.2.18)(vite@5.3.1))':
+  '@sveltejs/adapter-vercel@5.4.1(@sveltejs/kit@2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4)))(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4)))':
     dependencies:
-      '@sveltejs/kit': 2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1))(svelte@4.2.18)(vite@5.3.1)
+      '@sveltejs/kit': 2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4)))(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4))
       '@vercel/nft': 0.27.2
       esbuild: 0.21.5
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  '@sveltejs/kit@2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1))(svelte@4.2.18)(vite@5.3.1)':
+  '@sveltejs/kit@2.5.17(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4)))(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 3.1.1(svelte@4.2.18)(vite@5.3.1)
+      '@sveltejs/vite-plugin-svelte': 3.1.1(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4))
       '@types/cookie': 0.6.0
       cookie: 0.6.0
       devalue: 5.0.0
@@ -2087,28 +2096,28 @@ snapshots:
       sirv: 2.0.4
       svelte: 4.2.18
       tiny-glob: 0.2.9
-      vite: 5.3.1
+      vite: 5.3.1(@types/node@22.5.4)
 
-  '@sveltejs/vite-plugin-svelte-inspector@2.1.0(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1))(svelte@4.2.18)(vite@5.3.1)':
+  '@sveltejs/vite-plugin-svelte-inspector@2.1.0(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4)))(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 3.1.1(svelte@4.2.18)(vite@5.3.1)
+      '@sveltejs/vite-plugin-svelte': 3.1.1(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4))
       debug: 4.3.5
       svelte: 4.2.18
-      vite: 5.3.1
+      vite: 5.3.1(@types/node@22.5.4)
     transitivePeerDependencies:
       - supports-color
 
-  '@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1)':
+  '@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4))':
     dependencies:
-      '@sveltejs/vite-plugin-svelte-inspector': 2.1.0(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1))(svelte@4.2.18)(vite@5.3.1)
+      '@sveltejs/vite-plugin-svelte-inspector': 2.1.0(@sveltejs/vite-plugin-svelte@3.1.1(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4)))(svelte@4.2.18)(vite@5.3.1(@types/node@22.5.4))
       debug: 4.3.5
       deepmerge: 4.3.1
       kleur: 4.1.5
       magic-string: 0.30.10
       svelte: 4.2.18
       svelte-hmr: 0.16.0(svelte@4.2.18)
-      vite: 5.3.1
-      vitefu: 0.2.5(vite@5.3.1)
+      vite: 5.3.1(@types/node@22.5.4)
+      vitefu: 0.2.5(vite@5.3.1(@types/node@22.5.4))
     transitivePeerDependencies:
       - supports-color
 
@@ -2144,6 +2153,10 @@ snapshots:
       '@types/mapbox__point-geometry': 0.1.4
       '@types/pbf': 3.0.5
 
+  '@types/node@22.5.4':
+    dependencies:
+      undici-types: 6.19.8
+
   '@types/pbf@3.0.5': {}
 
   '@types/pug@2.0.10': {}
@@ -3270,6 +3283,8 @@ snapshots:
 
   ufo@1.5.3: {}
 
+  undici-types@6.19.8: {}
+
   union-value@1.0.1:
     dependencies:
       arr-union: 3.1.0
@@ -3304,17 +3319,18 @@ snapshots:
 
   util-deprecate@1.0.2: {}
 
-  vite@5.3.1:
+  vite@5.3.1(@types/node@22.5.4):
     dependencies:
       esbuild: 0.21.5
       postcss: 8.4.38
       rollup: 4.18.0
     optionalDependencies:
+      '@types/node': 22.5.4
       fsevents: 2.3.3
 
-  vitefu@0.2.5(vite@5.3.1):
+  vitefu@0.2.5(vite@5.3.1(@types/node@22.5.4)):
     optionalDependencies:
-      vite: 5.3.1
+      vite: 5.3.1(@types/node@22.5.4)
 
   vt-pbf@3.1.3:
     dependencies:

frontend/src/lib/components/CountryCard.svelte

@@ -5,6 +5,8 @@
 	import { createEventDispatcher } from 'svelte';
 	const dispatch = createEventDispatcher();
 
+	import MapMarkerStar from '~icons/mdi/map-marker-star';
+
 	export let country: Country;
 
 	async function nav() {
@@ -21,7 +23,12 @@
 	</figure>
 	<div class="card-body">
 		<h2 class="card-title overflow-ellipsis">{country.name}</h2>
-		<div class="badge badge-primary">{continentCodeToString(country.continent)}</div>
+		{#if country.subregion}
+			<div class="badge badge-primary">{country.subregion}</div>
+		{/if}
+		{#if country.capital}
+			<div class="badge badge-secondary"><MapMarkerStar class="-ml-1 mr-1" />{country.capital}</div>
+		{/if}
 		<div class="card-actions justify-end">
 			<!-- <button class="btn btn-info" on:click={moreInfo}>More Info</button> -->
 			<button class="btn btn-primary" on:click={nav}>Open</button>

frontend/src/lib/types.ts

@@ -39,15 +39,17 @@ export type Country = {
 	id: number;
 	name: string;
 	country_code: string;
-	continent: string;
+	subregion: string;
 	flag_url: string;
+	capital: string;
 };
 
 export type Region = {
 	id: number;
 	name: string;
-	name_en?: string;
 	country: number;
+	latitude: number;
+	longitude: number;
 };
 
 export type VisitedRegion = {

frontend/src/routes/adventures/+page.server.ts

@@ -3,7 +3,7 @@ import type { PageServerLoad } from './$types';
 const PUBLIC_SERVER_URL = process.env['PUBLIC_SERVER_URL'];
 import type { Adventure } from '$lib/types';
 
-import type { Actions, RequestEvent } from '@sveltejs/kit';
+import type { Actions } from '@sveltejs/kit';
 import { fetchCSRFToken, tryRefreshToken } from '$lib/index.server';
 import { checkLink } from '$lib';
 

frontend/src/routes/map/+page.svelte

@@ -54,7 +54,7 @@
 	}
 	let visitedRegions = data.props.visitedRegions;
 
-	let geoJSON = [];
+	let allRegions = [];
 
 	let visitArray = [];
 
@@ -72,12 +72,12 @@
 	// mapped to the checkbox
 	let showGEO = false;
 	$: {
-		if (showGEO && geoJSON.length === 0) {
+		if (showGEO && allRegions.length === 0) {
 			(async () => {
-				geoJSON = await fetch('/api/geojson/').then((res) => res.json());
+				allRegions = await fetch('/api/visitedregion/').then((res) => res.json());
 			})();
 		} else if (!showGEO) {
-			geoJSON = [];
+			allRegions = [];
 		}
 	}
 
@@ -99,7 +99,7 @@
 				<input type="checkbox" bind:checked={showPlanned} class="checkbox checkbox-primary" />
 			</label>
 			<!-- <div class="divider divider-horizontal"></div> -->
-			<label for="show-geo">Show Borders</label>
+			<label for="show-geo">Show Visited Regions</label>
 			<input
 				type="checkbox"
 				id="show-geo"
@@ -183,33 +183,34 @@
 			</Marker>
 		{/if}
 	{/each}
-	{#if showGEO}
-		<GeoJSON id="states" data={geoJSON} promoteId="ISOCODE">
-			<LineLayer
-				layout={{ 'line-cap': 'round', 'line-join': 'round' }}
-				paint={{ 'line-color': 'grey', 'line-width': 3 }}
-				beforeLayerType="symbol"
-			/>
-			<FillLayer
-				paint={{ 'fill-color': 'rgba(37, 244, 26, 0.15)' }}
-				filter={['in', 'ISOCODE', ...visitArray]}
-			/>
-			<SymbolLayer
-				layout={{
-					'text-field': ['get', 'name'],
-					'text-size': 12,
-					'text-anchor': 'center'
-				}}
-				paint={{
-					'text-color': 'black'
-				}}
-			/>
-		</GeoJSON>
-	{/if}
+
 	<MapEvents on:click={addMarker} />
 	{#each newMarker as marker}
 		<DefaultMarker lngLat={marker.lngLat} />
 	{/each}
+
+	{#each allRegions as { longitude, latitude, name, region }}
+		<Marker
+			lngLat={[longitude, latitude]}
+			on:click={() => (clickedName = name)}
+			class="grid h-8 w-8 place-items-center rounded-full border border-gray-200 bg-green-300 text-black shadow-md"
+		>
+			<svg
+				width="24"
+				height="24"
+				viewBox="0 0 24 24"
+				fill="none"
+				xmlns="http://www.w3.org/2000/svg"
+			>
+				<!-- green circle -->
+				<circle cx="12" cy="12" r="10" stroke="green" stroke-width="2" fill="green" />
+			</svg>
+			<Popup openOn="click" offset={[0, -10]}>
+				<div class="text-lg text-black font-bold">{name}</div>
+				<p class="font-semibold text-black text-md">{region}</p>
+			</Popup>
+		</Marker>
+	{/each}
 </MapLibre>
 
 <svelte:head>

frontend/src/routes/worldtravel/[id]/+page.svelte

@@ -1,6 +1,17 @@
 <script lang="ts">
 	import RegionCard from '$lib/components/RegionCard.svelte';
 	import type { Region, VisitedRegion } from '$lib/types';
+	// import {
+	// 	DefaultMarker,
+	// 	MapEvents,
+	// 	MapLibre,
+	// 	Popup,
+	// 	Marker,
+	// 	GeoJSON,
+	// 	LineLayer,
+	// 	FillLayer,
+	// 	SymbolLayer
+	// } from 'svelte-maplibre';
 	import type { PageData } from './$types';
 	export let data: PageData;
 	let regions: Region[] = data.props?.regions || [];
@@ -47,6 +58,23 @@
 	{/each}
 </div>
 
+<!-- {#if data.props && data.props.regions}
+	<MapLibre
+		style="https://basemaps.cartocdn.com/gl/voyager-gl-style/style.json"
+		class="relative aspect-[9/16] max-h-[70vh] w-full sm:aspect-video sm:max-h-full"
+		standardControls
+	>
+		{#each data.props.regions as marker}
+			<DefaultMarker lngLat={[marker.longitude, marker.latitude]}>
+				<Popup openOn="click" offset={[0, -10]}>
+					<div class="text-lg text-black font-bold">{marker.name}</div>
+					<p class="font-semibold text-black text-md">{marker.id}</p>
+				</Popup>
+			</DefaultMarker>
+		{/each}
+	</MapLibre>
+{/if} -->
+
 <svelte:head>
 	<title
 		>{data.props && data.props.country ? `Regions in ${data.props.country.name}` : 'Regions'}</title