Merge develop

This commit is contained in:
Pieter Vander Vennet 2025-01-29 21:19:11 +01:00
commit 3fe1f39c46
457 changed files with 6866 additions and 218533 deletions

View file

@ -1,11 +1,10 @@
<script lang="ts">
import Loading from "./Loading.svelte"
</script>
<div class="relative w-60 h-80">
<div class="animate-pulse w-full h-full bg-gray-400">
</div>
<div class="w-full h-full absolute top-0 flex items-center justify-center">
<div class="relative h-80 w-60">
<div class="h-full w-full animate-pulse bg-gray-400" />
<div class="absolute top-0 flex h-full w-full items-center justify-center">
<Loading />
</div>
</div>

View file

@ -2,8 +2,6 @@
import { OsmConnection } from "../../Logic/Osm/OsmConnection"
import Translations from "../i18n/Translations.js"
import Tr from "./Tr.svelte"
import Login from "../../assets/svg/Login.svelte"
import ArrowRightOnRectangle from "@babeard/svelte-heroicons/solid/ArrowRightOnRectangle"
import ArrowLeftOnRectangle from "@babeard/svelte-heroicons/solid/ArrowLeftOnRectangle"
export let osmConnection: OsmConnection
@ -12,11 +10,14 @@
if (osmConnection === undefined) {
console.error("No osmConnection passed into loginButton")
}
let isLoggedIn = osmConnection.isLoggedIn
</script>
<button class={clss} on:click={() => osmConnection.AttemptLogin()} style="margin-left: 0">
<ArrowLeftOnRectangle class="m-1 w-12" />
<slot>
<Tr t={Translations.t.general.loginWithOpenStreetMap} />
</slot>
</button>
{#if !$isLoggedIn}
<button class={clss} on:click={() => osmConnection.AttemptLogin()} style="margin-left: 0">
<ArrowLeftOnRectangle class="m-1 w-12" />
<slot>
<Tr t={Translations.t.general.loginWithOpenStreetMap} />
</slot>
</button>
{/if}