diff --git a/.github/workflows/backend-release.yml b/.github/workflows/backend-release.yml index e12143c..696f8b5 100644 --- a/.github/workflows/backend-release.yml +++ b/.github/workflows/backend-release.yml @@ -2,7 +2,7 @@ name: Upload the tagged release backend image to GHCR and Docker Hub on: release: - types: [published] + types: [released] env: IMAGE_NAME: "adventurelog-backend" diff --git a/.github/workflows/frontend-release.yml b/.github/workflows/frontend-release.yml index a73af32..bb7fc6b 100644 --- a/.github/workflows/frontend-release.yml +++ b/.github/workflows/frontend-release.yml @@ -2,7 +2,7 @@ name: Upload tagged release frontend image to GHCR and Docker Hub on: release: - types: [published] + types: [released] env: IMAGE_NAME: "adventurelog-frontend" diff --git a/frontend/src/lib/components/AdventureLink.svelte b/frontend/src/lib/components/AdventureLink.svelte index b1bb85f..cb4551b 100644 --- a/frontend/src/lib/components/AdventureLink.svelte +++ b/frontend/src/lib/components/AdventureLink.svelte @@ -19,14 +19,14 @@ if (modal) { modal.showModal(); } - let res = await fetch(`/api/adventures/all/?include_collections=false`, { + let res = await fetch(`/api/adventures/?include_collections=false`, { method: 'GET' }); const newAdventures = await res.json(); if (res.ok && adventures) { - adventures = newAdventures; + adventures = newAdventures.results; } isLoading = false; }); diff --git a/frontend/src/lib/components/AdventureModal.svelte b/frontend/src/lib/components/AdventureModal.svelte index 3970ede..d8889d7 100644 --- a/frontend/src/lib/components/AdventureModal.svelte +++ b/frontend/src/lib/components/AdventureModal.svelte @@ -16,6 +16,7 @@ let places: OpenStreetMapPlace[] = []; let images: { id: string; image: string }[] = []; let warningMessage: string = ''; + let constrainDates: boolean = false; import ActivityComplete from './ActivityComplete.svelte'; import { appVersion } from '$lib/config'; @@ -638,40 +639,73 @@ it would also work to just use on:click on the MapLibre component itself. -->
- {new Date(visit.start_date).toLocaleDateString(undefined, { - timeZone: 'UTC' - })} -
-- {new Date(visit.end_date).toLocaleDateString(undefined, { timeZone: 'UTC' })} -
-{visit.notes}
-+ {new Date(visit.start_date).toLocaleDateString(undefined, { + timeZone: 'UTC' + })} +
++ {new Date(visit.end_date).toLocaleDateString(undefined, { + timeZone: 'UTC' + })} +
+ +{visit.notes}
Adventure Type
- {adventure.type[0].toLocaleUpperCase() + adventure.type.slice(1)} + {typeToString(adventure.type)}
Visits
++ {adventure.visits.length} + {adventure.visits.length > 1 ? 'visits' : 'visit' + ':'} +
+ + {#each adventure.visits as visit} ++ {visit.start_date + ? new Date(visit.start_date).toLocaleDateString(undefined, { + timeZone: 'UTC' + }) + : ''} + {visit.end_date && visit.end_date !== '' + ? ' - ' + + new Date(visit.end_date).toLocaleDateString(undefined, { + timeZone: 'UTC' + }) + : ''} +
+{visit.notes}
+