Merge branch 'main' of github.com:pockethost/pockethost

packages/dashboard/src/app.css

@@ -13,6 +13,10 @@
   @apply mt-2 mb-2;
 }
 
+.prose :where(blockquote):not(:where([class~='not-prose'], [class~='not-prose'] *)) {
+  quotes: none;
+}
+
 .docs-content img {
   @apply border-accent rounded-lg border;
 }

packages/dashboard/src/routes/(app)/instances/[instanceId]/+layout.svelte

@@ -48,24 +48,24 @@
 {#if isReady}
   <div class="flex flex-row items-center justify-between mb-6 gap-4 pl-4 sm:pl-6 lg:pl-8 pr-2">
     <div>
-      <div class="flex items-center gap-2">
+      <div class="flex items-center gap-3">
-        <h2 class="text-4xl md:text-left text-base-content font-bold mb-3 break-words">
+        <h2 class="text-4xl md:text-left text-base-content font-bold break-words">
           {$instance.subdomain}
         </h2>
-      </div>
+        <span class="bg-gray-200 text-gray-700 text-xs px-2 py-1 rounded-full">
-      <span class="text-gray-400">
+          v{$instance.version}
-        Version {$instance.version} -
-        <span class="capitalize">{$instance.status}</span>
         </span>
         {#if $instance.dev}
           <a
             href={`/instances/${$instance.id}/dev`}
-          class="text-warning animate-pulse border-warning border-2 p-1 rounded"
+            class="text-warning animate-pulse text-2xl"
+            title="Dev Mode Active (SLOW)"
           >
-          Dev Mode Active (SLOW)
+            🚧
           </a>
         {/if}
       </div>
+    </div>
 
     <div>
       <Toggle checked={$instance.power} onChange={handlePowerChange($instance.id)} />

packages/dashboard/src/routes/(app)/instances/[instanceId]/Overview.svelte

@@ -2,6 +2,7 @@
   import CodeSample from '$components/CodeSample.svelte'
   import CardHeader from '$src/components/cards/CardHeader.svelte'
   import { DISCORD_URL, INSTANCE_URL } from '$src/env'
+  import { isCnameActive } from 'pockethost/common'
   import { instance } from './store'
 
   let installSnippet = `npm i pocketbase`
@@ -18,6 +19,7 @@
 });`
 </script>
 
+<div class="max-w-2xl">
   <CardHeader documentation={`/docs/accessing-instance/`}>Overview</CardHeader>
 
   <!-- These should be p but the inside already has p -->
@@ -33,19 +35,6 @@
 
   <div>
     <p class="mb-2">Connecting to Your Instance</p>
-  {#if $instance.cname}
-    {#if $instance.cname_active}
-      <div class="text-accent">Notice: You are in Custom Domain mode</div>
-    {:else}
-      <div class="text-error">
-        Notice: You are in Custom Domain mode but it is not active and will not work. Go find <a
-          href={DISCORD_URL}
-          target="_blank"
-          class="link"><code>.noaxis</code> on Discord</a
-        > to get set up.
-      </div>
-    {/if}
-  {/if}
     <CodeSample code={connectionSnippet} />
   </div>
 
@@ -65,3 +54,4 @@
       </li>
     </ul>
   </div>
+</div>

packages/dashboard/src/routes/(app)/instances/[instanceId]/admin-sync/+page.svelte

@@ -22,6 +22,7 @@
   }
 </script>
 
+<div class="max-w-2xl">
   <CardHeader documentation={`/docs/admin-sync`}>Admin Sync</CardHeader>
 
   <p class="mb-8">
@@ -32,3 +33,4 @@
   <ErrorMessage message={errorMessage} />
 
   <Toggle checked={!!syncAdmin} onChange={handleChange} />
+</div>

packages/dashboard/src/routes/(app)/instances/[instanceId]/delete/+page.svelte

@@ -63,6 +63,7 @@
   }
 </script>
 
+<div class="max-w-2xl">
   <CardHeader documentation={`/docs/delete`}>Delete Instance</CardHeader>
 
   {#if power}
@@ -86,6 +87,7 @@
   <form class="flex change-version-form-container-query gap-4" on:submit={handleSave}>
     <button type="submit" class="btn btn-error" disabled={power || isButtonDisabled}>Delete Instance</button>
   </form>
+</div>
 
 <style>
   .change-version-form-container-query {

packages/dashboard/src/routes/(app)/instances/[instanceId]/dev/+page.svelte

@@ -20,6 +20,7 @@
   }
 </script>
 
+<div class="max-w-2xl">
   <CardHeader documentation={`/docs/dev-mode`}>Dev Mode</CardHeader>
 
   <p class="mb-8">
@@ -30,3 +31,4 @@
   <ErrorMessage message={errorMessage} />
 
   <Toggle onChange={handleChange} checked={!!dev} onClass="warning" />
+</div>

packages/dashboard/src/routes/(app)/instances/[instanceId]/ftp/+page.svelte

@@ -15,6 +15,7 @@
   const ftpUrl = FTP_URL(email)
 </script>
 
+<div class="max-w-2xl">
   <CardHeader documentation={`/docs/ftp`}>FTP Access</CardHeader>
   <div class="mb-8">Securely access your instance files via FTPS. Use your PocketHost account login and password.</div>
 
@@ -49,3 +50,4 @@
       </tr>
     </tbody>
   </table>
+</div>

packages/dashboard/src/routes/(app)/instances/[instanceId]/rename/+page.svelte

@@ -59,7 +59,7 @@
   }
 </script>
 
-<div class="max-w-lg">
+<div class="max-w-2xl">
   <CardHeader documentation={`/docs/rename-instance`}>Rename Instance</CardHeader>
 
   <p class="mb-8">

packages/dashboard/src/routes/(app)/instances/[instanceId]/secrets/+page.svelte

@@ -14,6 +14,7 @@
   <title>{subdomain} secrets - PocketHost</title>
 </svelte:head>
 
-<!-- Consistency is key -->
+<div class="max-w-2xl">
   <CardHeader>Secrets</CardHeader>
   <SecretsInner />
+</div>

packages/dashboard/src/routes/(app)/instances/[instanceId]/version/+page.svelte

@@ -88,7 +88,7 @@
     <a href="https://github.com/pocketbase/pocketbase/releases" class="link">every minor release</a> of PocketBase.
   </div>
 
-  {#if $is23Available || is23OrHigher}
+  {#if !is23OrHigher}
     <div class="mb-8 bg-info p-4 rounded text-info-content">
       <p class="font-bold text-xl">Attention v0.23.* users:</p>
       <p>v0.22.* to v0.23.* is a major migration boundary and requires a manual migration process.</p>