From 28107286b12e00b99d56770d305b9cf0924cb0af Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Tue, 24 Sep 2024 14:37:17 +0545 Subject: [PATCH] more design fixes --- .../createMember.svelte | 2 +- .../members/+page.svelte | 73 +++++++++++++------ .../members/edit.svelte | 14 +++- 3 files changed, 63 insertions(+), 26 deletions(-) diff --git a/src/routes/(console)/organization-[organization]/createMember.svelte b/src/routes/(console)/organization-[organization]/createMember.svelte index c58244d4b..32d28a8dd 100644 --- a/src/routes/(console)/organization-[organization]/createMember.svelte +++ b/src/routes/(console)/organization-[organization]/createMember.svelte @@ -93,7 +93,7 @@ Roles', - 'Owner, Developer, Editor, Analyst, Billing.', + 'Owner, Developer Default, Editor, Analyst, Billing.', 'Learn more about roles.' ]} id="role" diff --git a/src/routes/(console)/organization-[organization]/members/+page.svelte b/src/routes/(console)/organization-[organization]/members/+page.svelte index e84d53da4..3bbdd0dbb 100644 --- a/src/routes/(console)/organization-[organization]/members/+page.svelte +++ b/src/routes/(console)/organization-[organization]/members/+page.svelte @@ -22,8 +22,9 @@ import { base } from '$app/paths'; import { isOwner } from '$lib/stores/roles'; import Edit from './edit.svelte'; - import { getRoleLabel } from '$lib/stores/billing'; + import { getRoleLabel, upgradeURL } from '$lib/stores/billing'; import { BillingPlan } from '$lib/constants'; + import { isCloud } from '$lib/system'; export let data: PageData; @@ -84,37 +85,63 @@
-

- Roles - {#if $organization?.billingPlan === BillingPlan.FREE} - Pro plan + {#if isCloud} +

+ Roles + {#if $organization?.billingPlan === BillingPlan.FREE} + Pro plan + {/if} +

+ {#if $organization?.billingPlan != BillingPlan.FREE} +

+ Owner, Developer Default, Editor, Analyst, Billing. +

+

+ Learn more about roles. +

+ {:else} +

+ Owner, Developer, Editor, Analyst. +

+

+ Learn more + Upgrade plan +

{/if} -

- {#if $organization?.billingPlan != BillingPlan.FREE} -

- Owner, Developer Default, Editor, Analyst, Billing. -

-

- Learn more about roles. -

{:else}

- Owner, Developer, Editor, Analyst. + Roles + Appwrite Cloud +

+

+ Upgrade to Cloud to assign new roles to members or ask + us about our entriprise self hosted offering.

Learn more - Upgrade plan + Upgrade to Cloud

{/if}
diff --git a/src/routes/(console)/organization-[organization]/members/edit.svelte b/src/routes/(console)/organization-[organization]/members/edit.svelte index 7905db296..dc374142b 100644 --- a/src/routes/(console)/organization-[organization]/members/edit.svelte +++ b/src/routes/(console)/organization-[organization]/members/edit.svelte @@ -56,7 +56,7 @@ showEdit = false; addNotification({ type: 'success', - message: `Membership updated` + message: `Role updated` }); trackEvent(Submit.MembershipUpdate); dispatch('updated', membership); @@ -78,7 +78,17 @@ - + Roles', + 'Owner, Developer Default, Editor, Analyst, Billing.', + 'Learn more about roles.' + ]} + id="role" + label="Role" + required + options={roles} + bind:value={role} />