-
- - Card ending in {paymentMethod.last4} -
-Upgrade your plan to add more {service}
- +
+
+
+ {couponData.code.toUpperCase()} is not a valid promo code
+
+
+{:else if couponData?.status === 'active'}
+
-
-
- {couponData.code.toUpperCase()} is not a valid promo code
-
+
+
+
+ {couponData.code.toUpperCase()} applied (-{formatCurrency(couponData.credits)})
+
+
- {:else if couponData?.status === 'active'}
-
-
- {/if}
-
+
+
-
-
-
- {couponData.code.toUpperCase()} applied (-{formatCurrency(
- couponData.credits
- )})
-
-
-
-
- {currentPlan.name} plan
-{formatCurrency(currentPlan.price)}
- - -Additional seats ({collaborators?.length})
-- {formatCurrency(extraSeatsCost)} -
- - {#if couponData?.status === 'active'} -
- Upcoming charge
Due on {!currentPlan.trialDays
- ? toLocaleDate(billingPayDate.toString())
- : toLocaleDate(trialEndDate.toString())}
-
- {formatCurrency(estimatedTotal)} -
- - -
- You'll pay {formatCurrency(estimatedTotal)} now, with your first
- billing cycle starting on
- {!currentPlan.trialDays
- ? toLocaleDate(billingPayDate.toString())
- : toLocaleDate(trialEndDate.toString())}. {#if couponData?.status === 'active'}Once your credits run out, you'll be charged
- {formatCurrency(currentPlan.price)} plus usage fees every 30
- days.
+
+ Due on {!currentPlan.trialDays + ? toLocaleDate(billingPayDate.toString()) + : toLocaleDate(trialEndDate.toString())}
-
-
-
-
+
{#if showSetAsDefault}
- -
-
-
-
+
+
+ (selectedTab = BillingPlan.FREE)}>
{tierFree.name}
-
-
+ (selectedTab = BillingPlan.PRO)}>
{tierPro.name}
-
-
+ (selectedTab = BillingPlan.SCALE)}>
{tierScale.name}
-
-
-
+
+
-
+ {plan.name} plan
{#if selectedTab === BillingPlan.FREE}
-
-{plan.name} plan
{#if downgrade}- @@ -67,37 +69,26 @@
-
+
- - - Limited to {plan.databases} Database, {plan.buckets} Buckets, {plan.functions} - Functions per project - + Limited to {plan.databases} Database, {plan.buckets} Buckets, {plan.functions} + Functions per project + +
- Limited to 1 organization member +
- + Limited to {plan.bandwidth}GB bandwidth
- - Limited to 1 organization member + Limited to {plan.storage}GB storage
- - - {plan.bandwidth}GB bandwidth - - -
- - - {plan.storage}GB storage - - -
- - - {formatNum(plan.executions)} executions - + Limited to {formatNum(plan.executions)} executions
- Unlimited databases, buckets, functions
- {plan.bandwidth}GB bandwidth
- {plan.storage}GB storage @@ -105,9 +96,8 @@
- Email support
- Unlimited seats
- Organization roles
- SOC-2, HIPAA compliance @@ -115,29 +105,5 @@
- Priority support
{plan.name} plan
-Everything in the Free plan, plus:
--
+
{plan.name} plan
-Everything in the Pro plan, plus:
--
+
- - {excess?.members} members -
-- - {humanFileSize(excess?.storage).value} - {humanFileSize(excess?.storage).unit} -
-- - - {formatNum(excess?.executions)} executions - -
-- - - {formatNum(excess?.users)} users - -
-+ + {excess?.members} members +
++ + {humanFileSize(excess?.storage).value} + {humanFileSize(excess?.storage).unit} +
++ + + {formatNum(excess?.executions)} executions + +
++ + + {formatNum(excess?.users)} users + +
+-
-
-
-
- ---- {tierFree.name} - {#if $organization?.billingPlan === BillingPlan.FREE && !isNewOrg} - Current plan - {/if} -
-- {tierFree.description} -
-- {formatCurrency(freePlan?.price ?? 0)} -
-
-
- -
-
- ---- {#if $organization?.billingPlan === BillingPlan.PRO && !isNewOrg} - Current plan - {/if} -
-- {tierPro.description} -
-- {formatCurrency(proPlan?.price ?? 0)} per member/month + usage -
-
- -
-
- ---- {tierScale.name} - {#if $organization?.billingPlan === BillingPlan.SCALE && !isNewOrg} - Current plan - {/if} -
-- {tierScale.description} -
-- {formatCurrency(scalePlan?.price ?? 0)} per month + usage -
-
-
-
-
-
- {#if error}
- {error}
+
{/if}
-
-{/if}
+
+
{#if showPaymentModal && isCloud && hasStripePublicKey}
-
- - - No saved payment methods -
+
-
- {/if}
-
+
+
+
- {#if activeMenu.bottom}
- 3 ? '22rem' : '25rem'};`}
- data-private>
+
- - {org.name} - +
-
- --
- Additional members -
-- {formatCurrency( - extraMembers * - (currentPlan?.addons?.member?.price ?? - 0) - )} ----- {extraMembers} -
-
- {/if}
- {#if currentInvoice?.usage}
- {#each currentInvoice.usage as excess, i}
- - 0 || extraMembers}>
- {#if ['storage', 'bandwidth'].includes(excess.name)}
- {@const excessValue = humanFileSize(
- excess.value
- )}
- --
- {excess.name} -
- {formatCurrency(excess.amount)} -- {excessValue.value ?? 0}{excessValue.unit} -
- {/if} - {#if ['users', 'executions'].includes(excess.name)} ---- {excess.name} -
- {formatCurrency(excess.amount)} -- {abbreviateNumber(excess.value)} -
- {/if} -
- {/each}
- {/if}
- -
{/if} - + + {:else} @@ -193,10 +199,6 @@ } } - .new-button { - flex-shrink: 0; - } - :global(.sub-navigation header) { top: 48px !important; } diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte index d61704705..a8b20597f 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/collection-[collection]/table.svelte @@ -278,35 +278,33 @@ {#if relAttributes?.length} -{ + $showCreate = true; + $showSubNavigation = false; + }} + leadingIcon={IconPlus}> + Create collection + +- +- -Relation -Setting -- - {#each relAttributes as attr} - -- - {/each} -- - {#if attr.twoWay} - - {:else} - - {/if} - {attr.key} - - -- {attr.onDelete} - -- {Deletion[attr.onDelete]} - -+ Relation +Setting ++ + + {/each} ++ + {#if attr.twoWay} + + {:else} + + {/if} + {attr.key} + + ++ {attr.onDelete} + ++ {Deletion[attr.onDelete]} + +{/if} -To change the selection edit the relationship settings. diff --git a/src/routes/(console)/project-[project]/databases/database-[database]/settings/+page.svelte b/src/routes/(console)/project-[project]/databases/database-[database]/settings/+page.svelte index 6cecdb91a..bab02f56a 100644 --- a/src/routes/(console)/project-[project]/databases/database-[database]/settings/+page.svelte +++ b/src/routes/(console)/project-[project]/databases/database-[database]/settings/+page.svelte @@ -1,7 +1,7 @@- diff --git a/src/routes/(console)/project-[project]/functions/+page.ts b/src/routes/(console)/project-[project]/functions/+page.ts index e12234637..96f2b6489 100644 --- a/src/routes/(console)/project-[project]/functions/+page.ts +++ b/src/routes/(console)/project-[project]/functions/+page.ts @@ -2,10 +2,10 @@ import { Query } from '@appwrite.io/console'; import { sdk } from '$lib/stores/sdk'; import { getLimit, getPage, pageToOffset } from '$lib/helpers/load'; import { CARD_LIMIT, Dependencies } from '$lib/constants'; -import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ url, depends, route }) => { +export const load = async ({ url, depends, route, parent }) => { depends(Dependencies.FUNCTIONS); + const { templatesList } = await parent(); const page = getPage(url); const limit = getLimit(url, route, CARD_LIMIT); @@ -18,6 +18,7 @@ export const load: PageLoad = async ({ url, depends, route }) => { Query.limit(limit), Query.offset(offset), Query.orderDesc('') - ]) + ]), + templatesList }; }; diff --git a/src/routes/(console)/project-[project]/functions/create-function/(components)/aside.svelte b/src/routes/(console)/project-[project]/functions/create-function/(components)/aside.svelte index 0e818e1db..ae7ea0a6e 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/(components)/aside.svelte +++ b/src/routes/(console)/project-[project]/functions/create-function/(components)/aside.svelte @@ -2,29 +2,33 @@ import { Card, SvgIcon } from '$lib/components'; import { Icon, Layout, Typography } from '@appwrite.io/pink-svelte'; import { IconGithub, IconGitBranch } from '@appwrite.io/pink-icons-svelte'; - import type { Models } from '@appwrite.io/console'; + import type { Models, Runtime } from '@appwrite.io/console'; - export let runtime: Partial+ + + {#if data.functions.total}+ service="functions" + on:click={() => goto(`${base}/project-${project}/functions/create-function`)}> {#each data.functions.functions as func} -+-- {func.name} -- + + + {func.name} ++ - -
+ {/if}- - {`Next execution: + + -+ {`Next execution: ${getNextScheduledExecution(func)}`} - {func.$id} @@ -141,6 +128,6 @@ allowCreate={$canWriteFunctions} href="https://appwrite.io/docs/products/functions" target="function" - on:click={openWizard} /> + on:click={() => goto(`${base}/project-${project}/functions/create-function`)} /> {/if}; - export let repositoryName: string; - export let branch: string; - export let rootDir: string; - export let domain: string = ''; + export let runtime: Runtime; + export let repositoryName: string = undefined; + export let branch: string = undefined; + export let rootDir: string = undefined; export let showGitData = true; + export let runtimes: Models.RuntimeList; + + $: selectedRuntime = runtimes?.runtimes.find((r) => r.$id === runtime); + + $: console.log(runtimes); - {#if runtime?.name} + {#if selectedRuntime?.name} Runtime - {#if runtime?.key} - + {#if selectedRuntime?.key} + {/if} - {runtime.name} + {selectedRuntime.name} - {selectedRuntime.version} + {#key runtime} + + {/key} + + {#if isCloud} + + + {/if} {#if showEntrypoint}+ {#if $organization?.billingPlan === BillingPlan.FREE} + + Upgrade to Pro or Scale to adjust + your CPU and RAM beyond the default. + + {/if} +- import CreateTemplate from './wizard/createTemplate.svelte'; - - export function connectTemplate( - template: Models.TemplateFunction, - runtime: string | null = null - ) { - const variables: Record - + const starterTemplateRuntimes = starterTemplate.runtimes.filter((r) => + baseRuntimesList.some((base) => base.$id === r.name) + ); - +-----+ let hasInstallations: boolean; + let selectedRepository: string; -Connect Git repository -- Create and deploy a function with a connected git repository. -
--- {#if isSelfHosted && !isVcsEnabled} - - {/if} -- --- + const starterTemplate = data.templatesList.templates.find( + (template) => template.id === 'starter' + ); - - -Quick start -Use a starter template.
--
- {#await Promise.all([$baseRuntimesList, $starterTemplate])}
- {#each Array(6) as _i}
-
- - - - {/each} - {:then [response, quickStart]} - {@const runtimes = new Map(response.runtimes.map((r) => [r.$id, r]))} - {@const templates = quickStart.runtimes.filter((template) => - runtimes.has(template.name) - )} - {#each templates.slice(0, 6) as template} - {@const runtimeDetail = runtimes.get(template.name)} -
- - - - {/each} + const featuredTemplatesList = data.templatesList.templates + .filter((template) => template.id !== 'starter') + .slice(0, 4); - {#if templates.length < 6} -
-
-
- --
- More runtimes coming soon
-
- - {/if} - {/await} -- - -Templates -- Find the right template for your use case. -
+ const baseRuntimesList = [ + ...new Map( + data.runtimesList.runtimes.map((runtime) => { + const base = runtime.name.split('-')[0]; + return [base, runtime]; + }) + ).values() + ]; --
- {#await $featuredTemplatesList}
- {#each Array(3) as _i}
-
- - - - {/each} - {:then templatesListWithoutStarter} - {#each templatesListWithoutStarter.templates as template} -
- - - - {/each} - {/await} -
- You can also create a function - or using the CLI. - Learn more. -
-+ diff --git a/src/routes/(console)/project-[project]/functions/create-function/+page.ts b/src/routes/(console)/project-[project]/functions/create-function/+page.ts index e69de29bb..935756a39 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/+page.ts +++ b/src/routes/(console)/project-[project]/functions/create-function/+page.ts @@ -0,0 +1,12 @@ +export const load = async ({ parent, url }) => { + const { templatesList, installations, runtimesList } = await parent(); + + return { + installations, + installation: installations.installations.find( + (installation) => installation.$id === url.searchParams.get('installation') + ), + runtimesList, + templatesList + }; +}; diff --git a/src/routes/(console)/project-[project]/functions/create-function/manual/+page.svelte b/src/routes/(console)/project-[project]/functions/create-function/manual/+page.svelte new file mode 100644 index 000000000..ea7b0f8da --- /dev/null +++ b/src/routes/(console)/project-[project]/functions/create-function/manual/+page.svelte @@ -0,0 +1,202 @@ + + ++ ++ + + + You can also create a function { + trackEvent('click_create_function_manual', { from: 'cover' }); + }} + href={`${wizardBase}/create-function/manual`}>manually + or using the CLI. + Learn more. + ++ {#if isSelfHosted && !isVcsEnabled} + + ++ + {:else} +Connect Git repository + ++ ++ ++ Configure your self-hosted instance to connect your function to + a Git repository. +
++ +++ + {/if} ++ + {#if hasInstallations} +Connect Git repository + ++ + + {/if} ++ + + Missing a repository? check your permissions + ++ + ++ +Quick start ++ {#each starterTemplateRuntimes.slice(0, 6) as template} + {@const iconName = template.name.split('-')[0]} + {@const runtimeDetail = baseRuntimesList.find( + (runtime) => runtime.$id === template.name + )} + + +{ + trackEvent('click_connect_template', { + from: 'cover', + template: starterTemplate.id, + runtime: template.name + }); + }} + href={`${wizardBase}/create-function/template-${starterTemplate.id}?runtime=${runtimeDetail.$id}`}> + + {/each} ++ ++ ++ + ++ {runtimeDetail?.name} + {#if runtimeDetail?.name?.toLowerCase() === 'deno'} + ++ {/if} + + + + {#each featuredTemplatesList as template} + + + +{ + trackEvent('click_connect_template', { + from: 'cover', + template: template.name + }); + }}> + + {/each} ++ ++ ++ {template.name} + ++ + {template.tagline} + ++ Browse all templates + ++ Create function - Appwrite ++ + diff --git a/src/routes/(console)/project-[project]/functions/create-function/manual/+page.ts b/src/routes/(console)/project-[project]/functions/create-function/manual/+page.ts new file mode 100644 index 000000000..aa4c29297 --- /dev/null +++ b/src/routes/(console)/project-[project]/functions/create-function/manual/+page.ts @@ -0,0 +1,9 @@ +export const load = async ({ parent }) => { + let { installations, runtimesList, specificationsList } = await parent(); + + return { + installations, + runtimesList, + specificationsList + }; +}; diff --git a/src/routes/(console)/project-[project]/functions/create-function/manual/configuration.svelte b/src/routes/(console)/project-[project]/functions/create-function/manual/configuration.svelte new file mode 100644 index 000000000..9dff286a2 --- /dev/null +++ b/src/routes/(console)/project-[project]/functions/create-function/manual/configuration.svelte @@ -0,0 +1,36 @@ + + + diff --git a/src/routes/(console)/project-[project]/functions/create-function/repository-[repository]/+page.svelte b/src/routes/(console)/project-[project]/functions/create-function/repository-[repository]/+page.svelte index 42f9c4d45..0f1b156bb 100644 --- a/src/routes/(console)/project-[project]/functions/create-function/repository-[repository]/+page.svelte +++ b/src/routes/(console)/project-[project]/functions/create-function/repository-[repository]/+page.svelte @@ -1,18 +1,16 @@ -
- - -
-
-
Total size
-- {humanFileSize(deployment.size + deployment.buildSize).value + - humanFileSize(deployment.size + deployment.buildSize).unit} -
-- - ---- Deployment size: - {humanFileSize(deployment.size).value + - humanFileSize(deployment.size).unit} -
-- Build size: - {humanFileSize(deployment.buildSize).value + - humanFileSize(deployment.buildSize).unit} -
-
-
- 3 ? '22rem' : '25rem'};`} data-private>
-
+
-
+
+
{/if}
-
-
+
+
-
-
- This payment method has expired
-
+
+
+
+
+{paymentMethod?.name}
+{paymentMethod?.expiryMonth}/{paymentMethod?.expiryYear}
+
+ {#if paymentMethod?.lastError || paymentMethod?.expired}
+
+
+ Details
+
+
+ {#if paymentMethod?.expired}
+ This payment method has expired
+ {/if}
+ {#if paymentMethod?.lastError}
+ {paymentMethod.lastError}
+ {/if}
+
+
{/if}
- {#if paymentMethod?.lastError}
-
- {paymentMethod.lastError}
-
- {/if}
-
+
diff --git a/src/lib/components/customId.svelte b/src/lib/components/customId.svelte
index 9301b04a1..0db5336dc 100644
--- a/src/lib/components/customId.svelte
+++ b/src/lib/components/customId.svelte
@@ -1,5 +1,5 @@
diff --git a/src/lib/components/emptySearch.svelte b/src/lib/components/emptySearch.svelte
index 5a0b7e00d..220a79f3c 100644
--- a/src/lib/components/emptySearch.svelte
+++ b/src/lib/components/emptySearch.svelte
@@ -1,26 +1,32 @@
-
-
- {#if paymentMethod?.expired}
-
-
-
-
- - {paymentMethod?.brand} ending in {paymentMethod?.last4} -
-- Expires {paymentMethod?.expiryMonth}/{paymentMethod?.expiryYear} -
- {#if paymentMethod?.name} -- {paymentMethod.name} -
- {/if} -
-
-{/if}
+ {#if !hidePagination}
+ Total results: 0
-Total results: 0
+
@@ -91,27 +92,24 @@
{#if column && operator && !operator?.hideInput}
{#if column?.array}
-
- {#if column.format === 'enum'}
- ({
- label: e?.label ?? e,
- value: e?.value ?? e,
- checked: arrayValues.includes(e?.value ?? e)
- }))}>
-
- {:else}
-
+ {#if column.format === 'enum'}
+ ({
+ label: e?.label ?? e,
+ value: e?.value ?? e,
+ checked: arrayValues.includes(e?.value ?? e)
+ }))}>
+
+ {:else}
+
-
-
diff --git a/src/lib/components/filters/customFilters.svelte b/src/lib/components/filters/customFilters.svelte
new file mode 100644
index 000000000..09ff475fb
--- /dev/null
+++ b/src/lib/components/filters/customFilters.svelte
@@ -0,0 +1,20 @@
+
+
+-
{#if column.format === 'enum'}
@@ -122,9 +120,7 @@
options={column?.elements?.map((e) => ({
label: e?.label ?? e,
value: e?.value ?? e
- }))}
- label="Value"
- showLabel={false} />
+ }))} />
{:else if column.type === 'integer' || column.type === 'double'}
+
+
+
+
+ {filter.title}
+
+
+
+
+
+
diff --git a/src/lib/components/filters/setFilters.ts b/src/lib/components/filters/setFilters.ts
new file mode 100644
index 000000000..97c9f741f
--- /dev/null
+++ b/src/lib/components/filters/setFilters.ts
@@ -0,0 +1,187 @@
+import type { Column } from '$lib/helpers/types';
+import { get, writable } from 'svelte/store';
+import { type FilterData } from './quickFilters';
+import { tags, type TagValue } from './store';
+
+export const parsedTags = writable- Before installing Git in a locally hosted Appwrite project, ensure your environment - variables are configured. -
-+ Before installing Git in a locally hosted Appwrite project, ensure your + environment variables are configured. +
+
+
+
+
{
e.preventDefault();
@@ -26,7 +26,7 @@
-
- {name} per page. Total results: {sum >= 5000 ? `${sum}+` : sum} + {name} per page. Total: {sum >= 5000 ? `${sum}+` : sum}
+
+
+
diff --git a/src/lib/components/menu/subMenu.svelte b/src/lib/components/menu/subMenu.svelte
new file mode 100644
index 000000000..ac52af18c
--- /dev/null
+++ b/src/lib/components/menu/subMenu.svelte
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+ {#if $$slots.start}
+
+
+
+
diff --git a/src/lib/components/mfaChallengeFormList.svelte b/src/lib/components/mfaChallengeFormList.svelte
index e04952d95..4b69eef35 100644
--- a/src/lib/components/mfaChallengeFormList.svelte
+++ b/src/lib/components/mfaChallengeFormList.svelte
@@ -10,10 +10,10 @@
}
await sdk.forConsole.account.updateMfaChallenge(challenge.$id, code);
await invalidate(Dependencies.ACCOUNT);
- trackEvent(Submit.AccountCreate);
+ trackEvent(Submit.AccountLogin, { mfa_used: true });
} catch (error) {
inputDigitFields?.clearInputsAndRefocus();
- trackError(error, Submit.AccountCreate);
+ trackError(error, Submit.AccountLogin);
throw error;
}
}
@@ -33,7 +33,6 @@
export let factors: Models.MfaFactors & { recoveryCode: boolean };
/** If true, the form will be submitted automatically when the code is entered. */
- export let autoSubmit: boolean = true;
export let showVerifyButton: boolean = true;
export let disabled: boolean = false;
export let challenge: Models.MfaChallenge;
diff --git a/src/lib/components/modal.svelte b/src/lib/components/modal.svelte
index ad51b11c8..9bd18b068 100644
--- a/src/lib/components/modal.svelte
+++ b/src/lib/components/modal.svelte
@@ -1,14 +1,12 @@
{#if [...$groups.keys()]?.length}
-
+
+
+
-
-
-
-
-
-
-
- Add a role
-
-
- Phone: {data?.phone}
+ {/if}
+ Members: {data?.total}
+
+
+{/if}
diff --git a/src/lib/components/permissions/team.svelte b/src/lib/components/permissions/team.svelte
index b2efaf4d0..5a155d350 100644
--- a/src/lib/components/permissions/team.svelte
+++ b/src/lib/components/permissions/team.svelte
@@ -70,7 +70,7 @@
}
-
- {#if role === 'users'}
-
-
-
-
+ {#if data?.phone}
+ Users
- {:else if role === 'guests'}
- Guests
- {:else if role === 'any'}
- Any
- {:else}
- {
- data = n;
- })
- .finally(() => {
- tick().then(() => {
- instance.setContent(content);
- });
- });
- }
- }}>
- {role}
-
-
-
-
- {#if data}
- {@const isUser = role.startsWith('user')}
- {@const isTeam = role.startsWith('team')}
- {@const isAnonymous = !data.email && !data.phone && isUser}
-
-
- {/if}
-
+
+ View user
+
+
+ {:else if isTeam}
+
+
+ View team
+
+
+ {/if}
+
+ {/await}
+ {/key}
+ Are you sure you want to delete this billing address from your account?
{/if} diff --git a/src/routes/(console)/account/payments/deletePaymentModal.svelte b/src/routes/(console)/account/payments/deletePaymentModal.svelte index 9e5b43498..63efeca25 100644 --- a/src/routes/(console)/account/payments/deletePaymentModal.svelte +++ b/src/routes/(console)/account/payments/deletePaymentModal.svelte @@ -9,6 +9,7 @@ import { addNotification } from '$lib/stores/notifications'; import type { Organization } from '$lib/stores/organization'; import { sdk } from '$lib/stores/sdk'; + import { Layout, Link, Typography } from '@appwrite.io/pink-svelte'; export let linkedOrgs: Organization[] = []; export let showDelete = false; @@ -40,23 +41,23 @@ bind:open={showDelete} bind:error> {#if linkedOrgs.length === 1} -
+
+
-
+
+
Are you sure you want to delete this payment method from your account?
{/if} diff --git a/src/routes/(console)/account/payments/editAddressModal.svelte b/src/routes/(console)/account/payments/editAddressModal.svelte index a70f9d8e7..74938b4af 100644 --- a/src/routes/(console)/account/payments/editAddressModal.svelte +++ b/src/routes/(console)/account/payments/editAddressModal.svelte @@ -51,10 +51,10 @@ type: 'success', message: `Address has been added` }); - trackEvent(Submit.BillingAddressCreate); + trackEvent(Submit.BillingAddressUpdate); } catch (e) { error = e.message; - trackError(e, Submit.BillingAddressCreate); + trackError(e, Submit.BillingAddressUpdate); } } diff --git a/src/routes/(console)/account/payments/editPaymentModal.svelte b/src/routes/(console)/account/payments/editPaymentModal.svelte index bcd68d08c..c054ec557 100644 --- a/src/routes/(console)/account/payments/editPaymentModal.svelte +++ b/src/routes/(console)/account/payments/editPaymentModal.svelte @@ -1,5 +1,5 @@
- {#if $organization?.paymentMethodId}
-
-
-
-
- {#if defaultPaymentMethod.userId === $user.$id}
- {
- isSelectedBackup = false;
- showEdit = true;
- showDropdown = false;
- }}>
- Edit
-
- {/if}
- {
- isSelectedBackup = false;
- showReplace = true;
- showDropdown = false;
- }}>
- Replace
-
- {
- isSelectedBackup = false;
- showDelete = true;
- showDropdown = false;
- }}>
- Remove
-
-
-
-
- {:else}
- {@const filteredPaymentMethods = $paymentMethods.paymentMethods.filter(
- (o) => !!o.last4 && o.$id !== $organization?.backupPaymentMethodId
- )}
-
-
- {/if}
-
- {#if $organization?.billingPlan !== BillingPlan.FREE && $organization?.billingPlan !== BillingPlan.GITHUB_EDUCATION}
-
-
-
-
-
-
- {#if $paymentMethods.total}
- {#each filteredPaymentMethods as paymentMethod}
- {
- showDropdown = false;
- addPaymentMethod(paymentMethod?.$id);
- }}>
-
-
- {/each}
- {/if}
- (showPayment = true)}>
- Add new payment method
-
-
-
-
- - Card ending in {paymentMethod.last4} -
-
- Add a payment method
-
-
- {#if $organization?.backupPaymentMethodId}
-
-
-
-
- {:else}
- {@const filteredPaymentMethods = $paymentMethods.paymentMethods.filter(
- (o) => !!o.last4 && o.$id !== $organization?.paymentMethodId
- )}
- {
+ isSelectedBackup = true;
+ showReplace = true;
+ }}>
+ Replace
+
+ {
+ isSelectedBackup = true;
+ showDelete = true;
+ }}>
+ Remove
+
+
+
+
+
{/if}
-
+
+ {#if !$organization?.backupPaymentMethodId}
+ {@const filteredPaymentMethods = $paymentMethods.paymentMethods.filter(
+ (o) => !!o.last4 && o.$id !== $organization?.paymentMethodId
+ )}
+ Backup
-
-
-
- {#if $paymentMethods.total}
- {#each filteredPaymentMethods as paymentMethod}
-
+ {#if backupPaymentMethod?.userId === $user?.$id}
+ {
- showDropdownBackup = true;
- addBackupPaymentMethod(paymentMethod?.$id);
+ isSelectedBackup = true;
+ showEdit = true;
}}>
-
-
- {/each}
- {/if}
- (showPayment = true)}>
- Add new payment method
-
-
-
-
+ Edit
+
+ {/if}
+
+
+
+
+
+
+ If your default payment fails, your backup method will be
+ charged automatically.
+
+
+
+
+ {#if $paymentMethods.total}
+ {#each filteredPaymentMethods as paymentMethod}
+ addBackupPaymentMethod(paymentMethod?.$id)}>
+
+
+
+ {/each}
+ {/if}
+ (showPayment = true)}>
+ Add new payment method
+
+
+
+
+ {/if}
+ {:else}
+ {@const filteredPaymentMethods = $paymentMethods.paymentMethods.filter(
+ (o) => !!o.last4 && o.$id !== $organization?.backupPaymentMethodId
+ )}
+
-
+
+
+
+ {tierToPlan($organization?.billingPlan)?.name} plan
+
+
+ {isTrial || $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION
+ ? formatCurrency(0)
+ : currentPlan
+ ? formatCurrency(currentPlan?.price)
+ : ''}
+
+
- {#if $organization?.billingPlan !== BillingPlan.FREE && $organization?.billingPlan !== BillingPlan.GITHUB_EDUCATION && extraUsage > 0}
-
-
- Add-ons{extraMembers ? extraAddons + 1 : extraAddons}
-
-
-
+ {#if $organization?.billingPlan !== BillingPlan.FREE && $organization?.billingPlan !== BillingPlan.GITHUB_EDUCATION && extraUsage > 0}
+
+
+ {formatCurrency(extraUsage >= 0 ? extraUsage : 0)}
+
+
+ {#if extraMembers}
+
+
+ Additional members
+ {formatCurrency(
+ extraMembers *
+ (currentPlan?.addons?.member?.price ?? 0)
+ )}
+
+
+ {extraMembers}
+
+
+ {/if}
+ {#if currentInvoice?.usage}
+ {#each currentInvoice.usage as excess, i}
+ {#if i > 0 || extraMembers}
+
+
+ {usageNameToLabel(
+ excess.name
+ )}
+ {formatCurrency(
+ excess.amount
+ )}
+
+
+
+
+
+ {formatNumberWithCommas(
+ excess.value ?? 0
+ )} bytes
+
+ {excessValue.value ??
+ 0}{excessValue.unit}
+
+
+
+
+ {/if}
+ {#if ['users', 'executions'].includes(excess.name)}
+
+
+ {usageNameToLabel(
+ excess.name
+ )}
+ {formatCurrency(
+ excess.amount
+ )}
+
+
+
+
+ {formatNumberWithCommas(excess.value)}
+
+ {abbreviateNumber(excess.value)}
+
+
+
+ {/if}
+ {/each}
+ {/if}
+
+
+ {/if}
-
- {/if}
+ {#if $organization?.billingPlan !== BillingPlan.FREE && availableCredit > 0}
+
+
+ Credits to be applied
+
+
+ {formatCurrency(
+ Math.min(availableCredit, currentInvoice?.amount ?? 0)
+ )}
+
+
+ {/if}
- {#if $organization?.billingPlan !== BillingPlan.FREE && availableCredit > 0}
-
-
- Credits to be applied
-
-
- {/if}
-
- {#if $organization?.billingPlan !== BillingPlan.FREE && $organization?.billingPlan !== BillingPlan.GITHUB_EDUCATION}
-
- Current total (USD)
-
-
-
-
- {/if}
-
-
-
- {tierToPlan($organization?.billingPlan)?.name} plan
-
+
- {isTrial ||
- $organization?.billingPlan === BillingPlan.GITHUB_EDUCATION
- ? formatCurrency(0)
- : currentPlan
- ? formatCurrency(currentPlan?.price)
- : ''}
-
-
-
-
-
-
- {formatCurrency(extraUsage >= 0 ? extraUsage : 0)}
-
-
- -
- {#if extraMembers}
-
- -{formatCurrency(
- Math.min(availableCredit, currentInvoice?.amount ?? 0)
- )}
-
-
- {formatCurrency(
- Math.max(
- (currentInvoice?.amount ?? 0) -
- Math.min(
- availableCredit,
- currentInvoice?.amount ?? 0
- ),
- 0
- )
- )}
-
- Payment method
-
+
{'{{user}}'}
{'{{project}}'}
{'{{otp}}'}
-
+
diff --git a/src/routes/(console)/project-[project]/auth/templates/emailInviteTemplate.svelte b/src/routes/(console)/project-[project]/auth/templates/emailInviteTemplate.svelte
index fb7a93500..2e4425eb0 100644
--- a/src/routes/(console)/project-[project]/auth/templates/emailInviteTemplate.svelte
+++ b/src/routes/(console)/project-[project]/auth/templates/emailInviteTemplate.svelte
@@ -7,6 +7,7 @@
import { addNotification } from '$lib/stores/notifications';
import { Id } from '$lib/components';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
+ import { Layout } from '@appwrite.io/pink-svelte';
const projectId = $page.params.project;
let locale = 'en';
@@ -34,7 +35,7 @@
}
-
+
{'{{team}}'}
@@ -42,4 +43,4 @@
{'{{project}}'}
{'{{redirect}}'}
-
+
diff --git a/src/routes/(console)/project-[project]/auth/templates/emailMagicUrlTemplate.svelte b/src/routes/(console)/project-[project]/auth/templates/emailMagicUrlTemplate.svelte
index e15372245..19e6c5eb9 100644
--- a/src/routes/(console)/project-[project]/auth/templates/emailMagicUrlTemplate.svelte
+++ b/src/routes/(console)/project-[project]/auth/templates/emailMagicUrlTemplate.svelte
@@ -7,6 +7,7 @@
import { addNotification } from '$lib/stores/notifications';
import { Id } from '$lib/components';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
+ import { Layout } from '@appwrite.io/pink-svelte';
const projectId = $page.params.project;
@@ -36,11 +37,11 @@
}
-
+
{'{{user}}'}
{'{{project}}'}
{'{{redirect}}'}
-
+
diff --git a/src/routes/(console)/project-[project]/auth/templates/emailRecoveryTemplate.svelte b/src/routes/(console)/project-[project]/auth/templates/emailRecoveryTemplate.svelte
index 56d028108..e6a9443f6 100644
--- a/src/routes/(console)/project-[project]/auth/templates/emailRecoveryTemplate.svelte
+++ b/src/routes/(console)/project-[project]/auth/templates/emailRecoveryTemplate.svelte
@@ -7,6 +7,7 @@
import { addNotification } from '$lib/stores/notifications';
import { Id } from '$lib/components';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
+ import { Layout } from '@appwrite.io/pink-svelte';
const projectId = $page.params.project;
@@ -35,11 +36,11 @@
}
-
+
{'{{user}}'}
{'{{project}}'}
{'{{redirect}}'}
-
+
diff --git a/src/routes/(console)/project-[project]/auth/templates/emailSessionAlertTemplate.svelte b/src/routes/(console)/project-[project]/auth/templates/emailSessionAlertTemplate.svelte
index 8dd83904b..438e8d2dd 100644
--- a/src/routes/(console)/project-[project]/auth/templates/emailSessionAlertTemplate.svelte
+++ b/src/routes/(console)/project-[project]/auth/templates/emailSessionAlertTemplate.svelte
@@ -7,6 +7,7 @@
import { addNotification } from '$lib/stores/notifications';
import { Id } from '$lib/components';
import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
+ import { Layout } from '@appwrite.io/pink-svelte';
const projectId = $page.params.project;
let locale = 'en';
@@ -34,7 +35,7 @@
}
-
+
{'{{user}}'}
@@ -43,4 +44,4 @@
{'{{ipAddress}}'}
{'{{country}}'}
-
+
diff --git a/src/routes/(console)/project-[project]/auth/templates/emailSignature.svelte b/src/routes/(console)/project-[project]/auth/templates/emailSignature.svelte
index 59b9fa5ea..e99af4250 100644
--- a/src/routes/(console)/project-[project]/auth/templates/emailSignature.svelte
+++ b/src/routes/(console)/project-[project]/auth/templates/emailSignature.svelte
@@ -1,5 +1,5 @@
diff --git a/src/routes/(console)/project-[project]/createVariableModal.svelte b/src/routes/(console)/project-[project]/createVariableModal.svelte
new file mode 100644
index 000000000..899b070a3
--- /dev/null
+++ b/src/routes/(console)/project-[project]/createVariableModal.svelte
@@ -0,0 +1,115 @@
+
+
+
+
+
+
-
- {#if $proxyRuleList?.rules?.length}
- Source
- -
-
- {/if}
- Domains
- -
-
-
-
-
+
+ {#if isScheduled}
+ Updated
- -+ Deployment size: + {humanFileSize(deployment.sourceSize).value + + humanFileSize(deployment.sourceSize).unit} +
++ Build size: + {humanFileSize(deployment.buildSize).value + + humanFileSize(deployment.buildSize).unit} +
+ +
+
+
+ Execution ID
+
+ {selectedLog?.$id}
+
+
+
+
+
+
+
+
+ {#if selectedLog}
+
+
+ {capitalize(selectedLog.status)}
+
+
+
+ {`Scheduled to execute on ${toLocaleDateTime(selectedLog.scheduledAt)}`}
+
+
+
+
-
- {#if status === 'scheduled'}
-
- {timeFromNow(execution.scheduledAt)}
- {:else}
- {status}
- {/if}
-
-
- {`Scheduled to execute on ${toLocaleDateTime(execution.scheduledAt)}`}
-
+
+ {status}
+
+
+
+ {`Scheduled to execute on ${toLocaleDateTime(log.scheduledAt)}`}
+
+ Are you sure you want to disconnect {$func.name}? This will affect future deployments to this function. @@ -70,4 +70,4 @@
-
-
- {$func.name}
+ {$func.name}
-
- {$func.runtime}
-
-
+
-
- Created at: {toLocaleDateTime($func.$createdAt)}
-Last updated at: {toLocaleDateTime($func.$updatedAt)}
-- Configure a Git repository that will trigger your function deployments when updated. -
- {#if step === 1} - {#await getRepos()} - Fetching repositories.. - {:then} -
-
-
-
-
-
-
- - Manage organization configuration in your project settings. -
- {#if repositoriesList.length} --
- {#each repositoriesList as repo}
-
- - - - {/each} -
-
- {:else if search}
- Total results: {repositoriesList.length}
-
-
-
- Sorry we couldn't find "{search}"
-
- There are no repositories that match your search.
-
-
-
-
-
-
-
-
- You have no repositories.
-- Need a hand? Learn more in our - documentation. -
-
-
-
- {selectedRepo.name}
-Last updated: {toLocaleDateTime(selectedRepo.pushedAt)}
-