diff --git a/src/lib/commandCenter/panels/platforms.svelte b/src/lib/commandCenter/panels/platforms.svelte index 3822d54d9..ba69c0754 100644 --- a/src/lib/commandCenter/panels/platforms.svelte +++ b/src/lib/commandCenter/panels/platforms.svelte @@ -4,13 +4,14 @@ addPlatform } from '$routes/(console)/project-[project]/overview/platforms/+page.svelte'; import Template from './template.svelte'; + import { IconAndroid, IconApple, IconCode, IconFlutter } from '@appwrite.io/pink-icons-svelte'; let search = ''; let platforms = [ { label: 'Web', - icon: 'code', + icon: IconCode, group: 'platforms', callback: () => { addPlatform(Platform.Web); @@ -18,7 +19,7 @@ }, { label: 'Flutter', - icon: 'flutter', + icon: IconFlutter, group: 'platforms', callback: () => { addPlatform(Platform.Flutter); @@ -26,7 +27,7 @@ }, { label: 'Android', - icon: 'android', + icon: IconAndroid, group: 'platforms', callback: () => { addPlatform(Platform.Android); @@ -34,7 +35,7 @@ }, { label: 'Apple', - icon: 'apple', + icon: IconApple, group: 'platforms', callback: () => { addPlatform(Platform.Apple); diff --git a/src/lib/commandCenter/searchers/buckets.ts b/src/lib/commandCenter/searchers/buckets.ts index eecc30552..2f4e33f81 100644 --- a/src/lib/commandCenter/searchers/buckets.ts +++ b/src/lib/commandCenter/searchers/buckets.ts @@ -7,6 +7,13 @@ import type { Command, Searcher } from '../commands'; import { addSubPanel } from '../subPanels'; import { FilesPanel } from '../panels'; import { base } from '$app/paths'; +import { + IconFolder, + IconKey, + IconLockClosed, + IconPuzzle, + IconSearch +} from '@appwrite.io/pink-icons-svelte'; const getBucketCommand = (bucket: Models.Bucket, projectId: string) => { return { @@ -15,7 +22,7 @@ const getBucketCommand = (bucket: Models.Bucket, projectId: string) => { goto(`${base}/project-${projectId}/storage/bucket-${bucket.$id}`); }, group: 'buckets', - icon: 'folder' + icon: IconFolder } satisfies Command; }; @@ -37,7 +44,7 @@ export const bucketSearcher = (async (query: string) => { }, group: 'buckets', nested: true, - icon: 'search', + icon: IconSearch, keepOpen: true }, { @@ -50,7 +57,7 @@ export const bucketSearcher = (async (query: string) => { }, group: 'buckets', nested: true, - icon: 'key' + icon: IconKey }, { label: 'Extensions', @@ -61,7 +68,7 @@ export const bucketSearcher = (async (query: string) => { }, group: 'buckets', nested: true, - icon: 'puzzle' + icon: IconPuzzle }, { label: 'File Security', @@ -73,7 +80,7 @@ export const bucketSearcher = (async (query: string) => { }, group: 'buckets', nested: true, - icon: 'lock-closed' + icon: IconLockClosed } ]; } diff --git a/src/lib/commandCenter/searchers/databases.ts b/src/lib/commandCenter/searchers/databases.ts index e1153005c..5464b9ddc 100644 --- a/src/lib/commandCenter/searchers/databases.ts +++ b/src/lib/commandCenter/searchers/databases.ts @@ -4,6 +4,7 @@ import { get } from 'svelte/store'; import type { Searcher } from '../commands'; import { sdk } from '$lib/stores/sdk'; import { base } from '$app/paths'; +import { IconDatabase } from '@appwrite.io/pink-icons-svelte'; export const dbSearcher = (async (query: string) => { const { databases } = await sdk.forProject.databases.list(); @@ -18,7 +19,7 @@ export const dbSearcher = (async (query: string) => { callback: () => { goto(`${base}/project-${get(project).$id}/databases/database-${db.$id}`); }, - icon: 'database' + icon: IconDatabase }) as const ); }) satisfies Searcher; diff --git a/src/lib/commandCenter/searchers/files.ts b/src/lib/commandCenter/searchers/files.ts index bab3a35f8..cbaf6123e 100644 --- a/src/lib/commandCenter/searchers/files.ts +++ b/src/lib/commandCenter/searchers/files.ts @@ -6,6 +6,7 @@ import { Query } from '@appwrite.io/console'; import { goto } from '$app/navigation'; import { project } from '$routes/(console)/project-[project]/store'; import { base } from '$app/paths'; +import { IconDocument } from '@appwrite.io/pink-icons-svelte'; export const fileSearcher = (async (query: string) => { const $bucket = get(bucket); @@ -22,7 +23,7 @@ export const fileSearcher = (async (query: string) => { callback: () => { goto(`${base}/project-${$project.$id}/storage/bucket-${$bucket.$id}/file-${file.$id}`); }, - icon: 'document', + icon: IconDocument, group: 'files' })); }) satisfies Searcher; diff --git a/src/lib/commandCenter/searchers/messages.ts b/src/lib/commandCenter/searchers/messages.ts index 0ce8e2d5e..71f6664a2 100644 --- a/src/lib/commandCenter/searchers/messages.ts +++ b/src/lib/commandCenter/searchers/messages.ts @@ -3,32 +3,33 @@ import { project } from '$routes/(console)/project-[project]/store'; import { get } from 'svelte/store'; import { type Searcher } from '../commands'; import { sdk } from '$lib/stores/sdk'; -import { MessagingProviderType } from '@appwrite.io/console'; +import { MessagingProviderType, type Models } from '@appwrite.io/console'; import { base } from '$app/paths'; +import { IconAnnotation, IconDeviceMobile, IconMail } from '@appwrite.io/pink-icons-svelte'; -const getLabel = (message) => { +const getLabel = (message: Models.Message) => { switch (message.providerType) { case MessagingProviderType.Push: - return message.data.title; + return message.data['title']; case MessagingProviderType.Sms: - return message.data.content; + return message.data['content']; case MessagingProviderType.Email: - return message.data.subject; + return message.data['subject']; default: return 'null'; } }; -const getIcon = (message) => { +const getIcon = (message: Models.Message) => { switch (message.providerType) { case MessagingProviderType.Push: - return 'device-mobile'; + return IconDeviceMobile; case MessagingProviderType.Sms: - return 'annotation'; + return IconAnnotation; case MessagingProviderType.Email: - return 'mail'; + return IconMail; default: - return 'send'; + throw new Error('Unsupported provider type'); } }; diff --git a/src/lib/commandCenter/searchers/teams.ts b/src/lib/commandCenter/searchers/teams.ts index 57c91c9d1..201e07f56 100644 --- a/src/lib/commandCenter/searchers/teams.ts +++ b/src/lib/commandCenter/searchers/teams.ts @@ -5,6 +5,7 @@ import { get } from 'svelte/store'; import type { Command, Searcher } from '../commands'; import type { Models } from '@appwrite.io/console'; import { base } from '$app/paths'; +import { IconUserCircle } from '@appwrite.io/pink-icons-svelte'; const getTeamCommand = (team: Models.Team, projectId: string) => ({ @@ -13,7 +14,7 @@ const getTeamCommand = (team: Models.Team, projectId: string goto(`${base}/project-${projectId}/auth/teams/team-${team.$id}`); }, group: 'teams', - icon: 'user-circle' + icon: IconUserCircle }) satisfies Command; export const teamSearcher = (async (query: string) => { diff --git a/src/lib/commandCenter/searchers/topics.ts b/src/lib/commandCenter/searchers/topics.ts index 3153a26ac..42b11e651 100644 --- a/src/lib/commandCenter/searchers/topics.ts +++ b/src/lib/commandCenter/searchers/topics.ts @@ -4,6 +4,7 @@ import { get } from 'svelte/store'; import type { Searcher } from '../commands'; import { sdk } from '$lib/stores/sdk'; import { base } from '$app/paths'; +import { IconChevronRight } from '@appwrite.io/pink-icons-svelte'; export const topicsSearcher = (async (query: string) => { const { topics } = await sdk.forProject.messaging.listTopics([], query || undefined); @@ -20,7 +21,7 @@ export const topicsSearcher = (async (query: string) => { callback: () => { goto(`${base}/project-${projectId}/messaging/topics/topic-${topic.$id}`); }, - icon: 'send' + icon: IconChevronRight // TODO: @itznotabug - 'send' no replacement yet. }) as const ); }) satisfies Searcher; diff --git a/src/lib/commandCenter/searchers/users.ts b/src/lib/commandCenter/searchers/users.ts index 7cb13381e..5695fe840 100644 --- a/src/lib/commandCenter/searchers/users.ts +++ b/src/lib/commandCenter/searchers/users.ts @@ -6,6 +6,7 @@ import type { Command, Searcher } from '../commands'; import type { Models } from '@appwrite.io/console'; import { promptDeleteUser } from '$routes/(console)/project-[project]/auth/user-[user]/dangerZone.svelte'; import { base } from '$app/paths'; +import { IconTrash, IconUserCircle } from '@appwrite.io/pink-icons-svelte'; const getUserCommand = (user: Models.User, projectId: string) => ({ @@ -14,7 +15,7 @@ const getUserCommand = (user: Models.User, projectId: string goto(`${base}/project-${projectId}/auth/user-${user.$id}`); }, group: 'users', - icon: 'user-circle' + icon: IconUserCircle }) satisfies Command; export const userSearcher = (async (query: string) => { @@ -31,7 +32,7 @@ export const userSearcher = (async (query: string) => { }, group: 'users', nested: true, - icon: 'trash' + icon: IconTrash }, { label: 'Go to activity', diff --git a/src/lib/components/billing/couponInput.svelte b/src/lib/components/billing/couponInput.svelte index 168325715..411e5e074 100644 --- a/src/lib/components/billing/couponInput.svelte +++ b/src/lib/components/billing/couponInput.svelte @@ -1,5 +1,5 @@ diff --git a/src/lib/components/customId.svelte b/src/lib/components/customId.svelte index 0db5336dc..77c32899f 100644 --- a/src/lib/components/customId.svelte +++ b/src/lib/components/customId.svelte @@ -9,7 +9,6 @@ export let name: string; export let id: string; export let autofocus = true; - export let fullWidth = false; export let isProject = false; $: if (!show) { id = null; diff --git a/src/lib/components/eventModal.svelte b/src/lib/components/eventModal.svelte index 38490b08a..db94a7142 100644 --- a/src/lib/components/eventModal.svelte +++ b/src/lib/components/eventModal.svelte @@ -184,6 +184,7 @@ action: null as EventAction | null, attribute: null as string | null }; + let helper: string = null; let customInput: string = null; let customInputCursor = -1; let showInput = false; @@ -235,6 +236,10 @@ customInput = null; showInput = false; } + + $: if (showInput) { + helper = getCustomInputHelperStr(customInput, customInputCursor); + } @@ -303,12 +308,17 @@ {/if} {#if showInput} - - - - - - + + + + + + + + + + {helper ?? ''} + {:else} e.value).join('.')} diff --git a/src/lib/components/feedback/feedbackGeneral.svelte b/src/lib/components/feedback/feedbackGeneral.svelte index 896f58a03..5b99e8250 100644 --- a/src/lib/components/feedback/feedbackGeneral.svelte +++ b/src/lib/components/feedback/feedbackGeneral.svelte @@ -3,11 +3,9 @@ import { feedbackData } from '$lib/stores/feedback'; - - - + diff --git a/src/lib/components/feedback/feedbackNPS.svelte b/src/lib/components/feedback/feedbackNPS.svelte index d2d3fa074..db0e8c73b 100644 --- a/src/lib/components/feedback/feedbackNPS.svelte +++ b/src/lib/components/feedback/feedbackNPS.svelte @@ -4,15 +4,13 @@ import { FormList, InputTextarea } from '$lib/elements/forms'; - - - {#if $feedbackData.value !== null} - - - {/if} - + +{#if $feedbackData.value !== null} + + +{/if} diff --git a/src/lib/components/filePicker.svelte b/src/lib/components/filePicker.svelte index 734d8bf6f..b5ffacb4f 100644 --- a/src/lib/components/filePicker.svelte +++ b/src/lib/components/filePicker.svelte @@ -241,6 +241,7 @@ columnsS={3} columns={4}> {#each response?.files as file} + ; export let analyticsSource = ''; - export let clearOnClick = false; /* eslint @typescript-eslint/no-explicit-any: 'off' */ let value: any = null; let selectedColumn: string | null = null; diff --git a/src/lib/components/git/productionBranchFieldset.svelte b/src/lib/components/git/productionBranchFieldset.svelte index 885258354..f6de639ab 100644 --- a/src/lib/components/git/productionBranchFieldset.svelte +++ b/src/lib/components/git/productionBranchFieldset.svelte @@ -10,6 +10,7 @@ export let silentMode: boolean; export let installationId: string; export let repositoryId: string; + export let product: 'sites' | 'functions'; let show = false; @@ -90,5 +91,5 @@ {#if show} - + {/if} diff --git a/src/lib/components/git/selectRootModal.svelte b/src/lib/components/git/selectRootModal.svelte index 13b0f7c7f..61524aa37 100644 --- a/src/lib/components/git/selectRootModal.svelte +++ b/src/lib/components/git/selectRootModal.svelte @@ -18,7 +18,7 @@ export let show = false; export let rootDir: string; - export let product: 'sites' | 'functions'; + export let product: 'sites' | 'functions' = 'functions'; let isLoading = true; let directories: Directory[] = [ @@ -88,7 +88,7 @@ const runtime = await sdk.forProject.vcs.createRepositoryDetection( $installation.$id, $repository.id, - VCSDetectionType.Framework, //TODO: add type: VCSDetectionType.Framework || VCSDetectionType.Runtime according to the product + product === 'sites' ? VCSDetectionType.Framework : VCSDetectionType.Runtime, path ); //TODO: Fix runtime after passing type: runtime.framework || runtime.runtime diff --git a/src/lib/components/labelCard.svelte b/src/lib/components/labelCard.svelte index b7c154791..052e2ddd3 100644 --- a/src/lib/components/labelCard.svelte +++ b/src/lib/components/labelCard.svelte @@ -11,12 +11,13 @@ export let tooltipShow = false; // Pink v2 + export let icon: Props['icon'] = undefined; export let radius: Props['radius'] = 's'; export let imageRadius: Props['imageRadius'] = 'xxs'; export let padding: Props['padding'] = 's'; export let variant: Props['variant'] = 'primary'; export let name: Props['name'] = undefined; - //temporarily unefined + //temporarily undefined export let title: Props['title'] = undefined; export let disabled = false; export let src: string = null; @@ -31,6 +32,7 @@ {name} {src} {alt} + {icon} {padding} {imageRadius} {variant} diff --git a/src/lib/components/mfaChallengeFormList.svelte b/src/lib/components/mfaChallengeFormList.svelte index 4b69eef35..86e6c2dec 100644 --- a/src/lib/components/mfaChallengeFormList.svelte +++ b/src/lib/components/mfaChallengeFormList.svelte @@ -71,7 +71,7 @@ }); -{#if challengeType == AuthenticationFactor.Recoverycode} +{#if challengeType === AuthenticationFactor.Recoverycode} Enter below one of the recovery codes you received when enabling MFA for this account. @@ -80,10 +80,10 @@ {#if factors.totp && (challengeType == AuthenticationFactor.Totp || challengeType == null)} Enter below a 6-digit one-time code generated by your authentication app. - {:else if challengeType == AuthenticationFactor.Email} + {:else if challengeType === AuthenticationFactor.Email} A 6-digit verification code was sent to your email, enter it below. - {:else if challengeType == AuthenticationFactor.Phone} + {:else if challengeType === AuthenticationFactor.Phone} A 6-digit verification code was sent to your phone, enter it below. {/if} @@ -105,7 +105,7 @@ Authenticator app {/if} - {#if factors.email && challengeType != AuthenticationFactor.Email} + {#if factors.email && challengeType !== AuthenticationFactor.Email} - {/if} - - {#if $feedback.notification} -
-
-
- {/if} - - - - - - - (showSupport = !showSupport)}> - - - - - - - - -
- - diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte index b2c934fc7..b41987f9d 100644 --- a/src/lib/layout/logs.svelte +++ b/src/lib/layout/logs.svelte @@ -343,7 +343,7 @@ language="sh" class="limited-code-height" /> {:else} - +

No response was recorded.

{/if} @@ -357,7 +357,7 @@ language="sh" class="limited-code-height" /> {:else} - +

No response was recorded.

{/if} diff --git a/src/lib/layout/navigation.svelte b/src/lib/layout/navigation.svelte index 67b619678..0d6704e0d 100644 --- a/src/lib/layout/navigation.svelte +++ b/src/lib/layout/navigation.svelte @@ -3,7 +3,6 @@ import { getContext } from 'svelte'; import type { Writable } from 'svelte/store'; - export let state: 'closed' | 'open' | 'icons' = 'open'; export let subNavigation; $: subNavigation = $page.data.subNavigation; diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index 0edd5e688..f1609ff0f 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -1,12 +1,12 @@ contact support. - + {:else if domain.status === 'unverified'}