diff --git a/.prettierrc b/.prettierrc index 80f0cc28..88b48c84 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,11 +1,14 @@ { - "semi": false, - "useTabs": false, "singleQuote": true, - "trailingComma": "all", + "trailingComma": "es5", + "semi": false, + "printWidth": 120, + "tabWidth": 2, + "useTabs": false, "plugins": [ - "./node_modules/prettier-plugin-organize-imports/index.js", - "./node_modules/prettier-plugin-svelte/plugin.js", - "./node_modules/prettier-plugin-jsdoc/dist/index.js" - ] + "prettier-plugin-organize-imports", + "prettier-plugin-svelte", + "prettier-plugin-jsdoc" + ], + "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }] } diff --git a/package.json b/package.json index 742c2f3c..c6553c2b 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "prettier": "^3.4.2", "prettier-plugin-jsdoc": "^1.3.2", "prettier-plugin-organize-imports": "^4.1.0", - "prettier-plugin-svelte": "^3.3.2", + "prettier-plugin-svelte": "^3.4.0", "tslib": "^2.8.1", "tsx": "^4.19.2", "typescript": "^5.7.3" diff --git a/packages/dashboard/src/components/AlertBar.svelte b/packages/dashboard/src/components/AlertBar.svelte index 5862c21c..347ec693 100644 --- a/packages/dashboard/src/components/AlertBar.svelte +++ b/packages/dashboard/src/components/AlertBar.svelte @@ -58,11 +58,7 @@ {#if message && !isHidden} - {:else} - + {/if} {#if formError} diff --git a/packages/dashboard/src/components/cards/Card.svelte b/packages/dashboard/src/components/cards/Card.svelte index e48c31c5..8603620e 100644 --- a/packages/dashboard/src/components/cards/Card.svelte +++ b/packages/dashboard/src/components/cards/Card.svelte @@ -6,9 +6,7 @@
diff --git a/packages/dashboard/src/components/cards/CardHeader.svelte b/packages/dashboard/src/components/cards/CardHeader.svelte index 07ea320b..113032dc 100644 --- a/packages/dashboard/src/components/cards/CardHeader.svelte +++ b/packages/dashboard/src/components/cards/CardHeader.svelte @@ -9,14 +9,8 @@

- Full documentation Full documentation
{/if} diff --git a/packages/dashboard/src/components/guards/UserHasRole.svelte b/packages/dashboard/src/components/guards/UserHasRole.svelte index 7d6f8fa2..447ec6d1 100644 --- a/packages/dashboard/src/components/guards/UserHasRole.svelte +++ b/packages/dashboard/src/components/guards/UserHasRole.svelte @@ -1,9 +1,5 @@ -
-

- Frequently asked questions -

+
+

Frequently asked questions

- Legacy accounts have access to existing projects and features, but - cannot create new projects or use new features. + Legacy accounts have access to existing projects and features, but cannot create new projects or use new + features.

- If you upgrade to a paid plan and then downgrade again, you will still - have access to your Legacy projects and features, but any new projects - and features created on a paid plan will no longer work. + If you upgrade to a paid plan and then downgrade again, you will still have access to your Legacy projects and + features, but any new projects and features created on a paid plan will no longer work.

- PocketHost is committed to giving back to the open source community that - helps create PocketHost and PocketBase. + PocketHost is committed to giving back to the open source community that helps create PocketHost and PocketBase.

- 10% of net proceeds (after expenses) are donated back to the community. - Specifically, PocketHost makes donations to the PocketBase project and - major contributors to the PocketHost project. -

-

- In addition, 1% of membership fees is collected by Stripe to reduce - carbon footprints around the world. + 10% of net proceeds (after expenses) are donated back to the community. Specifically, PocketHost makes donations + to the PocketBase project and major contributors to the PocketHost project.

+

In addition, 1% of membership fees is collected by Stripe to reduce carbon footprints around the world.

- When we say 'unlimited', we mean it in the Fair Use sense of the word. - Obviously, everything has limits. In our study of PocketHost usage - patterns, we found that even the busiest and most successful PocketHost - instances rarely stress our system. + When we say 'unlimited', we mean it in the Fair Use sense of the word. Obviously, everything has limits. In our + study of PocketHost usage patterns, we found that even the busiest and most successful PocketHost instances + rarely stress our system.

