From 1712f559aa76c0f0d412c6f50260879190118ea2 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 6 May 2021 16:39:34 +0100
Subject: [PATCH] Update routing to serve any builder routes under /app so that
 envoy can proxy correctly

---
 packages/builder/cypress.json                 |  2 +-
 .../backend/DataTable/RowFieldControl.svelte  |  2 +-
 .../components/backend/DataTable/Table.svelte |  2 +-
 .../DataTable/modals/ManageAccessModal.svelte |  2 +-
 .../IntegrationConfigForm.svelte              |  2 +-
 .../common/bindings/BindingPanel.svelte       |  2 +-
 .../common/bindings/ServerBindingPanel.svelte |  2 +-
 .../AppPreview/CurrentItemPreview.svelte      |  5 +++--
 .../PropertyControls/PropertyControl.svelte   |  2 +-
 .../settings/tabs/DangerZone.svelte           |  2 +-
 .../src/components/start/AppCard.svelte       |  2 +-
 .../src/pages/{ => app}/_layout.svelte        |  0
 .../src/pages/{ => app}/admin/index.svelte    |  0
 .../src/pages/{ => app}/auth/index.svelte     |  0
 .../src/pages/{ => app}/auth/login.svelte     |  0
 .../builder/[application]/_reset.svelte       |  4 ++--
 .../automate/[automation]/_layout.svelte      |  0
 .../automate/[automation]/index.svelte        |  0
 .../[application]/automate/_layout.svelte     |  0
 .../[application]/automate/index.svelte       |  0
 .../builder/[application]/data/_layout.svelte |  0
 .../[query]/_layout.svelte                    |  0
 .../[selectedDatasource]/[query]/index.svelte |  0
 .../[selectedDatasource]/_layout.svelte       |  0
 .../[selectedDatasource]/index.svelte         |  2 +-
 .../data/datasource/_layout.svelte            |  0
 .../data/datasource/index.svelte              |  0
 .../builder/[application]/data/index.svelte   |  0
 .../data/table/[selectedTable]/_layout.svelte |  0
 .../data/table/[selectedTable]/index.svelte   |  0
 .../[selectedField]/index.svelte              |  0
 .../relationship/[selectedRow]/index.svelte   |  0
 .../[selectedTable]/relationship/index.svelte |  0
 .../[application]/data/table/_layout.svelte   |  0
 .../[application]/data/table/index.svelte     |  0
 .../data/view/[selectedView]/_layout.svelte   |  0
 .../data/view/[selectedView]/index.svelte     |  0
 .../[application]/deploy/_layout.svelte       |  0
 .../builder/[application]/deploy/index.svelte |  0
 .../[assetType]/[asset]/_fallback.svelte      |  0
 .../design/[assetType]/_layout.svelte         |  0
 .../design/[assetType]/index.svelte           |  0
 .../[application]/design/_layout.svelte       |  0
 .../builder/[application]/design/index.svelte |  0
 .../builder/[application]/index.svelte        |  0
 .../[application]/settings/_layout.svelte     |  0
 .../[application]/settings/index.svelte       |  0
 .../src/pages/{ => app}/builder/index.svelte  |  0
 packages/builder/src/pages/app/index.svelte   |  4 ++++
 .../src/pages/{ => app}/portal/_layout.svelte | 22 +++++++++++--------
 .../{ => app}/portal/apps/_layout.svelte      |  0
 .../pages/{ => app}/portal/apps/index.svelte  |  0
 .../src/pages/{ => app}/portal/index.svelte   |  0
 .../pages/{ => app}/portal/oauth/index.svelte |  0
 .../portal/oauth/logos/Google.svelte          |  0
 .../{ => app}/portal/settings/_layout.svelte  |  0
 .../{ => app}/portal/settings/general.svelte  |  0
 .../{ => app}/portal/settings/index.svelte    |  0
 packages/builder/src/pages/index.svelte       |  2 +-
 packages/builder/vite.config.js               |  4 ++++
 60 files changed, 38 insertions(+), 25 deletions(-)
 rename packages/builder/src/pages/{ => app}/_layout.svelte (100%)
 rename packages/builder/src/pages/{ => app}/admin/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/auth/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/auth/login.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/_reset.svelte (97%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/automate/[automation]/_layout.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/automate/[automation]/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/automate/_layout.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/automate/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/data/_layout.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/data/datasource/[selectedDatasource]/[query]/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/data/datasource/[selectedDatasource]/_layout.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/data/datasource/[selectedDatasource]/index.svelte (98%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/data/datasource/_layout.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/data/datasource/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/data/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/data/table/[selectedTable]/_layout.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/data/table/[selectedTable]/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/data/table/[selectedTable]/relationship/[selectedRow]/[selectedField]/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/data/table/[selectedTable]/relationship/[selectedRow]/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/data/table/[selectedTable]/relationship/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/data/table/_layout.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/data/table/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/data/view/[selectedView]/_layout.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/data/view/[selectedView]/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/deploy/_layout.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/deploy/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/design/[assetType]/[asset]/_fallback.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/design/[assetType]/_layout.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/design/[assetType]/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/design/_layout.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/design/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/settings/_layout.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/[application]/settings/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/builder/index.svelte (100%)
 create mode 100644 packages/builder/src/pages/app/index.svelte
 rename packages/builder/src/pages/{ => app}/portal/_layout.svelte (86%)
 rename packages/builder/src/pages/{ => app}/portal/apps/_layout.svelte (100%)
 rename packages/builder/src/pages/{ => app}/portal/apps/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/portal/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/portal/oauth/index.svelte (100%)
 rename packages/builder/src/pages/{ => app}/portal/oauth/logos/Google.svelte (100%)
 rename packages/builder/src/pages/{ => app}/portal/settings/_layout.svelte (100%)
 rename packages/builder/src/pages/{ => app}/portal/settings/general.svelte (100%)
 rename packages/builder/src/pages/{ => app}/portal/settings/index.svelte (100%)

diff --git a/packages/builder/cypress.json b/packages/builder/cypress.json
index 669ee5af34..236cd3803e 100644
--- a/packages/builder/cypress.json
+++ b/packages/builder/cypress.json
@@ -1,5 +1,5 @@
 {
-  "baseUrl": "http://localhost:10000/builder/",
+  "baseUrl": "http://localhost:10000/app/",
   "video": true,
   "projectId": "bmbemn",
   "env": {
diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
index 46c77d6411..5dd63fdaed 100644
--- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
+++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Input, Select, DatePicker, Toggle, TextArea } from "@budibase/bbui"
   import Dropzone from "components/common/Dropzone.svelte"
-  import { capitalise } from "../../../helpers"
+  import { capitalise } from "helpers"
   import LinkedRowSelector from "components/common/LinkedRowSelector.svelte"
 
   export let defaultValue
diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte
index 5c66a5b740..d3f4b8cf4b 100644
--- a/packages/builder/src/components/backend/DataTable/Table.svelte
+++ b/packages/builder/src/components/backend/DataTable/Table.svelte
@@ -59,7 +59,7 @@
 
   const selectRelationship = ({ tableId, rowId, fieldName }) => {
     $goto(
-      `/builder/${$params.application}/data/table/${tableId}/relationship/${rowId}/${fieldName}`
+      `/app/builder/${$params.application}/data/table/${tableId}/relationship/${rowId}/${fieldName}`
     )
   }
 
diff --git a/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte b/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte
index 14cb572ff1..e3df066171 100644
--- a/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte
@@ -8,7 +8,7 @@
     Body,
     ModalContent,
   } from "@budibase/bbui"
-  import { capitalise } from "../../../../helpers"
+  import { capitalise } from "helpers"
 
   export let resourceId
   export let permissions
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
index e442afd08d..575399ed7a 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Label, Input, Layout } from "@budibase/bbui"
   import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
-  import { capitalise } from "../../../../helpers"
+  import { capitalise } from "helpers"
 
   export let integration
   export let schema
diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte
index 9576f7526f..37e7f520f3 100644
--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@@ -14,7 +14,7 @@
     getBindableProperties,
     readableToRuntimeBinding,
   } from "builderStore/dataBinding"
