diff --git a/frontend/src/lib/components/Navbar.svelte b/frontend/src/lib/components/Navbar.svelte index aa0f64d..782935e 100644 --- a/frontend/src/lib/components/Navbar.svelte +++ b/frontend/src/lib/components/Navbar.svelte @@ -83,25 +83,6 @@
    • -
    - - -
    {/if} {#if !data.user} @@ -112,6 +93,26 @@ {/if} + +
    + + +
    -
    - - -
    {/if} {#if !data.user} @@ -163,6 +145,26 @@ {/if} + +
    + + +
    diff --git a/frontend/src/lib/components/NewAdventure.svelte b/frontend/src/lib/components/NewAdventure.svelte index 55c21b3..0875bb3 100644 --- a/frontend/src/lib/components/NewAdventure.svelte +++ b/frontend/src/lib/components/NewAdventure.svelte @@ -27,7 +27,8 @@ user_id: NaN, latitude: null, longitude: null, - is_public: false + is_public: false, + collection: null }; let image: File; diff --git a/frontend/src/lib/config.ts b/frontend/src/lib/config.ts index 8d36a24..978f5b9 100644 --- a/frontend/src/lib/config.ts +++ b/frontend/src/lib/config.ts @@ -1,4 +1,4 @@ -export let appVersion = 'Web v0.4.0'; -export let versionChangelog = 'https://github.com/seanmorley15/AdventureLog/releases/tag/v0.4.0'; +export let appVersion = 'Web v0.4.1'; +export let versionChangelog = 'https://github.com/seanmorley15/AdventureLog/releases/tag/v0.4.1'; export let appTitle = 'AdventureLog'; export let copyrightYear = '2024'; diff --git a/frontend/src/routes/adventures/+page.svelte b/frontend/src/routes/adventures/+page.svelte index d5d598e..3ab518b 100644 --- a/frontend/src/routes/adventures/+page.svelte +++ b/frontend/src/routes/adventures/+page.svelte @@ -20,8 +20,6 @@ let resultsPerPage: number = 10; - let currentView: string = 'cards'; - let next: string | null = data.props.next || null; let previous: string | null = data.props.previous || null; let count = data.props.count || 0; diff --git a/frontend/src/routes/search/+page.svelte b/frontend/src/routes/search/+page.svelte index ddb36ce..1017547 100644 --- a/frontend/src/routes/search/+page.svelte +++ b/frontend/src/routes/search/+page.svelte @@ -13,6 +13,7 @@ } let osmResults: OpenStreetMapPlace[] = []; + let adventures: Adventure[] = []; let query: string | null = ''; @@ -36,7 +37,7 @@ }); console.log(data); - let adventures: Adventure[] = []; + if (data.props) { adventures = data.props.adventures; } @@ -44,7 +45,9 @@ {#if adventures.length === 0 && osmResults.length === 0} -{:else} +{/if} + +{#if adventures.length > 0}

    AdventureLog Results

    {#each adventures as adventure} @@ -56,7 +59,11 @@ /> {/each}
    +{/if} +{#if adventures.length > 0 && osmResults.length > 0}
    +{/if} +{#if osmResults.length > 0}

    Online Results

    {#each osmResults as result}