From fc7e3d363a0fb1cc9fc092d289c75ea5fad74b0c Mon Sep 17 00:00:00 2001
From: Ben Allfree <ben@benallfree.com>
Date: Wed, 13 Dec 2023 23:40:24 -0800
Subject: [PATCH] Superadmin nav fixes

---
 .../superadmin/src/components/Logo.svelte     |  2 -
 .../superadmin/src/routes/+layout.svelte      | 62 ++++++++++++++++++-
 frontends/superadmin/src/routes/+page.svelte  |  5 +-
 .../src/routes/dashboard/+layout.svelte       |  7 ---
 .../src/routes/dashboard/Dashboard.svelte     | 42 -------------
 .../src/routes/plugins/+page.svelte           | 33 ++++++++++
 .../superadmin/src/routes/stats/+page.svelte  | 29 +++++++++
 7 files changed, 122 insertions(+), 58 deletions(-)
 delete mode 100644 frontends/superadmin/src/routes/dashboard/+layout.svelte
 delete mode 100644 frontends/superadmin/src/routes/dashboard/Dashboard.svelte
 create mode 100644 frontends/superadmin/src/routes/plugins/+page.svelte
 create mode 100644 frontends/superadmin/src/routes/stats/+page.svelte

diff --git a/frontends/superadmin/src/components/Logo.svelte b/frontends/superadmin/src/components/Logo.svelte
index 64efd112..ee427c17 100644
--- a/frontends/superadmin/src/components/Logo.svelte
+++ b/frontends/superadmin/src/components/Logo.svelte
@@ -6,8 +6,6 @@
 <div class="flex items-center justify-center gap-4">
   <img
     src="/images/pockethost-cloud-logo.jpg"
-    width="450"
-    height="450"
     class="mix-blend-lighten {logoWidth}"
     alt="PocketHost Logo"
   />
diff --git a/frontends/superadmin/src/routes/+layout.svelte b/frontends/superadmin/src/routes/+layout.svelte
index 01476550..69e85644 100644
--- a/frontends/superadmin/src/routes/+layout.svelte
+++ b/frontends/superadmin/src/routes/+layout.svelte
@@ -1,11 +1,24 @@
 <script>
+  import { page } from '$app/stores'
+  import Logo from '$components/Logo.svelte'
   import MediaQuery from '$components/MediaQuery.svelte'
   import MobileNavDrawer from '$components/MobileNavDrawer.svelte'
   import Navbar from '$components/Navbar.svelte'
   import AuthStateGuard from '$components/helpers/AuthStateGuard.svelte'
   import Meta from '$components/helpers/Meta.svelte'
   import UserLoggedIn from '$components/helpers/UserLoggedIn.svelte'
+  import { client } from '$src/pocketbase-client'
   import '../app.css'
+
+  const handleLogoutAndRedirect = async () => {
+    const { logOut } = client()
+
+    // Clear out the pocketbase information about the current user
+    logOut()
+
+    // Hard refresh to make sure any remaining data is cleared
+    window.location.href = '/'
+  }
 </script>
 
 <Meta />