-  import { currentAsset, store } from "../../../builderStore"
+  import { currentAsset, store } from "builderStore"
   import { handlebarsCompletions } from "constants/completions"
   import { addToText } from "./utils"
 
diff --git a/packages/builder/src/components/common/bindings/ServerBindingPanel.svelte b/packages/builder/src/components/common/bindings/ServerBindingPanel.svelte
index cabc9c9dfb..ca6d211a2a 100644
--- a/packages/builder/src/components/common/bindings/ServerBindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/ServerBindingPanel.svelte
@@ -10,7 +10,7 @@
   import { createEventDispatcher } from "svelte"
   import { isValid } from "@budibase/string-templates"
   import { handlebarsCompletions } from "constants/completions"
-  import { readableToRuntimeBinding } from "../../../builderStore/dataBinding"
+  import { readableToRuntimeBinding } from "builderStore/dataBinding"
   import { addToText } from "./utils"
 
   const dispatch = createEventDispatcher()
diff --git a/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte b/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
index cb56877ae3..69287fac38 100644
--- a/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
+++ b/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
@@ -3,7 +3,7 @@
   import { store, currentAsset, selectedComponent } from "builderStore"
   import iframeTemplate from "./iframeTemplate"
   import { Screen } from "builderStore/store/screenTemplates/utils/Screen"
