From 018545bbcda192804523c924d07e0802f7ddca7a Mon Sep 17 00:00:00 2001
From: Christian Beutel <>
Date: Sun, 16 Jun 2024 01:03:02 +0200
Subject: [PATCH] v0.7.1

---
 CHANGELOG.md                                  |  8 +++++
 docs/package-lock.json                        |  4 +--
 docs/package.json                             |  2 +-
 docs/src/components/footer.astro              |  2 +-
 .../content/docs/getting-started/changelog.md |  8 +++++
 web/package-lock.json                         |  4 +--
 web/package.json                              |  2 +-
 .../logo/logo_text_light_with_version.svelte  |  2 +-
 web/src/routes/+layout.server.ts              |  8 ++---
 web/src/routes/+layout.svelte                 | 29 ++++++++++++++-----
 10 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbdef225..7a8ca346 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v0.7.1
+## Features
+- A warning is now displayed if the ORIGIN environment variable is misconfigured
+  
+## Bug fixes
+- Fixes login for http connections
+- Trails are now properly sorted across all pages
+
 # v0.7.0
 ## Features
 - Trail sort and sort direction are now remembered through a page reload
diff --git a/docs/package-lock.json b/docs/package-lock.json
index bf85d321..8034fcf3 100644
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "docs",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "docs",
-      "version": "0.7.0",
+      "version": "0.7.1",
       "dependencies": {
         "@astrojs/check": "^0.7.0",
         "@astrojs/node": "^8.2.6",
diff --git a/docs/package.json b/docs/package.json
index a1bbb429..88156e4a 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "docs",
   "type": "module",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",
diff --git a/docs/src/components/footer.astro b/docs/src/components/footer.astro
index 5560c1ac..b53db8e3 100644
--- a/docs/src/components/footer.astro
+++ b/docs/src/components/footer.astro
@@ -111,7 +111,7 @@ const isNotHomepage = Astro.props.slug !== "";
                         class="fill-primary dark:fill-white"
                         font-size="0.75rem"
                     >
-                        v0.7.0
+                        v0.7.1
                     </text>
                 </svg>
             </div>
diff --git a/docs/src/content/docs/getting-started/changelog.md b/docs/src/content/docs/getting-started/changelog.md
index 0c9dd38f..835ed344 100644
--- a/docs/src/content/docs/getting-started/changelog.md
+++ b/docs/src/content/docs/getting-started/changelog.md
@@ -3,6 +3,14 @@ title: Changelog
 description: What changed in the last patch?
 ---
 
+## v0.7.1
+### Features
+- A warning is now displayed if the ORIGIN environment variable is misconfigured
+  
+### Bug fixes
+- Fixes login for http connections
+- Trails are now properly sorted across all pages
+
 ## v0.7.0
 ### Features
 - Trail sort and sort direction are now remembered through a page reload
diff --git a/web/package-lock.json b/web/package-lock.json
index f92ed292..180172cf 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "wanderer",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "wanderer",
-      "version": "0.7.0",
+      "version": "0.7.1",
       "dependencies": {
         "@fortawesome/fontawesome-free": "^6.5.1",
         "@sveltejs/adapter-node": "^4.0.1",
diff --git a/web/package.json b/web/package.json
index 8f520e6d..337056ae 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wanderer",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "private": true,
   "scripts": {
     "dev": "vite dev",
diff --git a/web/src/lib/components/logo/logo_text_light_with_version.svelte b/web/src/lib/components/logo/logo_text_light_with_version.svelte
index cc9c7eb3..af6e6e8b 100644
--- a/web/src/lib/components/logo/logo_text_light_with_version.svelte
+++ b/web/src/lib/components/logo/logo_text_light_with_version.svelte
@@ -95,5 +95,5 @@
         d="M43.857 43.3045C44.0569 43.0652 44.4246 43.0652 44.6245 43.3045L46.6259 45.7008C46.8978 46.0263 46.6663 46.5213 46.2421 46.5213H42.2394C41.8152 46.5213 41.5837 46.0263 41.8556 45.7008L43.857 43.3045Z"
         fill="#242734"
     />
-    <text x="178" y="64" fill="white" font-size="0.75rem">v0.7.0</text>
+    <text x="178" y="64" fill="white" font-size="0.75rem">v0.7.1</text>
 </svg>
diff --git a/web/src/routes/+layout.server.ts b/web/src/routes/+layout.server.ts
index 38a096e6..e9923a94 100644
--- a/web/src/routes/+layout.server.ts
+++ b/web/src/routes/+layout.server.ts
@@ -3,10 +3,6 @@ import '$lib/i18n';
 import type { LayoutServerLoad } from './$types';
 import { env } from "$env/dynamic/private";
 
-export const load: LayoutServerLoad = async ({ locals, url }) => {
-	const warnings = []
-	if (env.ORIGIN != url.origin) {
-		warnings.push(`You are accessing wanderer from <span class="font-mono bg-gray-100">${url.origin}</span> but your ORIGIN environment variable is set to <span class="font-mono bg-gray-100">${env.ORIGIN}</span>. This may cause errors.`)
-	}
-	return { settings: locals.settings, warnings: warnings }
+export const load: LayoutServerLoad = async ({ locals, url }) => {	
+	return { settings: locals.settings, origin: env.ORIGIN }
 }
\ No newline at end of file
diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelte
index 4ad2898d..563b07a3 100644
--- a/web/src/routes/+layout.svelte
+++ b/web/src/routes/+layout.svelte
@@ -1,5 +1,7 @@
 <script lang="ts">
+    import { browser } from "$app/environment";
     import { beforeNavigate, goto } from "$app/navigation";
+    import { page } from "$app/stores";
     import { env } from "$env/dynamic/public";
     import Toast from "$lib/components/base/toast.svelte";
     import Footer from "$lib/components/footer.svelte";
@@ -11,10 +13,8 @@
     import "../css/app.css";
     import "../css/components.css";
     import "../css/theme.css";
-    import { page } from "$app/stores";
     import { onMount } from "svelte";
 
-    
     beforeNavigate((n) => {
         if (!$currentUser && isRouteProtected(n.to?.url?.pathname ?? "")) {
             n.cancel();
@@ -22,13 +22,19 @@
         }
     });
 
+    onMount(() => {
+        if ($page.data.origin != location.origin) {
+            showWarning = true;
+        }
+    });
+
     let hideDemoHint = false;
-    let hideWarning = false;
+    let showWarning = false;
 </script>
 
 {#if env.PUBLIC_IS_DEMO === "true" && !hideDemoHint}
     <div
-        class="flex items-center justify-between bg-amber-200 text-center p-4 text-sm"
+        class="flex items-center justify-between bg-amber-200 text-center p-4 text-sm text-black"
         out:slide
     >
         <div></div>
@@ -42,14 +48,21 @@
     </div>
 {/if}
 
-{#if $page.data.warnings?.length && !hideWarning}
+{#if showWarning}
     <div
-        class="flex items-center justify-between bg-red-200 text-center p-4 text-sm"
+        class="flex items-center justify-between bg-red-200 text-center p-4 text-sm text-black"
         out:slide
     >
         <div></div>
-        <span>{@html $page.data.warnings[0]} </span>
-        <button class="btn-icon self-end" on:click={() => (hideWarning = true)}
+        <p>
+            You are accessing wanderer from <span class="font-mono bg-gray-100"
+                >{location.origin}</span
+            >
+            but your ORIGIN environment variable is set to
+            <span class="font-mono bg-gray-100">{$page.data.origin}</span>. This
+            may cause errors.
+        </p>
+        <button class="btn-icon self-end" on:click={() => (showWarning = false)}
             ><i class="fa fa-close"></i></button
         >
     </div>