@@ -125,7 +122,7 @@ export const providers: ProvidersMap = {
placeholder: 'Enter key ID',
popover: [
'
How to get the auth key ID?',
- 'Head to
Apple Developer Member Center -> Certificates, Identifiers & Profiles -> Keys.',
+ 'Head to
Apple Developer Member Center -> Certificates, Identifiers & Profiles -> Keys.',
'Click on your key to view details.'
]
},
@@ -136,7 +133,7 @@ export const providers: ProvidersMap = {
allowedFileExtensions: ['p8'],
popover: [
'
How to get the authentication key?',
- 'Head to
Apple Developer Member Center (under Program resources)
-> Certificates, Identifiers & Profiles -> Keys.',
+ 'Head to
Apple Developer Member Center (under Program resources)
-> Certificates, Identifiers & Profiles -> Keys.',
'Create a key and give it a name. Enable the Apple Push Notifications service (APNS), and register your key.'
]
}
@@ -157,17 +154,16 @@ export const providers: ProvidersMap = {
[Providers.Mailgun]: {
imageIcon: 'mailgun',
title: 'Mailgun',
- link: 'https://signup.mailgun.com/new/signup',
description: '',
configure: [
{
label: 'API key',
name: 'apiKey',
- type: 'text',
+ type: 'password',
placeholder: 'Enter API key',
popover: [
'
How to get the API key?',
- 'Create an account in
Mailgun.',
+ 'Create an account in
Mailgun.',
'Head to
Profile -> API Security -> Add new key.'
]
},
@@ -179,7 +175,7 @@ export const providers: ProvidersMap = {
popover: [
'
How to create a domain?',
'Head to
Sending -> Domains -> Add new domain.',
- 'Follow
Mailgun instructions to verify the domain name.'
+ 'Follow
Mailgun instructions to verify the domain name.'
]
},
{
@@ -220,18 +216,17 @@ export const providers: ProvidersMap = {
},
[Providers.Sendgrid]: {
imageIcon: 'sendgrid',
- title: 'Sendgrid',
- link: 'https://login.sendgrid.com/login/identifier?_gl=1*3vtcwz*_ga*MTMzODgwNDQ5OC4xNzA2MjAxMDUz*_ga_8W5LR442LD*MTcwNjIwMTA1My4xLjAuMTcwNjIwMTA1My4wLjAuMA..',
+ title: 'SendGrid',
description: '',
configure: [
{
label: 'API key',
name: 'apiKey',
- type: 'text',
+ type: 'password',
placeholder: 'Enter API key',
popover: [
'
How to get the API key?',
- 'Create an account in
Sendgrid.',
+ 'Create an account in
SendGrid.',
'Head to
Settings -> API Keys -> Create API key.'
]
},
@@ -267,7 +262,6 @@ export const providers: ProvidersMap = {
[Providers.SMTP]: {
classIcon: 'mail',
title: 'SMTP',
- link: '',
description: '',
configure: [
{
@@ -293,7 +287,7 @@ export const providers: ProvidersMap = {
{
label: 'Password',
name: 'password',
- type: 'text',
+ type: 'password',
optional: true,
placeholder: 'Enter password'
},
@@ -361,7 +355,6 @@ export const providers: ProvidersMap = {
[Providers.Twilio]: {
imageIcon: 'twilio',
title: 'Twilio',
- link: 'https://login.twilio.com/u/signup?state=hKFo2SBaQktjdzI0ZHdKdm44QUc5YzBRXzlNMmlyTExkRWVTTaFur3VuaXZlcnNhbC1sb2dpbqN0aWTZIHpwNUVrWDJzeFRJdUczVU5LTk16X0FHWEQ3dHU0S3hko2NpZNkgTW05M1lTTDVSclpmNzdobUlKZFI3QktZYjZPOXV1cks',
description: '',
configure: [
{
@@ -371,17 +364,17 @@ export const providers: ProvidersMap = {
placeholder: 'Enter Account SID',
popover: [
'
How to get the Account SID?',
- 'Head to
Twilio console -> Account info -> Account SID.'
+ 'Head to
Twilio console -> Account info -> Account SID.'
]
},
{
label: 'Auth token',
name: 'authToken',
- type: 'text',
+ type: 'password',
placeholder: 'Enter Auth token',
popover: [
'
How to get the Auth token?',
- 'Head to
Twilio console -> Account info -> Auth Token.'
+ 'Head to
Twilio console -> Account info -> Auth Token.'
]
},
{
@@ -391,8 +384,8 @@ export const providers: ProvidersMap = {
placeholder: 'Enter phone',
popover: [
'
How to get sender number?',
- 'Head to
Twilio console -> Account info -> My Twilio phone number.',
- 'If you have multiple
Twilio phone numbers, you can select one as the default number.'
+ 'Head to
Twilio console -> Develop -> Phone Numbers -> Manage -> Active Numbers.',
+ 'If you have multiple
Twilio phone numbers, you can select one as the default number.'
]
}
]
@@ -400,17 +393,16 @@ export const providers: ProvidersMap = {
[Providers.Msg91]: {
imageIcon: 'msg91',
title: 'MSG91',
- link: 'https://control.msg91.com/signin/',
description: '',
configure: [
{
label: 'Auth key',
name: 'authKey',
- type: 'text',
+ type: 'password',
placeholder: 'Enter auth key',
popover: [
'
How to get the Auth key?',
- 'Create an account in
MSG91.',
+ 'Create an account in
MSG91.',
'Click to open the
Username dropdown -> Authkey -> Verify your mobile number -> Create Authkey.'
]
},
@@ -421,7 +413,7 @@ export const providers: ProvidersMap = {
placeholder: 'Enter sender ID',
popover: [
'
How to create a Sender ID?',
- 'Head to
MSG91 dashboard -> SMS -> Sender ID -> Create sender ID.'
+ 'Head to
MSG91 dashboard -> SMS -> Sender ID -> Create sender ID.'
]
},
{
@@ -435,7 +427,6 @@ export const providers: ProvidersMap = {
[Providers.Telesign]: {
imageIcon: 'telesign',
title: 'Telesign',
- link: 'https://www.telesign.com/',
description: '',
configure: [
{
@@ -460,19 +451,18 @@ export const providers: ProvidersMap = {
},
[Providers.Textmagic]: {
imageIcon: 'textmagic',
- title: 'TextMagic',
- link: 'https://app.textmagic.com/login',
+ title: 'Textmagic',
description: '',
configure: [
{
label: 'API key',
name: 'apiKey',
- type: 'text',
+ type: 'password',
placeholder: 'Enter API key',
popover: [
'
How to get the API key?',
- 'Create an account in
TextMagic.',
- 'Head to
TextMagic dashboard -> API Settings -> Add new API key.'
+ 'Create an account in
Textmagic.',
+ 'Head to
Textmagic dashboard -> Services -> API -> Add new API key.'
]
},
{
@@ -492,28 +482,27 @@ export const providers: ProvidersMap = {
[Providers.Vonage]: {
imageIcon: 'vonage',
title: 'Vonage',
- link: 'https://www.vonage.com/?bypassgeoloc=true',
description: '',
configure: [
{
label: 'API key',
name: 'apiKey',
- type: 'text',
+ type: 'password',
placeholder: 'Enter API key',
popover: [
'
How to get the API key?',
- 'Create an account in Vonage.',
- 'Head to
Vonage dashboard and copy the API key.'
+ 'Create an account in
Vonage.',
+ 'Head to
Vonage dashboard and copy the API key.'
]
},
{
label: 'API secret',
name: 'apiSecret',
- type: 'text',
+ type: 'password',
placeholder: 'Enter API secret',
popover: [
'
How to get the API secret?',
- 'Head to
Vonage dashboard and copy the API secret.'
+ 'Head to
Vonage dashboard and copy the API secret.'
]
},
{
diff --git a/src/routes/console/project-[project]/messaging/providers/update.svelte b/src/routes/console/project-[project]/messaging/providers/update.svelte
index 953315629..2f6dfb517 100644
--- a/src/routes/console/project-[project]/messaging/providers/update.svelte
+++ b/src/routes/console/project-[project]/messaging/providers/update.svelte
@@ -77,10 +77,10 @@
$providerParams[$provider].domain,
$providerParams[$provider].isEuRegion,
$providerParams[$provider].enabled,
- $providerParams[$provider].fromName,
+ $providerParams[$provider].fromName || undefined,
$providerParams[$provider].fromEmail,
- $providerParams[$provider].replyToName,
- $providerParams[$provider].replyToEmail
+ $providerParams[$provider].replyToName || undefined,
+ $providerParams[$provider].replyToEmail || undefined
);
break;
case Providers.Sendgrid:
@@ -89,10 +89,10 @@
$providerParams[$provider].name,
$providerParams[$provider].enabled,
$providerParams[$provider].apiKey,
- $providerParams[$provider].fromName,
+ $providerParams[$provider].fromName || undefined,
$providerParams[$provider].fromEmail,
- $providerParams[$provider].replyToName,
- $providerParams[$provider].replyToEmail
+ $providerParams[$provider].replyToName || undefined,
+ $providerParams[$provider].replyToEmail || undefined
);
break;
case Providers.SMTP:
diff --git a/src/routes/console/project-[project]/messaging/providers/wizard/configure.svelte b/src/routes/console/project-[project]/messaging/providers/wizard/configure.svelte
index a15c52d4e..1fc3860b0 100644
--- a/src/routes/console/project-[project]/messaging/providers/wizard/configure.svelte
+++ b/src/routes/console/project-[project]/messaging/providers/wizard/configure.svelte
@@ -71,6 +71,9 @@
id={input.name}
label={input.label}
placeholder={input.placeholder}
+ required={!input.optional}
+ showPasswordButton
+ isPopoverDefined={input.popover !== undefined}
bind:value={$providerParams[$provider][input.name]}>
{@html input.popover?.join('
')}
@@ -82,6 +85,7 @@
label={input.label}
placeholder={input.placeholder}
required={!input.optional}
+ isPopoverDefined={input.popover !== undefined}
bind:value={$providerParams[$provider][input.name]}>
@@ -95,6 +99,7 @@
label={input.label}
placeholder={input.placeholder}
required={!input.optional}
+ isPopoverDefined={input.popover !== undefined}
bind:value={$providerParams[$provider][input.name]}>
@@ -108,6 +113,7 @@
label={input.label}
placeholder={input.placeholder}
required={!input.optional}
+ isPopoverDefined={input.popover !== undefined}
bind:value={$providerParams[$provider][input.name]}>
@@ -120,6 +126,7 @@
label={input.label}
allowedFileExtensions={input.allowedFileExtensions}
required={!input.optional}
+ isPopoverDefined={input.popover !== undefined}
bind:files={files[input.name]}>
@@ -131,7 +138,6 @@
{input.description}
diff --git a/src/routes/console/project-[project]/messaging/topics/+page.svelte b/src/routes/console/project-[project]/messaging/topics/+page.svelte
index 2b86aee24..4cd0959c8 100644
--- a/src/routes/console/project-[project]/messaging/topics/+page.svelte
+++ b/src/routes/console/project-[project]/messaging/topics/+page.svelte
@@ -82,8 +82,7 @@
total={data.topics.total} />
{:else if $hasPageQueries}
-
- {:else if data.search && data.search != 'empty'}
+ {:else if data.search}
Sorry, we couldn't find '{data.search}'
@@ -94,11 +93,10 @@
{:else}
-
($showCreate = true)}
- href="https://appwrite.io/docs/references/cloud/client-web/teams"
+ href="https://appwrite.io/docs/products/messaging/topics"
target="topic" />
{/if}
diff --git a/src/routes/console/project-[project]/messaging/topics/+page.ts b/src/routes/console/project-[project]/messaging/topics/+page.ts
index 5a5186371..af2242188 100644
--- a/src/routes/console/project-[project]/messaging/topics/+page.ts
+++ b/src/routes/console/project-[project]/messaging/topics/+page.ts
@@ -21,7 +21,7 @@ export const load = async ({ depends, url, route }) => {
search,
query,
page,
- topics: sdk.forProject.messaging.listTopics(
+ topics: await sdk.forProject.messaging.listTopics(
[
Query.limit(limit),
Query.offset(offset),
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/+layout.ts b/src/routes/console/project-[project]/messaging/topics/topic-[topic]/+layout.ts
index 234f55abf..6b82ae854 100644
--- a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/+layout.ts
+++ b/src/routes/console/project-[project]/messaging/topics/topic-[topic]/+layout.ts
@@ -10,6 +10,6 @@ export const load: LayoutLoad = async ({ params, depends }) => {
return {
header: Header,
breadcrumbs: Breadcrumbs,
- topic: sdk.forProject.messaging.getTopic(params.topic)
+ topic: await sdk.forProject.messaging.getTopic(params.topic)
};
};
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/activity/+page.ts b/src/routes/console/project-[project]/messaging/topics/topic-[topic]/activity/+page.ts
index ac7c27bac..bf12dffa4 100644
--- a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/activity/+page.ts
+++ b/src/routes/console/project-[project]/messaging/topics/topic-[topic]/activity/+page.ts
@@ -12,7 +12,7 @@ export const load: PageLoad = async ({ params, url, route }) => {
return {
offset,
limit,
- logs: sdk.forProject.messaging.listTopicLogs(params.topic, [
+ logs: await sdk.forProject.messaging.listTopicLogs(params.topic, [
Query.limit(limit),
Query.offset(offset)
])
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/subscribers/+page.svelte b/src/routes/console/project-[project]/messaging/topics/topic-[topic]/subscribers/+page.svelte
index e5725ecc0..27219e4e0 100644
--- a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/subscribers/+page.svelte
+++ b/src/routes/console/project-[project]/messaging/topics/topic-[topic]/subscribers/+page.svelte
@@ -125,8 +125,7 @@
total={data.subscribers.total} />
{:else if $hasPageQueries}
-
- {:else if data.search && data.search != 'empty'}
+ {:else if data.search}
Sorry, we couldn't find '{data.search}'
@@ -139,11 +138,10 @@
{:else}
-
(showAdd = true)}
- href="https://appwrite.io/docs/references/cloud/client-web/teams"
+ href="https://appwrite.io/docs/products/messaging/topics/#subscribe-targets-to-topics"
target="subscriber" />
{/if}
diff --git a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/subscribers/+page.ts b/src/routes/console/project-[project]/messaging/topics/topic-[topic]/subscribers/+page.ts
index a5bc68a9b..9f2a8116e 100644
--- a/src/routes/console/project-[project]/messaging/topics/topic-[topic]/subscribers/+page.ts
+++ b/src/routes/console/project-[project]/messaging/topics/topic-[topic]/subscribers/+page.ts
@@ -22,7 +22,7 @@ export const load: PageLoad = async ({ params, url, route, depends }) => {
limit,
search,
query,
- subscribers: sdk.forProject.messaging.listSubscribers(
+ subscribers: await sdk.forProject.messaging.listSubscribers(
params.topic,
[
Query.limit(limit),
diff --git a/src/routes/console/project-[project]/messaging/topicsModal.svelte b/src/routes/console/project-[project]/messaging/topicsModal.svelte
index fb716fb17..247dad8e1 100644
--- a/src/routes/console/project-[project]/messaging/topicsModal.svelte
+++ b/src/routes/console/project-[project]/messaging/topicsModal.svelte
@@ -121,7 +121,7 @@
There are no topics that match your search.
-
@@ -134,10 +134,9 @@
You have no topics. Create a topic to see them here.
-
Need a hand? Learn more in our
documentation
Message
-
- {createMessage(providers[$providerType].text)}
+ {createMessage(providers[$providerType].text)} Learn more in our .
{#if $providerType === MessagingProviderType.Email}
diff --git a/src/routes/console/project-[project]/messaging/wizard/step3.svelte b/src/routes/console/project-[project]/messaging/wizard/step3.svelte
index 58ecd6409..2d66e5574 100644
--- a/src/routes/console/project-[project]/messaging/wizard/step3.svelte
+++ b/src/routes/console/project-[project]/messaging/wizard/step3.svelte
@@ -1,8 +1,8 @@
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/+layout.ts b/src/routes/console/project-[project]/settings/webhooks/[webhook]/+layout.ts
index e8f219bdc..940fbeef8 100644
--- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/+layout.ts
+++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/+layout.ts
@@ -15,6 +15,6 @@ export const load: LayoutLoad = async ({ params, depends }) => {
webhook: await sdk.forConsole.projects.getWebhook(params.project, params.webhook)
};
} catch (e) {
- throw error(e.code, e.message);
+ error(e.code, e.message);
}
};
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+layout.ts b/src/routes/console/project-[project]/storage/bucket-[bucket]/+layout.ts
index 5b554f477..85e862d89 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+layout.ts
+++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/+layout.ts
@@ -15,6 +15,6 @@ export const load: LayoutLoad = async ({ params, depends }) => {
bucket: await sdk.forProject.storage.getBucket(params.bucket)
};
} catch (e) {
- throw error(e.code, e.message);
+ error(e.code, e.message);
}
};
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts
index 38c6ff563..0510deb59 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts
+++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+layout.ts
@@ -15,6 +15,6 @@ export const load: LayoutLoad = async ({ params, depends }) => {
file: await sdk.forProject.storage.getFile(params.bucket, params.file)
};
} catch (e) {
- throw error(e.code, e.message);
+ error(e.code, e.message);
}
};
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
index 501154834..3499e9c34 100644
--- a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
+++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/updateMaxFileSize.svelte
@@ -14,7 +14,7 @@
import { updateBucket } from './+page.svelte';
const service = getServiceLimit('fileSize');
- const { value, unit, baseValue, units } = createByteUnitPair($bucket.maximumFileSize);
+ const { value, unit, baseValue, units } = createByteUnitPair($bucket.maximumFileSize, 1000);
const options = units.map((v) => ({ label: v.name, value: v.name }));
function updateMaxSize() {
@@ -36,7 +36,7 @@
Set the maximum file size allowed in the bucket.
{#if isCloud}
- {@const size = humanFileSize(sizeToBytes(service, 'GB', 1024))}
+ {@const size = humanFileSize(sizeToBytes(service, 'MB', 1000))}
{@const plan = tierToPlan($organization?.billingPlan)}
diff --git a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts
index b16adae7a..6c174caa7 100644
--- a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts
+++ b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts
@@ -11,6 +11,6 @@ export const load: PageLoad = async ({ params }) => {
: StorageUsageRange.ThirtyDays;
return sdk.forProject.storage.getUsage(period);
} catch (e) {
- throw error(e.code, e.message);
+ error(e.code, e.message);
}
};
diff --git a/src/routes/console/store.ts b/src/routes/console/store.ts
index af3eb65ee..3dabf7951 100644
--- a/src/routes/console/store.ts
+++ b/src/routes/console/store.ts
@@ -9,6 +9,4 @@ export const consoleVariables = derived(
($page) => $page.data.consoleVariables as Models.ConsoleVariables
);
-export const showPostReleaseModal = writable(false);
-
export const activeHeaderAlert = writable(null);
diff --git a/src/routes/console/wizard/cloudOrganization/addressDetails.svelte b/src/routes/console/wizard/cloudOrganization/addressDetails.svelte
index 608833f9c..00439227e 100644
--- a/src/routes/console/wizard/cloudOrganization/addressDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganization/addressDetails.svelte
@@ -6,6 +6,7 @@
import { createOrganization } from './store';
import type { AddressesList } from '$lib/sdk/billing';
import { RadioBoxes } from '$lib/components';
+ import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
let options = [
{
@@ -33,7 +34,9 @@
addressLine2 ? addressLine2 : undefined
);
$createOrganization.billingAddressId = response.$id;
+ trackEvent(Submit.BillingAddressCreate);
} catch (error) {
+ trackError(error, Submit.BillingAddressCreate);
throw new Error(error.message);
}
}
diff --git a/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte b/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte
index 58aedf179..a7c6209f6 100644
--- a/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte
+++ b/src/routes/console/wizard/cloudOrganization/confirmDetails.svelte
@@ -1,9 +1,12 @@
diff --git a/src/routes/hackathon/+page.ts b/src/routes/hackathon/+page.ts
index bbeeb2f69..8898d6227 100644
--- a/src/routes/hackathon/+page.ts
+++ b/src/routes/hackathon/+page.ts
@@ -2,7 +2,7 @@ import { isCloud } from '$lib/system';
import { redirect } from '@sveltejs/kit';
export async function load({ parent }) {
- if (!isCloud) throw redirect(303, '/');
+ if (!isCloud) redirect(303, '/');
const { account } = await parent();
- if (!account) throw redirect(303, '/login');
+ if (!account) redirect(303, '/login');
}
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
index 43fde46a6..4d49845ae 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -17,6 +17,7 @@
import { isCloud } from '$lib/system';
import { page } from '$app/stores';
import { OAuthProvider } from '@appwrite.io/console';
+ import { redirectTo } from '$routes/store';
let mail: string, pass: string, disabled: boolean;
@@ -29,7 +30,14 @@
type: 'success',
message: 'Successfully logged in.'
});
+ if ($redirectTo) {
+ window.location.href = $redirectTo;
+ return;
+ }
+
+ await invalidate(Dependencies.ACCOUNT);
trackEvent(Submit.AccountCreate);
+
if ($page.url.searchParams) {
const redirect = $page.url.searchParams.get('redirect');
$page.url.searchParams.delete('redirect');
@@ -53,6 +61,7 @@
function onGithubLogin() {
let url = window.location.origin;
+
if ($page.url.searchParams) {
const redirect = $page.url.searchParams.get('redirect');
$page.url.searchParams.delete('redirect');
diff --git a/src/routes/mfa/+page.svelte b/src/routes/mfa/+page.svelte
index 26a0a61de..b7a82d8d9 100644
--- a/src/routes/mfa/+page.svelte
+++ b/src/routes/mfa/+page.svelte
@@ -1,7 +1,7 @@