diff --git a/packages/bbui/src/Layout/Page.svelte b/packages/bbui/src/Layout/Page.svelte index 037e6aefa8..6750005c74 100644 --- a/packages/bbui/src/Layout/Page.svelte +++ b/packages/bbui/src/Layout/Page.svelte @@ -25,7 +25,7 @@ } .narrow { - max-width: 800px; + max-width: 840px; margin: 0; } diff --git a/packages/builder/src/components/common/inputs/CopyInput.svelte b/packages/builder/src/components/common/inputs/CopyInput.svelte index 589623f542..fea4e87701 100644 --- a/packages/builder/src/components/common/inputs/CopyInput.svelte +++ b/packages/builder/src/components/common/inputs/CopyInput.svelte @@ -12,7 +12,7 @@ dummy.select() document.execCommand("copy") document.body.removeChild(dummy) - notifications.success(`URL copied to clipboard`) + notifications.success(`Copied to clipboard`) } diff --git a/packages/builder/src/components/portal/page/SideNav.svelte b/packages/builder/src/components/portal/page/SideNav.svelte index 01097f9c3a..fdd54b2182 100644 --- a/packages/builder/src/components/portal/page/SideNav.svelte +++ b/packages/builder/src/components/portal/page/SideNav.svelte @@ -15,6 +15,7 @@ flex-direction: column; justify-content: flex-start; align-items: stretch; + gap: 4px; } .title { margin-left: var(--spacing-m); diff --git a/packages/builder/src/components/settings/UpdateAPIKeyModal.svelte b/packages/builder/src/components/settings/UpdateAPIKeyModal.svelte deleted file mode 100644 index 4322822ec8..0000000000 --- a/packages/builder/src/components/settings/UpdateAPIKeyModal.svelte +++ /dev/null @@ -1,41 +0,0 @@ - - - - - You can find information about your developer account here, such as the API - key used to access the Budibase API. - - - diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte index c741fe6749..7d350b0973 100644 --- a/packages/builder/src/components/start/AppRow.svelte +++ b/packages/builder/src/components/start/AppRow.svelte @@ -11,8 +11,12 @@
-
- +
+
editApp(app)}> @@ -96,7 +100,7 @@ .app-status:not(.deployed) :global(.spectrum-Icon), .app-status:not(.deployed) :global(.spectrum-Body) { - color: var(--spectrum-global-color-gray-700); + color: var(--spectrum-global-color-gray-600); } .app-row-actions { diff --git a/packages/builder/src/pages/builder/apps/index.svelte b/packages/builder/src/pages/builder/apps/index.svelte index d175edabad..4b2c336f6c 100644 --- a/packages/builder/src/pages/builder/apps/index.svelte +++ b/packages/builder/src/pages/builder/apps/index.svelte @@ -89,7 +89,7 @@ {#if $auth.user && loaded}
- +
@@ -196,6 +196,11 @@ .container { height: 100%; overflow: auto; + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: center; + padding: 80px; } .content { width: 100%; diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index 9c2aa8da33..b98c21105c 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -15,14 +15,12 @@ import { onMount } from "svelte" import UpdateUserInfoModal from "components/settings/UpdateUserInfoModal.svelte" import ChangePasswordModal from "components/settings/ChangePasswordModal.svelte" - import UpdateAPIKeyModal from "components/settings/UpdateAPIKeyModal.svelte" import Logo from "assets/bb-emblem.svg" import { isEnabled, TENANT_FEATURE_FLAGS } from "helpers/featureFlags" let loaded = false let userInfoModal let changePasswordModal - let apiKeyModal let mobileMenuVisible = false let activeTab = "Apps" @@ -42,92 +40,79 @@ title: "Users", href: "/builder/portal/users/users", }, - { title: "Auth", href: "/builder/portal/manage/auth" }, - { title: "Email", href: "/builder/portal/manage/email" }, { title: "Plugins", - href: "/builder/portal/manage/plugins", + href: "/builder/portal/plugins", badge: "New", }, - { - title: "Organisation", - href: "/builder/portal/settings/organisation", - heading: "Settings", + title: "Usage", + href: "/builder/portal/usage", }, { - title: "Theming", - href: "/builder/portal/settings/theming", - }, - ]) - - if (!$adminStore.cloud) { - menu = menu.concat([ - { - title: "Update", - href: "/builder/portal/settings/update", - }, - ]) - } - } else { - menu = menu.concat([ - { - title: "Theming", - href: "/builder/portal/settings/theming", - heading: "Settings", + title: "Settings", + href: "/builder/portal/settings", }, ]) + // if (!$adminStore.cloud) { + // menu = menu.concat([ + // { + // title: "Update", + // href: "/builder/portal/settings/update", + // }, + // ]) + // } } // add link to account portal if the user has access let accountSectionAdded = false // link out to account-portal if account holder in cloud or always in self-host - if ($auth?.user?.accountPortalAccess || (!$adminStore.cloud && admin)) { - accountSectionAdded = true - menu = menu.concat([ - { - title: "Account", - href: $adminStore.accountPortalUrl, - heading: "Account", - }, - ]) - } - - if (isEnabled(TENANT_FEATURE_FLAGS.LICENSING)) { - // always show usage in self-host or cloud if licensing enabled - menu = menu.concat([ - { - title: "Usage", - href: "/builder/portal/settings/usage", - heading: accountSectionAdded ? "" : "Account", - }, - ]) - - // show the relevant hosting upgrade page - if ($adminStore.cloud && $auth?.user?.accountPortalAccess) { - menu = menu.concat([ - { - title: "Upgrade", - href: $adminStore.accountPortalUrl + "/portal/upgrade", - badge: "New", - }, - ]) - } - - // show the billing page to licensed account holders in cloud - if ( - $auth?.user?.accountPortalAccess && - $auth.user.account.stripeCustomerId - ) { - menu = menu.concat([ - { - title: "Billing", - href: $adminStore.accountPortalUrl + "/portal/billing", - }, - ]) - } - } + // if ($auth?.user?.accountPortalAccess || (!$adminStore.cloud && admin)) { + // accountSectionAdded = true + // menu = menu.concat([ + // { + // title: "Account", + // href: $adminStore.accountPortalUrl, + // heading: "Account", + // }, + // ]) + // } + // + // if (isEnabled(TENANT_FEATURE_FLAGS.LICENSING)) { + // // always show usage in self-host or cloud if licensing enabled + // menu = menu.concat([ + // { + // title: "Usage", + // href: "/builder/portal/settings/usage", + // heading: accountSectionAdded ? "" : "Account", + // }, + // ]) + // + // // show the relevant hosting upgrade page + // if ($adminStore.cloud && $auth?.user?.accountPortalAccess) { + // menu = menu.concat([ + // { + // title: "Upgrade", + // href: $adminStore.accountPortalUrl + "/portal/upgrade", + // badge: "New", + // }, + // ]) + // } + // + // // show the billing page to licensed account holders in cloud + // if ( + // $auth?.user?.accountPortalAccess && + // $auth.user.account.stripeCustomerId + // ) { + // menu = menu.concat([ + // { + // title: "Billing", + // href: $adminStore.accountPortalUrl + "/portal/billing", + // }, + // ]) + // } + // } menu = menu.filter(item => !!item) return menu @@ -216,11 +201,6 @@ > Update user information - {#if $auth.isBuilder} - apiKeyModal.show()}> - View API key - - {/if} changePasswordModal.show()} @@ -247,9 +227,6 @@ - - - {/if} diff --git a/packages/builder/src/pages/builder/portal/manage/auth/_logos/Google.svelte b/packages/builder/src/pages/builder/portal/settings/auth/_logos/Google.svelte similarity index 100% rename from packages/builder/src/pages/builder/portal/manage/auth/_logos/Google.svelte rename to packages/builder/src/pages/builder/portal/settings/auth/_logos/Google.svelte diff --git a/packages/builder/src/pages/builder/portal/manage/auth/_logos/OIDC.svelte b/packages/builder/src/pages/builder/portal/settings/auth/_logos/OIDC.svelte similarity index 100% rename from packages/builder/src/pages/builder/portal/manage/auth/_logos/OIDC.svelte rename to packages/builder/src/pages/builder/portal/settings/auth/_logos/OIDC.svelte diff --git a/packages/builder/src/pages/builder/portal/manage/auth/index.svelte b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/portal/manage/auth/index.svelte rename to packages/builder/src/pages/builder/portal/settings/auth/index.svelte diff --git a/packages/builder/src/pages/builder/portal/manage/email/[template].svelte b/packages/builder/src/pages/builder/portal/settings/email/[template].svelte similarity index 100% rename from packages/builder/src/pages/builder/portal/manage/email/[template].svelte rename to packages/builder/src/pages/builder/portal/settings/email/[template].svelte diff --git a/packages/builder/src/pages/builder/portal/manage/email/_components/TemplateBindings.svelte b/packages/builder/src/pages/builder/portal/settings/email/_components/TemplateBindings.svelte similarity index 100% rename from packages/builder/src/pages/builder/portal/manage/email/_components/TemplateBindings.svelte rename to packages/builder/src/pages/builder/portal/settings/email/_components/TemplateBindings.svelte diff --git a/packages/builder/src/pages/builder/portal/manage/email/_layout.svelte b/packages/builder/src/pages/builder/portal/settings/email/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/portal/manage/email/_layout.svelte rename to packages/builder/src/pages/builder/portal/settings/email/_layout.svelte diff --git a/packages/builder/src/pages/builder/portal/manage/email/index.svelte b/packages/builder/src/pages/builder/portal/settings/email/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/portal/manage/email/index.svelte rename to packages/builder/src/pages/builder/portal/settings/email/index.svelte diff --git a/packages/builder/src/pages/builder/portal/settings/index.svelte b/packages/builder/src/pages/builder/portal/settings/index.svelte index 57825a095b..b7f09de51a 100644 --- a/packages/builder/src/pages/builder/portal/settings/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/index.svelte @@ -1,4 +1,4 @@ diff --git a/packages/builder/src/pages/builder/portal/settings/theming.svelte b/packages/builder/src/pages/builder/portal/settings/theme.svelte similarity index 90% rename from packages/builder/src/pages/builder/portal/settings/theming.svelte rename to packages/builder/src/pages/builder/portal/settings/theme.svelte index 815c0d2813..977dc80ed7 100644 --- a/packages/builder/src/pages/builder/portal/settings/theming.svelte +++ b/packages/builder/src/pages/builder/portal/settings/theme.svelte @@ -6,13 +6,13 @@ - Theming + Theme Customize how Budibase looks and feels.
- +