diff --git a/frontend/src/routes/worldtravel/+page.svelte b/frontend/src/routes/worldtravel/+page.svelte index 874991d..c7022f8 100644 --- a/frontend/src/routes/worldtravel/+page.svelte +++ b/frontend/src/routes/worldtravel/+page.svelte @@ -10,8 +10,15 @@ let filteredCountries: Country[] = []; const allCountries: Country[] = data.props?.countries || []; + let worldSubregions: string[] = []; + + worldSubregions = [...new Set(allCountries.map((country) => country.subregion))]; + // remove blank subregions + worldSubregions = worldSubregions.filter((subregion) => subregion !== ''); + console.log(worldSubregions); let filterOption: string = 'all'; + let subRegionOption: string = ''; $: { if (searchQuery === '') { @@ -35,6 +42,12 @@ } else { filteredCountries = filteredCountries; } + + if (subRegionOption !== '') { + filteredCountries = filteredCountries.filter( + (country) => country.subregion === subRegionOption + ); + } } @@ -43,37 +56,44 @@

{filteredCountries.length} countries found

- -
- (filterOption = 'all')} - /> - (filterOption = 'partial')} - /> - (filterOption = 'complete')} - /> - (filterOption = 'not')} - /> +
+
+ (filterOption = 'all')} + /> + (filterOption = 'partial')} + /> + (filterOption = 'complete')} + /> + (filterOption = 'not')} + /> +
+
@@ -98,6 +118,10 @@ {/each}
+{#if filteredCountries.length === 0} +

No countries found

+{/if} + Countries | World Travel diff --git a/frontend/src/routes/worldtravel/[id]/+page.svelte b/frontend/src/routes/worldtravel/[id]/+page.svelte index 90cbfb0..012284e 100644 --- a/frontend/src/routes/worldtravel/[id]/+page.svelte +++ b/frontend/src/routes/worldtravel/[id]/+page.svelte @@ -1,31 +1,22 @@

Regions in {country?.name}

@@ -58,23 +49,6 @@ {/each}
- - {data.props && data.props.country ? `Regions in ${data.props.country.name}` : 'Regions'}