app

commit 11867df0bc467240c1cccf2abd867929be6256da
parent 7adb4880324ea899a484b8d3e24d98b8917b5fab
Author: triesap <137732411+triesap@users.noreply.github.com>
Date:   Fri, 27 Sep 2024 15:11:10 +0000

Update routes previously modifing tabs component stores, update root tabs component

Diffstat:
M
src/routes/(app)/+layout.svelte
 | 
41
+----------------------------------------
M
src/routes/(app)/+page.svelte
 | 
35
+++++++++++++++++++++++++++++++----
M
src/routes/(app)/models/location-gcs/+page.svelte
 | 
2
--
A
src/routes/(app)/models/nostr-relay/+page.svelte
 | 
39
+++++++++++++++++++++++++++++++++++++++
M
src/routes/(app)/models/trade-product/+page.svelte
 | 
2
--
M
src/routes/(app)/settings/+page.svelte
 | 
10
----------

6 files changed, 71 insertions(+), 58 deletions(-)
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
@@ -1,46 +1,7 @@
 <script lang="ts">
-    import {
-        LayoutWindow,
-        Tabs,
-        app_tab_active,
-        route,
-        tabs_visible,
-    } from "@radroots/svelte-lib";
+    import { LayoutWindow } from "@radroots/svelte-lib";
 </script>
 
 <LayoutWindow>
     <slot />
 </LayoutWindow>
-{#if $tabs_visible}
-    <Tabs
-        basis={{
-            list: [
-                {
-                    icon: `house-line`,
-                    callback: async (tab_i) => {
-                        app_tab_active.set(tab_i);
-                        await route(`/`);
-                    },
-                },
-                {
-                    icon: `compass`,
-                    callback: async (tab_i) => {
-                        await route(`/models/trade-product/add`);
-                    },
-                },
-                {
-                    icon: `network`,
-                    callback: async (tab_i) => {
-                        await route(`/models/nostr-profile`);
-                    },
-                },
-                {
-                    icon: `bell-simple`,
-                    callback: async (tab_i) => {
-                        await route(`/settings`);
-                    },
-                },
-            ],
-        }}
-    />
-{/if}
diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
     import { app_nostr_key } from "$lib/stores";
     import {
-        app_tab_active,
         type CallbackPromise,
         EnvelopeLower,
         Glyph,
@@ -11,7 +10,7 @@
         nav_prev,
         type NavigationRoute,
         route,
-        tabs_visible,
+        Tabs,
     } from "@radroots/svelte-lib";
     import { onMount } from "svelte";
 
@@ -19,8 +18,6 @@
 
     onMount(async () => {
         try {
-            tabs_visible.set(true);
-            app_tab_active.set(0);
             nav_prev.set([]);
         } catch (e) {
         } finally {
@@ -144,6 +141,36 @@
         </div>
     </div>
 </LayoutView>
+<Tabs
+    basis={{
+        list: [
+            {
+                icon: `house-line`,
+                callback: async (tab_i) => {
+                    await route(`/`);
+                },
+            },
+            {
+                icon: `compass`,
+                callback: async (tab_i) => {
+                    await route(`/models/trade-product/add`);
+                },
+            },
+            {
+                icon: `network`,
+                callback: async (tab_i) => {
+                    await route(`/models/nostr-profile`);
+                },
+            },
+            {
+                icon: `bell-simple`,
+                callback: async (tab_i) => {
+                    await route(`/models/nostr-relay`);
+                },
+            },
+        ],
+    }}
+/>
 <EnvelopeLower
     basis={{
         visible: tmp_show_envelope,
diff --git a/src/routes/(app)/models/location-gcs/+page.svelte b/src/routes/(app)/models/location-gcs/+page.svelte
@@ -7,7 +7,6 @@
         LayoutView,
         Nav,
         t,
-        tabs_visible,
         Trellis,
     } from "@radroots/svelte-lib";
     import { onMount } from "svelte";
@@ -17,7 +16,6 @@
 
     onMount(async () => {
         try {
-            tabs_visible.set(false);
             await fetch_models();
         } catch (e) {
         } finally {
diff --git a/src/routes/(app)/models/nostr-relay/+page.svelte b/src/routes/(app)/models/nostr-relay/+page.svelte
@@ -0,0 +1,39 @@
+<script lang="ts">
+    import { lc } from "$lib/client";
+    import type { NostrRelay } from "@radroots/models";
+    import { LayoutTrellis, LayoutView } from "@radroots/svelte-lib";
+    import { onMount } from "svelte";
+
+    let models_list: NostrRelay[] = [];
+
+    onMount(async () => {
+        try {
+            await load_models();
+        } catch (e) {
+        } finally {
+        }
+    });
+
+    const load_models = async (): Promise<void> => {
+        try {
+            //loading_models = true;
+            const res = await lc.db.nostr_relay_get({
+                list: [`all`],
+            });
+            console.log(JSON.stringify(res, null, 4), `res`);
+            if (typeof res !== `string`) models_list = res;
+        } catch (e) {
+            console.log(`(error) load_models `, e);
+        } finally {
+            //loading_models = false;
+        }
+    };
+</script>
+
+<LayoutView>
+    <LayoutTrellis>
+        <pre class="text-layer-0-glyph">
+            {JSON.stringify(models_list, null, 4)}
+        </pre>
+    </LayoutTrellis>
+</LayoutView>
diff --git a/src/routes/(app)/models/trade-product/+page.svelte b/src/routes/(app)/models/trade-product/+page.svelte
@@ -8,7 +8,6 @@
         Nav,
         route,
         t,
-        tabs_visible,
         time_fmt_iso,
         Trellis,
     } from "@radroots/svelte-lib";
@@ -19,7 +18,6 @@
 
     onMount(async () => {
         try {
-            tabs_visible.set(false);
             await fetch_models();
         } catch (e) {
         } finally {
diff --git a/src/routes/(app)/settings/+page.svelte b/src/routes/(app)/settings/+page.svelte
@@ -8,19 +8,9 @@
         LayoutView,
         Nav,
         t,
-        tabs_visible,
         toggle_color_mode,
         Trellis,
     } from "@radroots/svelte-lib";
-    import { onMount } from "svelte";
-
-    onMount(async () => {
-        try {
-            tabs_visible.set(false);
-        } catch (e) {
-        } finally {
-        }
-    });
 </script>
 
 <LayoutView>