diff --git a/compose-dev.yml b/compose-dev.yml index 180cf13..6c7e43c 100644 --- a/compose-dev.yml +++ b/compose-dev.yml @@ -9,7 +9,4 @@ services: - ORIGIN=http://localhost:3000 - SKIP_DB_WAIT=true # Only necessary for externaly hosted databases such as NeonDB - volumes: - - ./sql:/sql - -# docker compose -f ./compose-dev.yml up --build \ No newline at end of file +# docker compose -f ./compose-dev.yml up --build diff --git a/docker-compose.yml b/docker-compose.yml index 223872d..2dc5862 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,8 +11,6 @@ services: # Only necessary for externaly hosted databases such as NeonDB depends_on: - db - volumes: - - ./sql:/sql db: image: postgres environment: diff --git a/src/lib/components/AdventureCard.svelte b/src/lib/components/AdventureCard.svelte index 4adc189..2434252 100644 --- a/src/lib/components/AdventureCard.svelte +++ b/src/lib/components/AdventureCard.svelte @@ -4,38 +4,31 @@ import calendar from "$lib/assets/calendar.svg"; import { goto } from "$app/navigation"; import { desc } from "drizzle-orm"; + import type { Adventure } from "$lib/utils/types"; const dispatch = createEventDispatcher(); export let type: String; - export let name: String | undefined = undefined; - export let location: String | undefined = undefined; - export let date: String | undefined = undefined; - export let id: Number | undefined = undefined; - export let regionId: String | undefined = undefined; - export let visited: Boolean | undefined = undefined; - export let countryCode: String | undefined = undefined; + export let adventure: Adventure; + + // export let name: String | undefined = undefined; + // export let location: String | undefined = undefined; + // export let date: String | undefined = undefined; + // export let id: Number | undefined = undefined; function remove() { - dispatch("remove", id); + dispatch("remove", adventure.id); } function edit() { - dispatch("edit", id); + dispatch("edit", adventure.id); } function add() { - dispatch("add", { name, location }); - } - function markVisited() { - dispatch("markVisited", regionId); - visited = true; - } - function removeVisit() { - dispatch("removeVisit", regionId); - visited = false; + dispatch("add", adventure); } function moreInfo() { - goto(`/worldtravel/${countryCode}/${regionId}`); + console.log(adventure.id); + goto(`/adventure/${adventure.id}`); } @@ -43,26 +36,39 @@ class="card min-w-max lg:w-96 md:w-80 sm:w-60 xs:w-40 bg-primary-content shadow-xl overflow-hidden text-base-content" >
{location}
+{adventure.location}
{date}
+{adventure.date}