From 0685065bf6842d842d77ed749cac375ebd5bc3fc Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Thu, 1 Aug 2024 09:38:02 -0400
Subject: [PATCH] refactor: Add additional attributions to AboutModal and
 filter adventures based on user ID in +page.svelte

---
 frontend/src/lib/components/AboutModal.svelte |  1 +
 frontend/src/routes/search/+page.svelte       | 45 +++++++++++++++----
 2 files changed, 38 insertions(+), 8 deletions(-)

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</a
 			>. Their data is liscensed under the ODbL liscense.
+			<br /> Additional attributions can be found in the README file.
 		</p>
 
 		<button class="btn btn-primary" on:click={close}>Close</button>
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<number>) {
-		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<Adventure>) {
-		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}
 	<NotFound error={data.error} />
 {/if}
 
-{#if adventures.length > 0}
+{#if myAdventures.length !== 0 && publicAdventures.length !== 0}
 	<h2 class="text-center font-bold text-2xl mb-4">AdventureLog Results</h2>
+{/if}
+
+{#if myAdventures.length > 0}
+	<h2 class="text-center font-bold text-2xl mb-4">My Adventures</h2>
 	<div class="flex flex-wrap gap-4 mr-4 justify-center content-center">
-		{#each adventures as adventure}
+		{#each myAdventures as adventure}
 			<AdventureCard
 				user={data.user}
 				type={adventure.type}
@@ -97,7 +111,22 @@
 		{/each}
 	</div>
 {/if}
-{#if adventures.length > 0 && osmResults.length > 0}
+
+{#if publicAdventures.length > 0}
+	<h2 class="text-center font-bold text-2xl mb-4">Public Adventures</h2>
+	<div class="flex flex-wrap gap-4 mr-4 justify-center content-center">
+		{#each publicAdventures as adventure}
+			<AdventureCard
+				user={null}
+				type={adventure.type}
+				{adventure}
+				on:delete={deleteAdventure}
+				on:edit={editAdventure}
+			/>
+		{/each}
+	</div>
+{/if}
+{#if myAdventures.length > 0 && osmResults.length > 0 && publicAdventures.length > 0}
 	<div class="divider"></div>
 {/if}
 {#if osmResults.length > 0}