From 10466f5913d07740f01be10045e15715557a9c9a Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Sun, 4 Aug 2024 21:30:11 -0400
Subject: [PATCH] feat: Add public/private badge to CollectionCard and fix
 delete button in NoteCard

---
 .../src/lib/components/CollectionCard.svelte  |  1 +
 frontend/src/lib/components/NoteCard.svelte   |  2 +-
 frontend/src/lib/components/NoteModal.svelte  | 10 +--
 .../src/routes/collections/[id]/+page.svelte  |  3 +
 .../forgot-password/confirm/+page.svelte      | 71 ++++++++++++-------
 5 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/frontend/src/lib/components/CollectionCard.svelte b/frontend/src/lib/components/CollectionCard.svelte
index 1b6df55..eaffcee 100644
--- a/frontend/src/lib/components/CollectionCard.svelte
+++ b/frontend/src/lib/components/CollectionCard.svelte
@@ -61,6 +61,7 @@
 				) + 1}{' '}
 				days
 			</p>{/if}
+		<div class="badge badge-neutral">{collection.is_public ? 'Public' : 'Private'}</div>
 		<div class="card-actions justify-end">
 			{#if type != 'link'}
 				<button on:click={deleteCollection} class="btn btn-secondary"
diff --git a/frontend/src/lib/components/NoteCard.svelte b/frontend/src/lib/components/NoteCard.svelte
index 218a5b0..3ad40f7 100644
--- a/frontend/src/lib/components/NoteCard.svelte
+++ b/frontend/src/lib/components/NoteCard.svelte
@@ -45,7 +45,7 @@
 					id="delete_adventure"
 					data-umami-event="Delete Adventure"
 					class="btn btn-warning"
-					on:click={deleteNote}><TrashCan class="w-6 h-6" />Delete</button
+					on:click={deleteNote}><TrashCan class="w-6 h-6" /></button
 				>
 			{/if}
 		</div>
diff --git a/frontend/src/lib/components/NoteModal.svelte b/frontend/src/lib/components/NoteModal.svelte
index 2da411f..34bb2c6 100644
--- a/frontend/src/lib/components/NoteModal.svelte
+++ b/frontend/src/lib/components/NoteModal.svelte
@@ -164,11 +164,11 @@
 				{#if newNote.links.length > 0}
 					<ul class="list-none">
 						{#each newNote.links as link, i}
-							<li class="mb-1">
-								<a href={link} target="_blank">{link}</a>
+							<li class="mb-4">
+								<a href={link} class="link link-primary" target="_blank">{link}</a>
 								<button
 									type="button"
-									class="btn btn-sm btn-error"
+									class="btn btn-sm btn-error absolute right-0"
 									on:click={() => {
 										newNote.links = newNote.links.filter((_, index) => index !== i);
 									}}
@@ -199,11 +199,11 @@
 					</div>
 				{/if}
 
-				<button class="btn btn-primary" on:click={save}>Save</button>
+				<button class="btn btn-primary mr-1" on:click={save}>Save</button>
 				<button class="btn btn-neutral" on:click={close}>Close</button>
 
 				{#if collection.is_public}
-					<div role="alert" class="alert alert-info mt-4">
+					<div role="alert" class="alert mt-4">
 						<svg
 							xmlns="http://www.w3.org/2000/svg"
 							fill="none"
diff --git a/frontend/src/routes/collections/[id]/+page.svelte b/frontend/src/routes/collections/[id]/+page.svelte
index d149ee8..357ed5d 100644
--- a/frontend/src/routes/collections/[id]/+page.svelte
+++ b/frontend/src/routes/collections/[id]/+page.svelte
@@ -412,6 +412,9 @@
 	{#if collection.name}
 		<h1 class="text-center font-extrabold text-4xl mb-2">{collection.name}</h1>
 	{/if}
+	{#if collection.description}
+		<p class="text-center text-lg mb-2">{collection.description}</p>
+	{/if}
 	{#if adventures.length > 0}
 		<div class="flex items-center justify-center mb-4">
 			<div class="stats shadow bg-base-300">
diff --git a/frontend/src/routes/settings/forgot-password/confirm/+page.svelte b/frontend/src/routes/settings/forgot-password/confirm/+page.svelte
index d2b42a6..e7ba067 100644
--- a/frontend/src/routes/settings/forgot-password/confirm/+page.svelte
+++ b/frontend/src/routes/settings/forgot-password/confirm/+page.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { enhance } from '$app/forms';
+	import { goto } from '$app/navigation';
 	import { page } from '$app/stores';
 	import type { PageData } from './$types';
 
@@ -7,29 +8,51 @@
 </script>
 
 <h1 class="text-center font-bold text-4xl mb-4">Change Password</h1>
-<form action="?/reset" method="post" use:enhance>
-	<input type="hidden" name="uid" value={data.props.uid} />
-	<input type="hidden" name="token" value={data.props.token} />
-	<div class="flex items-center justify-center gap-4">
-		<input
-			type="password"
-			class="input input-bordered w-full max-w-xs"
-			id="new_password1"
-			name="new_password1"
-			placeholder="New Password"
-		/>
-		<input
-			type="password"
-			class="input input-bordered w-full max-w-xs"
-			id="new_password2"
-			name="new_password2"
-			placeholder="Confirm Password"
-		/>
-		<button type="submit" class="btn btn-primary"> Submit </button>
-		{#if $page.form?.message}
-			<div class="text-center text-error mt-4">
-				{$page.form?.message}
+
+{#if data.props.token && data.props.uid}
+	<p class="text-center">You will then be redirected to the login page.</p>
+	<div
+		class="modal-action items-center"
+		style="display: flex; flex-direction: column; align-items: center; width: 100%;"
+	>
+		<form action="?/reset" method="post" use:enhance>
+			<input type="hidden" name="uid" value={data.props.uid} />
+			<input type="hidden" name="token" value={data.props.token} />
+
+			<div class="mb-2 w-full">
+				<input
+					type="password"
+					class="input input-bordered w-full"
+					id="new_password1"
+					name="new_password1"
+					placeholder="New Password"
+				/>
 			</div>
-		{/if}
+			<div class="mb-2 w-full">
+				<input
+					type="password"
+					class="input input-bordered w-full"
+					id="new_password2"
+					name="new_password2"
+					placeholder="Confirm Password"
+				/>
+			</div>
+			<button type="submit" class="btn btn-primary w-full">Submit</button>
+			{#if $page.form?.message}
+				<div class="text-center text-error mt-4">
+					{$page.form?.message}
+				</div>
+			{/if}
+		</form>
 	</div>
-</form>
+{:else}
+	<div class="flex justify-center">
+		<div class="items-center justify-center">
+			<p class="text-center">Token and UID are required for password reset.</p>
+
+			<button class="btn btn-neutral" on:click={() => goto('/settings/forgot-password')}>
+				Reset Password
+			</button>
+		</div>
+	</div>
+{/if}