diff --git a/src/lib/constants.ts b/src/lib/constants.ts index 6dfc31a99..ae142ca22 100644 --- a/src/lib/constants.ts +++ b/src/lib/constants.ts @@ -260,22 +260,31 @@ export const eventServices: Array = [ export const usageRates = { 'tier-0': [ - { resource: 'Organization members', amount: 'Unlimited', unit: '', rate: '$20/member' }, - { resource: 'Bandwidth', amount: 1, unit: 'TB', rate: '$0.04/GB' }, - { resource: 'Storage', amount: 150, unit: 'GB', rate: '$0.025/GB' }, { + id: 'members', + resource: 'Organization members', + amount: 1, + unit: '', + rate: '$20/member' + }, + { id: 'bandwith', resource: 'Bandwidth', amount: 10, unit: 'GB', rate: '$0.04/GB' }, + { id: 'storage', resource: 'Storage', amount: 2, unit: 'GB', rate: '$0.025/GB' }, + { + id: 'executions', resource: 'Function executions', - amount: 3500000, + amount: 750000, unit: 'executions', rate: '$2/1M executions' }, { + id: 'users', resource: 'Active users', amount: 200000, unit: 'AU', rate: '$0.0012/user' }, { + id: 'connections', resource: 'Concurrent connections', amount: 750, unit: 'connections', @@ -284,26 +293,30 @@ export const usageRates = { ], 'tier-1': [ { + id: 'members', resource: 'Organization members', amount: 'Unlimited', unit: '', rate: '$20/member' }, - { resource: 'Bandwidth', amount: 1, unit: 'TB', rate: '$0.04/GB' }, - { resource: 'Storage', amount: 150, unit: 'GB', rate: '$0.025/GB' }, + { id: 'bandwith', resource: 'Bandwidth', amount: 1, unit: 'TB', rate: '$0.04/GB' }, + { id: 'storage', resource: 'Storage', amount: 150, unit: 'GB', rate: '$0.025/GB' }, { + id: 'executions', resource: 'Function executions', amount: 3500000, unit: 'executions', rate: '$2/1M executions' }, { + id: 'users', resource: 'Active users', amount: 200000, unit: 'AU', rate: '$0.0012/user' }, { + id: 'connections', resource: 'Concurrent connections', amount: 750, unit: 'connections', @@ -312,26 +325,30 @@ export const usageRates = { ], 'tier-2': [ { + id: 'members', resource: 'Organization members', amount: 'Unlimited', unit: '', rate: '$20/member' }, - { resource: 'Bandwidth', amount: 1, unit: 'TB', rate: '$0.04/GB' }, - { resource: 'Storage', amount: 150, unit: 'GB', rate: '$0.025/GB' }, + { id: 'bandwith', resource: 'Bandwidth', amount: 1, unit: 'TB', rate: '$0.04/GB' }, + { id: 'storage', resource: 'Storage', amount: 150, unit: 'GB', rate: '$0.025/GB' }, { + id: 'executions', resource: 'Function executions', amount: 3500000, unit: 'executions', rate: '$2/1M executions' }, { + id: 'users', resource: 'Active users', amount: 200000, unit: 'AU', rate: '$0.0012/user' }, { + id: 'connections', resource: 'Concurrent connections', amount: 750, unit: 'connections', diff --git a/src/lib/elements/table/body.svelte b/src/lib/elements/table/body.svelte index 88c2327f0..ab03e4884 100644 --- a/src/lib/elements/table/body.svelte +++ b/src/lib/elements/table/body.svelte @@ -1,20 +1,35 @@ -
+
-{#if isCloud && limitReached && name} +{#if isCloud && limitReached && service} - + Upgrade your plan to add {name} to your organization - + diff --git a/src/lib/layout/containerHeader.svelte b/src/lib/layout/containerHeader.svelte new file mode 100644 index 000000000..529be11d6 --- /dev/null +++ b/src/lib/layout/containerHeader.svelte @@ -0,0 +1,62 @@ + + +
+
+ {title} + {#if isCloud} +
{ + instance.setContent(tooltipContent); + }); + } + }}> + + {title} limited + +
+ {/if} +
+ + +
+ +{#if isCloud} +
+
+

+ Your are limited to {limit} + {title.toLocaleLowerCase()} per project on the {tier}. +

+ + for addtional {title.toLocaleLowerCase()}. +
+
+{/if} diff --git a/src/lib/layout/index.ts b/src/lib/layout/index.ts index 2172f7e0a..9537e351b 100644 --- a/src/lib/layout/index.ts +++ b/src/lib/layout/index.ts @@ -16,3 +16,4 @@ export { default as Usage, type UsagePeriods } from './usage.svelte'; export { default as Activity } from './activity.svelte'; export { default as Progress } from './progress.svelte'; export { default as GridHeader } from './gridHeader.svelte'; +export { default as ContainerHeader } from './containerHeader.svelte'; diff --git a/src/routes/console/organization-[organization]/members/+page.svelte b/src/routes/console/organization-[organization]/members/+page.svelte index 140a59510..4565d77ca 100644 --- a/src/routes/console/organization-[organization]/members/+page.svelte +++ b/src/routes/console/organization-[organization]/members/+page.svelte @@ -2,7 +2,7 @@ import { invalidate } from '$app/navigation'; import { page } from '$app/stores'; import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; - import { AvatarInitials, Heading, PaginationWithLimit } from '$lib/components'; + import { AvatarInitials, PaginationWithLimit } from '$lib/components'; import { Dependencies } from '$lib/constants'; import { Pill } from '$lib/elements'; import { Button } from '$lib/elements/forms'; @@ -15,7 +15,7 @@ TableRow, TableScroll } from '$lib/elements/table'; - import { Container } from '$lib/layout'; + import { Container, ContainerHeader } from '$lib/layout'; import { addNotification } from '$lib/stores/notifications'; import { members, newMemberModal, organization } from '$lib/stores/organization'; import { sdk } from '$lib/stores/sdk'; @@ -57,14 +57,12 @@ {#if data.organizationMembers.total} -
- Members - + -
+ @@ -73,7 +71,7 @@ - + {#each data.organizationMembers.memberships as member} diff --git a/src/routes/console/project-[project]/settings/usage/[[period]]/+page.svelte b/src/routes/console/project-[project]/settings/usage/[[period]]/+page.svelte index 95c6cc7ac..567e805eb 100644 --- a/src/routes/console/project-[project]/settings/usage/[[period]]/+page.svelte +++ b/src/routes/console/project-[project]/settings/usage/[[period]]/+page.svelte @@ -8,18 +8,20 @@ export let data; $: requests = data.requests; - // $: network = data.response.network; - // $: executions = data.response.executions; - // $: documents = data.response.documents; - // $: databases = data.response.databases; - // $: users = data.response.users; - // $: storage = data.response.storage; - // $: buckets = data.response.buckets; + // $: network = data.network; + // $: executions = data.executions; + // $: documents = data.documents; + // $: databases = data.databases; + // $: users = data.users; + // $: storage = data.storage; + // $: buckets = data.buckets; + + $: console.log(data);
- Functions + Usage