- PocketHost is a haven for developers who want to launch and iterate - quickly on ideas without worrying about metering and infrastructure. + PocketHost is a haven for developers who want to launch and iterate quickly on ideas without worrying about + metering and infrastructure.

- If your app gets big and it starts affecting the system, we'll talk - about an enterprise plan or a dedicated setup. + If your app gets big and it starts affecting the system, we'll talk about an enterprise plan or a dedicated + setup.

- Please enjoy PocketHost knowing that you can use as much storage, - bandwidth, and CPU as your application requires under normal operating - conditions. Let us handle the hosting so you can get back to work. + Please enjoy PocketHost knowing that you can use as much storage, bandwidth, and CPU as your application + requires under normal operating conditions. Let us handle the hosting so you can get back to work.

+

Short version: We only want your money if you are happy.

- Short version: We only want your money if you are happy. -

-

- Long version: If you need to cancel your membership for any reason, - please contact .noaxis on Discord. If you cancel within the first 5 days of a signup or renewal, we'll - refund the full amount. Otherwise, we'll pro-rate it. Sound good? + >. If you cancel within the first 5 days of a signup or renewal, we'll refund the full amount. Otherwise, we'll + pro-rate it. Sound good?

- If you create additional instances and then downgrade to the free plan, - the extra instances will remain accessible in your dashboard, but they - will not run. + If you create additional instances and then downgrade to the free plan, the extra instances will remain + accessible in your dashboard, but they will not run.

diff --git a/packages/dashboard/src/routes/(app)/dashboard/InstanceList.svelte b/packages/dashboard/src/routes/(app)/dashboard/InstanceList.svelte index 0b336b9e..f8e9889e 100644 --- a/packages/dashboard/src/routes/(app)/dashboard/InstanceList.svelte +++ b/packages/dashboard/src/routes/(app)/dashboard/InstanceList.svelte @@ -23,7 +23,7 @@ } -{#each values($globalInstancesStore).sort( (a, b) => a.subdomain.localeCompare(b.subdomain), ) as instance, index} +{#each values($globalInstancesStore).sort((a, b) => a.subdomain.localeCompare(b.subdomain)) as instance, index}
diff --git a/packages/dashboard/src/routes/(app)/dashboard/Main.svelte b/packages/dashboard/src/routes/(app)/dashboard/Main.svelte index 654e0eb9..3a09cbc6 100644 --- a/packages/dashboard/src/routes/(app)/dashboard/Main.svelte +++ b/packages/dashboard/src/routes/(app)/dashboard/Main.svelte @@ -1,9 +1,5 @@ - {isReady ? $instance.subdomain : 'Instance'} overview - PocketHost + {isReady ? $instance.subdomain : 'Instance'} overview - PocketHost {#if isReady} -
+
-

+

{$instance.subdomain}

@@ -77,19 +68,13 @@
- +
{#if !$instance.power}
- +
{/if} @@ -101,29 +86,17 @@ Overview
  • - Secrets + Secrets
  • Logs
  • - FTP Access + FTP Access
  • - - PocketBase Logo + + PocketBase Logo Admin @@ -136,36 +109,22 @@
  • diff --git a/packages/dashboard/src/routes/(app)/instances/[instanceId]/Overview.svelte b/packages/dashboard/src/routes/(app)/instances/[instanceId]/Overview.svelte index aece9cc5..7d1bdf43 100644 --- a/packages/dashboard/src/routes/(app)/instances/[instanceId]/Overview.svelte +++ b/packages/dashboard/src/routes/(app)/instances/[instanceId]/Overview.svelte @@ -38,9 +38,10 @@
    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.noaxis on Discord to get set up.
    {/if} @@ -57,18 +58,10 @@

    Additional Resources:

    diff --git a/packages/dashboard/src/routes/(app)/instances/[instanceId]/Toggle.svelte b/packages/dashboard/src/routes/(app)/instances/[instanceId]/Toggle.svelte index 0d408a1f..df41e401 100644 --- a/packages/dashboard/src/routes/(app)/instances/[instanceId]/Toggle.svelte +++ b/packages/dashboard/src/routes/(app)/instances/[instanceId]/Toggle.svelte @@ -16,17 +16,12 @@