-  import { FrontendTypes } from "../../../constants"
+  import { FrontendTypes } from "constants"
 
   let iframe
   let layout
@@ -82,7 +82,8 @@
     style="height: 100%; width: 100%"
     title="componentPreview"
     bind:this={iframe}
-    srcdoc={template} />
+    srcdoc={template}
+  />
 </div>
 
 <style>
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte
index a993400c32..857a8279bf 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte
@@ -7,7 +7,7 @@
     runtimeToReadableBinding,
   } from "builderStore/dataBinding"
   import BindingPanel from "components/common/bindings/BindingPanel.svelte"
-  import { capitalise } from "../../../../helpers"
+  import { capitalise } from "helpers"
 
   export let label = ""
   export let bindable = true
diff --git a/packages/builder/src/components/settings/tabs/DangerZone.svelte b/packages/builder/src/components/settings/tabs/DangerZone.svelte
index 1144e8c666..d8a0c27fe7 100644
--- a/packages/builder/src/components/settings/tabs/DangerZone.svelte
+++ b/packages/builder/src/components/settings/tabs/DangerZone.svelte
@@ -11,7 +11,7 @@
     const id = $params.application
     await del(`/api/applications/${id}`)
     loading = false
-    $goto("/builder/")
+    $goto("/app")
   }
 </script>
 
diff --git a/packages/builder/src/components/start/AppCard.svelte b/packages/builder/src/components/start/AppCard.svelte
index cc4c8ee4bf..afeb72f77d 100644
--- a/packages/builder/src/components/start/AppCard.svelte
+++ b/packages/builder/src/components/start/AppCard.svelte
@@ -36,7 +36,7 @@
 <Layout noPadding gap="XS">
   <div class="preview" use:gradient />
   <div class="title">
-    <Link href={`/builder/${_id}`}>
+    <Link href={`/app/builder/${_id}`}>
       <Heading size="XS">
         {name}
       </Heading>
