From c8e7b76d0003db9c7c1369650b73fa41d822559c Mon Sep 17 00:00:00 2001
From: Christian Beutel <>
Date: Mon, 1 Jul 2024 17:16:13 +0200
Subject: [PATCH] fixes display issues

---
 CHANGELOG.md                                       | 14 ++++++++++++++
 docs/src/content/docs/getting-started/changelog.md | 11 +++++++++++
 web/src/lib/components/trail/trail_card.svelte     |  2 +-
 .../lib/components/trail/trail_filter_panel.svelte |  2 +-
 .../lib/components/trail/trail_info_panel.svelte   |  6 +++---
 .../lib/components/trail/trail_list_item.svelte    |  2 +-
 web/src/routes/lists/+page.svelte                  |  2 +-
 web/src/routes/map/+page.svelte                    |  4 ++--
 web/src/routes/map/trail/[id]/+page.svelte         |  8 ++++----
 web/src/routes/trails/+page.svelte                 |  6 +++---
 10 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 580b26bd..0cd806b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# v0.7.3
+## Features
+- Adds support for FIT files
+  
+## Bug fixes
+- Fixes display issue for the filter panel in the map view
+
+## Translations
+- adds Italian translation (thanks to [lukasitaly](https://github.com/lukasitaly))
+  
+## Bug fixes
+- Icons in dropdown menus are now displaying properly again
+- The trail id is now returned when using the upload API endpoint
+
 # v0.7.2
 ## Bug fixes
 - Icons in dropdown menus are now displaying properly again
diff --git a/docs/src/content/docs/getting-started/changelog.md b/docs/src/content/docs/getting-started/changelog.md
index b56b7913..8d0f7294 100644
--- a/docs/src/content/docs/getting-started/changelog.md
+++ b/docs/src/content/docs/getting-started/changelog.md
@@ -3,6 +3,17 @@ title: Changelog
 description: What changed in the last patch?
 ---
 
+## v0.7.3
+### Features
+- Adds support for FIT files
+  
+### Bug fixes
+- Fixes display issue for the filter panel in the map view
+
+### Translations
+- adds Italian translation (thanks to [lukasitaly](https://github.com/lukasitaly))
+  
+
 ## v0.7.2
 ### Bug fixes
 - Icons in dropdown menus are now displaying properly again
diff --git a/web/src/lib/components/trail/trail_card.svelte b/web/src/lib/components/trail/trail_card.svelte
index ae8b8ab4..7de38f0c 100644
--- a/web/src/lib/components/trail/trail_card.svelte
+++ b/web/src/lib/components/trail/trail_card.svelte
@@ -61,7 +61,7 @@
                     </h5>
                 {/if}
                 <h5>
-                    <i class="fa fa-person-hiking mr-3"></i>{$_(
+                    <i class="fa fa-gauge mr-3"></i>{$_(
                         trail.difficulty ?? "?",
                     )}
                 </h5>
diff --git a/web/src/lib/components/trail/trail_filter_panel.svelte b/web/src/lib/components/trail/trail_filter_panel.svelte
index 2f64711a..54bc289c 100644
--- a/web/src/lib/components/trail/trail_filter_panel.svelte
+++ b/web/src/lib/components/trail/trail_filter_panel.svelte
@@ -122,7 +122,7 @@
     }
 </script>
 
-<div class="trail-filter sticky top-4 p-8 border border-input-border rounded-xl self-start">
+<div class="trail-filter p-8 border border-input-border rounded-xl">
     {#if showTrailSearch}
         <div class="flex gap-2 items-center">
             <div class="basis-full">
diff --git a/web/src/lib/components/trail/trail_info_panel.svelte b/web/src/lib/components/trail/trail_info_panel.svelte
index f4bea543..a5fa9d7e 100644
--- a/web/src/lib/components/trail/trail_info_panel.svelte
+++ b/web/src/lib/components/trail/trail_info_panel.svelte
@@ -161,7 +161,7 @@
 </script>
 
 <div
-    class="trail-info-panel max-w-5xl mx-auto border border-input-border rounded-3xl h-full"
+    class="trail-info-panel mx-auto border border-input-border rounded-3xl h-full" style="max-width: min(100%, 64rem)"
 >
     <div class="trail-info-panel-header">
         <section class="relative h-80">
@@ -214,7 +214,7 @@
                             </h3>
                         {/if}
                         <h3 class="text-lg">
-                            <i class="fa fa-person-hiking mr-2"></i>
+                            <i class="fa fa-gauge mr-2"></i>
                             {$_(trail.difficulty ?? "?")}
                         </h3>
                     </div>
@@ -271,7 +271,7 @@
     >
         <Tabs {tabs} bind:activeTab></Tabs>
     </section>
-    <section class="trail-info-panel-content px-8 overflow-y-scroll" style="height: calc(100% - 420px)">
+    <section class="trail-info-panel-content px-8">
         <div
             class="grid grid-cols-1 my-4 gap-8"
             class:md:grid-cols-[1fr_18rem]={mode == "overview"}
diff --git a/web/src/lib/components/trail/trail_list_item.svelte b/web/src/lib/components/trail/trail_list_item.svelte
index ee5aa231..0f872129 100644
--- a/web/src/lib/components/trail/trail_list_item.svelte
+++ b/web/src/lib/components/trail/trail_list_item.svelte
@@ -51,7 +51,7 @@
                 <h5><i class="fa fa-location-dot mr-3"></i>{trail.location}</h5>
             {/if}
             <h5>
-                <i class="fa fa-person-hiking mr-3"></i>{$_(
+                <i class="fa fa-gauge mr-3"></i>{$_(
                     trail.difficulty ?? "?",
                 )}
             </h5>
diff --git a/web/src/routes/lists/+page.svelte b/web/src/routes/lists/+page.svelte
index 2671b858..f48904cf 100644
--- a/web/src/routes/lists/+page.svelte
+++ b/web/src/routes/lists/+page.svelte
@@ -103,7 +103,7 @@
             <h4 class="font-semibold text-lg">${trail.name}</h4>
             <div class="flex gap-x-4">
             ${trail.location ? `<h5><i class="fa fa-location-dot mr-2"></i>${trail.location}</h5>` : ""}
-            <h5><i class="fa fa-person-hiking mr-2"></i>${$_(trail.difficulty as string)}</h5>
+            <h5><i class="fa fa-gauge mr-2"></i>${$_(trail.difficulty as string)}</h5>
             </div>
             <div class="flex mt-2 gap-4 text-sm text-gray-500"><span class="shrink-0"><i
                         class="fa fa-left-right mr-2"></i>${formatDistance(
diff --git a/web/src/routes/map/+page.svelte b/web/src/routes/map/+page.svelte
index 10f96683..23cf4ea2 100644
--- a/web/src/routes/map/+page.svelte
+++ b/web/src/routes/map/+page.svelte
@@ -268,7 +268,7 @@
             <h4 class="font-semibold text-lg">${trail.name}</h4>
             <div class="flex gap-x-4">
             ${trail.location ? `<h5><i class="fa fa-location-dot mr-2"></i>${trail.location}</h5>` : ""}
-            <h5><i class="fa fa-person-hiking mr-2"></i>${$_(trail.difficulty as string)}</h5>
+            <h5><i class="fa fa-gauge mr-2"></i>${$_(trail.difficulty as string)}</h5>
             </div>
             <div class="flex mt-2 gap-4 text-sm text-gray-500"><span class="shrink-0"><i
                         class="fa fa-left-right mr-2"></i>${formatDistance(
@@ -353,7 +353,7 @@
             {/if}
         </div>
 
-        {#if !showMap || (browser && window.innerWidth >= 768)}
+        {#if !showFilter && (!showMap || (browser && window.innerWidth >= 768))}
             {#if $trails.length == 0}
                 <EmptyStateSearch></EmptyStateSearch>
             {/if}
diff --git a/web/src/routes/map/trail/[id]/+page.svelte b/web/src/routes/map/trail/[id]/+page.svelte
index 112727ae..39dad32b 100644
--- a/web/src/routes/map/trail/[id]/+page.svelte
+++ b/web/src/routes/map/trail/[id]/+page.svelte
@@ -16,16 +16,16 @@
     <title>{$trail.name} | {$_("map")} | wanderer</title>
 </svelte:head>
 <main class="grid grid-cols-1 md:grid-cols-[458px_1fr] gap-x-1 gap-y-4">
-    <div id="trail-details">
-        <TrailInfoPanel trail={$trail} {markers}></TrailInfoPanel>
+    <TrailInfoPanel trail={$trail} {markers}></TrailInfoPanel>
+    <div id="trail-details" class=" sticky top-0">
+        <MapWithElevation trail={$trail} bind:markers></MapWithElevation>
     </div>
-    <MapWithElevation trail={$trail} bind:markers></MapWithElevation>
 </main>
 
 <style>
     @media only screen and (min-width: 768px) {
         #trail-details {
-            height: calc(100vh - 124px);
+            max-height: calc(100vh - 124px);
         }
     }
 </style>
diff --git a/web/src/routes/trails/+page.svelte b/web/src/routes/trails/+page.svelte
index a3609227..4c088df2 100644
--- a/web/src/routes/trails/+page.svelte
+++ b/web/src/routes/trails/+page.svelte
@@ -17,16 +17,16 @@
     onMount(() => {
         if (window.innerWidth < 768) {
             filterExpanded = false;
-        }        
+        }
     });
 
-    async function handleFilterUpdate() {        
+    async function handleFilterUpdate() {
         const response = await trails_search_filter(filter, 1);
         pagination.page = response.page;
         pagination.totalPages = response.totalPages;
     }
 
-    async function paginate(page: number) {       
+    async function paginate(page: number) {
         pagination.page = page;
         const response = await trails_search_filter(filter, page);
     }