diff --git a/frontend/src/lib/components/Navbar.svelte b/frontend/src/lib/components/Navbar.svelte index 3011b9d..8e52f89 100644 --- a/frontend/src/lib/components/Navbar.svelte +++ b/frontend/src/lib/components/Navbar.svelte @@ -194,6 +194,10 @@ on:click={() => (window.location.href = 'https://docs.adventurelog.app/')} >Documentation +

Theme Selection

  • diff --git a/frontend/src/routes/adventures/[id]/+page.server.ts b/frontend/src/routes/adventures/[id]/+page.server.ts index aa253fb..aa01d2e 100644 --- a/frontend/src/routes/adventures/[id]/+page.server.ts +++ b/frontend/src/routes/adventures/[id]/+page.server.ts @@ -99,72 +99,5 @@ export const actions: Actions = { status: 204 }; } - }, - addToCollection: async (event) => { - const id = event.params as { id: string }; - const adventureId = id.id; - - const formData = await event.request.formData(); - const trip_id = formData.get('collection_id'); - - if (!trip_id) { - return { - status: 400, - error: { message: 'Missing collection id' } - }; - } - - if (!event.locals.user) { - const refresh = event.cookies.get('refresh'); - let auth = event.cookies.get('auth'); - if (!refresh) { - return { - status: 401, - body: { message: 'Unauthorized' } - }; - } - let res = await tryRefreshToken(refresh); - if (res) { - auth = res; - event.cookies.set('auth', auth, { - httpOnly: true, - sameSite: 'lax', - expires: new Date(Date.now() + 60 * 60 * 1000), // 60 minutes - path: '/' - }); - } else { - return { - status: 401, - body: { message: 'Unauthorized' } - }; - } - } - if (!adventureId) { - return { - status: 400, - error: new Error('Bad request') - }; - } - - let res = await fetch(`${serverEndpoint}/api/adventures/${event.params.id}/`, { - method: 'PATCH', - headers: { - Cookie: `${event.cookies.get('auth')}`, - 'Content-Type': 'application/json' - }, - body: JSON.stringify({ collection: trip_id }) - }); - let res2 = await res.json(); - console.log(res2); - if (!res.ok) { - return { - status: res.status, - error: new Error('Failed to delete adventure') - }; - } else { - return { - status: 204 - }; - } } }; diff --git a/frontend/src/routes/collections/[id]/+page.svelte b/frontend/src/routes/collections/[id]/+page.svelte index 10b996f..94b9283 100644 --- a/frontend/src/routes/collections/[id]/+page.svelte +++ b/frontend/src/routes/collections/[id]/+page.svelte @@ -88,16 +88,18 @@ return; } else { let adventure = event.detail; - let formData = new FormData(); - formData.append('collection_id', collection.id.toString()); - let res = await fetch(`/adventures/${adventure.id}?/addToCollection`, { - method: 'POST', - body: formData // Remove the Content-Type header + let res = await fetch(`/api/adventures/${adventure.id}/`, { + method: 'PATCH', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify({ collection: collection.id.toString() }) }); if (res.ok) { console.log('Adventure added to collection'); + adventure = await res.json(); adventures = [...adventures, adventure]; } else { console.log('Error adding adventure to collection'); diff --git a/frontend/src/routes/user/[uuid]/+page.svelte b/frontend/src/routes/user/[uuid]/+page.svelte index 162b6f1..071be0f 100644 --- a/frontend/src/routes/user/[uuid]/+page.svelte +++ b/frontend/src/routes/user/[uuid]/+page.svelte @@ -6,11 +6,13 @@ console.log(user); -
    -
    - {user.username} +{#if user.profile_pic} +
    +
    + {user.username} +
    -
    +{/if}

    {user.first_name} {user.last_name}

    {user.username}

    @@ -21,6 +23,12 @@ {/if}
    +
    +

    + {user.date_joined ? 'Joined ' + new Date(user.date_joined).toLocaleDateString() : ''} +

    +
    + {user.username} | AdventureLog