diff --git a/hosting/envoy.dev.yaml.hbs b/hosting/envoy.dev.yaml.hbs index 3a7e73c89c..6cb1c804a9 100644 --- a/hosting/envoy.dev.yaml.hbs +++ b/hosting/envoy.dev.yaml.hbs @@ -16,6 +16,11 @@ static_resources: - name: local_services domains: ["*"] routes: + # special case to redirect specifically the route path + # to the builder, if this were a prefix then it would break minio + - match: { path: "/" } + redirect: { path_redirect: "/builder/" } + - match: { prefix: "/db/" } route: cluster: couchdb-service @@ -33,7 +38,11 @@ static_resources: route: cluster: server-dev - - match: { prefix: "/" } + - match: { path: "/" } + route: + cluster: builder-dev + + - match: { prefix: "/builder/" } route: cluster: builder-dev @@ -41,7 +50,7 @@ static_resources: route: cluster: builder-dev prefix_rewrite: "/builder/" - + # minio is on the default route because this works # best, minio + AWS SDK doesn't handle path proxy - match: { prefix: "/" } diff --git a/hosting/envoy.yaml b/hosting/envoy.yaml index d2202ff870..95db418352 100644 --- a/hosting/envoy.yaml +++ b/hosting/envoy.yaml @@ -21,7 +21,6 @@ static_resources: cluster: app-service prefix_rewrite: "/" - # special case for presenting our static self hosting page - match: { path: "/" } route: cluster: app-service diff --git a/packages/bbui/src/ActionMenu/ActionMenu.svelte b/packages/bbui/src/ActionMenu/ActionMenu.svelte index 6947e69a7e..8f17f260a8 100644 --- a/packages/bbui/src/ActionMenu/ActionMenu.svelte +++ b/packages/bbui/src/ActionMenu/ActionMenu.svelte @@ -4,6 +4,7 @@ import Menu from "../Menu/Menu.svelte" export let disabled = false + export let align = "left" let anchor let dropdown @@ -31,7 +32,7 @@
- + diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte index 05fb196064..26e9d4e007 100644 --- a/packages/bbui/src/Form/Core/Picker.svelte +++ b/packages/bbui/src/Form/Core/Picker.svelte @@ -19,6 +19,7 @@ export let getOptionValue = option => option export let open = false export let readonly = false + export let quiet = false const dispatch = createEventDispatcher() const onClick = e => { @@ -33,6 +34,7 @@ - - - - - - diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte index 77f8b655f5..b15001b788 100644 --- a/packages/builder/src/pages/builder/_layout.svelte +++ b/packages/builder/src/pages/builder/_layout.svelte @@ -1,116 +1,33 @@ -{#if $auth} - {#if $auth.user} -
-
- - -
-
- -
-
- {:else} - - {/if} +{#if loaded} + {/if} - - diff --git a/packages/builder/src/pages/builder/admin/index.svelte b/packages/builder/src/pages/builder/admin/index.svelte new file mode 100644 index 0000000000..d3027f881e --- /dev/null +++ b/packages/builder/src/pages/builder/admin/index.svelte @@ -0,0 +1,78 @@ + + +
+
+ + + +
+ + Create an admin user + The admin user has access to everything in Budibase. + +
+ + + + + + + +
+
+ + diff --git a/packages/builder/src/pages/builder/[application]/_reset.svelte b/packages/builder/src/pages/builder/app/[application]/_reset.svelte similarity index 96% rename from packages/builder/src/pages/builder/[application]/_reset.svelte rename to packages/builder/src/pages/builder/app/[application]/_reset.svelte index 8a9e047f23..98846b3db7 100644 --- a/packages/builder/src/pages/builder/[application]/_reset.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_reset.svelte @@ -6,9 +6,9 @@ import ThemeEditorDropdown from "components/settings/ThemeEditorDropdown.svelte" import FeedbackNavLink from "components/feedback/FeedbackNavLink.svelte" import { get } from "builderStore/api" - import { isActive, goto, layout, params } from "@roxi/routify" + import { isActive, goto, layout } from "@roxi/routify" import Logo from "/assets/bb-logo.svg" - import { capitalise } from "../../../helpers" + import { capitalise } from "helpers" // Get Package and set store export let application @@ -60,7 +60,7 @@ budibase icon $goto(`/builder/`)} + on:click={() => $goto(`../../portal/`)} /> diff --git a/packages/builder/src/pages/builder/[application]/automate/[automation]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/automate/[automation]/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/automate/[automation]/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/automate/[automation]/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/automate/[automation]/index.svelte b/packages/builder/src/pages/builder/app/[application]/automate/[automation]/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/automate/[automation]/index.svelte rename to packages/builder/src/pages/builder/app/[application]/automate/[automation]/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/automate/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/automate/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/automate/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/automate/index.svelte b/packages/builder/src/pages/builder/app/[application]/automate/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/automate/index.svelte rename to packages/builder/src/pages/builder/app/[application]/automate/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/data/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte rename to packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte similarity index 98% rename from packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte rename to packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte index c0f8b99778..7651eed33d 100644 --- a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte @@ -5,7 +5,7 @@ import { notifications } from "@budibase/bbui" import IntegrationConfigForm from "components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte" import ICONS from "components/backend/DatasourceNavigator/icons" - import { capitalise } from "../../../../../../helpers" + import { capitalise } from "helpers" let unsaved = false diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/datasource/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/data/datasource/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/datasource/index.svelte rename to packages/builder/src/pages/builder/app/[application]/data/datasource/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/index.svelte rename to packages/builder/src/pages/builder/app/[application]/data/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[selectedTable]/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/data/table/[selectedTable]/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[selectedTable]/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/index.svelte rename to packages/builder/src/pages/builder/app/[application]/data/table/[selectedTable]/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/relationship/[selectedRow]/[selectedField]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[selectedTable]/relationship/[selectedRow]/[selectedField]/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/relationship/[selectedRow]/[selectedField]/index.svelte rename to packages/builder/src/pages/builder/app/[application]/data/table/[selectedTable]/relationship/[selectedRow]/[selectedField]/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte rename to packages/builder/src/pages/builder/app/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/relationship/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[selectedTable]/relationship/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/relationship/index.svelte rename to packages/builder/src/pages/builder/app/[application]/data/table/[selectedTable]/relationship/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/table/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/table/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/data/table/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/table/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/table/index.svelte rename to packages/builder/src/pages/builder/app/[application]/data/table/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/view/[selectedView]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/view/[selectedView]/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/view/[selectedView]/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/data/view/[selectedView]/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/data/view/[selectedView]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/view/[selectedView]/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/data/view/[selectedView]/index.svelte rename to packages/builder/src/pages/builder/app/[application]/data/view/[selectedView]/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/deploy/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/deploy/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/deploy/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/deploy/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/deploy/index.svelte b/packages/builder/src/pages/builder/app/[application]/deploy/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/deploy/index.svelte rename to packages/builder/src/pages/builder/app/[application]/deploy/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/design/[assetType]/[asset]/_fallback.svelte b/packages/builder/src/pages/builder/app/[application]/design/[assetType]/[asset]/_fallback.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/design/[assetType]/[asset]/_fallback.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[assetType]/[asset]/_fallback.svelte diff --git a/packages/builder/src/pages/builder/[application]/design/[assetType]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[assetType]/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/design/[assetType]/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[assetType]/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/design/[assetType]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[assetType]/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/design/[assetType]/index.svelte rename to packages/builder/src/pages/builder/app/[application]/design/[assetType]/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/design/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/design/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/design/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/design/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/design/index.svelte rename to packages/builder/src/pages/builder/app/[application]/design/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/index.svelte b/packages/builder/src/pages/builder/app/[application]/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/index.svelte rename to packages/builder/src/pages/builder/app/[application]/index.svelte diff --git a/packages/builder/src/pages/builder/[application]/settings/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/settings/_layout.svelte rename to packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte diff --git a/packages/builder/src/pages/builder/[application]/settings/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/[application]/settings/index.svelte rename to packages/builder/src/pages/builder/app/[application]/settings/index.svelte diff --git a/packages/builder/src/pages/builder/app/index.svelte b/packages/builder/src/pages/builder/app/index.svelte new file mode 100644 index 0000000000..110b5e83d9 --- /dev/null +++ b/packages/builder/src/pages/builder/app/index.svelte @@ -0,0 +1,4 @@ + diff --git a/packages/builder/src/pages/builder/auth/index.svelte b/packages/builder/src/pages/builder/auth/index.svelte new file mode 100644 index 0000000000..bf30c6b310 --- /dev/null +++ b/packages/builder/src/pages/builder/auth/index.svelte @@ -0,0 +1,4 @@ + diff --git a/packages/builder/src/pages/builder/auth/login.svelte b/packages/builder/src/pages/builder/auth/login.svelte new file mode 100644 index 0000000000..b3efe9c121 --- /dev/null +++ b/packages/builder/src/pages/builder/auth/login.svelte @@ -0,0 +1,5 @@ + + + diff --git a/packages/builder/src/pages/builder/index.svelte b/packages/builder/src/pages/builder/index.svelte index 53e4d8a950..dc44c9e636 100644 --- a/packages/builder/src/pages/builder/index.svelte +++ b/packages/builder/src/pages/builder/index.svelte @@ -1,123 +1,4 @@ - -
-
- Welcome to the Budibase Beta - - - - -
- - - - - - -
- - - - - - diff --git a/packages/builder/src/pages/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte similarity index 60% rename from packages/builder/src/pages/portal/_layout.svelte rename to packages/builder/src/pages/builder/portal/_layout.svelte index 92c2b82ff4..5019edb56e 100644 --- a/packages/builder/src/pages/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -1,49 +1,53 @@ @@ -51,7 +55,7 @@