@@ -16,7 +29,11 @@
       <MediaQuery query="(min-width: 1280px)" let:matches>
         {#if matches}
           <Navbar />
-        {:else}
+        {/if}
+      </MediaQuery>
+
+      <MediaQuery query="(max-width: 700px)" let:matches>
+        {#if matches}
           <MobileNavDrawer>
             <Navbar />
           </MobileNavDrawer>
@@ -24,8 +41,47 @@
       </MediaQuery>
     </UserLoggedIn>
 
-    <div class="lg:p-4 lg:pt-0 xl:pt-4 min-h-screen grow">
-      <div class="bg-base-300 border-base-300 border-[16px] lg:p-4 rounded-2xl">
+    <div class="p-0 lg:p-4 min-h-screen grow">
+      <div
+        class="bg-base-300 border-base-300 border-[16px] m-0 md:p-4 rounded-2xl"
+      >
+        <MediaQuery
+          query="(min-width: 701px) and (max-width: 1279px)"
+          let:matches
+        >
+          {#if matches}
+            <UserLoggedIn>
+              <div role="tablist" class="tabs tabs-boxed">
+                <a href="/" role="tab" class="tab">
+                  <Logo hideLogoText={true} logoWidth="h-8" />
+                </a>
+
+                <a
+                  role="tab"
+                  class="tab {$page.url.pathname === '/stats'
+                    ? `tab-active`
+                    : ``}"
+                  href="/stats">Stats</a
+                >
+                <a
+                  role="tab"
+                  class="tab {$page.url.pathname === '/plugins'
+                    ? `tab-active`
+                    : ``}"
+                  href="/plugins">Plugins</a
+                >
+
+                <button
+                  type="button"
+                  class="tab"
+                  on:click={handleLogoutAndRedirect}
+                  ><i class="fa-regular fa-arrow-up-left-from-circle mr-2"></i> Logout</button
+                >
+              </div>
+            </UserLoggedIn>
+          {/if}
+        </MediaQuery>
+
         <slot />
       </div>
     </div>
diff --git a/frontends/superadmin/src/routes/+page.svelte b/frontends/superadmin/src/routes/+page.svelte
index d6c851d8..2f9eb2be 100644
--- a/frontends/superadmin/src/routes/+page.svelte
+++ b/frontends/superadmin/src/routes/+page.svelte
@@ -3,7 +3,6 @@
   import UserLoggedIn from '$components/helpers/UserLoggedIn.svelte'
   import UserLoggedOut from '$components/helpers/UserLoggedOut.svelte'
   import LoginForm from '$components/login-register/LoginForm.svelte'
-  import Dashboard from './dashboard/Dashboard.svelte'
 </script>
 
 <svelte:head>
@@ -11,9 +10,7 @@
 </svelte:head>
 
 <div>
-  <UserLoggedIn>
-    <Dashboard />
-  </UserLoggedIn>
+  <UserLoggedIn>Welcome</UserLoggedIn>
 
   <UserLoggedOut>
     <div class="min-h-screen flex items-center justify-center">
diff --git a/frontends/superadmin/src/routes/dashboard/+layout.svelte b/frontends/superadmin/src/routes/dashboard/+layout.svelte
deleted file mode 100644
index 29192b90..00000000
--- a/frontends/superadmin/src/routes/dashboard/+layout.svelte
+++ /dev/null
@@ -1,7 +0,0 @@
-<script>
-  import UserLoggedIn from '$components/helpers/UserLoggedIn.svelte'
-</script>
-
-<UserLoggedIn redirect>
-  <slot />
-</UserLoggedIn>
diff --git a/frontends/superadmin/src/routes/dashboard/Dashboard.svelte b/frontends/superadmin/src/routes/dashboard/Dashboard.svelte
deleted file mode 100644
index 543569dc..00000000
--- a/frontends/superadmin/src/routes/dashboard/Dashboard.svelte
+++ /dev/null
@@ -1,42 +0,0 @@
-<script lang="ts">
-  import AuthStateGuard from '$components/helpers/AuthStateGuard.svelte'
-  import { client } from '$src/pocketbase-client'
-  import { onMount } from 'svelte'
-  import { writable } from 'svelte/store'
-
-  type Plugin = {
-    slug: string
-    name: string
-    version: string
-    migration: number
-    enabled: boolean
-  }
-
-  const plugins = writable<Plugin[]>([])
-  const stats = writable({})
-
-  onMount(async () => {
-    plugins.set(await client().client.collection('plugins').getFullList())
-    stats.set(
-      ((await client().client.collection('stats').getFullList()) || []).pop() ||
-        {},
-    )
-  })
-</script>
-
-<svelte:head>
-  <title>Dashboard - PocketHost</title>
-</svelte:head>
-
-<AuthStateGuard>
-  <div>
-    {#each Object.entries($stats) as [key, idx]}
-      <div>{key}: {idx}</div>
-    {/each}
-  </div>
-  <div>
-    {#each $plugins as plugin}
-      <div>{plugin.name}</div>
-    {/each}
-  </div>
-</AuthStateGuard>
diff --git a/frontends/superadmin/src/routes/plugins/+page.svelte b/frontends/superadmin/src/routes/plugins/+page.svelte
new file mode 100644
index 00000000..2293e3a9
--- /dev/null
+++ b/frontends/superadmin/src/routes/plugins/+page.svelte
@@ -0,0 +1,33 @@
+<script lang="ts">
+  import { client } from '$src/pocketbase-client'
+  import { onMount } from 'svelte'
+  import { writable } from 'svelte/store'
+
+  type Plugin = {
+    slug: string
+    name: string
+    version: string
+    migration: number
+    enabled: boolean
+  }
+
+  const plugins = writable<Plugin[]>([])
+
+  onMount(async () => {
+    try {
+      plugins.set(await client().client.collection('plugins').getFullList())
+    } catch (e) {
+      console.error(e)
+    }
+  })
+</script>
+
+<svelte:head>
+  <title>Stats - PocketHost</title>
+</svelte:head>
+
+<div>
+  {#each $plugins as plugin}
+    <div>{plugin.name}</div>
+  {/each}
+</div>
diff --git a/frontends/superadmin/src/routes/stats/+page.svelte b/frontends/superadmin/src/routes/stats/+page.svelte
new file mode 100644
index 00000000..09dfecd3
--- /dev/null
+++ b/frontends/superadmin/src/routes/stats/+page.svelte
@@ -0,0 +1,29 @@
+<script lang="ts">
+  import { client } from '$src/pocketbase-client'
+  import { onMount } from 'svelte'
+  import { writable } from 'svelte/store'
+
+  const stats = writable({})
+
+  onMount(async () => {
+    try {
+      stats.set(
+        (
+          (await client().client.collection('stats').getFullList()) || []
+        ).pop() || {},
+      )
+    } catch (e) {
+      console.error(e)
+    }
+  })
+</script>
+
+<svelte:head>
+  <title>Stats - PocketHost</title>
+</svelte:head>
+
+<div>
+  {#each Object.entries($stats) as [key, idx]}
+    <div>{key}: {idx}</div>
+  {/each}
+</div>