+
{template.name}
{#each displayed as runtime}
{@const icon = getIconFromRuntime(runtime.name)}
{#if icon}
- -
+
-
+ -
+
+
diff --git a/src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/+page.svelte
index 1137cf318..e07244345 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/templates/template-[template]/+page.svelte
@@ -22,9 +22,10 @@
- -
-
- Use cases {$template.useCases.length}
+
-
+
+ Use cases
+ {$template.useCases.length}
{#each $template.useCases as useCase}
@@ -32,9 +33,10 @@
{/each}
- -
-
- Runtimes {$template.runtimes.length}
+
-
+
+ Runtimes
+ {$template.runtimes.length}
{#each $template.runtimes as runtime}
@@ -42,12 +44,12 @@
{/each}
- -
+
-
Published by
@@ -58,7 +60,7 @@
-
+
+
+
diff --git a/src/routes/(console)/project-[region]-[project]/functions/wizard/step1.svelte b/src/routes/(console)/project-[region]-[project]/functions/wizard/step1.svelte
index 26b97c118..d8c08dd1e 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/wizard/step1.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/wizard/step1.svelte
@@ -52,6 +52,7 @@
{:else}
{:else}
-
+
{/if}
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/topicsModal.svelte b/src/routes/(console)/project-[region]-[project]/messaging/topicsModal.svelte
index 684f9cee5..6b9e949b9 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/topicsModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/topicsModal.svelte
@@ -3,7 +3,7 @@
import { Button, FormList, InputCheckbox, InputSearch } from '$lib/elements/forms';
import { Table, TableBody, TableCell, TableRow } from '$lib/elements/table';
import { sdk } from '$lib/stores/sdk';
- import { Query, type Models, MessagingProviderType } from '@appwrite.io/console';
+ import { MessagingProviderType, type Models, Query } from '@appwrite.io/console';
import { createEventDispatcher } from 'svelte';
import { getTotal } from './wizard/store';
import { page } from '$app/stores';
@@ -23,6 +23,8 @@
let selected: Record = {};
let hasSelection = false;
+ let emptyTopicsExists = false;
+
function reset() {
offset = 0;
search = '';
@@ -49,6 +51,20 @@
.forProject($page.params.region, $page.params.project)
.messaging.listTopics(queries, search || undefined);
+ if (response.total !== 0) {
+ switch (providerType) {
+ case MessagingProviderType.Email:
+ emptyTopicsExists = response.topics.every((topic) => topic.emailTotal === 0);
+ break;
+ case MessagingProviderType.Sms:
+ emptyTopicsExists = response.topics.every((topic) => topic.smsTotal === 0);
+ break;
+ case MessagingProviderType.Push:
+ emptyTopicsExists = response.topics.every((topic) => topic.pushTotal === 0);
+ break;
+ }
+ }
+
totalResults = response.total;
topicResultsById = {};
response.topics.forEach((topic) => {
@@ -97,7 +113,9 @@
Select existing topics you want to send this message to its targets. The message will be
- sent only to targets.
+ sent only to
+
+ targets.
- {#if Object.keys(topicResultsById).length > 0}
+ {#if Object.keys(topicResultsById).length > 0 && !emptyTopicsExists}
@@ -158,9 +176,12 @@
Documentation
+ text
+ >Documentation
+
(search = '')}
- >Clear search
+ >Clear search
+
@@ -169,15 +190,19 @@
- You have no topics. Create a topic to see them here.
+ You have no topics{emptyTopicsExists
+ ? ` with ${providerType.toUpperCase()} targets`
+ : ''}. Create a topic to see them here.
- Need a hand? Learn more in our documentation .
+ >documentation
+
+ .
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/wizard/emailFormList.svelte b/src/routes/(console)/project-[region]-[project]/messaging/wizard/emailFormList.svelte
index 21044a815..19a9bd83a 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/wizard/emailFormList.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/wizard/emailFormList.svelte
@@ -10,7 +10,7 @@
InputTextarea
} from '$lib/elements/forms';
import { Pill } from '$lib/elements';
- import { Modal } from '$lib/components';
+ import { CustomId, Modal } from '$lib/components';
import { user } from '$lib/stores/user';
import { clickOnEnter } from '$lib/helpers/a11y';
import { ID, MessagingProviderType } from '@appwrite.io/console';
@@ -114,5 +114,12 @@
Message ID
+ {:else}
+
{/if}
diff --git a/src/routes/(console)/project-[region]-[project]/messaging/wizard/pushFormList.svelte b/src/routes/(console)/project-[region]-[project]/messaging/wizard/pushFormList.svelte
index 544060f22..8b4ec7758 100644
--- a/src/routes/(console)/project-[region]-[project]/messaging/wizard/pushFormList.svelte
+++ b/src/routes/(console)/project-[region]-[project]/messaging/wizard/pushFormList.svelte
@@ -38,7 +38,7 @@
Label
} from '$lib/elements/forms';
import { Pill } from '$lib/elements';
- import { Modal } from '$lib/components';
+ import { CustomId, Modal } from '$lib/components';
import { user } from '$lib/stores/user';
import { clickOnEnter } from '$lib/helpers/a11y';
import { ID, MessagingProviderType } from '@appwrite.io/console';
@@ -233,6 +233,13 @@
Message ID
+ {:else}
+
{/if}
+ {:else}
+
{/if}
diff --git a/src/routes/(console)/project-[region]-[project]/settings/GitDisconnectModal.svelte b/src/routes/(console)/project-[region]-[project]/settings/GitDisconnectModal.svelte
index 73f7673e1..32e32a3ae 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/GitDisconnectModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/GitDisconnectModal.svelte
@@ -56,11 +56,6 @@
bind:show={showGitDisconnect}
onSubmit={handleSubmit}
size="big">
-
- Are you sure you want to disconnect this git installation? This will affect future
- deployments to the following functions:
-
-
{#await loadFunctions()}
@@ -69,6 +64,10 @@
{:then functions}
{#if functions.total}
+
+ Are you sure you want to disconnect this git installation? This will affect future
+ deployments to the following functions:
+
{#each functions.functions as func}
@@ -78,7 +77,9 @@
{func.name}
-
+
Last deployed: {toLocaleDateTime(func.$updatedAt)}
diff --git a/src/routes/(console)/project-[region]-[project]/settings/GitInstallationModal.svelte b/src/routes/(console)/project-[region]-[project]/settings/GitInstallationModal.svelte
index 25bc41bd8..a86d68ce1 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/GitInstallationModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/GitInstallationModal.svelte
@@ -21,7 +21,7 @@
- Select a provider to import an existing git repositories.
+ Select a provider to import an existing git repository.
diff --git a/src/routes/(console)/project-[region]-[project]/settings/updateInstallations.svelte b/src/routes/(console)/project-[region]-[project]/settings/updateInstallations.svelte
index f72be2340..7817da15b 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/updateInstallations.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/updateInstallations.svelte
@@ -3,6 +3,7 @@
import { page } from '$app/stores';
import {
Alert,
+ Arrow,
AvatarGroup,
CardGrid,
DropList,
@@ -91,7 +92,7 @@
{#if total > 0}
-
+
-
-
- Installation ID
- Repository
- Updated
-
-
-
- {#each installations as installation, i}
-
-
- {installation.$id}
-
-
-
-
-
+
+
+
+ Installation ID
+ Repository
+ Updated
+
+
+
+ {#each installations as installation, i}
+
+
+ {installation.$id}
+
+
+
+
+
+
+
+ {installation.organization}
-
- {installation.organization}
-
-
-
- {dayjs().to(installation.$updatedAt)}
-
+
+
+ {dayjs().to(installation.$updatedAt)}
+
-
-
-
- (showInstallationDropdown[i] =
- !showInstallationDropdown[i])}>
-
-
-
- {
- showInstallationDropdown[i] = false;
- }}>
- Configure
-
- {
- showInstallationDropdown[i] = false;
- showGitDisconnect = true;
- selectedInstallation = installation;
- }}>
- Disconnect
-
-
-
-
-
- {/each}
-
-
+
+
+
+ (showInstallationDropdown[i] =
+ !showInstallationDropdown[i])}>
+
+
+
+ {
+ showInstallationDropdown[i] = false;
+ }}>
+ Configure
+
+ {
+ showInstallationDropdown[i] = false;
+ showGitDisconnect = true;
+ selectedInstallation = installation;
+ }}>
+ Disconnect
+
+
+
+
+
+ {/each}
+
+
+
Total installations: {total}
@@ -203,8 +208,12 @@
-
-
+
+
+
@@ -227,3 +236,9 @@
{#if showGitDisconnect}
{/if}
+
+
diff --git a/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte
index d7666f5bc..49a621528 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/usage/[[invoice]]/+page.svelte
@@ -2,6 +2,7 @@
import { Container } from '$lib/layout';
import { CardGrid, Heading, Card, ProgressBarBig } from '$lib/components';
import {
+ TableRow,
TableBody,
TableCell,
TableCellHead,
@@ -18,6 +19,10 @@
import { total } from '$lib/layout/usage.svelte';
import { BillingPlan } from '$lib/constants.js';
import { base } from '$app/paths';
+ import { formatCurrency, formatNumberWithCommas } from '$lib/helpers/numbers';
+ import Collapsible from '$lib/components/collapsible.svelte';
+ import CollapsibleItem from '$lib/components/collapsibleItem.svelte';
+ import { getCountryName } from '$lib/helpers/diallingCodes.js';
export let data;
@@ -380,6 +385,70 @@
{/if}
+
+ Phone OTP
+
+ Calculated for all Phone OTP sent across your project. Resets at the start of each
+ billing cycle.
+
+ You will not be charged for Phone OTPs before February 10th.
+
+ {#if data.usage.authPhoneTotal}
+
+
+ {formatNumberWithCommas(data.usage.authPhoneTotal)}
+ OTPs
+
+
+ Estimated cost
+
+ {formatCurrency(data.usage.authPhoneEstimate)}
+
+
+
+ {#if data.usage.authPhoneCountryBreakdown.length > 0}
+
+
+ Region breakdown
+
+
+ Region
+ Amount
+ Estimated cost
+
+
+ {#each data.usage.authPhoneCountryBreakdown as phone}
+
+
+ {getCountryName(phone.name)}
+
+
+ {formatNumberWithCommas(phone.value)}
+
+
+ {formatCurrency(phone.estimate)}
+
+
+ {/each}
+
+
+
+
+ {/if}
+ {:else}
+
+
+
+ No data to show
+
+
+ {/if}
+
+
Metrics are estimates updated every 24 hours and may not accurately reflect your invoice.
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/step1.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/step1.svelte
index ff4c02639..43454a461 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/step1.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/step1.svelte
@@ -1,43 +1,37 @@
File
Upload a file to add it to your bucket.
- {#if isCloud}
- {@const size = humanFileSize(sizeToBytes(service, 'MB', 1000))}
- {@const plan = tierToPlan($organization?.billingPlan)}
+ {#if isCloud && fileError === 'File size exceeds the limit'}
+ {@const size = humanFileSize($bucket.maximumFileSize ?? sizeToBytes(service, 'MB', 1000))}
- The {plan.name} plan has a maximum upload file size limit of {Math.floor(
- parseInt(size.value)
- )}{size.unit}.
- {#if $organization?.billingPlan === BillingPlan.FREE}
- Upgrade to allow files of a larger size.
- {/if}
+ The maximum file upload size for this bucket is {parseInt(size.value)}{size.unit}.
+ You can adjust it in your
+ bucket settings.
-
- {#if $organization?.billingPlan === BillingPlan.FREE}
-
- {/if}
-
{/if}
@@ -47,6 +41,7 @@
required
bind:files={$createFile.files}
allowedFileExtensions={$bucket.allowedFileExtensions}
+ bind:error={fileError}
maxSize={isCloud
? $bucket.maximumFileSize
: ($bucket.maximumFileSize ?? sizeToBytes(service, 'MB', 1000))} />
@@ -62,7 +57,7 @@
{:else}
-
+
{/if}
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
index a345f525d..9509002bd 100644
--- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
+++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
@@ -16,6 +16,11 @@
const service = currentPlan['fileSize'];
const { value, unit, baseValue, units } = createByteUnitPair($bucket.maximumFileSize, 1000);
const options = units.map((v) => ({ label: v.name, value: v.name }));
+ $: selectedUnit = $unit;
+
+ $: maxValue = function formMaxFileSize() {
+ return (service * 1000 * 1000) / units.find((unit) => unit.name === selectedUnit).value;
+ };
function updateMaxSize() {
updateBucket(
@@ -64,7 +69,7 @@
disabled={$readOnly && !GRACE_PERIOD_OVERRIDE}
placeholder={$bucket.maximumFileSize.toString()}
min={0}
- max={isCloud ? service : Infinity}
+ max={isCloud ? maxValue() : Infinity}
bind:value={$value} />
{:else}
-
+
{/if}
diff --git a/src/routes/(console)/supportWizard.svelte b/src/routes/(console)/supportWizard.svelte
index 615b43c9c..eb21414aa 100644
--- a/src/routes/(console)/supportWizard.svelte
+++ b/src/routes/(console)/supportWizard.svelte
@@ -20,6 +20,7 @@
onDestroy(() => {
$supportData = {
message: null,
+ subject: null,
category: 'general',
file: null
};
@@ -39,8 +40,8 @@
'Content-Type': 'application/json'
},
body: JSON.stringify({
- subject: 'support',
email: $user.email,
+ subject: $supportData.subject,
firstName: $user?.name || 'Unknown',
message: $supportData.message,
tags: ['cloud'],
@@ -75,6 +76,7 @@
function resetData() {
$supportData = {
message: null,
+ subject: null,
category: 'general',
file: null,
project: null
diff --git a/src/routes/(console)/wizard/support/mobileSupportModal.svelte b/src/routes/(console)/wizard/support/mobileSupportModal.svelte
index 31f2108c6..91818eddc 100644
--- a/src/routes/(console)/wizard/support/mobileSupportModal.svelte
+++ b/src/routes/(console)/wizard/support/mobileSupportModal.svelte
@@ -5,6 +5,24 @@
export let show: boolean;
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/routes/(console)/wizard/support/step1.svelte b/src/routes/(console)/wizard/support/step1.svelte
index 06f8f265b..68d2a3739 100644
--- a/src/routes/(console)/wizard/support/step1.svelte
+++ b/src/routes/(console)/wizard/support/step1.svelte
@@ -1,5 +1,5 @@
- Use cases {$template.useCases.length} +
+ Use cases + {$template.useCases.length}
- Runtimes {$template.runtimes.length} +
+ Runtimes + {$template.runtimes.length}
Published by
Select existing topics you want to send this message to its targets. The message will be
- sent only to
Total installations: {total}
@@ -203,8 +208,12 @@+ Calculated for all Phone OTP sent across your project. Resets at the start of each + billing cycle. +
+You will not be charged for Phone OTPs before February 10th.
++ {formatNumberWithCommas(data.usage.authPhoneTotal)} + OTPs +
++ Estimated cost + + {formatCurrency(data.usage.authPhoneEstimate)} + +
+No data to show
+Metrics are estimates updated every 24 hours and may not accurately reflect your invoice.
diff --git a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/step1.svelte b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/step1.svelte index ff4c02639..43454a461 100644 --- a/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/step1.svelte +++ b/src/routes/(console)/project-[region]-[project]/storage/bucket-[bucket]/create-file/step1.svelte @@ -1,43 +1,37 @@- The {plan.name} plan has a maximum upload file size limit of {Math.floor( - parseInt(size.value) - )}{size.unit}. - {#if $organization?.billingPlan === BillingPlan.FREE} - Upgrade to allow files of a larger size. - {/if} + The maximum file upload size for this bucket is {parseInt(size.value)}{size.unit}. + You can adjust it in your + bucket settings.
-