Server builder under /builder rather than /app for top level to avoid confusion

hosting/envoy.dev.yaml.hbs

@@ -19,7 +19,7 @@ static_resources:
               # 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: "/app/" }
+                redirect: { path_redirect: "/builder/" }
 
               - match: { prefix: "/db/" }
                 route:
@@ -42,14 +42,14 @@ static_resources:
                 route:
                   cluster: builder-dev
 
-              - match: { prefix: "/app/" }
+              - match: { prefix: "/builder/" }
                 route:
                   cluster: builder-dev
 
-              - match: { prefix: "/app" }
+              - match: { prefix: "/builder" }
                 route:
                   cluster: builder-dev
-                  prefix_rewrite: "/app/"
+                  prefix_rewrite: "/builder/"
 
               # minio is on the default route because this works
               # best, minio + AWS SDK doesn't handle path proxy

packages/builder/cypress.json

@@ -1,5 +1,5 @@
 {
-  "baseUrl": "http://localhost:10000/app/",
+  "baseUrl": "http://localhost:10000/builder/",
   "video": true,
   "projectId": "bmbemn",
   "env": {

packages/builder/src/components/backend/DataTable/Table.svelte

@@ -59,7 +59,7 @@
 
   const selectRelationship = ({ tableId, rowId, fieldName }) => {
     $goto(
-      `/app/builder/${$params.application}/data/table/${tableId}/relationship/${rowId}/${fieldName}`
+      `/builder/app/${$params.application}/data/table/${tableId}/relationship/${rowId}/${fieldName}`
     )
   }
 

packages/builder/src/components/settings/tabs/DangerZone.svelte

@@ -11,7 +11,7 @@
     const id = $params.application
     await del(`/api/applications/${id}`)
     loading = false
-    $goto("/app")
+    $goto("/builder")
   }
 </script>
 

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={`/app/builder/${_id}`}>
+    <Link href={`/builder/app/${_id}`}>
       <Heading size="XS">
         {name}
       </Heading>

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

@@ -112,7 +112,7 @@
       }
       const userResp = await api.post(`/api/users/metadata/self`, user)
       await userResp.json()
-      $goto(`/app/builder/${appJson._id}`)
+      window.location = `/builder/app/${appJson._id}`
     } catch (error) {
       console.error(error)
       notifications.error(error)

packages/builder/src/pages/builder/_layout.svelte

@@ -11,12 +11,14 @@
     await admin.init()
     await auth.checkAuth()
     loaded = true
+  })
 
   // Force creation of an admin user if one doesn't exist
-    if (!hasAdminUser) {
+  $: {
+    if (loaded && !hasAdminUser) {
       $goto("./admin")
     }
-  })
+  }
 
   // Redirect to log in at any time if the user isn't authenticated
   $: {

packages/builder/src/pages/builder/admin/index.svelte

@@ -2,15 +2,14 @@
   import {
     Button,
     Heading,
-    Label,
     notifications,
     Layout,
     Input,
     Body,
   } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import { onMount } from "svelte"
   import api from "builderStore/api"
+  import { admin } from "stores/portal"
 
   let adminUser = {}
 
@@ -18,13 +17,15 @@
     try {
       // Save the admin user
       const response = await api.post(`/api/admin/users/init`, adminUser)
-
       const json = await response.json()
-      if (response.status !== 200) throw new Error(json.message)
+      if (response.status !== 200) {
-      notifications.success(`Admin user created.`)
+        throw new Error(json.message)
+      }
+      notifications.success(`Admin user created`)
+      await admin.init()
       $goto("../portal")
     } catch (err) {
-      notifications.error(`Failed to create admin user.`)
+      notifications.error(`Failed to create admin user`)
     }
   }
 </script>

packages/builder/src/pages/builder/portal/_layout.svelte

@@ -35,19 +35,19 @@
   onMount(getInfo)
 
   let menu = [
-    { title: "Apps", href: "/app/portal/apps" },
+    { title: "Apps", href: "/builder/portal/apps" },
-    { title: "Drafts", href: "/app/portal/drafts" },
+    { title: "Drafts", href: "/builder/portal/drafts" },
-    { title: "Users", href: "/app/portal/users", heading: "Manage" },
+    { title: "Users", href: "/builder/portal/users", heading: "Manage" },
-    { title: "Groups", href: "/app/portal/groups" },
+    { title: "Groups", href: "/builder/portal/groups" },
-    { title: "Auth", href: "/app/portal/oauth" },
+    { title: "Auth", href: "/builder/portal/oauth" },
-    { title: "Email", href: "/app/portal/email" },
+    { title: "Email", href: "/builder/portal/email" },
     {
       title: "General",
-      href: "/app/portal/settings/general",
+      href: "/builder/portal/settings/general",
       heading: "Settings",
     },
-    { title: "Theming", href: "/app/portal/theming" },
+    { title: "Theming", href: "/builder/portal/theming" },
-    { title: "Account", href: "/app/portal/account" },
+    { title: "Account", href: "/builder/portal/account" },
   ]
 </script>
 

packages/builder/src/pages/index.svelte

@@ -1,4 +1,4 @@
 <script>
   import { goto } from "@roxi/routify"
-  $goto("./app")
+  $goto("./builder")
 </script>

packages/builder/vite.config.js

@@ -6,7 +6,7 @@ import path from "path"
 export default ({ mode }) => {
   const isProduction = mode === "production"
   return {
-    base: "/app/",
+    base: "/builder/",
     build: {
       minify: isProduction,
       outDir: "../server/builder",