From 8d1b50ff89a82e8892d1f8aea945d127706a3d9f Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 13 Jan 2023 09:25:12 +0000 Subject: [PATCH 01/11] Update spacing on user and group detail page and fix usage page showing wrong copy --- .../builder/src/pages/builder/portal/account/usage.svelte | 4 +++- .../src/pages/builder/portal/users/groups/[groupId].svelte | 2 +- .../src/pages/builder/portal/users/users/[userId].svelte | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/account/usage.svelte b/packages/builder/src/pages/builder/portal/account/usage.svelte index c541e66fb1..c502d35f79 100644 --- a/packages/builder/src/pages/builder/portal/account/usage.svelte +++ b/packages/builder/src/pages/builder/portal/account/usage.svelte @@ -32,6 +32,8 @@ $: license = $auth.user?.license $: accountPortalAccess = $auth?.user?.accountPortalAccess $: quotaReset = quotaUsage?.quotaReset + $: canManagePlan = + ($admin.cloud && accountPortalAccess) || (!$admin.cloud && $auth.isAdmin) const setMonthlyUsage = () => { monthlyUsage = [] @@ -184,7 +186,7 @@ - {#if $auth?.user?.accountPortalAccess} + {#if canManagePlan} To upgrade your plan and usage limits visit your account. diff --git a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte index 859e266ef0..ee584dd71b 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte @@ -250,7 +250,7 @@ flex-direction: row; justify-content: flex-start; align-items: center; - gap: var(--spacing-m); + gap: var(--spacing-l); } .header :global(.spectrum-Heading) { flex: 1 1 auto; diff --git a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte index 9498472f66..26a1d25f44 100644 --- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte +++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte @@ -389,6 +389,7 @@ display: flex; align-items: center; justify-content: flex-start; + gap: var(--spacing-l); } .tableTitle { display: flex; @@ -396,7 +397,6 @@ align-items: flex-end; } .subtitle { - padding: 0 0 0 var(--spacing-m); display: flex; flex-direction: column; justify-content: center; From acd5859fc9a71376a86515238203769abf1e62b9 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 13 Jan 2023 09:26:35 +0000 Subject: [PATCH 02/11] Fix logo override not working --- .../src/pages/builder/portal/_components/Logo.svelte | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/portal/_components/Logo.svelte b/packages/builder/src/pages/builder/portal/_components/Logo.svelte index 8276510201..811e4a162a 100644 --- a/packages/builder/src/pages/builder/portal/_components/Logo.svelte +++ b/packages/builder/src/pages/builder/portal/_components/Logo.svelte @@ -1,9 +1,14 @@ -Budibase Logo $goto("./apps")} /> +Budibase Logo $goto("./apps")} +/> From 715fc0413ef58ea3b0b71e22fafb3d8adddf165c Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 13 Jan 2023 12:11:14 +0000 Subject: [PATCH 11/11] Make usage stats responsive and fix layout issues --- .../builder/src/components/usage/Usage.svelte | 29 ++++++++++++------- .../pages/builder/portal/account/usage.svelte | 1 + 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/packages/builder/src/components/usage/Usage.svelte b/packages/builder/src/components/usage/Usage.svelte index 49c4205a4c..6e81abfe63 100644 --- a/packages/builder/src/components/usage/Usage.svelte +++ b/packages/builder/src/components/usage/Usage.svelte @@ -39,15 +39,21 @@ {#if showWarning} {/if} -
- {usage.name} -
+ + + {usage.name} + + - {#if unlimited} - {usage.used} / Unlimited - {:else} - {usage.used} / {usage.total} - {/if} + + + {#if unlimited} + {usage.used} / Unlimited + {:else} + {usage.used} / {usage.total} + {/if} + +
{#if unlimited} @@ -89,13 +95,14 @@ display: flex; flex-direction: row; justify-content: space-between; + align-items: flex-end; margin-bottom: 12px; + gap: var(--spacing-m); } .header-container { display: flex; } - .heading { - margin-top: 3px; - margin-left: 5px; + .nowrap { + white-space: nowrap; } diff --git a/packages/builder/src/pages/builder/portal/account/usage.svelte b/packages/builder/src/pages/builder/portal/account/usage.svelte index c502d35f79..39970a4814 100644 --- a/packages/builder/src/pages/builder/portal/account/usage.svelte +++ b/packages/builder/src/pages/builder/portal/account/usage.svelte @@ -249,6 +249,7 @@ justify-content: flex-start; align-items: flex-start; gap: 40px; + flex-wrap: wrap; } .column { flex: 1 1 0;