From e7e249521b0396dc173693dbb7963832dc0a9869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Keviin=20=C3=85berg=20Kultalahti?= Date: Fri, 7 May 2021 12:16:09 +0200 Subject: [PATCH] merge fixes --- .../portal/manage/_layout.svelte | 0 .../portal/manage/auth}/_logos/Google.svelte | 0 .../builder/portal/manage/auth/index.svelte | 114 ++++++++++++++++++ .../portal/manage/oauth/_logos/Google.svelte | 43 +++++++ .../portal/manage/oauth/index.svelte | 0 .../users/_components/AddUserModal.svelte | 0 .../portal/manage/users/index.svelte | 0 .../builder/portal/oauth/_logos/Google.svelte | 43 +++++++ 8 files changed, 200 insertions(+) rename packages/builder/src/pages/{ => builder}/portal/manage/_layout.svelte (100%) rename packages/builder/src/pages/{portal/manage/oauth => builder/portal/manage/auth}/_logos/Google.svelte (100%) create mode 100644 packages/builder/src/pages/builder/portal/manage/auth/index.svelte create mode 100644 packages/builder/src/pages/builder/portal/manage/oauth/_logos/Google.svelte rename packages/builder/src/pages/{ => builder}/portal/manage/oauth/index.svelte (100%) rename packages/builder/src/pages/{ => builder}/portal/manage/users/_components/AddUserModal.svelte (100%) rename packages/builder/src/pages/{ => builder}/portal/manage/users/index.svelte (100%) create mode 100644 packages/builder/src/pages/builder/portal/oauth/_logos/Google.svelte diff --git a/packages/builder/src/pages/portal/manage/_layout.svelte b/packages/builder/src/pages/builder/portal/manage/_layout.svelte similarity index 100% rename from packages/builder/src/pages/portal/manage/_layout.svelte rename to packages/builder/src/pages/builder/portal/manage/_layout.svelte diff --git a/packages/builder/src/pages/portal/manage/oauth/_logos/Google.svelte b/packages/builder/src/pages/builder/portal/manage/auth/_logos/Google.svelte similarity index 100% rename from packages/builder/src/pages/portal/manage/oauth/_logos/Google.svelte rename to packages/builder/src/pages/builder/portal/manage/auth/_logos/Google.svelte diff --git a/packages/builder/src/pages/builder/portal/manage/auth/index.svelte b/packages/builder/src/pages/builder/portal/manage/auth/index.svelte new file mode 100644 index 0000000000..af05e0e92c --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/auth/index.svelte @@ -0,0 +1,114 @@ + + + + +
+ OAuth + + Every budibase app comes with basic authentication (email/password) + included. You can add additional authentication methods from the options + below. + +
+ + {#if google} +
+ + + + Google + + + + 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/builder/portal/manage/oauth/_logos/Google.svelte b/packages/builder/src/pages/builder/portal/manage/oauth/_logos/Google.svelte new file mode 100644 index 0000000000..5686e50abc --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/oauth/_logos/Google.svelte @@ -0,0 +1,43 @@ + + + + + + + + + + + + + diff --git a/packages/builder/src/pages/portal/manage/oauth/index.svelte b/packages/builder/src/pages/builder/portal/manage/oauth/index.svelte similarity index 100% rename from packages/builder/src/pages/portal/manage/oauth/index.svelte rename to packages/builder/src/pages/builder/portal/manage/oauth/index.svelte diff --git a/packages/builder/src/pages/portal/manage/users/_components/AddUserModal.svelte b/packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte similarity index 100% rename from packages/builder/src/pages/portal/manage/users/_components/AddUserModal.svelte rename to packages/builder/src/pages/builder/portal/manage/users/_components/AddUserModal.svelte diff --git a/packages/builder/src/pages/portal/manage/users/index.svelte b/packages/builder/src/pages/builder/portal/manage/users/index.svelte similarity index 100% rename from packages/builder/src/pages/portal/manage/users/index.svelte rename to packages/builder/src/pages/builder/portal/manage/users/index.svelte diff --git a/packages/builder/src/pages/builder/portal/oauth/_logos/Google.svelte b/packages/builder/src/pages/builder/portal/oauth/_logos/Google.svelte new file mode 100644 index 0000000000..5686e50abc --- /dev/null +++ b/packages/builder/src/pages/builder/portal/oauth/_logos/Google.svelte @@ -0,0 +1,43 @@ + + + + + + + + + + + + +