1
0
Fork 0
mirror of https://github.com/seanmorley15/AdventureLog.git synced 2025-08-05 13:15:18 +02:00

Merge pull request #77 from seanmorley15/development

Development
This commit is contained in:
Sean Morley 2024-05-28 13:33:15 -04:00 committed by GitHub
commit e4ab8185bd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 66 additions and 23 deletions

View file

@ -163,12 +163,14 @@
<!-- if there is a button in form, it will close the modal --> <!-- if there is a button in form, it will close the modal -->
<button class="btn mt-4" on:click={close}>Close</button> <button class="btn mt-4" on:click={close}>Close</button>
</form> </form>
<button class="btn btn-secondary" on:click={generate} <div class="flex items-center justify-center flex-wrap gap-4 mt-4">
>Generate Description</button <button class="btn btn-secondary" on:click={generate}
> >Generate Description</button
<button class="btn btn-secondary" on:click={searchImage} >
>Search for Image</button <button class="btn btn-secondary" on:click={searchImage}
> >Search for Image</button
>
</div>
</div> </div>
</div> </div>
</dialog> </dialog>

View file

@ -4,7 +4,7 @@
import type { Adventure } from "$lib/utils/types"; import type { Adventure } from "$lib/utils/types";
const dispatch = createEventDispatcher(); const dispatch = createEventDispatcher();
import { onMount } from "svelte"; import { onMount } from "svelte";
import { addActivityType } from "$lib"; import { addActivityType, generateDescription, getImage } from "$lib";
let modal: HTMLDialogElement; let modal: HTMLDialogElement;
console.log(adventureToEdit.id); console.log(adventureToEdit.id);
@ -41,6 +41,28 @@
adventureToEdit = addActivityType(activityInput, adventureToEdit); adventureToEdit = addActivityType(activityInput, adventureToEdit);
activityInput = ""; activityInput = "";
} }
async function generate() {
try {
console.log(adventureToEdit.name);
const desc = await generateDescription(adventureToEdit.name);
adventureToEdit.description = desc;
// Do something with the updated newAdventure object
} catch (error) {
console.error(error);
// Handle the error
}
}
async function searchImage() {
try {
const imageUrl = await getImage(adventureToEdit.name);
adventureToEdit.imageUrl = imageUrl;
} catch (error) {
console.error(error);
// Handle the error
}
}
</script> </script>
<dialog id="my_modal_1" class="modal"> <dialog id="my_modal_1" class="modal">
@ -124,6 +146,14 @@
<!-- if there is a button in form, it will close the modal --> <!-- if there is a button in form, it will close the modal -->
<button class="btn mt-4" on:click={close}>Close</button> <button class="btn mt-4" on:click={close}>Close</button>
</form> </form>
<div class="flex items-center justify-center flex-wrap gap-4 mt-4">
<button class="btn btn-secondary" on:click={generate}
>Generate Description</button
>
<button class="btn btn-secondary" on:click={searchImage}
>Search for Image</button
>
</div>
</div> </div>
</div> </div>
</dialog> </dialog>

View file

@ -97,7 +97,9 @@
{/if} {/if}
</ul> </ul>
</div> </div>
<a class="btn btn-ghost text-xl" href="/">AdventureLog 🗺️</a> <a class="btn btn-ghost text-xl" href="/"
>AdventureLog <img src="/favicon.png" alt="Map Logo" class="w-8" /></a
>
</div> </div>
<div class="navbar-center hidden lg:flex"> <div class="navbar-center hidden lg:flex">
<ul class="menu menu-horizontal px-1 gap-2"> <ul class="menu menu-horizontal px-1 gap-2">

View file

@ -242,7 +242,7 @@
{/each} {/each}
</div> </div>
{#if adventuresPlans.length == 0 && !isLoadingIdeas && !isLoadingTrips && !isShowingMoreFields && !isShowingNewTrip && tripPlans.length == 0} {#if adventuresPlans.length == 0 && !isLoadingIdeas && !isLoadingTrips && !isShowingMoreFields && !isShowingNewTrip && tripPlans.length > 0}
<div class="flex flex-col items-center justify-center mt-16"> <div class="flex flex-col items-center justify-center mt-16">
<article class="prose mb-4"><h2>Add some plans!</h2></article> <article class="prose mb-4"><h2>Add some plans!</h2></article>
<img src={mapDrawing} width="25%" alt="Logo" /> <img src={mapDrawing} width="25%" alt="Logo" />
@ -284,13 +284,20 @@
{/each} {/each}
</div> </div>
{#if tripPlans.length == 0 && !isLoadingIdeas && !isLoadingTrips && !isShowingMoreFields && !isShowingNewTrip} {#if tripPlans.length == 0 && !isLoadingIdeas && !isLoadingTrips && !isShowingMoreFields && !isShowingNewTrip && adventuresPlans.length > 0}
<div class="flex flex-col items-center justify-center mt-16"> <div class="flex flex-col items-center justify-center mt-16">
<article class="prose mb-4"><h2>Add some trips!</h2></article> <article class="prose mb-4"><h2>Add some trips!</h2></article>
<img src={mapDrawing} width="25%" alt="Logo" /> <img src={mapDrawing} width="25%" alt="Logo" />
</div> </div>
{/if} {/if}
{#if tripPlans.length == 0 && !isLoadingIdeas && !isLoadingTrips && !isShowingMoreFields && !isShowingNewTrip && adventuresPlans.length == 0}
<div class="flex flex-col items-center justify-center mt-16">
<article class="prose mb-4"><h2>Add some trips and plans!</h2></article>
<img src={mapDrawing} width="25%" alt="Logo" />
</div>
{/if}
<svelte:head> <svelte:head>
<title>My Plans | AdventureLog</title> <title>My Plans | AdventureLog</title>
<meta <meta

View file

@ -12,19 +12,21 @@
<h1 class="text-center font-bold text-4xl mb-4">Country List</h1> <h1 class="text-center font-bold text-4xl mb-4">Country List</h1>
{#each data.response as item} <div class="flex items-center justify-center flex-wrap">
<button {#each data.response as item}
class="btn btn-primary mr-4 mb-2" <button
on:click={() => nav(item.country_code)} class="btn btn-primary mr-2 ml-2 mb-2"
>{item.name} on:click={() => nav(item.country_code)}
<img >{item.name}
src={getFlag(24, item.country_code)} <img
class="inline-block -mt-1 mr-1" src={getFlag(24, item.country_code)}
alt="Flag" class="inline-block -mt-1 mr-1"
/></button alt="Flag"
> /></button
<!-- <p>Name: {item.name}, Continent: {item.continent}</p> --> >
{/each} <!-- <p>Name: {item.name}, Continent: {item.continent}</p> -->
{/each}
</div>
<svelte:head> <svelte:head>
<title>WorldTravel | AdventureLog</title> <title>WorldTravel | AdventureLog</title>