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" >
-

{name}

- {#if location && location !== ""} +

{adventure.name}

+ {#if adventure.location && adventure.location !== ""}
-

{location}

+

{adventure.location}

{/if} - {#if date && date !== ""} + {#if adventure.date && adventure.date !== ""}
-

{date}

+

{adventure.date}

{/if}
{#if type == "mylog"} - - + + + {/if} {#if type == "featured"} - + {/if}
diff --git a/src/lib/components/EditModal.svelte b/src/lib/components/EditModal.svelte index baecd7b..5b1db35 100644 --- a/src/lib/components/EditModal.svelte +++ b/src/lib/components/EditModal.svelte @@ -1,15 +1,12 @@ + + + + + + diff --git a/src/lib/components/Navbar.svelte b/src/lib/components/Navbar.svelte index 48997b2..1e6e2c6 100644 --- a/src/lib/components/Navbar.svelte +++ b/src/lib/components/Navbar.svelte @@ -78,6 +78,10 @@ + {/if} {#if adventures.length != 0}
@@ -272,12 +255,17 @@ {/if} -{#if !Number.isNaN(editId)} +{#if isShowingMoreFields} + +{/if} + +{#if adventureToEdit && adventureToEdit.id != undefined} @@ -288,11 +276,8 @@ > {#each adventures as adventure (adventure.id)} diff --git a/src/routes/planner/+page.server.ts b/src/routes/planner/+page.server.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/routes/planner/+page.svelte b/src/routes/planner/+page.svelte new file mode 100644 index 0000000..9c5b367 --- /dev/null +++ b/src/routes/planner/+page.svelte @@ -0,0 +1 @@ +

Welcome to the planner

diff --git a/src/routes/settings/admin/+page.server.ts b/src/routes/settings/admin/+page.server.ts index b0bc897..08f3037 100644 --- a/src/routes/settings/admin/+page.server.ts +++ b/src/routes/settings/admin/+page.server.ts @@ -8,7 +8,7 @@ import { userVisitedWorldTravel, } from "$lib/db/schema"; import type { DatabaseUser } from "$lib/server/auth"; -import { count } from "drizzle-orm"; +import { count, eq } from "drizzle-orm"; export const load: PageServerLoad = async (event) => { let users: DatabaseUser[] = []; @@ -26,6 +26,7 @@ export const load: PageServerLoad = async (event) => { visitCount = (await db .select({ count: count() }) .from(adventureTable) + .where(eq(adventureTable.type, "mylog")) .execute()) as unknown as number; userCount = (await db .select({ count: count() }) diff --git a/src/routes/setup/+page.svelte b/src/routes/setup/+page.svelte index ec815da..5827177 100644 --- a/src/routes/setup/+page.svelte +++ b/src/routes/setup/+page.svelte @@ -2,6 +2,10 @@ import { enhance } from "$app/forms"; let loading = false; + + function toggleLoad() { + loading = !loading; + }

AdventureLog Setup

@@ -16,7 +20,7 @@

Create Admin User

-
+ -; + diff --git a/src/routes/shared/[key]/+page.svelte b/src/routes/shared/[key]/+page.svelte index 7fcff7a..05a0cb8 100644 --- a/src/routes/shared/[key]/+page.svelte +++ b/src/routes/shared/[key]/+page.svelte @@ -2,6 +2,7 @@ import type { Adventure } from "$lib/utils/types"; export let data; let array = data.adventureArray as Adventure[]; + console.log(array); import AdventureCard from "$lib/components/AdventureCard.svelte"; @@ -20,13 +21,7 @@ class="grid xl:grid-cols-3 lg:grid-cols-3 md:grid-cols-2 sm:grid-cols-1 gap-4 mt-4 content-center auto-cols-auto ml-6 mr-6" > {#each array as adventure (adventure.id)} - + {/each}
diff --git a/src/routes/signup/+page.svelte b/src/routes/signup/+page.svelte index b3ee95e..c3cfdc0 100644 --- a/src/routes/signup/+page.svelte +++ b/src/routes/signup/+page.svelte @@ -61,4 +61,4 @@ name="description" content="Signup for AdventureLog to start logging your adventures!" /> -; + diff --git a/tailwind.config.js b/tailwind.config.js index cde0de5..43c0343 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -6,6 +6,15 @@ export default { }, plugins: [require("@tailwindcss/typography"), require("daisyui")], daisyui: { - themes: ["light", "dark", "night", "retro", "forest", "aqua", "garden"], + themes: [ + "light", + "dark", + "night", + "retro", + "forest", + "aqua", + "garden", + "emerald", + ], }, };