diff --git a/packages/dashboard/src/app.css b/packages/dashboard/src/app.css index b5c61c95..f390fb05 100644 --- a/packages/dashboard/src/app.css +++ b/packages/dashboard/src/app.css @@ -1,3 +1,14 @@ @tailwind base; @tailwind components; @tailwind utilities; + +.prose :where(pre):not(:where([class~='not-prose'], [class~='not-prose'] *)) { + @apply mb-1 mt-1; +} +.prose :where(code):not(:where([class~='not-prose'] *)) { + @apply bg-transparent; +} + +.prose :where(p):not(:where([class~='not-prose'], [class~='not-prose'] *)) { + @apply mt-0 mb-0; +} diff --git a/packages/dashboard/src/routes/app/instances/[instanceId]/+layout.svelte b/packages/dashboard/src/routes/app/instances/[instanceId]/+layout.svelte index 79813308..1a91f0fd 100644 --- a/packages/dashboard/src/routes/app/instances/[instanceId]/+layout.svelte +++ b/packages/dashboard/src/routes/app/instances/[instanceId]/+layout.svelte @@ -1,10 +1,13 @@ - @@ -27,93 +46,100 @@ {#if isReady} -
+

- {$instance.subdomain} + {$instance.subdomain}.pockethost.io + v{$instance.version}

- -
-
- Status:  {status} -
- -
Version: {version}
-
- - PocketBase Logo + - Admin - +
{#if $instance.maintenance} {/if} -
- Overview - Logs - Secrets - Settings -
+
+
+ +
+
+ + Danger Zone + +
+ +
- {#key $page.url.pathname} - - {/key} +
+ {#key $page.url.pathname} +
+ +
+ {/key} +
+
{:else}
Instance not found
{/if} diff --git a/packages/dashboard/src/routes/app/instances/[instanceId]/+page.svelte b/packages/dashboard/src/routes/app/instances/[instanceId]/+page.svelte index d9711bbe..ddd593ce 100644 --- a/packages/dashboard/src/routes/app/instances/[instanceId]/+page.svelte +++ b/packages/dashboard/src/routes/app/instances/[instanceId]/+page.svelte @@ -1,7 +1,7 @@ -
- - -
+ diff --git a/packages/dashboard/src/routes/app/instances/[instanceId]/Code.svelte b/packages/dashboard/src/routes/app/instances/[instanceId]/Code.svelte index 04293726..122ec432 100644 --- a/packages/dashboard/src/routes/app/instances/[instanceId]/Code.svelte +++ b/packages/dashboard/src/routes/app/instances/[instanceId]/Code.svelte @@ -1,7 +1,5 @@ - - Getting Started +

Overview

-
-

Your PocketBase URL is

- -
+
+

Your PocketBase URL is

+ +
-
-

Installing PocketBase

- -
+
+

Installing PocketBase

+ +
-
-

Connecting to Your Instance

- {#if $instance.cname} - {#if $instance.cname_active} -
Notice: You are in Custom Domain mode
- {:else} -
- Notice: You are in Custom Domain mode but it is not active and will - not work. Go find @noaxis on Discord to get set up. -
- {/if} +
+

Connecting to Your Instance

+ {#if $instance.cname} + {#if $instance.cname_active} +
Notice: You are in Custom Domain mode
+ {:else} +
+ Notice: You are in Custom Domain mode but it is not active and will not + work. Go find @noaxis on Discord to get set up. +
{/if} - -
+ {/if} + +
-
-

Making Your First Query

- -
+
+

Making Your First Query

+ +
-

Additional Resources:

- - +

Additional Resources:

+ diff --git a/packages/dashboard/src/routes/app/instances/[instanceId]/Ftpx.svelte b/packages/dashboard/src/routes/app/instances/[instanceId]/Ftpx.svelte deleted file mode 100644 index c26b506d..00000000 --- a/packages/dashboard/src/routes/app/instances/[instanceId]/Ftpx.svelte +++ /dev/null @@ -1,63 +0,0 @@ - - - - FTP Access - -

- Securely access your instance files via FTPS. Use your PocketHost account - login and password. -

- -

Bash:

- -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
DirectoryDescription
pb_dataThe PocketBase data directory, including upload storage and database - backups
pb_publicPublic files, such as a web frontend
pb_migrationsThe PocketBase migrations directory
pb_hooksThe PocketBase JS hooks directory
- diff --git a/packages/dashboard/src/routes/app/instances/[instanceId]/Toggle.svelte b/packages/dashboard/src/routes/app/instances/[instanceId]/Toggle.svelte new file mode 100644 index 00000000..340f782a --- /dev/null +++ b/packages/dashboard/src/routes/app/instances/[instanceId]/Toggle.svelte @@ -0,0 +1,35 @@ + + +
+ +
diff --git a/packages/dashboard/src/routes/app/instances/[instanceId]/admin-sync/+page.svelte b/packages/dashboard/src/routes/app/instances/[instanceId]/admin-sync/+page.svelte new file mode 100644 index 00000000..63040345 --- /dev/null +++ b/packages/dashboard/src/routes/app/instances/[instanceId]/admin-sync/+page.svelte @@ -0,0 +1,36 @@ + + + + Admin Sync + + +

+ Your instance will have an admin login that matches your pockethost.io login. +

+ + + + diff --git a/packages/dashboard/src/routes/app/instances/[instanceId]/settings/DeleteInstance.svelte b/packages/dashboard/src/routes/app/instances/[instanceId]/delete/+page.svelte similarity index 67% rename from packages/dashboard/src/routes/app/instances/[instanceId]/settings/DeleteInstance.svelte rename to packages/dashboard/src/routes/app/instances/[instanceId]/delete/+page.svelte index 53db71f2..006e8beb 100644 --- a/packages/dashboard/src/routes/app/instances/[instanceId]/settings/DeleteInstance.svelte +++ b/packages/dashboard/src/routes/app/instances/[instanceId]/delete/+page.svelte @@ -6,7 +6,8 @@ import { client } from '$src/pocketbase-client' import { globalInstancesStore } from '$util/stores' import { instance } from '../store' - import ErrorMessage from './ErrorMessage.svelte' + import ErrorMessage from '../settings/ErrorMessage.svelte' + import AlertBar from '$src/components/AlertBar.svelte' $: ({ id, maintenance, version } = $instance) @@ -63,37 +64,41 @@ } - - - Delete Instance - + + Delete Instance + -
- Deleting your instance will immediately and permanently delete your - instance: -
    -
  • Your subdomain
    • - 
  • pb_data/*
    • - 
  • pb_public/*
    • - 
  • pb_migrations/*
    • - 
  • pb_static/*
    • -
- If you are storing files on S3, you must delete them separately. -
+{#if !maintenance} + +{/if} - +
+ Deleting your instance will immediately and permanently delete your instance: +
    +
  • Your subdomain
    • + 
  • pb_data/*
    • + 
  • pb_public/*
    • + 
  • pb_migrations/*
    • + 
  • pb_static/*
    • +
+ If you are storing files on S3, you must delete them separately. +
-
+ + + - -
- +