diff --git a/development.md b/development.md
index a4958530..07cab492 100644
--- a/development.md
+++ b/development.md
@@ -9,7 +9,7 @@ cp .env-template-frontend-only .env
yarn dev
```
-That's it. Youre in business. Your local Svelte build will talk to the pockethost.io mothership and connect to that for all database-related tasks.
+That's it. You're in business. Your local Svelte build will talk to the pockethost.io mothership and connect to that for all database-related tasks.
# Developing the backend using `docker-compose`
@@ -26,7 +26,7 @@ cd pockethost
**Edit `/etc/hosts`**
-You need at least 3 host entries. One for the main domain, one for the database that tracks everything (the main pockethost.io db), and one (or more) for any instances you want to create an test. Wildcarding is not supported in `/etc/hosts`, so you have to make a manual entry for any PB instance you want to create and test. See `.etc-hosts-sample` for details.
+You need at least 3 host entries. One for the main domain, one for the database that tracks everything (the main pockethost.io db), and one (or more) for any instances you want to create a test. Wildcarding is not supported in `/etc/hosts`, so you have to make a manual entry for any PB instance you want to create and test. See `.etc-hosts-sample` for details.
```
127.0.0.1 pockethost.local # The main domain
@@ -38,7 +38,7 @@ You need at least 3 host entries. One for the main domain, one for the database
_Any time you change the PocketBase code, you need to rebuild (`yarn build:_`) and restart `docker-compose`\_
-This is to build the binary that runs INSIDE Docker. The Docker container will run using the same architecture as the host machine. If you are running an x86 machine, you'll probably need `build:386`. If you're running on Linux or Mac, then `arm64` is the one you want. You can try them both if you aren't sure. The worst that will appen is the `pocketbase` binary won't execute in Docker and you'll quickly discover that.
+This is to build the binary that runs INSIDE Docker. The Docker container will run using the same architecture as the host machine. If you are running an x86 machine, you'll probably need `build:386`. If you're running on Linux or Mac, then `arm64` is the one you want. You can try them both if you aren't sure. The worst that will happen is the `pocketbase` binary won't execute in Docker and you'll quickly discover that.
```bash
cd packages/pocketbase
diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts
index 37c05fe2..510f3c4e 100644
--- a/packages/common/src/index.ts
+++ b/packages/common/src/index.ts
@@ -1,3 +1,3 @@
export * from './assert'
-export * from './pocketbase'
+export * from './RealtimeSubscriptionManager'
export * from './schema'
diff --git a/packages/pockethost.io/.prettierignore b/packages/pockethost.io/.prettierignore
index 38972655..cb3c1f57 100644
--- a/packages/pockethost.io/.prettierignore
+++ b/packages/pockethost.io/.prettierignore
@@ -11,3 +11,6 @@ node_modules
pnpm-lock.yaml
package-lock.json
yarn.lock
+
+# Source files
+/src/assets/_bootstrap.css
\ No newline at end of file
diff --git a/packages/pockethost.io/.prettierrc b/packages/pockethost.io/.prettierrc
index bf509a7f..0b157833 100644
--- a/packages/pockethost.io/.prettierrc
+++ b/packages/pockethost.io/.prettierrc
@@ -1,19 +1,16 @@
{
- "useTabs": false,
- "singleQuote": true,
- "semi": false,
- "trailingComma": "none",
- "printWidth": 100,
- "pluginSearchDirs": [
- ".",
- "../.."
- ],
- "overrides": [
- {
- "files": "*.svelte",
- "options": {
- "parser": "svelte"
- }
- }
- ]
-}
\ No newline at end of file
+ "useTabs": false,
+ "singleQuote": true,
+ "semi": false,
+ "trailingComma": "none",
+ "printWidth": 100,
+ "pluginSearchDirs": [".", "../.."],
+ "overrides": [
+ {
+ "files": "*.svelte",
+ "options": {
+ "parser": "svelte"
+ }
+ }
+ ]
+}
diff --git a/packages/pockethost.io/package.json b/packages/pockethost.io/package.json
index 32192874..2470c297 100644
--- a/packages/pockethost.io/package.json
+++ b/packages/pockethost.io/package.json
@@ -1,41 +1,41 @@
{
- "name": "@pockethost/app",
- "version": "0.0.1",
- "private": true,
- "scripts": {
- "dev": "vite dev",
- "build": "vite build",
- "preview": "vite preview",
- "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
- "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
- "lint": "prettier --check .",
- "format": "prettier --write .",
- "serve": "node dist-server/index.js",
- "watch": "chokidar 'src/**' -c 'yarn build' --initial"
- },
- "devDependencies": {
- "@sveltejs/adapter-auto": "next",
- "@sveltejs/kit": "next",
- "chokidar-cli": "^3.0.0",
- "svelte": "^3.44.0",
- "svelte-check": "^2.7.1",
- "svelte-preprocess": "^4.10.6",
- "tslib": "^2.3.1",
- "typescript": "^4.7.4",
- "vite": "^3.1.0"
- },
- "type": "module",
- "dependencies": {
- "@fortawesome/free-brands-svg-icons": "^6.2.0",
- "@fortawesome/free-solid-svg-icons": "^6.2.0",
- "@pockethost/common": "0.0.1",
- "@s-libs/micro-dash": "12",
- "@sveltejs/adapter-node": "^1.0.0-next.92",
- "pocketbase": "^0.7.0",
- "random-word-slugs": "^0.1.6",
- "sass": "^1.54.9",
- "svelte-fa": "^3.0.3",
- "svelte-highlight": "^6.2.1",
- "sveltestrap": "^5.9.0"
- }
-}
\ No newline at end of file
+ "name": "@pockethost/app",
+ "version": "0.0.1",
+ "private": true,
+ "scripts": {
+ "dev": "vite dev",
+ "build": "vite build",
+ "preview": "vite preview",
+ "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
+ "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
+ "lint": "prettier --check .",
+ "format": "prettier --write .",
+ "serve": "node dist-server/index.js",
+ "watch": "chokidar 'src/**' -c 'yarn build' --initial"
+ },
+ "devDependencies": {
+ "@sveltejs/adapter-auto": "next",
+ "@sveltejs/kit": "next",
+ "chokidar-cli": "^3.0.0",
+ "svelte": "^3.44.0",
+ "svelte-check": "^2.7.1",
+ "svelte-preprocess": "^4.10.6",
+ "tslib": "^2.3.1",
+ "typescript": "^4.7.4",
+ "vite": "^3.1.0"
+ },
+ "type": "module",
+ "dependencies": {
+ "@fortawesome/free-brands-svg-icons": "^6.2.0",
+ "@fortawesome/free-solid-svg-icons": "^6.2.0",
+ "@pockethost/common": "0.0.1",
+ "@s-libs/micro-dash": "12",
+ "@sveltejs/adapter-node": "^1.0.0-next.92",
+ "pocketbase": "^0.7.0",
+ "random-word-slugs": "^0.1.6",
+ "sass": "^1.54.9",
+ "svelte-fa": "^3.0.3",
+ "svelte-highlight": "^6.2.1",
+ "sveltestrap": "^5.9.0"
+ }
+}
diff --git a/packages/pockethost.io/src/app.html b/packages/pockethost.io/src/app.html
index 68cfb073..7e5d793d 100644
--- a/packages/pockethost.io/src/app.html
+++ b/packages/pockethost.io/src/app.html
@@ -1,25 +1,40 @@
-
-
-
-
+
+
+
+
-
+
-
-
-
+
+
+
-
+
-
+
- %sveltekit.head%
-
-
-
A backend for your next app is as fast as signing up. No provisioning servers, no Docker fiddling, just B(ad)aaS productivity.
+
+ A backend for your next app is as fast as signing up. No provisioning servers, no Docker
+ fiddling, just B(ad)aaS productivity.
+
Sign up
@@ -43,44 +58,73 @@
-
With PocketHost, batteries are included. You get a database, outgoing email, SSL, authentication, cloud functions, and high concurrency all in one stop.
+
+ With PocketHost, batteries are included. You get a database, outgoing email, SSL,
+ authentication, cloud functions, and high concurrency all in one stop.
+
Email and oAuth authentication options work out of the box. Send transactional email to your users from our verified domain and your custom address yoursubdomin@pockethost.local.
+
+ Email and oAuth authentication options work out of the box. Send transactional email to
+ your users from our verified domain and your custom address yoursubdomin@pockethost.local.
+
-
PocketHost securely stores your files on Amazon S3, or you can use your own key to manage your own storage.
+
+ PocketHost securely stores your files on Amazon S3, or you can use your own key to
+ manage your own storage.
+
PocketHost is perfect for hobbist, low, and medium volume sites and apps.
-
PocketHost, and the underlying PocketBase, can scale to well over 10,000 simultaneous connections.
+
+ PocketHost, and the underlying PocketBase, can scale to well over 10,000 simultaneous
+ connections.
+
-
When you're ready to take your project in-house, we have you covered. You can export your entire PocketHost environment along with a Dockerfile to run it.
+
+ When you're ready to take your project in-house, we have you covered. You can export
+ your entire PocketHost environment along with a Dockerfile to run it.
+
-
PocketHost is powered by Svelte, Vite, Typescript, PocketBase, and SQLite. Because the entire stack is open source, you'll never be locked into the whims of a vendor.
+
+ PocketHost is powered by Svelte, Vite, Typescript, PocketBase, and SQLite. Because the
+ entire stack is open source, you'll never be locked into the whims of a vendor.
+
The PocketHost instance you are seeking does not exist.
Please check the instance URL and try again.
-
diff --git a/packages/pockethost.io/src/util/database.ts b/packages/pockethost.io/src/util/database.ts
new file mode 100644
index 00000000..bf91947e
--- /dev/null
+++ b/packages/pockethost.io/src/util/database.ts
@@ -0,0 +1,170 @@
+import { client } from '$src/pocketbase'
+import { InstanceStatus } from '@pockethost/common'
+import { redirect } from './redirect'
+const { authViaEmail, createUser, user, createInstance } = client
+
+export type FormErrorHandler = (value: string) => void
+
+export const handleFormError = (error: any, setError?: FormErrorHandler) => {
+ console.error(`Form error: ${error}`, { error })
+ if (setError) {
+ const message = client.parseError(error)[0]
+ setError(message)
+ } else {
+ throw error
+ }
+}
+
+/**
+ * This will log a user into Pocketbase, and includes an optional error handler
+ * @param email {string} The email of the user
+ * @param password {string} The password of the user
+ * @param setError {function} This can be used to show an alert bar if an error occurs during the login process
+ * @param shouldRedirect {boolean} This will redirect the user to the dashboard when they are logged in
+ */
+export const handleLogin = async (
+ email: string,
+ password: string,
+ setError?: FormErrorHandler,
+ shouldRedirect: boolean = true
+) => {
+ // Reset the form error if the form is submitted
+ setError?.('')
+
+ try {
+ await authViaEmail(email, password)
+
+ if (shouldRedirect) {
+ redirect('/dashboard')
+ }
+ } catch (error: any) {
+ handleFormError(error, setError)
+ }
+}
+
+/**
+ * This will register a new user into Pocketbase, and includes an optional error handler
+ * @param email {string} The email of the user
+ * @param password {string} The password of the user
+ * @param setError {function} This can be used to show an alert bar if an error occurs during the login process
+ */
+export const handleRegistration = async (
+ email: string,
+ password: string,
+ setError?: FormErrorHandler
+) => {
+ // Reset the form error if the form is submitted
+ setError?.('')
+
+ try {
+ await createUser(email, password)
+ } catch (error: any) {
+ handleFormError(error, setError)
+ }
+}
+
+export const handleCreateNewInstance = async (
+ instanceName: string,
+ setError?: FormErrorHandler
+) => {
+ // Get the newly created user id
+ const { id } = user() || {}
+
+ try {
+ // Prechecks
+ if (!instanceName) throw new Error(`Instance name is required`)
+ if (!id) throw new Error(`Must be logged in to create an instance`)
+
+ // Create a new instance using the generated name
+ const record = await createInstance({
+ subdomain: instanceName,
+ uid: id,
+ status: InstanceStatus.Idle
+ })
+
+ redirect(`/app/instances/${record.id}`)
+ } catch (error: any) {
+ handleFormError(error, setError)
+ }
+}
+
+export const handleInstanceGeneratorWidget = async (
+ email: string,
+ password: string,
+ instanceName: string,
+ setError = (value: string) => {}
+) => {
+ try {
+ // Handle user creation/signin
+ // First, attempt to log in using the provided credentials.
+ // If they have a password manager or anything like that, it will have
+ // populated the form with their existing login. Try using it.
+ await handleLogin(email, password, undefined, false)
+ .then(() => {
+ console.log(`Account ${email} already exists. Logged in.`)
+ })
+ .catch((e) => {
+ console.warn(`Login failed, attempting account creation.`)
+ // This means login has failed.
+ // Either their credentials were incorrect, or the account
+ // did not exist, or there is a system issue.
+ // Try creating the account. This will fail if the email address
+ // is already in use.
+ return handleRegistration(email, password)
+ .then(() => {
+ console.log(`Account created, proceeding to log in.`)
+ // This means registration succeeded. That's good.
+ // Log in using the new credentials
+ return handleLogin(email, password, undefined, false)
+ .then(() => {
+ console.log(`Logged in after account creation`)
+ })
+ .catch((e) => {
+ console.error(`Panic, auth system down`)
+ // This should never happen.
+ // If registration succeeds, login should always succeed.
+ // If a login fails at this point, the system is broken.
+ throw new Error(
+ `Login system is currently down. Please contact us so we can fix this.`
+ )
+ })
+ })
+ .catch((e) => {
+ console.warn(`User input error`)
+ // This is just for clarity
+ // If registration fails at this point, it means both
+ // login and account creation failed.
+ // This means there is something wrong with the user input.
+ // Bail out to show errors
+ // Transform the errors so they mention a problem with account creation.
+ const messages = client.parseError(e)
+ throw new Error(`Account creation: ${messages[0]}`)
+ })
+ })
+
+ console.log(`User before instance creation is `, user())
+ // We can only get here if we are successfully logged in using the credentials
+ // provided by the user.
+ // Instance creation could still fail if the name is taken
+ await handleCreateNewInstance(instanceName)
+ .then(() => {
+ console.log(`Creation of ${instanceName} succeeded`)
+ })
+ .catch((e) => {
+ console.warn(`Creation of ${instanceName} failed`)
+ // The instance creation could most likely fail if the name is taken.
+ // In any case, bail out to show errors.
+ if (e.data?.data?.subdomain?.code === 'validation_not_unique') {
+ // Handle this special and common case
+ throw new Error(`Instance name already taken.`)
+ }
+ // The errors remaining errors are kind of generic, so transofrm them into something about
+ // the instance name.
+ const messages = client.parseError(e)
+ throw new Error(`Instance creation: ${messages[0]}`)
+ })
+ } catch (error: any) {
+ console.error(`Caught widget error`, { error })
+ handleFormError(error, setError)
+ }
+}
diff --git a/packages/pockethost.io/src/util/stores.ts b/packages/pockethost.io/src/util/stores.ts
new file mode 100644
index 00000000..1963ceeb
--- /dev/null
+++ b/packages/pockethost.io/src/util/stores.ts
@@ -0,0 +1,3 @@
+import { writable } from 'svelte/store'
+
+const instanceCreationWidgetName = writable(0)
diff --git a/packages/pockethost.io/src/util/utilities.ts b/packages/pockethost.io/src/util/utilities.ts
new file mode 100644
index 00000000..6e5ca4f3
--- /dev/null
+++ b/packages/pockethost.io/src/util/utilities.ts
@@ -0,0 +1,3 @@
+export const getRandomElementFromArray = (array: string[]) => {
+ return array[Math.floor(Math.random() * array.length)]
+}
diff --git a/packages/pockethost.io/static/global.css b/packages/pockethost.io/static/global.css
index ffdb57f5..322fa29d 100644
--- a/packages/pockethost.io/static/global.css
+++ b/packages/pockethost.io/static/global.css
@@ -1,15 +1,41 @@
-body, p,
-h1, h2, h3, h4, h5, h6 {
- font-family: 'Inter', sans-serif;
+body {
}
-h1, h2, h3, h4, h5, h6 {
- font-weight: 700;
+body,
+p,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+ font-family: 'Inter', sans-serif;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+ font-weight: 700;
}
.btn.btn-primary {
- --bs-btn-border-radius: 50px;
- --bs-btn-bg: #0072f5;
- --bs-btn-padding-x: 24px;
- --bs-btn-padding-y: 8px;
-}
\ No newline at end of file
+ --bs-btn-border-radius: 50px;
+ --bs-btn-bg: #965de9;
+ --bs-btn-padding-x: 24px;
+ --bs-btn-padding-y: 8px;
+}
+
+.dropdown-menu {
+ --bs-dropdown-item-padding-y: 12px;
+}
+
+.alert {
+ --bs-alert-border-radius: 18px;
+}
+
+.form-control {
+ border-radius: 18px;
+}
diff --git a/packages/pockethost.io/static/images/logo-square.png b/packages/pockethost.io/static/images/logo-square.png
new file mode 100644
index 00000000..4d4d1954
Binary files /dev/null and b/packages/pockethost.io/static/images/logo-square.png differ
diff --git a/packages/pockethost.io/svelte.config.js b/packages/pockethost.io/svelte.config.js
index bcc1a892..c3838a63 100644
--- a/packages/pockethost.io/svelte.config.js
+++ b/packages/pockethost.io/svelte.config.js
@@ -3,19 +3,19 @@ import preprocess from 'svelte-preprocess'
/** @type {import('@sveltejs/kit').Config} */
const config = {
- // Consult https://github.com/sveltejs/svelte-preprocess
- // for more information about preprocessors
- preprocess: preprocess(),
+ // Consult https://github.com/sveltejs/svelte-preprocess
+ // for more information about preprocessors
+ preprocess: preprocess(),
- kit: {
- adapter: adapter({ out: 'dist-server' }),
- alias: {
- $components: './src/components',
- $util: './src/util',
- $src: './src'
- }
- },
- target: '#svelte'
+ kit: {
+ adapter: adapter({ out: 'dist-server' }),
+ alias: {
+ $components: './src/components',
+ $util: './src/util',
+ $src: './src'
+ }
+ },
+ target: '#svelte'
}
export default config
diff --git a/packages/pockethost.io/tsconfig.json b/packages/pockethost.io/tsconfig.json
index 3446fbd7..64a2aba8 100644
--- a/packages/pockethost.io/tsconfig.json
+++ b/packages/pockethost.io/tsconfig.json
@@ -1,23 +1,23 @@
{
- "extends": "./.svelte-kit/tsconfig.json",
- "compilerOptions": {
- "baseUrl": "",
- "allowJs": true,
- "checkJs": true,
- "esModuleInterop": true,
- "forceConsistentCasingInFileNames": true,
- "resolveJsonModule": true,
- "skipLibCheck": true,
- "sourceMap": true,
- "strict": true,
- "paths": {
- "$util/*": ["src/util/*"],
- "$components/*": ["src/components/*"],
- "$src/*": ["src/*"]
- }
- }
- // Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias
- //
- // If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
- // from the referenced tsconfig.json - TypeScript does not merge them in
+ "extends": "./.svelte-kit/tsconfig.json",
+ "compilerOptions": {
+ "baseUrl": "",
+ "allowJs": true,
+ "checkJs": true,
+ "esModuleInterop": true,
+ "forceConsistentCasingInFileNames": true,
+ "resolveJsonModule": true,
+ "skipLibCheck": true,
+ "sourceMap": true,
+ "strict": true,
+ "paths": {
+ "$util/*": ["src/util/*"],
+ "$components/*": ["src/components/*"],
+ "$src/*": ["src/*"]
+ }
+ }
+ // Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias
+ //
+ // If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
+ // from the referenced tsconfig.json - TypeScript does not merge them in
}
- 
+