From bd53a51af835478d23bef4772ce7e50553dc3fdf Mon Sep 17 00:00:00 2001
From: Kit La Touche <kit@transneptune.net>
Date: Wed, 9 Oct 2024 15:32:52 -0400
Subject: Move a lot of things around

---
 hi-ui/src/routes/(app)/+layout.svelte            | 95 +++++++++++++++++++++++
 hi-ui/src/routes/(app)/+page.svelte              |  0
 hi-ui/src/routes/(app)/ch/[channel]/+page.js     | 13 ++++
 hi-ui/src/routes/(app)/ch/[channel]/+page.svelte |  5 ++
 hi-ui/src/routes/+layout.svelte                  |  4 +-
 hi-ui/src/routes/+page.svelte                    | 96 ------------------------
 6 files changed, 115 insertions(+), 98 deletions(-)
 create mode 100644 hi-ui/src/routes/(app)/+layout.svelte
 create mode 100644 hi-ui/src/routes/(app)/+page.svelte
 create mode 100644 hi-ui/src/routes/(app)/ch/[channel]/+page.js
 create mode 100644 hi-ui/src/routes/(app)/ch/[channel]/+page.svelte
 delete mode 100644 hi-ui/src/routes/+page.svelte

(limited to 'hi-ui/src/routes')

diff --git a/hi-ui/src/routes/(app)/+layout.svelte b/hi-ui/src/routes/(app)/+layout.svelte
new file mode 100644
index 0000000..98d4acf
--- /dev/null
+++ b/hi-ui/src/routes/(app)/+layout.svelte
@@ -0,0 +1,95 @@
+<script>
+	import { onMount } from 'svelte';
+
+	import { boot, subscribeToEvents } from '$lib/apiServer';
+	import { currentUser, channelsList, messages } from '$lib/store';
+
+    import ChannelList from '$lib/components/ChannelList.svelte';
+    import CreateChannelForm from '$lib/components/CreateChannelForm.svelte';
+    import LogIn from '$lib/components/LogIn.svelte';
+    import MessageInput from '$lib/components/MessageInput.svelte';
+
+    let user;
+    let loading = true;
+
+    currentUser.subscribe((value) => {
+        user = value;
+    });
+
+    function onBooted(boot) {
+        currentUser.update(() => ({
+            id: boot.login.id,
+            username: boot.login.name,
+        }));
+        let channels = boot.channels.map((channel) => ({
+            id: channel.id,
+            name: channel.name,
+        }));
+        channelsList.update((value) => value.setChannels(channels));
+        let bootMessages = boot.channels.map((channel) => [channel.id, channel.messages]);
+        for (let [channel, channelMessages] of bootMessages) {
+            messages.update((value) => value.addMessages(channel, channelMessages));
+        }
+    }
+
+	onMount(async () => {
+        try {
+            let response = await boot();
+            switch (response.status) {
+                case 200:
+                    onBooted(response.data);
+                    subscribeToEvents(response.data.resume_point);
+                    break;
+                case 401:
+                    currentUser.update(() => null);
+                    break;
+                default:
+                    // TODO: display error.
+                    break;
+            }
+        } catch (_) {
+            // I don't want exceptions on non-200 series responses, dammit.
+        }
+        loading = false;
+	});
+</script>
+
+{#if loading}
+    <h2>Loading&hellip;</h2>
+{:else if user != null}
+    <div id="interface">
+        <div class="channel-list">
+            <ChannelList />
+        </div>
+        <div class="active-channel">
+            <slot />
+        </div>
+        <div class="create-channel">
+            <CreateChannelForm />
+        </div>
+        <div class="create-message">
+            <MessageInput />
+        </div>
+    </div>
+{:else}
+    <LogIn />
+{/if}
+
+<style>
+    #interface {
+        height: 89vh;
+        margin: 1rem;
+        display: grid;
+        grid-template-columns: 18rem auto;
+        grid-template-rows: auto 2rem;
+        grid-gap: 0.25rem;
+    }
+    #interface div {
+        max-height: 100%;
+        overflow: scroll;
+    }
+    #interface .active-channel {
+        border: 1px solid grey;
+        border-radius: 1.25rem;
+    }
+</style>
diff --git a/hi-ui/src/routes/(app)/+page.svelte b/hi-ui/src/routes/(app)/+page.svelte
new file mode 100644
index 0000000..e69de29
diff --git a/hi-ui/src/routes/(app)/ch/[channel]/+page.js b/hi-ui/src/routes/(app)/ch/[channel]/+page.js
new file mode 100644
index 0000000..5fd493a
--- /dev/null
+++ b/hi-ui/src/routes/(app)/ch/[channel]/+page.js
@@ -0,0 +1,13 @@
+export const ssr = false;
+
+import { activeChannel } from '$lib/store';
+
+
+/** @type {import('./$types').PageLoad} */
+export function load({ params }) {
+  let { channel } = params;
+  activeChannel.update((value) => {
+    value.set(channel)
+    return value;
+  });
+}
diff --git a/hi-ui/src/routes/(app)/ch/[channel]/+page.svelte b/hi-ui/src/routes/(app)/ch/[channel]/+page.svelte
new file mode 100644
index 0000000..26b493e
--- /dev/null
+++ b/hi-ui/src/routes/(app)/ch/[channel]/+page.svelte
@@ -0,0 +1,5 @@
+<script>
+    import ActiveChannel from '$lib/components/ActiveChannel.svelte';
+</script>
+
+<ActiveChannel />
diff --git a/hi-ui/src/routes/+layout.svelte b/hi-ui/src/routes/+layout.svelte
index 28ae4ec..8027443 100644
--- a/hi-ui/src/routes/+layout.svelte
+++ b/hi-ui/src/routes/+layout.svelte
@@ -2,8 +2,8 @@
   import { AppBar } from '@skeletonlabs/skeleton';
   import "../app.css";
 
