Remove old code

museum_map/server/frontend/src/components/Footer.svelte

@@ -1,53 +1,57 @@
 <script lang="ts">
-    import { config } from "../store";
+  import { createQuery } from "@tanstack/svelte-query";
+  import { apiRequest } from "../util";
+
+  const config = createQuery({
+    queryKey: ["/config/"],
+    queryFn: apiRequest<Config>,
+  });
 </script>
 
 <footer class="bg-inherit shadow-even shadow-black text-sm py-1 z-10">
-    <nav>
-        <ul class="flex flex-row flex-wrap gap-y-1">
-            <li class="flex-none w-full md:w-1/3 px-2 text-center md:text-left">
-                <a
-                    href="https://www.room3b.eu/pages/projects/digital-museum-map.html"
-                    target="_blank"
-                    rel="noopener"
-                    class="underline decoration-dotted hover:decoration-solid focus:decoration-solid"
-                    >Find out more about how this works</a
-                >
-            </li>
-            <li
-                class="flex-none w-full md:w-1/3 pt-1 md:pt-0 md:py-0 text-center"
+  <nav>
+    <ul class="flex flex-row flex-wrap gap-y-1">
+      <li class="flex-none w-full md:w-1/3 px-2 text-center md:text-left">
+        <a
+          href="https://www.room3b.eu/pages/projects/digital-museum-map.html"
+          target="_blank"
+          rel="noopener"
+          class="underline decoration-dotted hover:decoration-solid focus:decoration-solid"
+          >Find out more about how this works</a
+        >
+      </li>
+      <li class="flex-none w-full md:w-1/3 pt-1 md:pt-0 md:py-0 text-center">
+        {#if $config.isSuccess && $config.data.footer && $config.data.footer.center}
+          {#if $config.data.footer.center.url}
+            <a
+              href={$config.data.footer.center.url}
+              target="_blank"
+              rel="noopener"
+              class="underline decoration-dotted hover:decoration-solid focus:decoration-solid"
+              >{@html $config.data.footer.center.label}</a
             >
-                {#if $config && $config.footer && $config.footer.center}
-                    {#if $config.footer.center.url}
-                        <a
-                            href={$config.footer.center.url}
-                            target="_blank"
-                            rel="noopener"
-                            class="underline decoration-dotted hover:decoration-solid focus:decoration-solid"
-                            >{@html $config.footer.center.label}</a
-                        >
-                    {:else}
-                        <span>{@html $config.footer.center.label}</span>
-                    {/if}
-                {/if}
-            </li>
-            <li
-                class="flex-none w-full md:w-1/3 px-2 pt-1 md:pt-0 text-center md:text-right"
+          {:else}
+            <span>{@html $config.data.footer.center.label}</span>
+          {/if}
+        {/if}
+      </li>
+      <li
+        class="flex-none w-full md:w-1/3 px-2 pt-1 md:pt-0 text-center md:text-right"
+      >
+        {#if $config.isSuccess && $config.data.footer && $config.data.footer.right}
+          {#if $config.data.footer.right.url}
+            <a
+              href={$config.data.footer.right.url}
+              target="_blank"
+              rel="noopener"
+              class="underline decoration-dotted hover:decoration-solid focus:decoration-solid"
+              >{@html $config.data.footer.right.label}</a
             >
-                {#if $config && $config.footer && $config.footer.right}
-                    {#if $config.footer.right.url}
-                        <a
-                            href={$config.footer.right.url}
-                            target="_blank"
-                            rel="noopener"
-                            class="underline decoration-dotted hover:decoration-solid focus:decoration-solid"
-                            >{@html $config.footer.right.label}</a
-                        >
-                    {:else}
-                        <span>{@html $config.footer.right.label}</span>
-                    {/if}
-                {/if}
-            </li>
-        </ul>
-    </nav>
+          {:else}
+            <span>{@html $config.data.footer.right.label}</span>
+          {/if}
+        {/if}
+      </li>
+    </ul>
+  </nav>
 </footer>

museum_map/server/frontend/src/components/Header.svelte

@@ -1,9 +1,10 @@
 <script lang="ts">
   import { afterUpdate, onDestroy, onMount, tick } from "svelte";
   import { location } from "../simple-svelte-router";
-  import { useIsFetching } from "@tanstack/svelte-query";
+  import { createQuery, useIsFetching } from "@tanstack/svelte-query";
 
-  import { searchTerm, searchRoom, floors, tracker } from "../store";
+  import { searchTerm, searchRoom, tracker } from "../store";
+  import { apiRequest } from "../util";
 
   export let title: string;
   export let nav: { path: string; label: string }[];
@@ -13,6 +14,11 @@
   let showSearch = false;
   let searchElement: HTMLElement | null = null;
 
+  const floors = createQuery({
+    queryKey: ["/floors/"],
+    queryFn: apiRequest<Floor[]>,
+  });
+
   const unsubscribeLocation = location.subscribe((location) => {
     if (location.pathname.startsWith("/room")) {
       const parts = location.pathname.split("/");
@@ -26,9 +32,10 @@
     if (
       searchTerm.trim() !== "" &&
       $location.pathname === "/" &&
-      $floors.length > 0
+      $floors.isSuccess &&
+      $floors.data.length > 0
     ) {
-      location.push("/floor/" + $floors[0].id + "?search");
+      location.push("/floor/" + $floors.data[0].id + "?search");
     }
     if (searchTerm.trim() !== "") {
       showSearch = true;

museum_map/server/frontend/src/store/index.ts

@@ -1,60 +1,16 @@
-import { busyCounter, isBusy } from './busy';
-import { itemOfTheDay, randomItemsSelection } from './picks';
-import { floorTopics, majorCollections, floors, currentFloor } from './floors';
-import { rooms, currentRooms, currentRoom } from './rooms';
-import { items, currentItems, currentItem } from './items';
-import { config } from './config';
-import { cachedTopics, loadTopics } from './topics';
 import { localPreferences } from './preferences';
-import { searchTerm, searchRoom, matchingFloors, matchingRooms, matchingItems } from './search';
+import { searchTerm, searchRoom } from './search';
 import { consent, ageBand } from './consent';
 import { tracker } from './tracking';
-import { status, isConnected, isUpdatable, isReady } from "./status";
-import { loadingProgress, isLoaded } from './loading';
 
 export {
-    busyCounter,
-    isBusy,
-
-    itemOfTheDay,
-    randomItemsSelection,
-
-    floorTopics,
-    majorCollections,
-    floors,
-    currentFloor,
-
-    currentRoom,
-    currentRooms,
-    rooms,
-
-    items,
-    currentItems,
-    currentItem,
-
-    cachedTopics,
-    loadTopics,
-
-    config,
-
     localPreferences,
 
     searchTerm,
     searchRoom,
-    matchingFloors,
-    matchingRooms,
-    matchingItems,
 
     consent,
     ageBand,
 
     tracker,
-
-    status,
-    isConnected,
-    isUpdatable,
-    isReady,
-
-    loadingProgress,
-    isLoaded,
 };