.env enhancement for pocketbase domain/subdomain

This commit is contained in:
Ben Allfree
2022-10-13 11:39:31 -07:00
parent 1563ca2c11
commit 873333b1ff
4 changed files with 10 additions and 10 deletions

View File

@@ -1,7 +1,7 @@
import { PUBLIC_APP_DOMAIN, PUBLIC_CORE_PB_SUBDOMAIN } from '$env/static/public'
import { PUBLIC_PB_DOMAIN, PUBLIC_PB_SUBDOMAIN } from '$env/static/public'
import { createPocketbaseClient } from '@pockethost/common'
const url = `https://${PUBLIC_CORE_PB_SUBDOMAIN}.${PUBLIC_APP_DOMAIN}`
const url = `https://${PUBLIC_PB_SUBDOMAIN}.${PUBLIC_PB_DOMAIN}`
const client = createPocketbaseClient(url)
export { client }

View File

@@ -7,7 +7,7 @@
import ProvisioningStatus from '$components/ProvisioningStatus/ProvisioningStatus.svelte'
import { ProvisioningSize } from '$components/ProvisioningStatus/types'
import Title from '$components/Title/Title.svelte'
import { PUBLIC_APP_DOMAIN } from '$env/static/public'
import { PUBLIC_PB_DOMAIN } from '$env/static/public'
import { client } from '$src/pocketbase'
import { assertExists } from '@pockethost/common/src/assert'
import { InstanceStatus, type Instance_Out } from '@pockethost/common/src/schema'
@@ -28,7 +28,7 @@
instance = r
assertExists(instance, `Expected instance here`)
const { subdomain } = instance
url = `https://${subdomain}.${PUBLIC_APP_DOMAIN}`
url = `https://${subdomain}.${PUBLIC_PB_DOMAIN}`
code = `const url = '${url}'\nconst client = new PocketBase(url)`
})
})

View File

@@ -5,7 +5,7 @@
import Error from '$components/Error/Error.svelte'
import Protected from '$components/Protected.svelte'
import Title from '$components/Title/Title.svelte'
import { PUBLIC_APP_DOMAIN } from '$env/static/public'
import { PUBLIC_PB_DOMAIN } from '$env/static/public'
import { client } from '$src/pocketbase'
import { redirect } from '$util/redirect'
import { faRefresh } from '@fortawesome/free-solid-svg-icons'
@@ -24,7 +24,7 @@
let errorMessage: string[] = []
let code = ''
$: {
code = `const url = 'https://${instanceName}.${PUBLIC_APP_DOMAIN}'\nconst client = new PocketBase(url)`
code = `const url = 'https://${instanceName}.${PUBLIC_PB_DOMAIN}'\nconst client = new PocketBase(url)`
}
const handleCreate = () => {
@@ -61,7 +61,7 @@
name="instanceName"
type="text"
bind:value={instanceName}
/>.{PUBLIC_APP_DOMAIN}
/>.{PUBLIC_PB_DOMAIN}
</div>
<Error>{errorMessage.join('<br/>')}</Error>
<Button click={handleCreate}>Create</Button>

View File

@@ -5,7 +5,7 @@
import Protected from '$components/Protected.svelte'
import ProvisioningStatus from '$components/ProvisioningStatus/ProvisioningStatus.svelte'
import Title from '$components/Title/Title.svelte'
import { PUBLIC_APP_DOMAIN } from '$env/static/public'
import { PUBLIC_PB_DOMAIN } from '$env/static/public'
import { client } from '$src/pocketbase'
import {
InstanceStatus,
@@ -56,7 +56,7 @@
<ProvisioningStatus status={app.status} />
</Col>
<Col>
{app.subdomain}.{PUBLIC_APP_DOMAIN}
{app.subdomain}.{PUBLIC_PB_DOMAIN}
</Col>
<Col>
@@ -66,7 +66,7 @@
disabled={!isRunning(app)}
size={ButtonSizes.Micro}
click={() => {
window.open(`https://${app.subdomain}.${PUBLIC_APP_DOMAIN}/_`)
window.open(`https://${app.subdomain}.${PUBLIC_PB_DOMAIN}/_`)
}}>Admin</Button
>
</Col>