diff --git a/packages/builder/src/pages/_layout.svelte b/packages/builder/src/pages/app/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/_layout.svelte
rename to packages/builder/src/pages/app/_layout.svelte
diff --git a/packages/builder/src/pages/admin/index.svelte b/packages/builder/src/pages/app/admin/index.svelte
similarity index 100%
rename from packages/builder/src/pages/admin/index.svelte
rename to packages/builder/src/pages/app/admin/index.svelte
diff --git a/packages/builder/src/pages/auth/index.svelte b/packages/builder/src/pages/app/auth/index.svelte
similarity index 100%
rename from packages/builder/src/pages/auth/index.svelte
rename to packages/builder/src/pages/app/auth/index.svelte
diff --git a/packages/builder/src/pages/auth/login.svelte b/packages/builder/src/pages/app/auth/login.svelte
similarity index 100%
rename from packages/builder/src/pages/auth/login.svelte
rename to packages/builder/src/pages/app/auth/login.svelte
diff --git a/packages/builder/src/pages/builder/[application]/_reset.svelte b/packages/builder/src/pages/app/builder/[application]/_reset.svelte
similarity index 97%
rename from packages/builder/src/pages/builder/[application]/_reset.svelte
rename to packages/builder/src/pages/app/builder/[application]/_reset.svelte
index b025f94549..98846b3db7 100644
--- a/packages/builder/src/pages/builder/[application]/_reset.svelte
+++ b/packages/builder/src/pages/app/builder/[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
diff --git a/packages/builder/src/pages/builder/[application]/automate/[automation]/_layout.svelte b/packages/builder/src/pages/app/builder/[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/app/builder/[application]/automate/[automation]/_layout.svelte
diff --git a/packages/builder/src/pages/builder/[application]/automate/[automation]/index.svelte b/packages/builder/src/pages/app/builder/[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/app/builder/[application]/automate/[automation]/index.svelte
diff --git a/packages/builder/src/pages/builder/[application]/automate/_layout.svelte b/packages/builder/src/pages/app/builder/[application]/automate/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/[application]/automate/_layout.svelte
rename to packages/builder/src/pages/app/builder/[application]/automate/_layout.svelte
diff --git a/packages/builder/src/pages/builder/[application]/automate/index.svelte b/packages/builder/src/pages/app/builder/[application]/automate/index.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/[application]/automate/index.svelte
rename to packages/builder/src/pages/app/builder/[application]/automate/index.svelte
diff --git a/packages/builder/src/pages/builder/[application]/data/_layout.svelte b/packages/builder/src/pages/app/builder/[application]/data/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/[application]/data/_layout.svelte
rename to packages/builder/src/pages/app/builder/[application]/data/_layout.svelte
diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/[selectedDatasource]/[query]/_layout.svelte b/packages/builder/src/pages/app/builder/[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/app/builder/[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/app/builder/[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/app/builder/[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/app/builder/[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/app/builder/[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/app/builder/[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/app/builder/[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/app/builder/[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/app/builder/[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/app/builder/[application]/data/datasource/_layout.svelte
diff --git a/packages/builder/src/pages/builder/[application]/data/datasource/index.svelte b/packages/builder/src/pages/app/builder/[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/app/builder/[application]/data/datasource/index.svelte
diff --git a/packages/builder/src/pages/builder/[application]/data/index.svelte b/packages/builder/src/pages/app/builder/[application]/data/index.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/[application]/data/index.svelte
rename to packages/builder/src/pages/app/builder/[application]/data/index.svelte
diff --git a/packages/builder/src/pages/builder/[application]/data/table/[selectedTable]/_layout.svelte b/packages/builder/src/pages/app/builder/[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/app/builder/[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/app/builder/[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/app/builder/[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/app/builder/[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/app/builder/[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/app/builder/[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/app/builder/[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/app/builder/[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/app/builder/[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/app/builder/[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/app/builder/[application]/data/table/_layout.svelte
diff --git a/packages/builder/src/pages/builder/[application]/data/table/index.svelte b/packages/builder/src/pages/app/builder/[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/app/builder/[application]/data/table/index.svelte
diff --git a/packages/builder/src/pages/builder/[application]/data/view/[selectedView]/_layout.svelte b/packages/builder/src/pages/app/builder/[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/app/builder/[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/app/builder/[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/app/builder/[application]/data/view/[selectedView]/index.svelte
diff --git a/packages/builder/src/pages/builder/[application]/deploy/_layout.svelte b/packages/builder/src/pages/app/builder/[application]/deploy/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/[application]/deploy/_layout.svelte
rename to packages/builder/src/pages/app/builder/[application]/deploy/_layout.svelte
diff --git a/packages/builder/src/pages/builder/[application]/deploy/index.svelte b/packages/builder/src/pages/app/builder/[application]/deploy/index.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/[application]/deploy/index.svelte
rename to packages/builder/src/pages/app/builder/[application]/deploy/index.svelte
diff --git a/packages/builder/src/pages/builder/[application]/design/[assetType]/[asset]/_fallback.svelte b/packages/builder/src/pages/app/builder/[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/app/builder/[application]/design/[assetType]/[asset]/_fallback.svelte
diff --git a/packages/builder/src/pages/builder/[application]/design/[assetType]/_layout.svelte b/packages/builder/src/pages/app/builder/[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/app/builder/[application]/design/[assetType]/_layout.svelte
diff --git a/packages/builder/src/pages/builder/[application]/design/[assetType]/index.svelte b/packages/builder/src/pages/app/builder/[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/app/builder/[application]/design/[assetType]/index.svelte
diff --git a/packages/builder/src/pages/builder/[application]/design/_layout.svelte b/packages/builder/src/pages/app/builder/[application]/design/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/[application]/design/_layout.svelte
rename to packages/builder/src/pages/app/builder/[application]/design/_layout.svelte
diff --git a/packages/builder/src/pages/builder/[application]/design/index.svelte b/packages/builder/src/pages/app/builder/[application]/design/index.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/[application]/design/index.svelte
rename to packages/builder/src/pages/app/builder/[application]/design/index.svelte
diff --git a/packages/builder/src/pages/builder/[application]/index.svelte b/packages/builder/src/pages/app/builder/[application]/index.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/[application]/index.svelte
rename to packages/builder/src/pages/app/builder/[application]/index.svelte
diff --git a/packages/builder/src/pages/builder/[application]/settings/_layout.svelte b/packages/builder/src/pages/app/builder/[application]/settings/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/[application]/settings/_layout.svelte
rename to packages/builder/src/pages/app/builder/[application]/settings/_layout.svelte
diff --git a/packages/builder/src/pages/builder/[application]/settings/index.svelte b/packages/builder/src/pages/app/builder/[application]/settings/index.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/[application]/settings/index.svelte
rename to packages/builder/src/pages/app/builder/[application]/settings/index.svelte
diff --git a/packages/builder/src/pages/builder/index.svelte b/packages/builder/src/pages/app/builder/index.svelte
similarity index 100%
rename from packages/builder/src/pages/builder/index.svelte
rename to packages/builder/src/pages/app/builder/index.svelte
diff --git a/packages/builder/src/pages/app/index.svelte b/packages/builder/src/pages/app/index.svelte
new file mode 100644
index 0000000000..dc44c9e636
--- /dev/null
+++ b/packages/builder/src/pages/app/index.svelte
@@ -0,0 +1,4 @@
+<script>
+  import { goto } from "@roxi/routify"
+  $goto("./portal")
+</script>
diff --git a/packages/builder/src/pages/portal/_layout.svelte b/packages/builder/src/pages/app/portal/_layout.svelte
similarity index 86%
rename from packages/builder/src/pages/portal/_layout.svelte
rename to packages/builder/src/pages/app/portal/_layout.svelte
index c22229da15..2c80768e7a 100644
--- a/packages/builder/src/pages/portal/_layout.svelte
+++ b/packages/builder/src/pages/app/portal/_layout.svelte
@@ -35,15 +35,19 @@
   onMount(getInfo)
 
   let menu = [
-    { title: "Apps", href: "/portal/apps" },
-    { title: "Drafts", href: "/portal/drafts" },
-    { title: "Users", href: "/portal/users", heading: "Manage" },
-    { title: "Groups", href: "/portal/groups" },
-    { title: "Auth", href: "/portal/oauth" },
-    { title: "Email", href: "/portal/email" },
-    { title: "General", href: "/portal/settings/general", heading: "Settings" },
-    { title: "Theming", href: "/portal/theming" },
-    { title: "Account", href: "/portal/account" },
+    { title: "Apps", href: "/app/portal/apps" },
+    { title: "Drafts", href: "/app/portal/drafts" },
+    { title: "Users", href: "/app/portal/users", heading: "Manage" },
+    { title: "Groups", href: "/app/portal/groups" },
+    { title: "Auth", href: "/app/portal/oauth" },
+    { title: "Email", href: "/app/portal/email" },
+    {
+      title: "General",
+      href: "/app/portal/settings/general",
+      heading: "Settings",
+    },
+    { title: "Theming", href: "/app/portal/theming" },
+    { title: "Account", href: "/app/portal/account" },
   ]
 </script>
 
diff --git a/packages/builder/src/pages/portal/apps/_layout.svelte b/packages/builder/src/pages/app/portal/apps/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/portal/apps/_layout.svelte
rename to packages/builder/src/pages/app/portal/apps/_layout.svelte
diff --git a/packages/builder/src/pages/portal/apps/index.svelte b/packages/builder/src/pages/app/portal/apps/index.svelte
similarity index 100%
rename from packages/builder/src/pages/portal/apps/index.svelte
rename to packages/builder/src/pages/app/portal/apps/index.svelte
diff --git a/packages/builder/src/pages/portal/index.svelte b/packages/builder/src/pages/app/portal/index.svelte
similarity index 100%
rename from packages/builder/src/pages/portal/index.svelte
rename to packages/builder/src/pages/app/portal/index.svelte
diff --git a/packages/builder/src/pages/portal/oauth/index.svelte b/packages/builder/src/pages/app/portal/oauth/index.svelte
similarity index 100%
rename from packages/builder/src/pages/portal/oauth/index.svelte
rename to packages/builder/src/pages/app/portal/oauth/index.svelte
diff --git a/packages/builder/src/pages/portal/oauth/logos/Google.svelte b/packages/builder/src/pages/app/portal/oauth/logos/Google.svelte
similarity index 100%
rename from packages/builder/src/pages/portal/oauth/logos/Google.svelte
rename to packages/builder/src/pages/app/portal/oauth/logos/Google.svelte
diff --git a/packages/builder/src/pages/portal/settings/_layout.svelte b/packages/builder/src/pages/app/portal/settings/_layout.svelte
similarity index 100%
rename from packages/builder/src/pages/portal/settings/_layout.svelte
rename to packages/builder/src/pages/app/portal/settings/_layout.svelte
diff --git a/packages/builder/src/pages/portal/settings/general.svelte b/packages/builder/src/pages/app/portal/settings/general.svelte
similarity index 100%
rename from packages/builder/src/pages/portal/settings/general.svelte
rename to packages/builder/src/pages/app/portal/settings/general.svelte
diff --git a/packages/builder/src/pages/portal/settings/index.svelte b/packages/builder/src/pages/app/portal/settings/index.svelte
similarity index 100%
rename from packages/builder/src/pages/portal/settings/index.svelte
rename to packages/builder/src/pages/app/portal/settings/index.svelte
diff --git a/packages/builder/src/pages/index.svelte b/packages/builder/src/pages/index.svelte
index dc44c9e636..4767d8b38e 100644
--- a/packages/builder/src/pages/index.svelte
+++ b/packages/builder/src/pages/index.svelte
@@ -1,4 +1,4 @@
 <script>
   import { goto } from "@roxi/routify"
-  $goto("./portal")
+  $goto("./app")
 </script>
diff --git a/packages/builder/vite.config.js b/packages/builder/vite.config.js
index 4125dec77e..09c3e6ab63 100644
--- a/packages/builder/vite.config.js
+++ b/packages/builder/vite.config.js
@@ -56,6 +56,10 @@ export default ({ mode }) => {
           find: "actions",
           replacement: path.resolve("./src/actions"),
         },
+        {
+          find: "helpers",
+          replacement: path.resolve("./src/helpers"),
+        },
       ],
     },
   }