From baf858bc214a0847397b99e3f65f40cd4c6cdb25 Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Mon, 4 Dec 2023 16:09:30 +0100
Subject: [PATCH] Refactoring: remove slot name; fix logout button

---
 src/UI/Base/LoginButton.svelte              |  2 +-
 src/UI/Base/LogoutButton.svelte             |  2 +-
 src/UI/Favourites/FavouriteSummary.svelte   |  2 ++
 src/UI/Favourites/Favourites.svelte         | 10 ++++++++++
 src/UI/Popup/AddNewPoint/AddNewPoint.svelte |  2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/UI/Base/LoginButton.svelte b/src/UI/Base/LoginButton.svelte
index 504d48713..7381f7b78 100644
--- a/src/UI/Base/LoginButton.svelte
+++ b/src/UI/Base/LoginButton.svelte
@@ -11,7 +11,7 @@
 
 <button class={clss} on:click={() => osmConnection.AttemptLogin()}>
   <ToSvelte construct={Svg.login_svg().SetClass("w-12 m-1")} />
-  <slot name="message">
+  <slot>
     <Tr t={Translations.t.general.loginWithOpenStreetMap} />
   </slot>
 </button>
diff --git a/src/UI/Base/LogoutButton.svelte b/src/UI/Base/LogoutButton.svelte
index 93435f9eb..996fea08a 100644
--- a/src/UI/Base/LogoutButton.svelte
+++ b/src/UI/Base/LogoutButton.svelte
@@ -9,7 +9,7 @@
 
 <button
   on:click={() => {
-    state.osmConnection.LogOut()
+    osmConnection.LogOut()
   }}
 >
   <Logout class="h-6 w-6" />
diff --git a/src/UI/Favourites/FavouriteSummary.svelte b/src/UI/Favourites/FavouriteSummary.svelte
index 112c3dd69..4ac879628 100644
--- a/src/UI/Favourites/FavouriteSummary.svelte
+++ b/src/UI/Favourites/FavouriteSummary.svelte
@@ -21,6 +21,8 @@
     state.mapProperties.location.setData(
       { lon, lat }
     );
+    const z = state.mapProperties.zoom.data
+    state.mapProperties.zoom.setData( Math.min(17, Math.max(12, z )) )
     state.guistate.menuIsOpened.setData(false);
   }
 
diff --git a/src/UI/Favourites/Favourites.svelte b/src/UI/Favourites/Favourites.svelte
index f4452ef5b..eb438f11e 100644
--- a/src/UI/Favourites/Favourites.svelte
+++ b/src/UI/Favourites/Favourites.svelte
@@ -7,6 +7,8 @@
   import { Utils } from "../../Utils";
   import { GeoOperations } from "../../Logic/GeoOperations";
   import type { Feature, LineString, Point } from "geojson";
+  import LoginToggle from "../Base/LoginToggle.svelte";
+  import LoginButton from "../Base/LoginButton.svelte";
 
   /**
    * A panel showing all your favourites
@@ -37,6 +39,13 @@
   
 </script>
 
+<LoginToggle {state}>
+  <div slot="not-logged-in">
+    <LoginButton osmConnection={state.osmConnection}>
+      <Tr t={Translations.t.favouritePoi.loginToSeeList}/>
+    </LoginButton>
+  </div>
+  
 <div class="flex flex-col" on:keypress={(e) => console.log("Got keypress", e)}>
   <Tr t={Translations.t.favouritePoi.intro.Subs({length: $favourites?.length ?? 0})} />
   <Tr t={Translations.t.favouritePoi.privacy} />
@@ -56,3 +65,4 @@
     </button>
   </div>
 </div>
+</LoginToggle>
diff --git a/src/UI/Popup/AddNewPoint/AddNewPoint.svelte b/src/UI/Popup/AddNewPoint/AddNewPoint.svelte
index ef2616257..d28c573fa 100644
--- a/src/UI/Popup/AddNewPoint/AddNewPoint.svelte
+++ b/src/UI/Popup/AddNewPoint/AddNewPoint.svelte
@@ -161,7 +161,7 @@
       2. What do we want to add?
       3. Are all elements of this category visible? (i.e. there are no filters possibly hiding this, is the data still loading, ...) -->
   <LoginButton osmConnection={state.osmConnection} slot="not-logged-in">
-    <Tr slot="message" t={Translations.t.general.add.pleaseLogin} />
+    <Tr t={Translations.t.general.add.pleaseLogin} />
   </LoginButton>
   <div class="h-full w-full">
     {#if $zoom < Constants.minZoomLevelToAddNewPoint}