diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/+layout.svelte b/frontends/dashboard/src/routes/app/instances/[instanceId]/+layout.svelte index d9c1ac2e..54aa27de 100644 --- a/frontends/dashboard/src/routes/app/instances/[instanceId]/+layout.svelte +++ b/frontends/dashboard/src/routes/app/instances/[instanceId]/+layout.svelte @@ -1,6 +1,8 @@ {#if isReady} +
+
+

+ {$instance.subdomain} +

+ +
+
+ Status:  {status} +
+ +
Version: {version}
+
+
+ + + PocketBase Logo + Admin + +
+ + {#if $instance.maintenance} + + {/if} + +
+ Overview + Logs + Secrets + Settings +
+ {:else}
Instance not found
diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/+page.svelte b/frontends/dashboard/src/routes/app/instances/[instanceId]/+page.svelte index 85737c0d..4f00253b 100644 --- a/frontends/dashboard/src/routes/app/instances/[instanceId]/+page.svelte +++ b/frontends/dashboard/src/routes/app/instances/[instanceId]/+page.svelte @@ -1,85 +1,20 @@ - {subdomain} details - PocketHost + {subdomain} overview - PocketHost -
-
-

- {$instance.subdomain} -

- -
-
- Status:  {status} -
- -
Version: {version}
-
-
- - - PocketBase Logo - Admin - -
- -{#if $instance.maintenance} - -{/if} -
- -
- -
- - -
- - - -
- - - - - - - - -
diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/Secrets/Secrets.svelte b/frontends/dashboard/src/routes/app/instances/[instanceId]/Secrets/Secrets.svelte deleted file mode 100644 index b350a737..00000000 --- a/frontends/dashboard/src/routes/app/instances/[instanceId]/Secrets/Secrets.svelte +++ /dev/null @@ -1,82 +0,0 @@ - - - - Secrets - -

- These secrets are passed into your pocketbase executable and - can be accessed from pb_hooks JS hooks. -

- - - {#if $items.length > 0} -
- -
- {/if} - - {#if $items.length === 0} -
- - No Environment Variables Found -
- {/if} - -
- - - -
- -
- {#if activeTab === 0} -
- {/if} - - {#if activeTab === 1} - - {/if} -
-
diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/logs/+page.svelte b/frontends/dashboard/src/routes/app/instances/[instanceId]/logs/+page.svelte new file mode 100644 index 00000000..84ea8157 --- /dev/null +++ b/frontends/dashboard/src/routes/app/instances/[instanceId]/logs/+page.svelte @@ -0,0 +1,16 @@ + + + + {subdomain} logging - PocketHost + + + diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/logs/Logging.svelte b/frontends/dashboard/src/routes/app/instances/[instanceId]/logs/Logging.svelte new file mode 100644 index 00000000..f7ec5957 --- /dev/null +++ b/frontends/dashboard/src/routes/app/instances/[instanceId]/logs/Logging.svelte @@ -0,0 +1,11 @@ + + + + Instance Logging + + diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/Logging.svelte b/frontends/dashboard/src/routes/app/instances/[instanceId]/logs/LoggingInner.svelte similarity index 57% rename from frontends/dashboard/src/routes/app/instances/[instanceId]/Logging.svelte rename to frontends/dashboard/src/routes/app/instances/[instanceId]/logs/LoggingInner.svelte index ea9762e6..f90388a1 100644 --- a/frontends/dashboard/src/routes/app/instances/[instanceId]/Logging.svelte +++ b/frontends/dashboard/src/routes/app/instances/[instanceId]/logs/LoggingInner.svelte @@ -1,12 +1,10 @@ - - Instance Logging +

+ Instance logs appear here in realtime, including console.log from + JavaScript hooks. +

-

- Instance logs appear here in realtime, including console.log from - JavaScript hooks. -

+ + + +
+ +
+ {#each $logs as log} +
+ + +
+ {log.time} + {log.stream} + {logText(log)} +
+
+ {/each} +
+
diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/secrets/+page.svelte b/frontends/dashboard/src/routes/app/instances/[instanceId]/secrets/+page.svelte new file mode 100644 index 00000000..8093a49c --- /dev/null +++ b/frontends/dashboard/src/routes/app/instances/[instanceId]/secrets/+page.svelte @@ -0,0 +1,16 @@ + + + + {subdomain} secrets - PocketHost + + + diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/Secrets/Form.svelte b/frontends/dashboard/src/routes/app/instances/[instanceId]/secrets/Form.svelte similarity index 100% rename from frontends/dashboard/src/routes/app/instances/[instanceId]/Secrets/Form.svelte rename to frontends/dashboard/src/routes/app/instances/[instanceId]/secrets/Form.svelte diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/Secrets/List.svelte b/frontends/dashboard/src/routes/app/instances/[instanceId]/secrets/List.svelte similarity index 100% rename from frontends/dashboard/src/routes/app/instances/[instanceId]/Secrets/List.svelte rename to frontends/dashboard/src/routes/app/instances/[instanceId]/secrets/List.svelte diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/secrets/Secrets.svelte b/frontends/dashboard/src/routes/app/instances/[instanceId]/secrets/Secrets.svelte new file mode 100644 index 00000000..1eab4e45 --- /dev/null +++ b/frontends/dashboard/src/routes/app/instances/[instanceId]/secrets/Secrets.svelte @@ -0,0 +1,11 @@ + + + + Secrets + + + diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/secrets/SecretsInner.svelte b/frontends/dashboard/src/routes/app/instances/[instanceId]/secrets/SecretsInner.svelte new file mode 100644 index 00000000..4ed67f0f --- /dev/null +++ b/frontends/dashboard/src/routes/app/instances/[instanceId]/secrets/SecretsInner.svelte @@ -0,0 +1,76 @@ + + +

+ These secrets are passed into your pocketbase executable and can + be accessed from pb_hooks JS hooks. +

+ + +{#if $items.length > 0} +
+ +
+{/if} + +{#if $items.length === 0} +
+ + No Environment Variables Found +
+{/if} + +
+ + + +
+ +
+ {#if activeTab === 0} +
+ {/if} + + {#if activeTab === 1} + + {/if} +
diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/Secrets/stores.ts b/frontends/dashboard/src/routes/app/instances/[instanceId]/secrets/stores.ts similarity index 100% rename from frontends/dashboard/src/routes/app/instances/[instanceId]/Secrets/stores.ts rename to frontends/dashboard/src/routes/app/instances/[instanceId]/secrets/stores.ts diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/settings/+page.svelte b/frontends/dashboard/src/routes/app/instances/[instanceId]/settings/+page.svelte new file mode 100644 index 00000000..04623c01 --- /dev/null +++ b/frontends/dashboard/src/routes/app/instances/[instanceId]/settings/+page.svelte @@ -0,0 +1,33 @@ + + + + {subdomain} overview - PocketHost + + + + +
+ + + + + + + + + +
diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/Danger/AdminSync.svelte b/frontends/dashboard/src/routes/app/instances/[instanceId]/settings/AdminSync.svelte similarity index 100% rename from frontends/dashboard/src/routes/app/instances/[instanceId]/Danger/AdminSync.svelte rename to frontends/dashboard/src/routes/app/instances/[instanceId]/settings/AdminSync.svelte diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/Danger/DangerZoneTitle.svelte b/frontends/dashboard/src/routes/app/instances/[instanceId]/settings/DangerZoneTitle.svelte similarity index 100% rename from frontends/dashboard/src/routes/app/instances/[instanceId]/Danger/DangerZoneTitle.svelte rename to frontends/dashboard/src/routes/app/instances/[instanceId]/settings/DangerZoneTitle.svelte diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/Danger/DeleteInstance.svelte b/frontends/dashboard/src/routes/app/instances/[instanceId]/settings/DeleteInstance.svelte similarity index 100% rename from frontends/dashboard/src/routes/app/instances/[instanceId]/Danger/DeleteInstance.svelte rename to frontends/dashboard/src/routes/app/instances/[instanceId]/settings/DeleteInstance.svelte diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/Danger/ErrorMessage.svelte b/frontends/dashboard/src/routes/app/instances/[instanceId]/settings/ErrorMessage.svelte similarity index 100% rename from frontends/dashboard/src/routes/app/instances/[instanceId]/Danger/ErrorMessage.svelte rename to frontends/dashboard/src/routes/app/instances/[instanceId]/settings/ErrorMessage.svelte diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/Danger/Maintenance.svelte b/frontends/dashboard/src/routes/app/instances/[instanceId]/settings/Maintenance.svelte similarity index 100% rename from frontends/dashboard/src/routes/app/instances/[instanceId]/Danger/Maintenance.svelte rename to frontends/dashboard/src/routes/app/instances/[instanceId]/settings/Maintenance.svelte diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/Danger/RenameInstance.svelte b/frontends/dashboard/src/routes/app/instances/[instanceId]/settings/RenameInstance.svelte similarity index 100% rename from frontends/dashboard/src/routes/app/instances/[instanceId]/Danger/RenameInstance.svelte rename to frontends/dashboard/src/routes/app/instances/[instanceId]/settings/RenameInstance.svelte diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/Danger/VersionChange/VersionChange.svelte b/frontends/dashboard/src/routes/app/instances/[instanceId]/settings/VersionChange/VersionChange.svelte similarity index 100% rename from frontends/dashboard/src/routes/app/instances/[instanceId]/Danger/VersionChange/VersionChange.svelte rename to frontends/dashboard/src/routes/app/instances/[instanceId]/settings/VersionChange/VersionChange.svelte diff --git a/frontends/dashboard/src/routes/app/instances/[instanceId]/Danger/VersionChange/VersionPicker.svelte b/frontends/dashboard/src/routes/app/instances/[instanceId]/settings/VersionChange/VersionPicker.svelte similarity index 100% rename from frontends/dashboard/src/routes/app/instances/[instanceId]/Danger/VersionChange/VersionPicker.svelte rename to frontends/dashboard/src/routes/app/instances/[instanceId]/settings/VersionChange/VersionPicker.svelte