From 879b182e56b1daa5930a61a3be07f6b4d923364c Mon Sep 17 00:00:00 2001 From: Sean Morley Date: Wed, 7 Aug 2024 17:36:25 -0400 Subject: [PATCH 1/2] chore: Update CollectionCard component to display correct toast message when archiving/unarchiving a collection --- .../src/lib/components/CollectionCard.svelte | 4 ++-- .../src/routes/collections/[id]/+page.svelte | 22 ++++++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/frontend/src/lib/components/CollectionCard.svelte b/frontend/src/lib/components/CollectionCard.svelte index f8005b4f..7696c749 100644 --- a/frontend/src/lib/components/CollectionCard.svelte +++ b/frontend/src/lib/components/CollectionCard.svelte @@ -37,10 +37,10 @@ }); if (res.ok) { console.log(`Collection ${is_archived ? 'archived' : 'unarchived'}`); - addToast('info', `Adventure ${is_archived ? 'archived' : 'unarchived'} successfully!`); + addToast('info', `Collection ${is_archived ? 'archived' : 'unarchived'} successfully!`); dispatch('delete', collection.id); } else { - console.log('Error archiving adventure'); + console.log('Error archiving collection'); } } diff --git a/frontend/src/routes/collections/[id]/+page.svelte b/frontend/src/routes/collections/[id]/+page.svelte index 5fd0e099..e78e6b4d 100644 --- a/frontend/src/routes/collections/[id]/+page.svelte +++ b/frontend/src/routes/collections/[id]/+page.svelte @@ -287,7 +287,7 @@ {/if} {#if collection} - {#if data.user} + {#if data.user && !collection.is_archived}
@@ -384,6 +384,26 @@
{/if} + {#if collection.is_archived} +
+ +
+ {/if} {#if collection.name}

{collection.name}

{/if} From 844dd0c797ec8b49daca68491a4d163aa3c7d73f Mon Sep 17 00:00:00 2001 From: Sean Morley Date: Wed, 7 Aug 2024 17:56:53 -0400 Subject: [PATCH 2/2] Update home page content --- frontend/src/lib/components/Navbar.svelte | 5 ++++ frontend/src/routes/+page.svelte | 33 ++++++++++++++--------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/frontend/src/lib/components/Navbar.svelte b/frontend/src/lib/components/Navbar.svelte index 3abf0fac..e3aa004e 100644 --- a/frontend/src/lib/components/Navbar.svelte +++ b/frontend/src/lib/components/Navbar.svelte @@ -179,6 +179,11 @@ class="dropdown-content bg-neutral text-neutral-content z-[1] menu p-2 shadow rounded-box w-52" > +

Theme Selection

  • diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte index 9838a6b6..ad1a655e 100644 --- a/frontend/src/routes/+page.svelte +++ b/frontend/src/routes/+page.svelte @@ -35,14 +35,19 @@ {/if}

    - Discover and plan your next epic adventure with our cutting-edge travel app. Explore - breathtaking destinations, create custom itineraries, and stay connected on the go. + Discover and plan your next adventure with AdventureLog. Explore breathtaking + destinations, create custom itineraries, and stay connected on the go.

    • - + {#if data.user} + + {:else} + + + {/if}
    - Our adventure travel app is designed to simplify your journey, providing you with the - tools and resources to plan, pack, and navigate your next epic adventure. + AdventureLog is designed to simplify your journey, providing you with the tools and + resources to plan, pack, and navigate your next unforgettable adventure.

    @@ -92,25 +97,27 @@