-  import { currentUser } from '../store';
-  import LogOut from '../lib/LogOut.svelte';
+  import { currentUser } from '$lib/store';
+  import LogOut from '$lib/components/LogOut.svelte';
 </script>
 
 <div id="app">
diff --git a/hi-ui/src/routes/+page.svelte b/hi-ui/src/routes/+page.svelte
deleted file mode 100644
index 932582d..0000000
--- a/hi-ui/src/routes/+page.svelte
+++ /dev/null
@@ -1,96 +0,0 @@
-<script>
-	import { onMount } from 'svelte';
-
-	import { boot, subscribeToEvents } from '../apiServer';
-	import { currentUser, channelsList, messages } from '../store';
-
-    import ActiveChannel from '../lib/ActiveChannel.svelte';
-    import ChannelList from '../lib/ChannelList.svelte';
-    import CreateChannelForm from '../lib/CreateChannelForm.svelte';
-    import LogIn from '../lib/LogIn.svelte';
-    import MessageInput from '../lib/MessageInput.svelte';
-
-    let user;
-    let loading = true;
-
-    currentUser.subscribe((value) => {
-        user = value;
-    });
-
-    function onBooted(boot) {
-        currentUser.update(() => ({
-            id: boot.login.id,
-            username: boot.login.name,
-        }));
-        let channels = boot.channels.map((channel) => ({
-            id: channel.id,
-            name: channel.name,
-        }));
-        channelsList.update((value) => value.setChannels(channels));
-        let bootMessages = boot.channels.map((channel) => [channel.id, channel.messages]);
-        for (let [channel, channelMessages] of bootMessages) {
-            messages.update((value) => value.addMessages(channel, channelMessages));
-        }
-    }
-
-	onMount(async () => {
-        try {
-            let response = await boot();
-            switch (response.status) {
-                case 200:
-                    onBooted(response.data);
-                    subscribeToEvents(response.data.resume_point);
-                    break;
-                case 401:
-                    currentUser.update(() => null);
-                    break;
-                default:
-                    // TODO: display error.
-                    break;
-            }
-        } catch (_) {
-            // I don't want exceptions on non-200 series responses, dammit.
-        }
-        loading = false;
-	});
-</script>
-
-{#if loading}
-    <h2>Loading&hellip;</h2>
-{:else if user != null}
-    <div id="interface">
-        <div class="channel-list">
-            <ChannelList />
-        </div>
-        <div class="active-channel">
-            <ActiveChannel />
-        </div>
-        <div class="create-channel">
-            <CreateChannelForm />
-        </div>
-        <div class="create-message">
-            <MessageInput />
-        </div>
-    </div>
-{:else}
-    <LogIn />
-{/if}
-
-<style>
-    #interface {
-        height: 89vh;
-        margin: 1rem;
-        display: grid;
-        grid-template-columns: 18rem auto;
-        grid-template-rows: auto 2rem;
-        grid-gap: 0.25rem;
-    }
-    #interface div {
-        max-height: 100%;
-        overflow: scroll;
-    }
-    #interface .active-channel {
-        border: 1px solid grey;
-        border-radius: 1.25rem;
-    }
-</style>
-- 
cgit v1.2.3