From 9ea9b83fee38568fecdd79f4ffb91dc902eb90cd Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Mon, 24 May 2021 16:19:29 +0100
Subject: [PATCH 1/4] Add real Budibase space logo as the default logo

---
 packages/builder/assets/bb-space-black.svg    | 18 +++++++++++++
 packages/builder/assets/bb-space-purple.svg   | 25 +++++++++++++++++++
 .../src/pages/builder/admin/index.svelte      |  5 ++--
 .../src/pages/builder/apps/index.svelte       |  3 ++-
 .../src/pages/builder/auth/forgot.svelte      |  3 ++-
 .../src/pages/builder/auth/login.svelte       |  5 ++--
 .../src/pages/builder/auth/reset.svelte       | 11 ++++----
 .../src/pages/builder/invite/index.svelte     |  5 ++--
 .../src/pages/builder/portal/_layout.svelte   |  6 ++---
 .../builder/src/stores/portal/organisation.js |  2 +-
 packages/builder/vite.config.js               |  4 +++
 11 files changed, 68 insertions(+), 19 deletions(-)
 create mode 100644 packages/builder/assets/bb-space-black.svg
 create mode 100644 packages/builder/assets/bb-space-purple.svg

diff --git a/packages/builder/assets/bb-space-black.svg b/packages/builder/assets/bb-space-black.svg
new file mode 100644
index 0000000000..fa1743f90c
--- /dev/null
+++ b/packages/builder/assets/bb-space-black.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+     viewBox="0 0 46.39 46.39" style="enable-background:new 0 0 46.39 46.39;" xml:space="preserve">
+<style type="text/css">
+    .st0{fill:#FFFFFF;}
+</style>
+    <g>
+    <path class="st0" d="M45.28,22.9c-0.49,28.44-42.79,28.43-43.27,0C2.5-5.54,44.8-5.54,45.28,22.9z"/>
+        <path d="M23.65,45.45c-29.64-0.48-29.63-44.63,0-45.1C53.28,0.82,53.28,44.98,23.65,45.45z M23.65,2.18
+        c-27.09,0.09-27.09,41.36,0,41.44C50.74,43.53,50.74,2.26,23.65,2.18z"/>
+        <path d="M41.94,21.07C38.86,8.69,3.47,8.77,5.01,24.45C5.74,49.51,46.24,46.16,41.94,21.07z"/>
+        <path class="st0" d="M14.69,22.35c0.06,4.27-6.65,4.27-6.58,0C8.05,18.08,14.76,18.08,14.69,22.35z"/>
+        <path class="st0" d="M11.07,28.39c0.02,1.7-2.65,1.7-2.62,0C8.42,26.68,11.09,26.68,11.07,28.39z"/>
+        <path class="st0" d="M30.56,16.2c0.28-1.27,6.76,0.79,8.45,5.64c1.69,4.84-2.11,12.22-3.52,11.43
+        C36.02,25.33,37.44,22.84,30.56,16.2z"/>
+</g>
+</svg>
\ No newline at end of file
diff --git a/packages/builder/assets/bb-space-purple.svg b/packages/builder/assets/bb-space-purple.svg
new file mode 100644
index 0000000000..ccfb8b220d
--- /dev/null
+++ b/packages/builder/assets/bb-space-purple.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+     viewBox="0 0 34.41 34.41" style="enable-background:new 0 0 34.41 34.41;" xml:space="preserve">
+<style type="text/css">
+    .st0{fill:#FFFFFF;stroke:url(#SVGID_1_);stroke-miterlimit:10;}
+    .st1{fill:url(#SVGID_2_);}
+    .st2{fill:#FFFFFF;}
+</style>
+    <g>
+    <linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="0.9311" y1="17.2025" x2="33.4739" y2="17.2025">
+        <stop  offset="0" style="stop-color:#9E99FF"/>
+        <stop  offset="1" style="stop-color:#5C45FF"/>
+    </linearGradient>
+        <path class="st0" d="M17.2,33.2c-21.03-0.34-21.03-31.67,0-32C38.23,1.54,38.23,32.87,17.2,33.2z"/>
+        <linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="3.9435" y1="20.058" x2="30.407" y2="20.058">
+        <stop  offset="0" style="stop-color:#9E99FF"/>
+            <stop  offset="1" style="stop-color:#5C45FF"/>
+    </linearGradient>
+        <path class="st1" d="M30.18,15.91C27.99,7.12,2.89,7.18,3.98,18.3C4.5,36.09,33.23,33.71,30.18,15.91z"/>
+        <path class="st2" d="M6.42,21.1c-0.02-1.21,1.88-1.21,1.86,0C8.29,22.3,6.4,22.3,6.42,21.1z"/>
+        <path class="st2" d="M6.18,16.81c-0.04-3.03,4.72-3.03,4.67,0C10.89,19.84,6.13,19.84,6.18,16.81z"/>
+        <path class="st2" d="M25.61,24.56c0.38-5.63,1.38-7.4-3.5-12.11c0.2-0.9,4.8,0.56,6,4C29.3,19.88,26.61,25.12,25.61,24.56z"/>
+</g>
+</svg>
\ No newline at end of file
diff --git a/packages/builder/src/pages/builder/admin/index.svelte b/packages/builder/src/pages/builder/admin/index.svelte
index 6baf927973..b63eab849b 100644
--- a/packages/builder/src/pages/builder/admin/index.svelte
+++ b/packages/builder/src/pages/builder/admin/index.svelte
@@ -9,8 +9,9 @@
   } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
   import api from "builderStore/api"
-  import { admin, organisation } from "stores/portal"
+  import { admin } from "stores/portal"
   import PasswordRepeatInput from "components/common/users/PasswordRepeatInput.svelte"
+  import Logo from "assets/bb-space-black.svg"
 
   let adminUser = {}
   let error
@@ -35,7 +36,7 @@
 <section>
   <div class="container">
     <Layout>
-      <img src={$organisation.logoUrl || "https://i.imgur.com/ZKyklgF.png"} />
+      <img src={Logo} />
       <Layout gap="XS" justifyItems="center" noPadding>
         <Heading size="M">Create an admin user</Heading>
         <Body size="M" textAlign="center">
diff --git a/packages/builder/src/pages/builder/apps/index.svelte b/packages/builder/src/pages/builder/apps/index.svelte
index 5fb75a43be..0365efa1a3 100644
--- a/packages/builder/src/pages/builder/apps/index.svelte
+++ b/packages/builder/src/pages/builder/apps/index.svelte
@@ -19,6 +19,7 @@
   import UpdateUserInfoModal from "components/settings/UpdateUserInfoModal.svelte"
   import ChangePasswordModal from "components/settings/ChangePasswordModal.svelte"
   import { processStringSync } from "@budibase/string-templates"
+  import Logo from "assets/bb-space-black.svg"
 
   let loaded = false
   let userInfoModal
@@ -38,7 +39,7 @@
     <Page>
       <div class="content">
         <Layout noPadding>
-          <img src={$organisation.logoUrl} />
+          <img src={$organisation.logoUrl || Logo} />
           <div class="info-title">
             <Layout noPadding gap="XS">
               <Heading size="L">
diff --git a/packages/builder/src/pages/builder/auth/forgot.svelte b/packages/builder/src/pages/builder/auth/forgot.svelte
index f26c3bfc2b..f56293313a 100644
--- a/packages/builder/src/pages/builder/auth/forgot.svelte
+++ b/packages/builder/src/pages/builder/auth/forgot.svelte
@@ -8,6 +8,7 @@
     Heading,
   } from "@budibase/bbui"
   import { organisation, auth } from "stores/portal"
+  import Logo from "assets/bb-space-black.svg"
 
   let email = ""
 
@@ -25,7 +26,7 @@
   <div class="main">
     <Layout>
       <Layout noPadding justifyItems="center">
-        <img src={$organisation.logoUrl || "https://i.imgur.com/ZKyklgF.png"} />
+        <img src={$organisation.logoUrl || Logo} />
       </Layout>
       <Layout gap="XS" noPadding>
         <Heading textAlign="center">Forgotten your password?</Heading>
diff --git a/packages/builder/src/pages/builder/auth/login.svelte b/packages/builder/src/pages/builder/auth/login.svelte
index 1cc032fb2c..734a26cbf5 100644
--- a/packages/builder/src/pages/builder/auth/login.svelte
+++ b/packages/builder/src/pages/builder/auth/login.svelte
@@ -10,8 +10,9 @@
     notifications,
   } from "@budibase/bbui"
   import { goto, params } from "@roxi/routify"
-  import { auth, organisation } from "stores/portal"
+  import { auth } from "stores/portal"
   import GoogleButton from "./_components/GoogleButton.svelte"
+  import Logo from "assets/bb-space-black.svg"
 
   let username = ""
   let password = ""
@@ -49,7 +50,7 @@
   <div class="main">
     <Layout>
       <Layout noPadding justifyItems="center">
-        <img src={$organisation.logoUrl || "https://i.imgur.com/ZKyklgF.png"} />
+        <img src={Logo} />
         <Heading>Sign in to Budibase</Heading>
       </Layout>
       <GoogleButton />
diff --git a/packages/builder/src/pages/builder/auth/reset.svelte b/packages/builder/src/pages/builder/auth/reset.svelte
index 2287ee5ca0..e3e6ab42d9 100644
--- a/packages/builder/src/pages/builder/auth/reset.svelte
+++ b/packages/builder/src/pages/builder/auth/reset.svelte
@@ -2,7 +2,8 @@
   import { Body, Button, Heading, Layout, notifications } from "@budibase/bbui"
   import { goto, params } from "@roxi/routify"
   import PasswordRepeatInput from "components/common/users/PasswordRepeatInput.svelte"
-  import { auth, organisation } from "stores/portal"
+  import { auth } from "stores/portal"
+  import Logo from "assets/bb-space-black.svg"
 
   const resetCode = $params["?code"]
   let password, error
@@ -33,10 +34,7 @@
   <div class="main">
     <Layout>
       <Layout noPadding justifyItems="center">
-        <img
-          src={$organisation.logoUrl || "https://i.imgur.com/ZKyklgF.png"}
-          alt="Organisation logo"
-        />
+        <img src={Logo} alt="Organisation logo" />
       </Layout>
       <Layout gap="XS" noPadding>
         <Heading textAlign="center">Reset your password</Heading>
@@ -49,8 +47,9 @@
         cta
         on:click={reset}
         disabled={error || (forceResetPassword ? false : !resetCode)}
-        >Reset your password</Button
       >
+        Reset your password
+      </Button>
     </Layout>
   </div>
 </div>
diff --git a/packages/builder/src/pages/builder/invite/index.svelte b/packages/builder/src/pages/builder/invite/index.svelte
index 65b20f8a9d..fb1a5b8281 100644
--- a/packages/builder/src/pages/builder/invite/index.svelte
+++ b/packages/builder/src/pages/builder/invite/index.svelte
@@ -1,8 +1,9 @@
 <script>
   import { Layout, Heading, Body, Button, notifications } from "@budibase/bbui"
   import { goto, params } from "@roxi/routify"
-  import { users, organisation } from "stores/portal"
+  import { users } from "stores/portal"
   import PasswordRepeatInput from "components/common/users/PasswordRepeatInput.svelte"
+  import Logo from "assets/bb-space-black.svg"
 
   const inviteCode = $params["?code"]
   let password, error
@@ -24,7 +25,7 @@
 <section>
   <div class="container">
     <Layout>
-      <img src={$organisation.logoUrl || "https://i.imgur.com/ZKyklgF.png"} />
+      <img src={Logo} />
       <Layout gap="XS" justifyItems="center" noPadding>
         <Heading size="M">Accept Invitation</Heading>
         <Body textAlign="center" size="M">
diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte
index 9dc4e19b6a..4e39c124d9 100644
--- a/packages/builder/src/pages/builder/portal/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/_layout.svelte
@@ -15,6 +15,7 @@
   import { onMount } from "svelte"
   import UpdateUserInfoModal from "components/settings/UpdateUserInfoModal.svelte"
   import ChangePasswordModal from "components/settings/ChangePasswordModal.svelte"
+  import Logo from "assets/bb-space-black.svg"
 
   let loaded = false
   let userInfoModal
@@ -74,10 +75,7 @@
       <Layout paddingX="L" paddingY="L">
         <div class="branding">
           <div class="name" on:click={() => $goto("./apps")}>
-            <img
-              src={$organisation?.logoUrl || "https://i.imgur.com/ZKyklgF.png"}
-              alt="Logotype"
-            />
+            <img src={$organisation?.logoUrl || Logo} alt="Logotype" />
             <span>{$organisation?.company || "Budibase"}</span>
           </div>
           <div class="onboarding">
diff --git a/packages/builder/src/stores/portal/organisation.js b/packages/builder/src/stores/portal/organisation.js
index 5171016b99..a0be3a5553 100644
--- a/packages/builder/src/stores/portal/organisation.js
+++ b/packages/builder/src/stores/portal/organisation.js
@@ -3,7 +3,7 @@ import api from "builderStore/api"
 
 const DEFAULT_CONFIG = {
   platformUrl: "http://localhost:1000",
-  logoUrl: "https://i.imgur.com/ZKyklgF.png",
+  logoUrl: undefined,
   docsUrl: undefined,
   company: "Budibase",
 }
diff --git a/packages/builder/vite.config.js b/packages/builder/vite.config.js
index 69b5730b5b..d8b8dbba1d 100644
--- a/packages/builder/vite.config.js
+++ b/packages/builder/vite.config.js
@@ -32,6 +32,10 @@ export default ({ mode }) => {
     resolve: {
       dedupe: ["@roxi/routify"],
       alias: [
+        {
+          find: "assets",
+          replacement: path.resolve("./assets"),
+        },
         {
           find: "components",
           replacement: path.resolve("./src/components"),

From 2c580e6b30e7c4126e239ff726cca8cd0ff1d0ee Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Mon, 24 May 2021 16:22:39 +0100
Subject: [PATCH 2/4] Fix links to apps from non-builder app list not working

---
 packages/builder/src/pages/builder/apps/index.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/apps/index.svelte b/packages/builder/src/pages/builder/apps/index.svelte
index 0365efa1a3..7ac76befcf 100644
--- a/packages/builder/src/pages/builder/apps/index.svelte
+++ b/packages/builder/src/pages/builder/apps/index.svelte
@@ -79,7 +79,7 @@
             <div class="group">
               <Layout gap="S" noPadding>
                 {#each publishedApps as app, idx (app.appId)}
-                  <a class="app" target="_blank" href={`/${app.appId}`}>
+                  <a class="app" target="_blank" href={`/${app.prodId}`}>
                     <div class="preview" use:gradient={{ seed: app.name }} />
                     <div class="app-info">
                       <Heading size="XS">{app.name}</Heading>

From d856eae6f777d739c7766097e58d8d021ee3705a Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Mon, 24 May 2021 16:28:08 +0100
Subject: [PATCH 3/4] Fix logo size on create admin screen

---
 packages/builder/src/pages/builder/admin/index.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/pages/builder/admin/index.svelte b/packages/builder/src/pages/builder/admin/index.svelte
index b63eab849b..96f0b54679 100644
--- a/packages/builder/src/pages/builder/admin/index.svelte
+++ b/packages/builder/src/pages/builder/admin/index.svelte
@@ -70,7 +70,7 @@
     align-items: stretch;
   }
   img {
-    width: 40px;
+    width: 48px;
     margin: 0 auto;
   }
 </style>

From 4a53d4c11eaa3c3294098c8b5f2746ec2648069d Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Mon, 24 May 2021 16:49:43 +0100
Subject: [PATCH 4/4] Hide developer mode option when you aren't a developer

---
 .../builder/src/pages/builder/apps/index.svelte    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/pages/builder/apps/index.svelte b/packages/builder/src/pages/builder/apps/index.svelte
index 7ac76befcf..6f8827677b 100644
--- a/packages/builder/src/pages/builder/apps/index.svelte
+++ b/packages/builder/src/pages/builder/apps/index.svelte
@@ -64,12 +64,14 @@
               >
                 Update password
               </MenuItem>
-              <MenuItem
-                icon="UserDeveloper"
-                on:click={() => $goto("../portal")}
-              >
-                Open developer mode
-              </MenuItem>
+              {#if $auth.isBuilder}
+                <MenuItem
+                  icon="UserDeveloper"
+                  on:click={() => $goto("../portal")}
+                >
+                  Open developer mode
+                </MenuItem>
+              {/if}
               <MenuItem icon="LogOut" on:click={auth.logout}>Log out</MenuItem>
             </ActionMenu>
           </div>