Browse Source

Lint fix and now diplaying the '/app/' prefix when previewing an app url

master
Dean 5 years ago
parent
commit
56d1339ffb
  1. 8
      packages/builder/src/components/start/CreateAppModal.svelte
  2. 4
      packages/builder/src/pages/builder/portal/manage/users/index.svelte

8
packages/builder/src/components/start/CreateAppModal.svelte

@ -25,8 +25,12 @@
await setupValidation() await setupValidation()
}) })
const appPrefix = "/app"
$: appUrl = `${window.location.origin}${ $: appUrl = `${window.location.origin}${
$values.url ? $values.url : `${resolveAppUrl(template, $values.name)}` $values.url
? `${appPrefix}${$values.url}`
: `${appPrefix}${resolveAppUrl(template, $values.name)}`
}` }`
const resolveAppUrl = (template, name) => { const resolveAppUrl = (template, name) => {
@ -161,7 +165,7 @@
/> />
{#if $values.url && $values.url !== "" && !$validation.errors.url} {#if $values.url && $values.url !== "" && !$validation.errors.url}
<div class="app-server" title={appUrl}> <div class="app-server" title={appUrl}>
{`${window.location.origin}${$values.url}`} {appUrl}
</div> </div>
{/if} {/if}
</span> </span>

4
packages/builder/src/pages/builder/portal/manage/users/index.svelte

@ -71,7 +71,9 @@
<Heading size="S">Users</Heading> <Heading size="S">Users</Heading>
<ButtonGroup> <ButtonGroup>
<Button disabled secondary>Import users</Button> <Button disabled secondary>Import users</Button>
<Button primary dataCy="add-user" on:click={createUserModal.show}>Add user</Button> <Button primary dataCy="add-user" on:click={createUserModal.show}
>Add user</Button
>
</ButtonGroup> </ButtonGroup>
</div> </div>
<div class="field"> <div class="field">

Loading…
Cancel
Save