From 6702eed782ccf891db6d269d5082f6613dd347e0 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 6 May 2021 13:57:36 +0100 Subject: [PATCH 01/28] Add quiet prop to BBUI select --- packages/bbui/src/Form/Core/Picker.svelte | 2 ++ packages/bbui/src/Form/Core/Select.svelte | 2 ++ packages/bbui/src/Form/Select.svelte | 2 ++ 3 files changed, 6 insertions(+) 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 @@ - - + The admin user has access to everything in budibase. + + + + + + + + @@ -56,14 +55,19 @@ justify-content: center; height: 100%; } - - header { + .container { + margin: 0 auto; + width: 260px; + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: stretch; + } + .container :global(p, h1) { text-align: center; - width: 80%; + } + img { + width: 40px; margin: 0 auto; } - - .config-form { - margin-bottom: 42px; - } From 817511b47ca4926f1a06a5a17000185bbc7b188c Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 6 May 2021 14:16:17 +0100 Subject: [PATCH 08/28] Fix app card text size and bug with global css rule --- .../builder/src/components/start/AppCard.svelte | 7 ++++--- packages/builder/src/pages/admin/index.svelte | 14 +++++++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/packages/builder/src/components/start/AppCard.svelte b/packages/builder/src/components/start/AppCard.svelte index bb558f07d0..e68d8c0313 100644 --- a/packages/builder/src/components/start/AppCard.svelte +++ b/packages/builder/src/components/start/AppCard.svelte @@ -37,7 +37,7 @@
- + {name} @@ -47,8 +47,9 @@
- Edited {Math.floor(1 + Math.random() * 10)} months ago + + Edited {Math.floor(1 + Math.random() * 10)} months ago + {#if Math.random() > 0.5} {/if} diff --git a/packages/builder/src/pages/admin/index.svelte b/packages/builder/src/pages/admin/index.svelte index 18f20bb0d6..9bcc6029c6 100644 --- a/packages/builder/src/pages/admin/index.svelte +++ b/packages/builder/src/pages/admin/index.svelte @@ -34,10 +34,14 @@ - - Create an admin user - The admin user has access to everything in budibase. - +
+ + Create an admin user + The admin user has access to everything in Budibase. + +
@@ -63,7 +67,7 @@ justify-content: flex-start; align-items: stretch; } - .container :global(p, h1) { + .center { text-align: center; } img { From 4a813b40786a462b0385a2fddc3266ff9fe76ee0 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 6 May 2021 14:47:21 +0100 Subject: [PATCH 09/28] Add new auth page to handle login and future work on reset password etc --- packages/builder/src/pages/auth/index.svelte | 0 packages/builder/src/pages/auth/login.svelte | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 packages/builder/src/pages/auth/index.svelte create mode 100644 packages/builder/src/pages/auth/login.svelte diff --git a/packages/builder/src/pages/auth/index.svelte b/packages/builder/src/pages/auth/index.svelte new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/builder/src/pages/auth/login.svelte b/packages/builder/src/pages/auth/login.svelte new file mode 100644 index 0000000000..e69de29bb2 From 3530d4658312f43be0fe70f5ac91d4b9725bbb9a Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 6 May 2021 14:47:41 +0100 Subject: [PATCH 10/28] Delete old builder layout page --- .../builder/src/pages/builder/_layout.svelte | 116 ------------------ 1 file changed, 116 deletions(-) delete mode 100644 packages/builder/src/pages/builder/_layout.svelte diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte deleted file mode 100644 index 77f8b655f5..0000000000 --- a/packages/builder/src/pages/builder/_layout.svelte +++ /dev/null @@ -1,116 +0,0 @@ - - -{#if $auth} - {#if $auth.user} -
-
- - -
-
- -
-
- {:else} - - {/if} -{/if} - - From 735c724a0d7e461af1ca965d64f5fbf586d4b81b Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 6 May 2021 14:49:11 +0100 Subject: [PATCH 11/28] Handle auth in top level routes and redirect as required. Change default route to be portal --- .../src/components/login/LoginForm.svelte | 16 +-- packages/builder/src/pages/_layout.svelte | 21 ++- packages/builder/src/pages/auth/index.svelte | 4 + packages/builder/src/pages/auth/login.svelte | 5 + .../pages/builder/[application]/_reset.svelte | 2 +- .../builder/src/pages/builder/index.svelte | 120 +----------------- packages/builder/src/pages/index.svelte | 5 +- .../builder/src/pages/portal/_layout.svelte | 11 +- .../src/pages/portal/apps/index.svelte | 36 +++++- packages/builder/src/stores/backend/auth.js | 36 ++---- 10 files changed, 86 insertions(+), 170 deletions(-) diff --git a/packages/builder/src/components/login/LoginForm.svelte b/packages/builder/src/components/login/LoginForm.svelte index 4de003379b..617e6c8463 100644 --- a/packages/builder/src/components/login/LoginForm.svelte +++ b/packages/builder/src/components/login/LoginForm.svelte @@ -1,7 +1,7 @@ Sign In With Google -
diff --git a/packages/builder/src/pages/_layout.svelte b/packages/builder/src/pages/_layout.svelte index ce10dc8c91..587092c718 100644 --- a/packages/builder/src/pages/_layout.svelte +++ b/packages/builder/src/pages/_layout.svelte @@ -1,27 +1,26 @@ {#if $admin.checklist} diff --git a/packages/builder/src/pages/auth/index.svelte b/packages/builder/src/pages/auth/index.svelte index e69de29bb2..bf30c6b310 100644 --- a/packages/builder/src/pages/auth/index.svelte +++ b/packages/builder/src/pages/auth/index.svelte @@ -0,0 +1,4 @@ + diff --git a/packages/builder/src/pages/auth/login.svelte b/packages/builder/src/pages/auth/login.svelte index e69de29bb2..b3efe9c121 100644 --- a/packages/builder/src/pages/auth/login.svelte +++ b/packages/builder/src/pages/auth/login.svelte @@ -0,0 +1,5 @@ + + + diff --git a/packages/builder/src/pages/builder/[application]/_reset.svelte b/packages/builder/src/pages/builder/[application]/_reset.svelte index 8a9e047f23..b025f94549 100644 --- a/packages/builder/src/pages/builder/[application]/_reset.svelte +++ b/packages/builder/src/pages/builder/[application]/_reset.svelte @@ -60,7 +60,7 @@ budibase icon $goto(`/builder/`)} + on:click={() => $goto(`../../portal/`)} /> diff --git a/packages/builder/src/pages/builder/index.svelte b/packages/builder/src/pages/builder/index.svelte index 5db193ccbc..110b5e83d9 100644 --- a/packages/builder/src/pages/builder/index.svelte +++ b/packages/builder/src/pages/builder/index.svelte @@ -1,120 +1,4 @@ - -
-
- Welcome to the Budibase Beta - - - - -
- - - - -
- - - - - - diff --git a/packages/builder/src/pages/index.svelte b/packages/builder/src/pages/index.svelte index bb0361f273..dc44c9e636 100644 --- a/packages/builder/src/pages/index.svelte +++ b/packages/builder/src/pages/index.svelte @@ -1 +1,4 @@ -Index route + diff --git a/packages/builder/src/pages/portal/_layout.svelte b/packages/builder/src/pages/portal/_layout.svelte index d7fcec7dc3..15ccfe8951 100644 --- a/packages/builder/src/pages/portal/_layout.svelte +++ b/packages/builder/src/pages/portal/_layout.svelte @@ -1,5 +1,5 @@
Apps - + + + +
@@ -42,6 +68,14 @@ Table {/if} + (template = null)} +> + + From cd39210573458f44ecec4b96d708b62b29cd184e Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 6 May 2021 15:33:28 +0100 Subject: [PATCH 15/28] Reduce size of MenuItem icons --- packages/bbui/src/Menu/Item.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bbui/src/Menu/Item.svelte b/packages/bbui/src/Menu/Item.svelte index 8aed496531..31c1cfc486 100644 --- a/packages/bbui/src/Menu/Item.svelte +++ b/packages/bbui/src/Menu/Item.svelte @@ -27,7 +27,7 @@ > {#if icon}
- Settings + Old settings Log out diff --git a/packages/builder/src/pages/portal/oauth/index.svelte b/packages/builder/src/pages/portal/oauth/index.svelte index 45c9761d38..96bd673784 100644 --- a/packages/builder/src/pages/portal/oauth/index.svelte +++ b/packages/builder/src/pages/portal/oauth/index.svelte @@ -60,47 +60,50 @@ -
- OAuth - - Every budibase app comes with basic authentication (email/password) - included. You can add additional authentication methods from the options - below. - -
- - {#if google} -
- + +
+ OAuth + + Every budibase app comes with basic authentication (email/password) + included. You can add additional authentication methods from the options + below. + +
+ + {#if google} +
Google - {#each ConfigFields.Google as field} -
- - -
- {/each} - - -
- - {/if} + + To allow users to authenticate using their Google accounts, fill out + the fields below. + +
+ + {#each ConfigFields.Google as field} +
+ + +
+ {/each} +
+ +
+ + {/if} +
diff --git a/packages/builder/src/pages/portal/settings/general.svelte b/packages/builder/src/pages/portal/settings/general.svelte index 6793d1852d..a12abac6df 100644 --- a/packages/builder/src/pages/portal/settings/general.svelte +++ b/packages/builder/src/pages/portal/settings/general.svelte @@ -45,12 +45,12 @@
General - Lorem ipsum, dolor sit amet consectetur adipisicing elit. Hic vero, aut + + Lorem ipsum, dolor sit amet consectetur adipisicing elit. Hic vero, aut culpa provident sunt ratione! Voluptas doloremque, dicta nisi velit perspiciatis, ratione vel blanditiis totam, nam voluptate repellat - aperiam fuga! + aperiam fuga! +
@@ -58,7 +58,7 @@ Here you can update your logo and organization name.
- +