diff --git a/frontend/src/lib/components/AboutModal.svelte b/frontend/src/lib/components/AboutModal.svelte index 2670c73..0ffdb55 100644 --- a/frontend/src/lib/components/AboutModal.svelte +++ b/frontend/src/lib/components/AboutModal.svelte @@ -64,6 +64,7 @@ class="text-primary-500 underline" href="https://operations.osmfoundation.org/policies/nominatim/">OpenStreepMap. Their data is liscensed under the ODbL liscense. +
Additional attributions can be found in the README file.

diff --git a/frontend/src/routes/search/+page.svelte b/frontend/src/routes/search/+page.svelte index 54476cf..c26f2af 100644 --- a/frontend/src/routes/search/+page.svelte +++ b/frontend/src/routes/search/+page.svelte @@ -10,11 +10,12 @@ export let data: PageData; function deleteAdventure(event: CustomEvent) { - adventures = adventures.filter((adventure) => adventure.id !== event.detail); + myAdventures = myAdventures.filter((adventure) => adventure.id !== event.detail); } let osmResults: OpenStreetMapPlace[] = []; - let adventures: Adventure[] = []; + let myAdventures: Adventure[] = []; + let publicAdventures: Adventure[] = []; let query: string | null = ''; @@ -48,7 +49,16 @@ console.log(data); if (data.props) { - adventures = data.props.adventures; + myAdventures = data.props.adventures; + publicAdventures = data.props.adventures; + + if (data.user?.pk != null) { + myAdventures = myAdventures.filter((adventure) => adventure.user_id === data.user?.pk ?? -1); + } else { + myAdventures = []; + } + + publicAdventures = publicAdventures.filter((adventure) => adventure.user_id !== data.user?.pk); } let adventureToEdit: Adventure; @@ -61,7 +71,7 @@ } function saveEdit(event: CustomEvent) { - adventures = adventures.map((adventure) => { + myAdventures = myAdventures.map((adventure) => { if (adventure.id === event.detail.id) { return event.detail; } @@ -79,14 +89,18 @@ /> {/if} -{#if adventures.length === 0 && osmResults.length === 0} +{#if myAdventures.length === 0 && osmResults.length === 0} {/if} -{#if adventures.length > 0} +{#if myAdventures.length !== 0 && publicAdventures.length !== 0}

AdventureLog Results

+{/if} + +{#if myAdventures.length > 0} +

My Adventures

- {#each adventures as adventure} + {#each myAdventures as adventure} {/if} -{#if adventures.length > 0 && osmResults.length > 0} + +{#if publicAdventures.length > 0} +

Public Adventures

+
+ {#each publicAdventures as adventure} + + {/each} +
+{/if} +{#if myAdventures.length > 0 && osmResults.length > 0 && publicAdventures.length > 0}
{/if} {#if osmResults.length > 0}