Skip to content

Commit

Permalink
Merge pull request #56 from seanmorley15/development
Browse files Browse the repository at this point in the history
WEBP Image support
  • Loading branch information
seanmorley15 authored May 5, 2024
2 parents 25f773e + c4d6113 commit 7f6b5d9
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 18 deletions.
Binary file added src/lib/assets/AdventureOverlook.webp
Binary file not shown.
Binary file added src/lib/assets/MapWithPins.webp
Binary file not shown.
36 changes: 20 additions & 16 deletions src/lib/components/Navbar.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,14 @@
tabindex="0"
class="menu menu-sm dropdown-content mt-3 z-[1] p-2 shadow bg-base-100 rounded-box w-52 gap-2"
>
<li>
<button on:click={() => goto("/log")}>My Log</button>
</li>
<li>
<button on:click={() => goto("/planner")}>Planner</button>
</li>
{#if user}
<li>
<button on:click={() => goto("/log")}>My Log</button>
</li>
<li>
<button on:click={() => goto("/planner")}>Planner</button>
</li>
{/if}
<li>
<button on:click={() => goto("/worldtravel")}>World Travel</button>
</li>
Expand All @@ -118,16 +120,18 @@
</div>
<div class="navbar-center hidden lg:flex">
<ul class="menu menu-horizontal px-1 gap-2">
<li>
<button class="btn btn-neutral" on:click={() => goto("/log")}
>My Log</button
>
</li>
<li>
<button class="btn btn-neutral" on:click={() => goto("/planner")}
>Planner</button
>
</li>
{#if user}
<li>
<button class="btn btn-neutral" on:click={() => goto("/log")}
>My Log</button
>
</li>
<li>
<button class="btn btn-neutral" on:click={() => goto("/planner")}
>Planner</button
>
</li>
{/if}
<li>
<button class="btn btn-neutral" on:click={() => goto("/worldtravel")}
>World Travel</button
Expand Down
6 changes: 4 additions & 2 deletions src/routes/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import { goto } from "$app/navigation";
import campingDrawing from "$lib/assets/camping.svg";
import { visitCount } from "$lib/utils/stores/visitCountStore";
import AdventureOverlook from "$lib/assets/AdventureOverlook.webp";
import MapWithPins from "$lib/assets/MapWithPins.webp";
async function navToLog() {
goto("/log");
Expand Down Expand Up @@ -45,7 +47,7 @@
</div>
</div>
<img
src="https://images.unsplash.com/photo-1463693396721-8ca0cfa2b3b5?q=80&w=2940&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D"
src={AdventureOverlook}
width="550"
height="550"
alt="Hero"
Expand Down Expand Up @@ -82,7 +84,7 @@
>
<!-- svelte-ignore a11y-img-redundant-alt -->
<img
src="https://images.unsplash.com/photo-1516738901171-8eb4fc13bd20?q=80&w=2940&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D"
src={MapWithPins}
width="550"
height="310"
alt="Image"
Expand Down

0 comments on commit 7f6b5d9

Please sign in to comment.