From ba89f90e5397c8c4c32c395c4117940cf562e7e2 Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Mon, 9 Sep 2024 13:31:00 -0400
Subject: [PATCH] Shared with collaborative editing

---
 README.md                                     |  2 ++
 .../src/lib/components/AdventureCard.svelte   | 20 +++++++++----------
 .../src/lib/components/ChecklistCard.svelte   |  7 ++++---
 .../src/lib/components/ChecklistModal.svelte  |  4 ++--
 frontend/src/lib/components/NoteCard.svelte   |  7 ++++---
 frontend/src/lib/components/NoteModal.svelte  |  3 ++-
 .../lib/components/TransportationCard.svelte  |  5 +++--
 frontend/src/lib/index.ts                     |  2 +-
 .../src/routes/adventures/[id]/+page.svelte   | 12 ++++++-----
 .../src/routes/collections/[id]/+page.svelte  |  4 ++++
 10 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index 8dc37c1..5976417 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@
 
 **Documentation can be found [here](https://docs.adventurelog.app).**
 
+**Join the AdventureLog Community Discord Server [here](https://discord.gg/wRbQ9Egr8C).**
+
 # Table of Contents
 
 - [Installation](#installation)
diff --git a/frontend/src/lib/components/AdventureCard.svelte b/frontend/src/lib/components/AdventureCard.svelte
index e2aac26..8ad5668 100644
--- a/frontend/src/lib/components/AdventureCard.svelte
+++ b/frontend/src/lib/components/AdventureCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { createEventDispatcher } from 'svelte';
 	import { goto } from '$app/navigation';
-	import type { Adventure, User } from '$lib/types';
+	import type { Adventure, Collection, User } from '$lib/types';
 	const dispatch = createEventDispatcher();
 
 	import Launch from '~icons/mdi/launch';
@@ -21,8 +21,8 @@
 	import ImageDisplayModal from './ImageDisplayModal.svelte';
 
 	export let type: string;
-
 	export let user: User | null;
+	export let collection: Collection | null = null;
 
 	let isCollectionModalOpen: boolean = false;
 	let isWarningModalOpen: boolean = false;
@@ -209,13 +209,11 @@
 			</button>
 		</div>
 		<div>
-			{#if adventure.type == 'visited' && user?.pk == adventure.user_id}
+			{#if adventure.type == 'visited'}
 				<div class="badge badge-primary">Visited</div>
-			{:else if user?.pk == adventure.user_id && adventure.type == 'planned'}
+			{:else if adventure.type == 'planned'}
 				<div class="badge badge-secondary">Planned</div>
-			{:else if (user?.pk !== adventure.user_id && adventure.type == 'planned') || adventure.type == 'visited'}
-				<div class="badge badge-secondary">Adventure</div>
-			{:else if user?.pk == adventure.user_id && adventure.type == 'lodging'}
+			{:else if adventure.type == 'lodging'}
 				<div class="badge badge-success">Lodging</div>
 			{:else if adventure.type == 'dining'}
 				<div class="badge badge-accent">Dining</div>
@@ -254,7 +252,7 @@
 		<div class="card-actions justify-end mt-2">
 			<!-- action options dropdown -->
 			{#if type != 'link'}
-				{#if user?.pk == adventure.user_id}
+				{#if adventure.user_id == user?.pk || (collection && user && collection.shared_with.includes(user.uuid))}
 					<div class="dropdown dropdown-end">
 						<div tabindex="0" role="button" class="btn btn-neutral-200">
 							<DotsHorizontal class="w-6 h-6" />
@@ -272,18 +270,18 @@
 							<button class="btn btn-neutral mb-2" on:click={editAdventure}>
 								<FileDocumentEdit class="w-6 h-6" />Edit {keyword}
 							</button>
-							{#if adventure.type == 'visited'}
+							{#if adventure.type == 'visited' && user?.pk == adventure.user_id}
 								<button class="btn btn-neutral mb-2" on:click={changeType('planned')}
 									><FormatListBulletedSquare class="w-6 h-6" />Change to Plan</button
 								>
 							{/if}
-							{#if adventure.type == 'planned'}
+							{#if adventure.type == 'planned' && user?.pk == adventure.user_id}
 								<button class="btn btn-neutral mb-2" on:click={changeType('visited')}
 									><CheckBold class="w-6 h-6" />Mark Visited</button
 								>
 							{/if}
 							<!-- remove from adventure -->
-							{#if adventure.collection && (adventure.type == 'visited' || adventure.type == 'planned')}
+							{#if adventure.collection && (adventure.type == 'visited' || adventure.type == 'planned') && user?.pk == adventure.user_id}
 								<button class="btn btn-neutral mb-2" on:click={removeFromCollection}
 									><LinkVariantRemove class="w-6 h-6" />Remove from Collection</button
 								>
diff --git a/frontend/src/lib/components/ChecklistCard.svelte b/frontend/src/lib/components/ChecklistCard.svelte
index 19a3e79..89a0c6c 100644
--- a/frontend/src/lib/components/ChecklistCard.svelte
+++ b/frontend/src/lib/components/ChecklistCard.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { addToast } from '$lib/toasts';
-	import type { Checklist, User } from '$lib/types';
+	import type { Checklist, Collection, User } from '$lib/types';
 	import { createEventDispatcher } from 'svelte';
 	const dispatch = createEventDispatcher();
 
@@ -10,6 +10,7 @@
 
 	export let checklist: Checklist;
 	export let user: User | null = null;
+	export let collection: Collection | null = null;
 
 	function editChecklist() {
 		dispatch('edit', checklist);
@@ -51,10 +52,10 @@
 			<!-- <button class="btn btn-neutral mb-2" on:click={() => goto(`/notes/${note.id}`)}
 				><Launch class="w-6 h-6" />Open Details</button
 			> -->
-			<button class="btn btn-neutral mb-2" on:click={editChecklist}>
+			<button class="btn btn-neutral-200 mb-2" on:click={editChecklist}>
 				<Launch class="w-6 h-6" />Open
 			</button>
-			{#if checklist.user_id == user?.pk}
+			{#if checklist.user_id == user?.pk || (collection && user && collection.shared_with.includes(user.uuid))}
 				<button
 					id="delete_adventure"
 					data-umami-event="Delete Checklist"
diff --git a/frontend/src/lib/components/ChecklistModal.svelte b/frontend/src/lib/components/ChecklistModal.svelte
index 22a6f93..07880ec 100644
--- a/frontend/src/lib/components/ChecklistModal.svelte
+++ b/frontend/src/lib/components/ChecklistModal.svelte
@@ -33,7 +33,7 @@
 			{
 				name: newItem,
 				is_checked: newStatus,
-				id: 0,
+				id: '',
 				user_id: 0,
 				checklist: 0,
 				created_at: '',
@@ -135,7 +135,7 @@
 			<p class="font-semibold text-md mb-2">Editing checklist {initialName}</p>
 		{/if}
 
-		{#if (checklist && user?.pk == checklist?.user_id) || !checklist}
+		{#if (checklist && user?.pk == checklist?.user_id) || (user && collection && collection.shared_with.includes(user.uuid)) || !checklist}
 			<form on:submit|preventDefault>
 				<div class="form-control mb-2">
 					<label for="name">Name</label>
diff --git a/frontend/src/lib/components/NoteCard.svelte b/frontend/src/lib/components/NoteCard.svelte
index 61fed53..2949254 100644
--- a/frontend/src/lib/components/NoteCard.svelte
+++ b/frontend/src/lib/components/NoteCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { goto } from '$app/navigation';
 	import { addToast } from '$lib/toasts';
-	import type { Note, User } from '$lib/types';
+	import type { Collection, Note, User } from '$lib/types';
 	import { createEventDispatcher } from 'svelte';
 	const dispatch = createEventDispatcher();
 
@@ -11,6 +11,7 @@
 
 	export let note: Note;
 	export let user: User | null = null;
+	export let collection: Collection | null = null;
 
 	function editNote() {
 		dispatch('edit', note);
@@ -52,10 +53,10 @@
 			<!-- <button class="btn btn-neutral mb-2" on:click={() => goto(`/notes/${note.id}`)}
 				><Launch class="w-6 h-6" />Open Details</button
 			> -->
-			<button class="btn btn-neutral mb-2" on:click={editNote}>
+			<button class="btn btn-neutral-200 mb-2" on:click={editNote}>
 				<Launch class="w-6 h-6" />Open
 			</button>
-			{#if note.user_id == user?.pk}
+			{#if note.user_id == user?.pk || (collection && user && collection.shared_with.includes(user.uuid))}
 				<button
 					id="delete_adventure"
 					data-umami-event="Delete Adventure"
diff --git a/frontend/src/lib/components/NoteModal.svelte b/frontend/src/lib/components/NoteModal.svelte
index 45b978e..c2d81ca 100644
--- a/frontend/src/lib/components/NoteModal.svelte
+++ b/frontend/src/lib/components/NoteModal.svelte
@@ -4,6 +4,7 @@
 	import { createEventDispatcher } from 'svelte';
 	const dispatch = createEventDispatcher();
 	import { onMount } from 'svelte';
+	import ShareModal from './ShareModal.svelte';
 	let modal: HTMLDialogElement;
 
 	export let note: Note | null = null;
@@ -113,7 +114,7 @@
 			<p class="font-semibold text-md mb-2">Editing note {initialName}</p>
 		{/if}
 
-		{#if (note && user?.pk == note?.user_id) || !note}
+		{#if (note && user?.pk == note?.user_id) || (collection && user && collection.shared_with.includes(user.uuid)) || !note}
 			<form on:submit|preventDefault>
 				<div class="form-control mb-2">
 					<label for="name">Name</label>
diff --git a/frontend/src/lib/components/TransportationCard.svelte b/frontend/src/lib/components/TransportationCard.svelte
index 68bcfe9..7b3a5e3 100644
--- a/frontend/src/lib/components/TransportationCard.svelte
+++ b/frontend/src/lib/components/TransportationCard.svelte
@@ -2,7 +2,7 @@
 	import { createEventDispatcher } from 'svelte';
 	import TrashCanOutline from '~icons/mdi/trash-can-outline';
 	import FileDocumentEdit from '~icons/mdi/file-document-edit';
-	import type { Transportation, User } from '$lib/types';
+	import type { Collection, Transportation, User } from '$lib/types';
 	import { addToast } from '$lib/toasts';
 
 	import ArrowDownThick from '~icons/mdi/arrow-down-thick';
@@ -11,6 +11,7 @@
 
 	export let transportation: Transportation;
 	export let user: User | null = null;
+	export let collection: Collection | null = null;
 
 	function editTransportation() {
 		dispatch('edit', transportation);
@@ -58,7 +59,7 @@
 			{/if}
 		</div>
 
-		{#if user?.pk === transportation.user_id}
+		{#if transportation.user_id == user?.pk || (collection && user && collection.shared_with.includes(user.uuid))}
 			<div class="card-actions justify-end">
 				<button on:click={deleteTransportation} class="btn btn-secondary"
 					><TrashCanOutline class="w-5 h-5 mr-1" /></button
diff --git a/frontend/src/lib/index.ts b/frontend/src/lib/index.ts
index 33a5aa3..701dd13 100644
--- a/frontend/src/lib/index.ts
+++ b/frontend/src/lib/index.ts
@@ -1,5 +1,5 @@
 import inspirationalQuotes from './json/quotes.json';
-import type { Adventure, Checklist, Collection, Note, Transportation } from './types';
+import type { Adventure, Checklist, Collection, Note, Transportation, User } from './types';
 
 export function getRandomQuote() {
 	const quotes = inspirationalQuotes.quotes;
diff --git a/frontend/src/routes/adventures/[id]/+page.svelte b/frontend/src/routes/adventures/[id]/+page.svelte
index 3227faa..1c942b8 100644
--- a/frontend/src/routes/adventures/[id]/+page.svelte
+++ b/frontend/src/routes/adventures/[id]/+page.svelte
@@ -96,11 +96,13 @@
 {/if}
 
 {#if adventure}
-	<div class="fixed bottom-4 right-4 z-[999]">
-		<button class="btn m-1 size-16 btn-primary" on:click={() => (isEditModalOpen = true)}
-			><ClipboardList class="w-8 h-8" /></button
-		>
-	</div>
+	{#if data.user && data.user.pk == adventure.user_id}
+		<div class="fixed bottom-4 right-4 z-[999]">
+			<button class="btn m-1 size-16 btn-primary" on:click={() => (isEditModalOpen = true)}
+				><ClipboardList class="w-8 h-8" /></button
+			>
+		</div>
+	{/if}
 	<div class="flex flex-col min-h-dvh">
 		<main class="flex-1">
 			<div class="max-w-5xl mx-auto p-4 md:p-6 lg:p-8">
diff --git a/frontend/src/routes/collections/[id]/+page.svelte b/frontend/src/routes/collections/[id]/+page.svelte
index 4647f01..10b996f 100644
--- a/frontend/src/routes/collections/[id]/+page.svelte
+++ b/frontend/src/routes/collections/[id]/+page.svelte
@@ -404,6 +404,7 @@
 					type={adventure.type}
 					{adventure}
 					on:typeChange={changeType}
+					{collection}
 				/>
 			{/each}
 		</div>
@@ -423,6 +424,7 @@
 						transportationToEdit = event.detail;
 						isTransportationEditModalOpen = true;
 					}}
+					{collection}
 				/>
 			{/each}
 		</div>
@@ -442,6 +444,7 @@
 					on:delete={(event) => {
 						notes = notes.filter((n) => n.id != event.detail);
 					}}
+					{collection}
 				/>
 			{/each}
 		</div>
@@ -461,6 +464,7 @@
 						checklistToEdit = event.detail;
 						isShowingChecklistModal = true;
 					}}
+					{collection}
 				/>
 			{/each}
 		</div>