diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 82281df36..1f4ef8396 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Use Node.js - uses: actions/setup-node@v2 + uses: actions/setup-node@v3 with: node-version: 18 # - name: Audit dependencies diff --git a/package-lock.json b/package-lock.json index 61530ef93..83761e17f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4493,6 +4493,23 @@ "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", "dev": true }, + "node_modules/happy-dom": { + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-8.9.0.tgz", + "integrity": "sha512-JZwJuGdR7ko8L61136YzmrLv7LgTh5b8XaEM3P709mLjyQuXJ3zHTDXvUtBBahRjGlcYW0zGjIiEWizoTUGKfA==", + "dev": true, + "optional": true, + "peer": true, + "dependencies": { + "css.escape": "^1.5.1", + "he": "^1.2.0", + "iconv-lite": "^0.6.3", + "node-fetch": "^2.x.x", + "webidl-conversions": "^7.0.0", + "whatwg-encoding": "^2.0.0", + "whatwg-mimetype": "^3.0.0" + } + }, "node_modules/has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -4562,6 +4579,17 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, + "optional": true, + "peer": true, + "bin": { + "he": "bin/he" + } + }, "node_modules/html-encoding-sniffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", diff --git a/src/lib/components/avatarInitials.svelte b/src/lib/components/avatarInitials.svelte index 1ce7ecfc6..025dd998c 100644 --- a/src/lib/components/avatarInitials.svelte +++ b/src/lib/components/avatarInitials.svelte @@ -1,11 +1,11 @@ diff --git a/src/lib/components/eventModal.svelte b/src/lib/components/eventModal.svelte index 7d728dcdb..b7a00370a 100644 --- a/src/lib/components/eventModal.svelte +++ b/src/lib/components/eventModal.svelte @@ -245,7 +245,7 @@ } - + Create Event
diff --git a/src/lib/components/feedbackGeneral.svelte b/src/lib/components/feedbackGeneral.svelte index fc380d0b1..aa9bdc42f 100644 --- a/src/lib/components/feedbackGeneral.svelte +++ b/src/lib/components/feedbackGeneral.svelte @@ -51,7 +51,7 @@ Your feedback is important to us. Please be honest and tell us what you think.
-
+ - + How likely are you to recommend Appwrite to a friend or colleague? diff --git a/src/lib/components/modal.svelte b/src/lib/components/modal.svelte index 8e38955ab..7f70c5842 100644 --- a/src/lib/components/modal.svelte +++ b/src/lib/components/modal.svelte @@ -2,12 +2,16 @@ import { createEventDispatcher, onDestroy, onMount } from 'svelte'; import { Alert } from '$lib/components'; import { trackEvent } from '$lib/actions/analytics'; + import { Form } from '$lib/elements/forms'; export let show = false; export let size: 'small' | 'big' = null; export let warning = false; export let error: string = null; export let closable = true; + export let onSubmit: () => Promise | void = function () { + return; + }; let dialog: HTMLDialogElement; let alert: HTMLElement; @@ -77,8 +81,7 @@ class:is-big={size === 'big'} bind:this={dialog}> {#if show} - - +
{#if warning}
@@ -127,6 +130,6 @@
{/if} - + {/if} diff --git a/src/lib/components/permissions/custom.svelte b/src/lib/components/permissions/custom.svelte index aecd66068..080d9aa93 100644 --- a/src/lib/components/permissions/custom.svelte +++ b/src/lib/components/permissions/custom.svelte @@ -25,7 +25,7 @@ $: disabled = !value || $groups.has(value); - + Custom permission

Custom permissions allow you to grant access to specific users or teams using their ID and @@ -44,6 +44,6 @@ - + diff --git a/src/lib/components/permissions/row.svelte b/src/lib/components/permissions/row.svelte index e4d369af2..778cc4ae5 100644 --- a/src/lib/components/permissions/row.svelte +++ b/src/lib/components/permissions/row.svelte @@ -1,6 +1,6 @@ - + Select teams

Grant access to any member of a specific team. To grant access to team members with specific @@ -144,6 +144,6 @@ {/if} - + diff --git a/src/lib/components/permissions/user.svelte b/src/lib/components/permissions/user.svelte index d5468b47d..c074af4fd 100644 --- a/src/lib/components/permissions/user.svelte +++ b/src/lib/components/permissions/user.svelte @@ -2,7 +2,7 @@ import { Button, InputSearch } from '$lib/elements/forms'; import { createEventDispatcher } from 'svelte'; import { AvatarInitials, EmptySearch, Modal, PaginationInline } from '..'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { Query, type Models } from '@aw-labs/appwrite-console'; import type { Writable } from 'svelte/store'; import type { Permission } from './permissions.svelte'; @@ -31,7 +31,7 @@ async function request() { if (!show) return; - results = await sdkForProject.users.list([Query.limit(5), Query.offset(offset)], search); + results = await sdk.forProject.users.list([Query.limit(5), Query.offset(offset)], search); } function onSelection(event: Event, role: string) { @@ -58,7 +58,7 @@ } - + Select users

Grant access to any authenticated or anonymous user.

- + diff --git a/src/lib/components/uploadBox.svelte b/src/lib/components/uploadBox.svelte index d074bf2e0..988567eba 100644 --- a/src/lib/components/uploadBox.svelte +++ b/src/lib/components/uploadBox.svelte @@ -1,7 +1,7 @@ {#if $uploader?.isOpen} diff --git a/src/lib/elements/forms/button.svelte b/src/lib/elements/forms/button.svelte index 27764b2a3..1dc57636d 100644 --- a/src/lib/elements/forms/button.svelte +++ b/src/lib/elements/forms/button.svelte @@ -1,5 +1,8 @@ - -
+ + + diff --git a/src/lib/helpers/project.ts b/src/lib/helpers/project.ts new file mode 100644 index 000000000..ff8f887b0 --- /dev/null +++ b/src/lib/helpers/project.ts @@ -0,0 +1,5 @@ +export function getProjectId() { + const pathname = window.location.pathname; + const projectMatch = pathname.match(/\/project-(.*?)\//); + return projectMatch?.[1] || null; +} diff --git a/src/lib/helpers/promises.ts b/src/lib/helpers/promises.ts new file mode 100644 index 000000000..9f8459dcd --- /dev/null +++ b/src/lib/helpers/promises.ts @@ -0,0 +1,3 @@ +export async function sleep(ms: number): Promise { + return new Promise((r) => setTimeout(r, ms)); +} diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte index 88a9a0b4b..0cc8abfdd 100644 --- a/src/lib/layout/header.svelte +++ b/src/lib/layout/header.svelte @@ -20,7 +20,7 @@ import { slide } from 'svelte/transition'; import { page } from '$app/stores'; import { Submit, trackEvent } from '$lib/actions/analytics'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { goto } from '$app/navigation'; let showDropdown = false; @@ -35,7 +35,7 @@ } async function logout() { - await sdkForConsole.account.deleteSession('current'); + await sdk.forConsole.account.deleteSession('current'); trackEvent(Submit.AccountLogout); await goto(`${base}/login`); } diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte index 4c4049e7b..7d92332af 100644 --- a/src/lib/layout/logs.svelte +++ b/src/lib/layout/logs.svelte @@ -6,7 +6,7 @@ import { Button } from '$lib/elements/forms'; import { base } from '$app/paths'; import { app } from '$lib/stores/app'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { page } from '$app/stores'; import { calculateTime } from '$lib/helpers/timeConversion'; import type { Models } from '@aw-labs/appwrite-console'; @@ -17,7 +17,7 @@ function isDeployment(data: Models.Deployment | Models.Execution): data is Models.Deployment { if ('buildId' in data) { selectedTab = 'logs'; - rawData = `${sdkForConsole.client.config.endpoint}/functions/${$log.func.$id}/deployment/${$log.data.$id}?mode=admin&project=${$page.params.project}`; + rawData = `${sdk.forConsole.client.config.endpoint}/functions/${$log.func.$id}/deployment/${$log.data.$id}?mode=admin&project=${$page.params.project}`; return true; } } @@ -25,7 +25,7 @@ function isExecution(data: Models.Deployment | Models.Execution): data is Models.Execution { if ('trigger' in data) { selectedTab = 'response'; - rawData = `${sdkForConsole.client.config.endpoint}/functions/${$log.func.$id}/execution/${$log.data.$id}?mode=admin&project=${$page.params.project}`; + rawData = `${sdk.forConsole.client.config.endpoint}/functions/${$log.func.$id}/execution/${$log.data.$id}?mode=admin&project=${$page.params.project}`; return true; } } diff --git a/src/lib/layout/wizard.svelte b/src/lib/layout/wizard.svelte index 9ae04c1ad..9dd6da750 100644 --- a/src/lib/layout/wizard.svelte +++ b/src/lib/layout/wizard.svelte @@ -122,7 +122,7 @@ {/if}
-
+ {#each sortedSteps as [step, { component }]} {#if currentStep === step} diff --git a/src/lib/layout/wizardExitModal.svelte b/src/lib/layout/wizardExitModal.svelte index 8f29e59d9..6019a5898 100644 --- a/src/lib/layout/wizardExitModal.svelte +++ b/src/lib/layout/wizardExitModal.svelte @@ -11,7 +11,7 @@ } - + Exit Process

Are you sure you want to exit from ? All data will be deleted. This action is diff --git a/src/lib/mock/form.test.svelte b/src/lib/mock/form.test.svelte new file mode 100644 index 000000000..c900d26e1 --- /dev/null +++ b/src/lib/mock/form.test.svelte @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts index d3fb4455c..d0939adf7 100644 --- a/src/lib/stores/sdk.ts +++ b/src/lib/stores/sdk.ts @@ -1,3 +1,4 @@ +import { getProjectId } from '$lib/helpers/project'; import { Project } from '$lib/sdk/project'; import { VARS } from '$lib/system'; import { @@ -21,21 +22,6 @@ clientConsole.setEndpoint(endpoint).setProject('console'); const clientProject = new Client(); clientProject.setEndpoint(endpoint).setMode('admin'); - -const setProject = (projectId: string): Client => clientProject.setProject(projectId); - -const sdkForConsole = { - client: clientConsole, - account: new Account(clientConsole), - avatars: new Avatars(clientConsole), - functions: new Functions(clientConsole), - health: new Health(clientConsole), - locale: new Locale(clientConsole), - projects: new Projects(clientConsole), - teams: new Teams(clientConsole), - users: new Users(clientConsole) -}; - const sdkForProject = { client: clientProject, account: new Account(clientProject), @@ -50,4 +36,24 @@ const sdkForProject = { users: new Users(clientProject) }; -export { sdkForConsole, sdkForProject, setProject }; +export const sdk = { + forConsole: { + client: clientConsole, + account: new Account(clientConsole), + avatars: new Avatars(clientConsole), + functions: new Functions(clientConsole), + health: new Health(clientConsole), + locale: new Locale(clientConsole), + projects: new Projects(clientConsole), + teams: new Teams(clientConsole), + users: new Users(clientConsole) + }, + get forProject() { + const projectId = getProjectId(); + if (projectId && projectId !== clientProject.config.project) { + clientProject.setProject(projectId); + } + + return sdkForProject; + } +}; diff --git a/src/lib/stores/uploader.ts b/src/lib/stores/uploader.ts index 9538d0b79..ece61c0b7 100644 --- a/src/lib/stores/uploader.ts +++ b/src/lib/stores/uploader.ts @@ -1,6 +1,6 @@ import type { Models } from '@aw-labs/appwrite-console'; import { writable } from 'svelte/store'; -import { sdkForProject } from './sdk'; +import { sdk } from './sdk'; type UploaderFile = { $id: string; @@ -71,7 +71,7 @@ const createUploader = () => { n.files.unshift(newFile); return n; }); - const uploadedFile = await sdkForProject.storage.createFile( + const uploadedFile = await sdk.forProject.storage.createFile( bucketId, id ?? 'unique()', file, diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 9d628c7ea..de3611aee 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -2,7 +2,7 @@ import '@appwrite.io/pink'; import '@appwrite.io/pink-icons'; import 'tippy.js/dist/tippy.css'; import LogRocket from 'logrocket'; -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { redirect } from '@sveltejs/kit'; import { Dependencies } from '$lib/constants'; import type { LayoutLoad } from './$types'; @@ -12,7 +12,7 @@ export const ssr = false; export const load: LayoutLoad = async ({ depends, url }) => { depends(Dependencies.ACCOUNT); try { - const account = await sdkForConsole.account.get(); + const account = await sdk.forConsole.account.get(); LogRocket.identify(account.$id, { name: account.name, @@ -21,7 +21,7 @@ export const load: LayoutLoad = async ({ depends, url }) => { return { account, - organizations: sdkForConsole.teams.list() + organizations: sdk.forConsole.teams.list() }; } catch (error) { const acceptedRoutes = [ diff --git a/src/routes/console/+layout.ts b/src/routes/console/+layout.ts index 6e464728e..65de11ecd 100644 --- a/src/routes/console/+layout.ts +++ b/src/routes/console/+layout.ts @@ -1,8 +1,8 @@ -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { LayoutLoad } from './$types'; export const load: LayoutLoad = async () => { - const response = await fetch(`${sdkForConsole.client.config.endpoint}/health/version`); + const response = await fetch(`${sdk.forConsole.client.config.endpoint}/health/version`); const data = await response.json(); return { diff --git a/src/routes/console/account/+page.svelte b/src/routes/console/account/+page.svelte index b94dc86cc..92cde835f 100644 --- a/src/routes/console/account/+page.svelte +++ b/src/routes/console/account/+page.svelte @@ -4,7 +4,7 @@ import { Container } from '$lib/layout'; import { onMount } from 'svelte'; import { user } from '$lib/stores/user'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { addNotification } from '$lib/stores/notifications'; import { base } from '$app/paths'; import Delete from './delete.svelte'; @@ -26,7 +26,7 @@ async function updateName() { try { - await sdkForConsole.account.updateName(name); + await sdk.forConsole.account.updateName(name); invalidate(Dependencies.ACCOUNT); addNotification({ message: 'Name has been updated', @@ -43,7 +43,7 @@ } async function updateEmail() { try { - await sdkForConsole.account.updateEmail(email, emailPassword); + await sdk.forConsole.account.updateEmail(email, emailPassword); invalidate(Dependencies.ACCOUNT); addNotification({ message: 'Email has been updated', @@ -61,7 +61,7 @@ async function updatePassword() { try { - await sdkForConsole.account.updatePassword(newPassword, oldPassword); + await sdk.forConsole.account.updatePassword(newPassword, oldPassword); newPassword = oldPassword = null; addNotification({ message: 'Password has been updated', @@ -79,7 +79,7 @@ -

+ Update Name @@ -94,7 +94,7 @@
-
+ Update Email @@ -122,7 +122,7 @@
-
+ Update Password

diff --git a/src/routes/console/account/activity/[[page]]/+page.ts b/src/routes/console/account/activity/[[page]]/+page.ts index 6ac71de8d..d3fc1b4d0 100644 --- a/src/routes/console/account/activity/[[page]]/+page.ts +++ b/src/routes/console/account/activity/[[page]]/+page.ts @@ -1,5 +1,5 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; @@ -10,6 +10,6 @@ export const load: PageLoad = async ({ params }) => { return { offset, - logs: await sdkForConsole.account.listLogs([Query.offset(offset), Query.limit(PAGE_LIMIT)]) + logs: await sdk.forConsole.account.listLogs([Query.offset(offset), Query.limit(PAGE_LIMIT)]) }; }; diff --git a/src/routes/console/account/delete.svelte b/src/routes/console/account/delete.svelte index cf981d4e9..139098292 100644 --- a/src/routes/console/account/delete.svelte +++ b/src/routes/console/account/delete.svelte @@ -5,13 +5,13 @@ import { Dependencies } from '$lib/constants'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; export let showDelete = false; const deleteAccount = async () => { try { - await sdkForConsole.account.updateStatus(); + await sdk.forConsole.account.updateStatus(); showDelete = false; invalidate(Dependencies.ACCOUNT); addNotification({ @@ -29,7 +29,7 @@ }; - + Delete Account

Are you sure you want to delete your account?

diff --git a/src/routes/console/account/header.svelte b/src/routes/console/account/header.svelte index d298924d8..71d54f3d3 100644 --- a/src/routes/console/account/header.svelte +++ b/src/routes/console/account/header.svelte @@ -7,7 +7,7 @@ import { Button } from '$lib/elements/forms'; import { isTabSelected } from '$lib/helpers/load'; import { Cover, CoverTitle } from '$lib/layout'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { user } from '$lib/stores/user'; const path = `/console/account`; @@ -38,7 +38,7 @@ ]; async function logout() { - await sdkForConsole.account.deleteSession('current'); + await sdk.forConsole.account.deleteSession('current'); trackEvent(Submit.AccountLogout); await goto(`${base}/login`); } diff --git a/src/routes/console/account/organizations/[[page]]/+page.svelte b/src/routes/console/account/organizations/[[page]]/+page.svelte index 60d477e6e..69ba0d589 100644 --- a/src/routes/console/account/organizations/[[page]]/+page.svelte +++ b/src/routes/console/account/organizations/[[page]]/+page.svelte @@ -11,14 +11,14 @@ import { Button } from '$lib/elements/forms'; import { Container } from '$lib/layout'; import CreateOrganization from '../../../createOrganization.svelte'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { CARD_LIMIT } from '$lib/constants'; import type { PageData } from './$types'; export let data: PageData; const getMemberships = async (teamId: string) => { - const memberships = await sdkForConsole.teams.listMemberships(teamId); + const memberships = await sdk.forConsole.teams.listMemberships(teamId); return memberships.memberships.map((team) => team.userName); }; diff --git a/src/routes/console/account/organizations/[[page]]/+page.ts b/src/routes/console/account/organizations/[[page]]/+page.ts index e51c4b146..9b602d7b5 100644 --- a/src/routes/console/account/organizations/[[page]]/+page.ts +++ b/src/routes/console/account/organizations/[[page]]/+page.ts @@ -1,5 +1,5 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; @@ -10,7 +10,7 @@ export const load: PageLoad = async ({ params }) => { return { offset, - organizations: await sdkForConsole.teams.list([ + organizations: await sdk.forConsole.teams.list([ Query.offset(offset), Query.limit(CARD_LIMIT), Query.orderDesc('$createdAt') diff --git a/src/routes/console/account/sessions/[[page]]/+page.svelte b/src/routes/console/account/sessions/[[page]]/+page.svelte index abb1d58be..808bdb9a1 100644 --- a/src/routes/console/account/sessions/[[page]]/+page.svelte +++ b/src/routes/console/account/sessions/[[page]]/+page.svelte @@ -12,7 +12,7 @@ TableScroll } from '$lib/elements/table'; import { Container } from '$lib/layout'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { goto, invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import type { Models } from '@aw-labs/appwrite-console'; @@ -23,11 +23,11 @@ export let data: PageData; const getBrowser = (clientCode: string) => { - return sdkForConsole.avatars.getBrowser(clientCode, 40, 40); + return sdk.forConsole.avatars.getBrowser(clientCode, 40, 40); }; const logout = async (session: Models.Session) => { - await sdkForConsole.account.deleteSession(session.$id); + await sdk.forConsole.account.deleteSession(session.$id); trackEvent(Submit.AccountDeleteSession); if (session.current) { await goto(`${base}/login`); @@ -35,7 +35,7 @@ invalidate(Dependencies.ACCOUNT_SESSIONS); }; const logoutAll = async () => { - await sdkForConsole.account.deleteSessions(); + await sdk.forConsole.account.deleteSessions(); trackEvent(Submit.AccountDeleteAllSessions); await goto(`${base}/login`); invalidate(Dependencies.ACCOUNT_SESSIONS); diff --git a/src/routes/console/account/sessions/[[page]]/+page.ts b/src/routes/console/account/sessions/[[page]]/+page.ts index ed1eaba0f..6165d5472 100644 --- a/src/routes/console/account/sessions/[[page]]/+page.ts +++ b/src/routes/console/account/sessions/[[page]]/+page.ts @@ -1,11 +1,11 @@ import { Dependencies } from '$lib/constants'; -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ depends }) => { depends(Dependencies.ACCOUNT_SESSIONS); return { - sessions: await sdkForConsole.account.listSessions() + sessions: await sdk.forConsole.account.listSessions() }; }; diff --git a/src/routes/console/createOrganization.svelte b/src/routes/console/createOrganization.svelte index 6fc75f52b..ab3c4ee22 100644 --- a/src/routes/console/createOrganization.svelte +++ b/src/routes/console/createOrganization.svelte @@ -3,7 +3,7 @@ import { Pill } from '$lib/elements'; import { InputText, Button, FormList } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { createEventDispatcher } from 'svelte'; import { goto, invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; @@ -21,7 +21,7 @@ const create = async () => { try { - const org = await sdkForConsole.teams.create(id ?? ID.unique(), name); + const org = await sdk.forConsole.teams.create(id ?? ID.unique(), name); await invalidate(Dependencies.ACCOUNT); dispatch('created'); await goto(`/console/organization-${org.$id}`); @@ -42,7 +42,7 @@ }; - + Create New Organization - + {#if !showCustomId}
@@ -70,7 +66,7 @@ {:else} {/if} - diff --git a/src/routes/console/organization-[organization]/+layout.ts b/src/routes/console/organization-[organization]/+layout.ts index 97de8b900..96da66f11 100644 --- a/src/routes/console/organization-[organization]/+layout.ts +++ b/src/routes/console/organization-[organization]/+layout.ts @@ -1,20 +1,19 @@ import Header from './header.svelte'; import Breadcrumbs from './breadcrumbs.svelte'; -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { LayoutLoad } from './$types'; import { error } from '@sveltejs/kit'; import { Dependencies } from '$lib/constants'; -export const load: LayoutLoad = async ({ params, parent, depends }) => { - await parent(); +export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.ORGANIZATION); try { return { header: Header, breadcrumbs: Breadcrumbs, - organization: await sdkForConsole.teams.get(params.organization), - members: await sdkForConsole.teams.listMemberships(params.organization) + organization: await sdk.forConsole.teams.get(params.organization), + members: await sdk.forConsole.teams.listMemberships(params.organization) }; } catch (e) { localStorage.removeItem('organization'); diff --git a/src/routes/console/organization-[organization]/[[page]]/+page.ts b/src/routes/console/organization-[organization]/[[page]]/+page.ts index e6f6520c3..d7cbd284d 100644 --- a/src/routes/console/organization-[organization]/[[page]]/+page.ts +++ b/src/routes/console/organization-[organization]/[[page]]/+page.ts @@ -1,5 +1,5 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; @@ -10,7 +10,7 @@ export const load: PageLoad = async ({ params }) => { return { offset, - projects: await sdkForConsole.projects.list([ + projects: await sdk.forConsole.projects.list([ Query.offset(offset), Query.limit(CARD_LIMIT), Query.equal('teamId', params.organization), diff --git a/src/routes/console/organization-[organization]/createMember.svelte b/src/routes/console/organization-[organization]/createMember.svelte index 1fec569ce..679f82d7d 100644 --- a/src/routes/console/organization-[organization]/createMember.svelte +++ b/src/routes/console/organization-[organization]/createMember.svelte @@ -3,7 +3,7 @@ import { Modal } from '$lib/components'; import { InputText, InputEmail, Button, FormList } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { createEventDispatcher } from 'svelte'; import { organization } from '$lib/stores/organization'; import { invalidate } from '$app/navigation'; @@ -19,7 +19,7 @@ const create = async () => { try { - const team = await sdkForConsole.teams.createMembership( + const team = await sdk.forConsole.teams.createMembership( $organization.$id, email, ['owner'], @@ -47,7 +47,7 @@ } - + Invite Member - + Create Project - + {#if !showCustomId}
(showCustomId = !showCustomId)}> @@ -71,6 +62,6 @@ - + diff --git a/src/routes/console/organization-[organization]/deleteMember.svelte b/src/routes/console/organization-[organization]/deleteMember.svelte index 59ea94346..3e5eeb081 100644 --- a/src/routes/console/organization-[organization]/deleteMember.svelte +++ b/src/routes/console/organization-[organization]/deleteMember.svelte @@ -4,7 +4,7 @@ import { Modal } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import type { Models } from '@aw-labs/appwrite-console'; import { createEventDispatcher } from 'svelte'; import { user } from '$lib/stores/user'; @@ -17,10 +17,10 @@ const deleteMembership = async () => { try { - await sdkForConsole.teams.deleteMembership(selectedMember.teamId, selectedMember.$id); + await sdk.forConsole.teams.deleteMembership(selectedMember.teamId, selectedMember.$id); if (isUser) { - await sdkForConsole.account.deleteSession('current'); + await sdk.forConsole.account.deleteSession('current'); await goto(`${base}/login`); } else { dispatch('deleted'); @@ -43,7 +43,7 @@ $: isUser = selectedMember?.userId === $user?.$id; - + {isUser ? 'Leave Organization' : 'Delete Member'} diff --git a/src/routes/console/organization-[organization]/deleteOrganization.svelte b/src/routes/console/organization-[organization]/deleteOrganization.svelte index a6dc3f020..49b3ebc5f 100644 --- a/src/routes/console/organization-[organization]/deleteOrganization.svelte +++ b/src/routes/console/organization-[organization]/deleteOrganization.svelte @@ -2,7 +2,7 @@ import { Modal } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { organization, organizationList } from '$lib/stores/organization'; import { goto, invalidate } from '$app/navigation'; import { base } from '$app/paths'; @@ -13,7 +13,7 @@ const deleteOrg = async () => { try { - await sdkForConsole.teams.delete($organization.$id); + await sdk.forConsole.teams.delete($organization.$id); addNotification({ type: 'success', message: `${$organization.name} has been deleted` @@ -37,7 +37,7 @@ }; - + Delete Organization

Are you sure you want to delete {$organization.name}? All projects ({$organization.total}) diff --git a/src/routes/console/organization-[organization]/header.svelte b/src/routes/console/organization-[organization]/header.svelte index d7b7137ed..8f115ad1b 100644 --- a/src/routes/console/organization-[organization]/header.svelte +++ b/src/routes/console/organization-[organization]/header.svelte @@ -72,7 +72,9 @@

- + + +
diff --git a/src/routes/console/project-[project]/auth/auth0OAuth.svelte b/src/routes/console/project-[project]/auth/auth0OAuth.svelte index a8a190cda..ff9bc2c32 100644 --- a/src/routes/console/project-[project]/auth/auth0OAuth.svelte +++ b/src/routes/console/project-[project]/auth/auth0OAuth.svelte @@ -2,7 +2,7 @@ import { page } from '$app/stores'; import { Modal, CopyInput, Alert } from '$lib/components'; import { Button, InputPassword, InputText, InputSwitch, FormList } from '$lib/elements/forms'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import type { Provider } from '$lib/stores/oauth-providers'; import { addNotification } from '$lib/stores/notifications'; import { onMount } from 'svelte'; @@ -27,7 +27,7 @@ const projectId = $page.params.project; const update = async () => { try { - await sdkForConsole.projects.updateOAuth2( + await sdk.forConsole.projects.updateOAuth2( projectId, provider.name.toLowerCase(), appId, @@ -58,7 +58,7 @@ : provider.secret; - + {provider.name} OAuth2 Settings

@@ -93,7 +93,7 @@

URI

diff --git a/src/routes/console/project-[project]/auth/authentikOAuth.svelte b/src/routes/console/project-[project]/auth/authentikOAuth.svelte index fa6929b10..d798177a5 100644 --- a/src/routes/console/project-[project]/auth/authentikOAuth.svelte +++ b/src/routes/console/project-[project]/auth/authentikOAuth.svelte @@ -2,7 +2,7 @@ import { page } from '$app/stores'; import { Modal, CopyInput, Alert } from '$lib/components'; import { Button, InputPassword, InputText, InputSwitch, FormList } from '$lib/elements/forms'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import type { Provider } from '$lib/stores/oauth-providers'; import { addNotification } from '$lib/stores/notifications'; import { onMount } from 'svelte'; @@ -27,7 +27,7 @@ const projectId = $page.params.project; const update = async () => { try { - await sdkForConsole.projects.updateOAuth2( + await sdk.forConsole.projects.updateOAuth2( projectId, provider.name.toLowerCase(), appId, @@ -58,7 +58,7 @@ : provider.secret; - + {provider.name} OAuth2 Settings

@@ -93,7 +93,7 @@

URI

 diff --git a/src/routes/console/project-[project]/auth/createTeam.svelte b/src/routes/console/project-[project]/auth/createTeam.svelte index 73a109d13..0875e522c 100644 --- a/src/routes/console/project-[project]/auth/createTeam.svelte +++ b/src/routes/console/project-[project]/auth/createTeam.svelte @@ -4,7 +4,7 @@ import { Pill } from '$lib/elements'; import { InputText, Button, FormList } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { ID } from '@aw-labs/appwrite-console'; import { createEventDispatcher } from 'svelte'; @@ -17,7 +17,7 @@ const create = async () => { try { - const team = await sdkForProject.teams.create(id ?? ID.unique(), name); + const team = await sdk.forProject.teams.create(id ?? ID.unique(), name); name = ''; showCreate = false; showCustomId = false; @@ -41,7 +41,7 @@ } - + Create Team { try { - const user = await sdkForProject.users.create( + const user = await sdk.forProject.users.create( id ?? ID.unique(), mail, phone, @@ -58,7 +58,7 @@ } - + Create User { try { - await sdkForConsole.projects.updateOAuth2( + await sdk.forConsole.projects.updateOAuth2( projectId, provider.name.toLowerCase(), appId, @@ -56,7 +56,7 @@ clientSecret && endpoint ? JSON.stringify({ clientSecret, endpoint }) : provider.secret; - + {provider.name} OAuth2 Settings

@@ -91,7 +91,7 @@

URI

 diff --git a/src/routes/console/project-[project]/auth/mainOAuth.svelte b/src/routes/console/project-[project]/auth/mainOAuth.svelte index 12b84ca97..c7a327a84 100644 --- a/src/routes/console/project-[project]/auth/mainOAuth.svelte +++ b/src/routes/console/project-[project]/auth/mainOAuth.svelte @@ -2,7 +2,7 @@ import { page } from '$app/stores'; import { Modal, CopyInput, Alert } from '$lib/components'; import { Button, InputPassword, InputText, InputSwitch, FormList } from '$lib/elements/forms'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import type { Provider } from '$lib/stores/oauth-providers'; import { addNotification } from '$lib/stores/notifications'; import { onMount } from 'svelte'; @@ -28,7 +28,7 @@ const update = async () => { try { - await sdkForConsole.projects.updateOAuth2( + await sdk.forConsole.projects.updateOAuth2( projectId, provider.name.toLowerCase(), appId, @@ -54,7 +54,7 @@ }; - + {provider.name} OAuth2 Settings

@@ -84,7 +84,7 @@

URI

diff --git a/src/routes/console/project-[project]/auth/microsoftOAuth.svelte b/src/routes/console/project-[project]/auth/microsoftOAuth.svelte index 41dc6f1b2..d715c16b8 100644 --- a/src/routes/console/project-[project]/auth/microsoftOAuth.svelte +++ b/src/routes/console/project-[project]/auth/microsoftOAuth.svelte @@ -2,7 +2,7 @@ import { page } from '$app/stores'; import { Modal, CopyInput, Alert } from '$lib/components'; import { Button, InputPassword, InputText, InputSwitch, FormList } from '$lib/elements/forms'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import type { Provider } from '$lib/stores/oauth-providers'; import { addNotification } from '$lib/stores/notifications'; import { onMount } from 'svelte'; @@ -28,7 +28,7 @@ const update = async () => { try { - await sdkForConsole.projects.updateOAuth2( + await sdk.forConsole.projects.updateOAuth2( projectId, provider.name.toLowerCase(), appId, @@ -57,7 +57,7 @@ clientSecret && tenantID ? JSON.stringify({ clientSecret, tenantID }) : provider.secret; - + {provider.name} OAuth2 Settings

@@ -93,7 +93,7 @@

URI

 diff --git a/src/routes/console/project-[project]/auth/oktaOAuth.svelte b/src/routes/console/project-[project]/auth/oktaOAuth.svelte index 39e3a3c04..4ebeb51ab 100644 --- a/src/routes/console/project-[project]/auth/oktaOAuth.svelte +++ b/src/routes/console/project-[project]/auth/oktaOAuth.svelte @@ -2,7 +2,7 @@ import { page } from '$app/stores'; import { Modal, CopyInput, Alert } from '$lib/components'; import { Button, InputPassword, InputText, InputSwitch, FormList } from '$lib/elements/forms'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import type { Provider } from '$lib/stores/oauth-providers'; import { addNotification } from '$lib/stores/notifications'; import { onMount } from 'svelte'; @@ -31,7 +31,7 @@ const update = async () => { try { - await sdkForConsole.projects.updateOAuth2( + await sdk.forConsole.projects.updateOAuth2( projectId, provider.name.toLowerCase(), appId, @@ -62,7 +62,7 @@ : provider.secret; - + {provider.name} OAuth2 Settings

@@ -103,7 +103,7 @@

URI

 diff --git a/src/routes/console/project-[project]/auth/security/updateSessionLength.svelte b/src/routes/console/project-[project]/auth/security/updateSessionLength.svelte index 778ed6e0e..053fc4fea 100644 --- a/src/routes/console/project-[project]/auth/security/updateSessionLength.svelte +++ b/src/routes/console/project-[project]/auth/security/updateSessionLength.svelte @@ -6,7 +6,7 @@ import { Button, InputNumber, InputSelect } from '$lib/elements/forms'; import { createTimeUnitPair } from '$lib/helpers/unit'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { project } from '../../store'; const projectId = $project.$id; @@ -15,7 +15,7 @@ async function updateSessionLength() { try { - await sdkForConsole.projects.updateAuthDuration(projectId, $baseValue); + await sdk.forConsole.projects.updateAuthDuration(projectId, $baseValue); invalidate(Dependencies.PROJECT); addNotification({ diff --git a/src/routes/console/project-[project]/auth/security/updateSessionsLimit.svelte b/src/routes/console/project-[project]/auth/security/updateSessionsLimit.svelte index 46e8e3f3d..f85374284 100644 --- a/src/routes/console/project-[project]/auth/security/updateSessionsLimit.svelte +++ b/src/routes/console/project-[project]/auth/security/updateSessionsLimit.svelte @@ -3,7 +3,7 @@ import { CardGrid, Heading } from '$lib/components'; import { Button, Form, InputNumber } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { project } from '../../store'; const projectId = $project.$id; @@ -12,7 +12,7 @@ async function updateSessionsLimit() { try { - await sdkForConsole.projects.updateAuthSessionsLimit(projectId, maxSessions); + await sdk.forConsole.projects.updateAuthSessionsLimit(projectId, maxSessions); addNotification({ type: 'success', @@ -29,7 +29,7 @@ } - + Sessions Limit

Maximum number of active sessions allowed per user.

diff --git a/src/routes/console/project-[project]/auth/security/updateUsersLimit.svelte b/src/routes/console/project-[project]/auth/security/updateUsersLimit.svelte index 807630fdb..3e0dade55 100644 --- a/src/routes/console/project-[project]/auth/security/updateUsersLimit.svelte +++ b/src/routes/console/project-[project]/auth/security/updateUsersLimit.svelte @@ -7,7 +7,7 @@ import { Button } from '$lib/elements/forms'; import { clickOnEnter } from '$lib/helpers/a11y'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { project } from '../../store'; const projectId = $project.$id; @@ -31,7 +31,7 @@ async function updateLimit() { submitting = true; try { - await sdkForConsole.projects.updateAuthLimit(projectId, isLimited ? newLimit : 0); + await sdk.forConsole.projects.updateAuthLimit(projectId, isLimited ? newLimit : 0); invalidate(Dependencies.PROJECT).then(() => (submitting = false)); addNotification({ type: 'success', diff --git a/src/routes/console/project-[project]/auth/settings/+page.svelte b/src/routes/console/project-[project]/auth/settings/+page.svelte index 78786f524..c40d7934e 100644 --- a/src/routes/console/project-[project]/auth/settings/+page.svelte +++ b/src/routes/console/project-[project]/auth/settings/+page.svelte @@ -4,7 +4,7 @@ import { InputSwitch } from '$lib/elements/forms'; import { Container } from '$lib/layout'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { project } from '../../store'; import { authMethods, type AuthMethod } from '$lib/stores/auth-methods'; import { OAuthProviders } from '$lib/stores/oauth-providers'; @@ -22,7 +22,7 @@ async function authUpdate(box: AuthMethod) { try { - await sdkForConsole.projects.updateAuthStatus(projectId, box.method, box.value); + await sdk.forConsole.projects.updateAuthStatus(projectId, box.method, box.value); addNotification({ type: 'success', message: `${box.label} authentication has been ${ diff --git a/src/routes/console/project-[project]/auth/teams/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/teams/[[page]]/+page.ts index dfd5d40df..ede361c0b 100644 --- a/src/routes/console/project-[project]/auth/teams/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/auth/teams/[[page]]/+page.ts @@ -1,11 +1,10 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent, url }) => { - await parent(); +export const load: PageLoad = async ({ params, url }) => { const page = Number(params.page); const offset = pageToOffset(page, PAGE_LIMIT); const search = url.search.slice(1) ?? undefined; @@ -14,7 +13,7 @@ export const load: PageLoad = async ({ params, parent, url }) => { offset, search, page, - teams: await sdkForProject.teams.list( + teams: await sdk.forProject.teams.list( [Query.limit(PAGE_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt')], search ) diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/+layout.ts b/src/routes/console/project-[project]/auth/teams/team-[team]/+layout.ts index f7b8997b6..9859dfe08 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/+layout.ts +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/+layout.ts @@ -1,18 +1,17 @@ import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { LayoutLoad } from './$types'; import { Dependencies } from '$lib/constants'; import { error } from '@sveltejs/kit'; -export const load: LayoutLoad = async ({ params, parent, depends }) => { - await parent(); +export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.TEAM); try { return { header: Header, breadcrumbs: Breadcrumbs, - team: await sdkForProject.teams.get(params.team) + team: await sdk.forProject.teams.get(params.team) }; } catch (e) { throw error(e.code, e.message); diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/+page.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/+page.svelte index 10dd00347..007ec5ead 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/+page.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/+page.svelte @@ -4,7 +4,7 @@ import { CardGrid, Box, Heading, AvatarInitials } from '$lib/components'; import { Container } from '$lib/layout'; import { Button, InputText, Form } from '$lib/elements/forms'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { toLocaleDateTime } from '$lib/helpers/date'; import { addNotification } from '$lib/stores/notifications'; import { team } from './store'; @@ -22,7 +22,7 @@ async function updateName() { try { - await sdkForProject.teams.update($page.params.team, teamName); + await sdk.forProject.teams.update($page.params.team, teamName); invalidate(Dependencies.TEAM); addNotification({ message: 'Name has been updated', @@ -55,7 +55,7 @@ - + Update Name diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/activity/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/teams/team-[team]/activity/[[page]]/+page.ts index a3a5fa8d0..eb4e0a47b 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/activity/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/activity/[[page]]/+page.ts @@ -1,17 +1,16 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent }) => { - await parent(); +export const load: PageLoad = async ({ params }) => { const page = Number(params.page); const offset = pageToOffset(page, PAGE_LIMIT); return { offset, - logs: await sdkForProject.teams.listLogs(params.team, [ + logs: await sdk.forProject.teams.listLogs(params.team, [ Query.limit(PAGE_LIMIT), Query.offset(offset) ]) diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/createMembership.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/createMembership.svelte index d7b50dfb1..fb6e9fe49 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/createMembership.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/createMembership.svelte @@ -4,7 +4,7 @@ import { Modal, Alert } from '$lib/components'; import { Button, InputEmail, InputText, InputTags, FormList } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { createEventDispatcher } from 'svelte'; export let showCreate = false; @@ -19,7 +19,7 @@ const url = `${$page.url.origin}/console/project-${$page.params.project}/auth/teams/team-${$page.params.team}/members`; try { - const user = await sdkForProject.teams.createMembership( + const user = await sdk.forProject.teams.createMembership( teamId, email, roles, @@ -42,7 +42,7 @@ }; - + Create Membership { try { - await sdkForProject.teams.deleteMembership( + await sdk.forProject.teams.deleteMembership( selectedMembership.teamId, selectedMembership.$id ); @@ -37,7 +37,7 @@ }; - + Delete Member

Are you sure you want to delete {selectedMembership.userName} from '{selectedMembership.teamName}'? diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/deleteTeam.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/deleteTeam.svelte index 95b6ad318..bf99459eb 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/deleteTeam.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/deleteTeam.svelte @@ -6,7 +6,7 @@ import { Modal } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import type { Models } from '@aw-labs/appwrite-console'; export let showDelete = false; @@ -14,7 +14,7 @@ const deleteTeam = async () => { try { - await sdkForProject.teams.delete(team.$id); + await sdk.forProject.teams.delete(team.$id); showDelete = false; trackEvent(Submit.TeamDelete); await goto(`${base}/console/project-${$page.params.project}/auth/teams`); @@ -28,7 +28,7 @@ }; - + Delete Team

Are you sure you want to delete {team.name}? diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/members/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/teams/team-[team]/members/[[page]]/+page.ts index 38c6fd930..42fbccef9 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/members/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/members/[[page]]/+page.ts @@ -1,11 +1,10 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent, depends, url }) => { - await parent(); +export const load: PageLoad = async ({ params, depends, url }) => { depends(Dependencies.MEMBERSHIPS); const teamId = params.team; const page = Number(params.page); @@ -15,7 +14,7 @@ export const load: PageLoad = async ({ params, parent, depends, url }) => { return { offset, search, - memberships: await sdkForProject.teams.listMemberships( + memberships: await sdk.forProject.teams.listMemberships( teamId, [Query.limit(PAGE_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt')], search diff --git a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts index fbc99f708..226b38e4c 100644 --- a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts @@ -1,11 +1,10 @@ import type { Models } from '@aw-labs/appwrite-console'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent }) => { - await parent(); +export const load: PageLoad = async ({ params }) => { const { period } = params; - const response = await sdkForProject.users.getUsage(period ?? '30d'); + const response = await sdk.forProject.users.getUsage(period ?? '30d'); return { count: response.usersCount as unknown as Models.Metric[], created: response.usersCreate as unknown as Models.Metric[], diff --git a/src/routes/console/project-[project]/auth/user-[user]/+layout.ts b/src/routes/console/project-[project]/auth/user-[user]/+layout.ts index 2cbe498c2..64adc0d20 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/+layout.ts +++ b/src/routes/console/project-[project]/auth/user-[user]/+layout.ts @@ -1,19 +1,18 @@ import type { LayoutLoad } from './$types'; import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { Dependencies } from '$lib/constants'; import { error } from '@sveltejs/kit'; -export const load: LayoutLoad = async ({ params, parent, depends }) => { - await parent(); +export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.USER); try { return { header: Header, breadcrumbs: Breadcrumbs, - user: await sdkForProject.users.get(params.user) + user: await sdk.forProject.users.get(params.user) }; } catch (e) { throw error(e.code, e.message); diff --git a/src/routes/console/project-[project]/auth/user-[user]/activity/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/user-[user]/activity/[[page]]/+page.ts index 829f37d4a..e11f65d70 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/activity/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/auth/user-[user]/activity/[[page]]/+page.ts @@ -1,17 +1,16 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent }) => { - await parent(); +export const load: PageLoad = async ({ params }) => { const page = Number(params.page); const offset = pageToOffset(page, PAGE_LIMIT); return { offset, - logs: await sdkForProject.users.listLogs(params.user, [ + logs: await sdk.forProject.users.listLogs(params.user, [ Query.limit(PAGE_LIMIT), Query.offset(offset) ]) diff --git a/src/routes/console/project-[project]/auth/user-[user]/deleteAllSessions.svelte b/src/routes/console/project-[project]/auth/user-[user]/deleteAllSessions.svelte index aa6e4b5b3..0ec466683 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/deleteAllSessions.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteAllSessions.svelte @@ -6,14 +6,14 @@ import { Dependencies } from '$lib/constants'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { user } from './store'; export let showDeleteAll = false; const deleteAllSessions = async () => { try { - await sdkForProject.users.deleteSessions($page.params.user); + await sdk.forProject.users.deleteSessions($page.params.user); invalidate(Dependencies.SESSIONS); showDeleteAll = false; addNotification({ @@ -31,7 +31,7 @@ }; - + Delete All Sessions

Are you sure you want to delete all of {$user.name}'s sessions? diff --git a/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte b/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte index 5df57af76..d02d963c7 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte @@ -7,7 +7,7 @@ import { Dependencies } from '$lib/constants'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import type { Models } from '@aw-labs/appwrite-console'; export let showDelete = false; @@ -15,7 +15,7 @@ const deleteMembership = async () => { try { - await sdkForProject.teams.deleteMembership( + await sdk.forProject.teams.deleteMembership( selectedMembership.teamId, selectedMembership.$id ); @@ -40,7 +40,7 @@ }; - + Delete Member {#if selectedMembership}

diff --git a/src/routes/console/project-[project]/auth/user-[user]/deleteSession.svelte b/src/routes/console/project-[project]/auth/user-[user]/deleteSession.svelte index 72b97f33c..972b4c228 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/deleteSession.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteSession.svelte @@ -6,14 +6,14 @@ import { Dependencies } from '$lib/constants'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; export let showDelete = false; export let selectedSessionId: string; const deleteSession = async () => { try { - await sdkForProject.users.deleteSession($page.params.user, selectedSessionId); + await sdk.forProject.users.deleteSession($page.params.user, selectedSessionId); invalidate(Dependencies.SESSIONS); addNotification({ type: 'success', @@ -30,7 +30,7 @@ }; - + Delete Sessions

Are you sure you want to delete this session?

diff --git a/src/routes/console/project-[project]/auth/user-[user]/deleteUser.svelte b/src/routes/console/project-[project]/auth/user-[user]/deleteUser.svelte index c18f0d220..60ec7865a 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/deleteUser.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteUser.svelte @@ -5,7 +5,7 @@ import { Modal } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { user } from './store'; import { project } from '../../store'; import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; @@ -14,7 +14,7 @@ const deleteUser = async () => { try { - await sdkForProject.users.delete($user.$id); + await sdk.forProject.users.delete($user.$id); showDelete = false; addNotification({ type: 'success', @@ -32,7 +32,7 @@ }; - + Delete User

Are you sure you want to delete {$user.name} from '{$project.name}'?

diff --git a/src/routes/console/project-[project]/auth/user-[user]/memberships/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/user-[user]/memberships/[[page]]/+page.ts index 6d3659337..15b388871 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/memberships/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/auth/user-[user]/memberships/[[page]]/+page.ts @@ -1,10 +1,8 @@ -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent }) => { - await parent(); - +export const load: PageLoad = async ({ params }) => { return { - memberships: await sdkForProject.users.listMemberships(params.user) + memberships: await sdk.forProject.users.listMemberships(params.user) }; }; diff --git a/src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.svelte b/src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.svelte index de64e1562..af3ef5568 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.svelte @@ -12,7 +12,7 @@ import { Pill } from '$lib/elements'; import { Button } from '$lib/elements/forms'; import { Container } from '$lib/layout'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import DeleteAllSessions from '../../deleteAllSessions.svelte'; import DeleteSessions from '../../deleteSession.svelte'; import type { PageData } from './$types'; @@ -23,7 +23,8 @@ let showDeleteAll = false; let selectedSessionId: string; - const getBrowser = (clientCode: string) => sdkForProject.avatars.getBrowser(clientCode, 40, 40); + const getBrowser = (clientCode: string) => + sdk.forProject.avatars.getBrowser(clientCode, 40, 40); diff --git a/src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.ts index 530b91396..b8fd5d5fb 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.ts @@ -1,12 +1,10 @@ import { Dependencies } from '$lib/constants'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent, depends }) => { +export const load: PageLoad = async ({ params, depends }) => { depends(Dependencies.SESSIONS); - await parent(); - return { - sessions: await sdkForProject.users.listSessions(params.user) + sessions: await sdk.forProject.users.listSessions(params.user) }; }; diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte index 893d7f726..7214d94c9 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, InputEmail } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { user } from './store'; @@ -16,7 +16,7 @@ async function updateEmail() { try { - await sdkForProject.users.updateEmail($user.$id, userEmail); + await sdk.forProject.users.updateEmail($user.$id, userEmail); invalidate(Dependencies.USER); addNotification({ message: 'Email has been updated', @@ -33,7 +33,7 @@ } - + Update Email diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte index 2767d3027..6aa1426b3 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, InputText } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { user } from './store'; @@ -16,7 +16,7 @@ async function updateName() { try { - await sdkForProject.users.updateName($user.$id, userName); + await sdk.forProject.users.updateName($user.$id, userName); invalidate(Dependencies.USER); addNotification({ message: 'Name has been updated', @@ -33,7 +33,7 @@ } - + Update Name diff --git a/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte b/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte index 9a21b40da..492c4c0cb 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte @@ -3,14 +3,14 @@ import { CardGrid, Heading } from '$lib/components'; import { Button, Form, InputPassword } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { user } from './store'; let newPassword: string = null; async function updatePassword() { try { - await sdkForProject.users.updatePassword($user.$id, newPassword); + await sdk.forProject.users.updatePassword($user.$id, newPassword); newPassword = null; addNotification({ message: 'Password has been updated', @@ -27,7 +27,7 @@ } - +
Update Password diff --git a/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte b/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte index de0cb9584..5851b2d93 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, InputPhone } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { user } from './store'; @@ -16,7 +16,7 @@ async function updatePhone() { try { - await sdkForProject.users.updatePhone($user.$id, userPhone); + await sdk.forProject.users.updatePhone($user.$id, userPhone); invalidate(Dependencies.USER); addNotification({ message: 'Phone has been updated', @@ -33,7 +33,7 @@ } - + Update Phone diff --git a/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte b/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte index 5b2bd623c..4a90b0e49 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { user } from './store'; @@ -35,7 +35,7 @@ try { let updatedPrefs = Object.fromEntries(prefs); - await sdkForProject.users.updatePrefs($user.$id, updatedPrefs); + await sdk.forProject.users.updatePrefs($user.$id, updatedPrefs); invalidate(Dependencies.USER); arePrefsDisabled = true; @@ -54,7 +54,7 @@ } - + User Preferences

diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte index 31a38a503..25da5891e 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte @@ -7,7 +7,7 @@ import { Button } from '$lib/elements/forms'; import { toLocaleDateTime } from '$lib/helpers/date'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { user } from './store'; let showVerifcationDropdown = false; @@ -15,7 +15,7 @@ async function updateVerificationEmail() { showVerifcationDropdown = false; try { - await sdkForProject.users.updateEmailVerification($user.$id, !$user.emailVerification); + await sdk.forProject.users.updateEmailVerification($user.$id, !$user.emailVerification); invalidate(Dependencies.USER); addNotification({ message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${ @@ -35,7 +35,7 @@ async function updateVerificationPhone() { showVerifcationDropdown = false; try { - await sdkForProject.users.updatePhoneVerification($user.$id, !$user.phoneVerification); + await sdk.forProject.users.updatePhoneVerification($user.$id, !$user.phoneVerification); invalidate(Dependencies.USER); addNotification({ message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${ @@ -54,7 +54,7 @@ } async function updateStatus() { try { - await sdkForProject.users.updateStatus($user.$id, !$user.status); + await sdk.forProject.users.updateStatus($user.$id, !$user.status); await invalidate(Dependencies.USER); addNotification({ message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${ diff --git a/src/routes/console/project-[project]/databases/+layout.ts b/src/routes/console/project-[project]/databases/+layout.ts index 12cc3f795..7db345058 100644 --- a/src/routes/console/project-[project]/databases/+layout.ts +++ b/src/routes/console/project-[project]/databases/+layout.ts @@ -2,9 +2,7 @@ import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; import type { LayoutLoad } from './$types'; -export const load: LayoutLoad = async ({ parent }) => { - await parent(); - +export const load: LayoutLoad = async () => { return { header: Header, breadcrumbs: Breadcrumbs diff --git a/src/routes/console/project-[project]/databases/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/[[page]]/+page.ts index 47cc014c6..f8d1e2352 100644 --- a/src/routes/console/project-[project]/databases/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/[[page]]/+page.ts @@ -1,17 +1,16 @@ -import { Query } from '@aw-labs/appwrite-console'; -import { sdkForProject } from '$lib/stores/sdk'; -import { pageToOffset } from '$lib/helpers/load'; import { CARD_LIMIT } from '$lib/constants'; +import { pageToOffset } from '$lib/helpers/load'; +import { sdk } from '$lib/stores/sdk'; +import { Query } from '@aw-labs/appwrite-console'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent }) => { - await parent(); +export const load: PageLoad = async ({ params }) => { const page = Number(params.page); const offset = pageToOffset(page, CARD_LIMIT); return { offset, - databases: await sdkForProject.databases.list([ + databases: await sdk.forProject.databases.list([ Query.limit(CARD_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt') diff --git a/src/routes/console/project-[project]/databases/create.svelte b/src/routes/console/project-[project]/databases/create.svelte index 237ed836a..ca42e67b1 100644 --- a/src/routes/console/project-[project]/databases/create.svelte +++ b/src/routes/console/project-[project]/databases/create.svelte @@ -4,7 +4,7 @@ import { Pill } from '$lib/elements'; import { Button, InputText, FormList } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { ID } from '@aw-labs/appwrite-console'; import { createEventDispatcher } from 'svelte'; @@ -18,7 +18,7 @@ const create = async () => { try { - const database = await sdkForProject.databases.create(id ? id : ID.unique(), name); + const database = await sdk.forProject.databases.create(id ? id : ID.unique(), name); showCreate = false; dispatch('created', database); addNotification({ @@ -39,7 +39,7 @@ }; - + Create Database { - await parent(); +export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.DATABASE); try { return { header: Header, breadcrumbs: Breadcrumbs, - database: await sdkForProject.databases.get(params.database) + database: await sdk.forProject.databases.get(params.database) }; } catch (e) { throw error(e.code, e.message); diff --git a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.ts index d7c69f3ca..5f3424e6d 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.ts @@ -1,17 +1,16 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent }) => { - await parent(); +export const load: PageLoad = async ({ params }) => { const page = Number(params.page); const offset = pageToOffset(page, CARD_LIMIT); return { offset, - collections: await sdkForProject.databases.listCollections(params.database, [ + collections: await sdk.forProject.databases.listCollections(params.database, [ Query.limit(CARD_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt') diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte index eb15b0dca..e8c0d8ccc 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte @@ -1,14 +1,14 @@ - + Delete Attribute

Are you sure you want to delete '{selectedAttribute?.key}' from {$collection?.name}? diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte index 6e5d4d13e..3cc221b0c 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/email.svelte @@ -1,7 +1,7 @@ - + Create Attribute

diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte index 7819f11f4..5f5df9e55 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createDocument.svelte @@ -2,7 +2,7 @@ import { Wizard } from '$lib/layout'; import { beforeNavigate, invalidate } from '$app/navigation'; import { attributes } from './store'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { page } from '$app/stores'; import { onDestroy, onMount } from 'svelte'; import { addNotification } from '$lib/stores/notifications'; @@ -33,7 +33,7 @@ async function create() { try { - await sdkForProject.databases.createDocument( + await sdk.forProject.databases.createDocument( databaseId, collectionId, $createDocument.id ?? ID.unique(), diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts index d6d43fcc9..54ffd67ac 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+layout.ts @@ -1,4 +1,4 @@ -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { Dependencies } from '$lib/constants'; import type { LayoutLoad } from './$types'; import Breadcrumbs from './breadcrumbs.svelte'; @@ -11,7 +11,7 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => { const { collection } = await parent(); try { - const document = await sdkForProject.databases.getDocument( + const document = await sdk.forProject.databases.getDocument( params.database, params.collection, params.document diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte index c4c9a7c72..83b79a742 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte @@ -2,7 +2,7 @@ import { CardGrid, Box, Heading, Alert } from '$lib/components'; import { Container } from '$lib/layout'; import { Button } from '$lib/elements/forms'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { doc } from './store'; import { addNotification } from '$lib/stores/notifications'; import { toLocaleDateTime } from '$lib/helpers/date'; @@ -22,7 +22,7 @@ async function updatePermissions() { try { - await sdkForProject.databases.updateDocument( + await sdk.forProject.databases.updateDocument( $doc.$databaseId, $doc.$collectionId, $doc.$id, diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/[[page]]/+page.ts index a6606dde6..ff2edc03c 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/activity/[[page]]/+page.ts @@ -1,17 +1,16 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent }) => { - await parent(); +export const load: PageLoad = async ({ params }) => { const page = Number(params.page); const offset = pageToOffset(page, PAGE_LIMIT); return { offset, - logs: await sdkForProject.databases.listDocumentLogs( + logs: await sdk.forProject.databases.listDocumentLogs( params.database, params.collection, params.document, diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte index 692265075..e7152591b 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/delete.svelte @@ -6,7 +6,7 @@ import { Modal } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { collection } from '../store'; export let showDelete = false; @@ -15,7 +15,7 @@ const handleDelete = async () => { try { - await sdkForProject.databases.deleteDocument( + await sdk.forProject.databases.deleteDocument( databaseId, $page.params.collection, $page.params.document @@ -39,7 +39,7 @@ }; - + Delete Document

diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte index b832db632..f12786d45 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/document.svelte @@ -5,7 +5,7 @@ import { doc } from './store'; import { onMount } from 'svelte'; import { page } from '$app/stores'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { addNotification } from '$lib/stores/notifications'; import { writable } from 'svelte/store'; import type { Models } from '@aw-labs/appwrite-console'; @@ -52,7 +52,7 @@ async function updateData() { try { - await sdkForProject.databases.updateDocument( + await sdk.forProject.databases.updateDocument( databaseId, collectionId, documentId, diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte index 604f85a58..c1c21e6d1 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/createIndex.svelte @@ -8,7 +8,7 @@ import { Button, FormList, InputSelect, InputText } from '$lib/elements/forms'; import { remove } from '$lib/helpers/array'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { indexes, type Attributes } from '../store'; import { collection } from '../store'; import Select from './select.svelte'; @@ -31,8 +31,8 @@ value: attribute.key, label: attribute.key })); + let attributeList = [{ value: '', order: '' }]; - let creating = false; function initialize() { attributeList = externalAttribute @@ -47,8 +47,7 @@ initialize(); } - $: addAttributeDisabled = - !attributeList.at(-1)?.value || !attributeList.at(-1)?.order || creating; + $: addAttributeDisabled = !attributeList.at(-1)?.value || !attributeList.at(-1)?.order; async function create() { if (!(key && selectedType && !addAttributeDisabled)) { @@ -56,10 +55,8 @@ return; } - creating = true; - try { - await sdkForProject.databases.createIndex( + await sdk.forProject.databases.createIndex( databaseId, $collection.$id, key, @@ -81,15 +78,13 @@ type: 'success' }); trackEvent(Submit.IndexCreate); + showCreateIndex = false; } catch (error) { addNotification({ message: error.message, type: 'error' }); trackError(error, Submit.IndexCreate); - } finally { - showCreateIndex = false; - creating = false; } } @@ -101,7 +96,7 @@ } - + Create Index @@ -156,6 +151,6 @@ - + diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte index a8c97dd1d..180fbfa9e 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/indexes/deleteIndex.svelte @@ -3,7 +3,7 @@ import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; import { collection } from '../store'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import type { Models } from '@aw-labs/appwrite-console'; import { createEventDispatcher } from 'svelte'; import { page } from '$app/stores'; @@ -17,7 +17,7 @@ const handleDelete = async () => { try { - await sdkForProject.databases.deleteIndex( + await sdk.forProject.databases.deleteIndex( databaseId, $collection.$id, selectedIndex.key @@ -39,7 +39,7 @@ }; - + Delete Index

diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte index bdd85c1f9..a5bcebbec 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/deleteCollection.svelte @@ -6,7 +6,7 @@ import { Modal } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { collection } from '../store'; export let showDelete = false; @@ -15,7 +15,7 @@ const handleDelete = async () => { try { - await sdkForProject.databases.deleteCollection(databaseId, $collection.$id); + await sdk.forProject.databases.deleteCollection(databaseId, $collection.$id); showDelete = false; addNotification({ type: 'success', @@ -35,7 +35,7 @@ }; - + Delete Collection

diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte index 24ccc1199..74e0ebbe6 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateName.svelte @@ -6,7 +6,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, InputText } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { collection } from '../store'; @@ -20,7 +20,7 @@ async function updateName() { try { - await sdkForProject.databases.updateCollection( + await sdk.forProject.databases.updateCollection( databaseId, $collection.$id, collectionName, @@ -44,7 +44,7 @@ } - + Update Name diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte index 418052dde..4d6324761 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updatePermissions.svelte @@ -8,7 +8,7 @@ import { Button } from '$lib/elements/forms'; import { symmetricDifference } from '$lib/helpers/array'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { collection } from '../store'; @@ -24,7 +24,7 @@ async function updatePermissions() { try { - await sdkForProject.databases.updateCollection( + await sdk.forProject.databases.updateCollection( databaseId, $collection.$id, $collection.name, diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte index e34406fb8..2b74f5f7c 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateSecurity.svelte @@ -6,7 +6,7 @@ import { Dependencies } from '$lib/constants'; import { Button, FormList, InputSwitch } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { collection } from '../store'; @@ -20,7 +20,7 @@ async function updateSecurity() { try { - await sdkForProject.databases.updateCollection( + await sdk.forProject.databases.updateCollection( databaseId, $collection.$id, $collection.name, diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte index ea064ebda..2b3cc1c51 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/settings/updateStatus.svelte @@ -7,7 +7,7 @@ import { Button, InputSwitch } from '$lib/elements/forms'; import { toLocaleDateTime } from '$lib/helpers/date'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { collection } from '../store'; @@ -21,7 +21,7 @@ async function toggleCollection() { try { - await sdkForProject.databases.updateCollection( + await sdk.forProject.databases.updateCollection( databaseId, $collection.$id, $collection.name, diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts index cf4a899cf..7ce5151b6 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/usage/[[period]]/+page.ts @@ -1,10 +1,9 @@ import type { Models } from '@aw-labs/appwrite-console'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent }) => { - await parent(); - const response = await sdkForProject.databases.getCollectionUsage( +export const load: PageLoad = async ({ params }) => { + const response = await sdk.forProject.databases.getCollectionUsage( params.database, params.collection, params.period ?? '30d' diff --git a/src/routes/console/project-[project]/databases/database-[database]/create.svelte b/src/routes/console/project-[project]/databases/database-[database]/create.svelte index 32c4bfa2c..4ed05e6b5 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/create.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/create.svelte @@ -6,7 +6,7 @@ import { Pill } from '$lib/elements'; import { Button, InputText, FormList } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { ID } from '@aw-labs/appwrite-console'; import { createEventDispatcher } from 'svelte'; @@ -21,7 +21,7 @@ const create = async () => { try { - const collection = await sdkForProject.databases.createCollection( + const collection = await sdk.forProject.databases.createCollection( databaseId, id ? id : ID.unique(), name @@ -46,7 +46,7 @@ }; - + Create Collection { try { - await sdkForProject.databases.delete(databaseId); + await sdk.forProject.databases.delete(databaseId); showDelete = false; addNotification({ type: 'success', @@ -32,7 +32,7 @@ }; - + Delete Database

Are you sure you want to delete {$database.name}? 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 2d07e248b..6c92833da 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 @@ -8,7 +8,7 @@ import { toLocaleDateTime } from '$lib/helpers/date'; import { Container } from '$lib/layout'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import Delete from '../delete.svelte'; import { database } from '../store'; @@ -31,7 +31,7 @@ async function updateName() { try { - await sdkForProject.databases.update($page.params.database, databaseName); + await sdk.forProject.databases.update($page.params.database, databaseName); invalidate(Dependencies.DATABASE); addNotification({ message: 'Name has been updated', diff --git a/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts index bc1023198..eca33fdee 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/usage/[[period]]/+page.ts @@ -1,10 +1,9 @@ import type { Models } from '@aw-labs/appwrite-console'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent }) => { - await parent(); - const response = await sdkForProject.databases.getDatabaseUsage( +export const load: PageLoad = async ({ params }) => { + const response = await sdk.forProject.databases.getDatabaseUsage( params.database, params.period ?? '30d' ); diff --git a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts index 9017a1b24..f3d931abf 100644 --- a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts @@ -1,11 +1,10 @@ import type { Models } from '@aw-labs/appwrite-console'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent }) => { - await parent(); +export const load: PageLoad = async ({ params }) => { const { period } = params; - const response = await sdkForProject.databases.getUsage(period ?? '30d'); + const response = await sdk.forProject.databases.getUsage(period ?? '30d'); return { count: response.databasesCount as unknown as Models.Metric[], diff --git a/src/routes/console/project-[project]/functions/+layout.svelte b/src/routes/console/project-[project]/functions/+layout.svelte index 8ccdfb692..268f2cfc0 100644 --- a/src/routes/console/project-[project]/functions/+layout.svelte +++ b/src/routes/console/project-[project]/functions/+layout.svelte @@ -1,13 +1,13 @@ - + {selectedVar ? 'Update' : 'Create'} Variable diff --git a/src/routes/console/project-[project]/functions/function-[function]/+layout.ts b/src/routes/console/project-[project]/functions/function-[function]/+layout.ts index d91cd6300..2db9b9bb4 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/+layout.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/+layout.ts @@ -1,19 +1,18 @@ -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { Dependencies } from '$lib/constants'; import type { LayoutLoad } from './$types'; import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; import { error } from '@sveltejs/kit'; -export const load: LayoutLoad = async ({ params, parent, depends }) => { - await parent(); +export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.FUNCTION); try { return { header: Header, breadcrumbs: Breadcrumbs, - function: await sdkForProject.functions.get(params.function) + function: await sdk.forProject.functions.get(params.function) }; } catch (e) { throw error(e.code, e.message); diff --git a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte index af41f1d46..fae9832b9 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte @@ -35,7 +35,7 @@ import Create from '../create.svelte'; import Activate from '../activate.svelte'; import { browser } from '$app/environment'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { page } from '$app/stores'; import Output from '$lib/components/output.svelte'; import { calculateTime } from '$lib/helpers/timeConversion'; @@ -57,7 +57,7 @@ $: activeDeployment = data.deployments.deployments.find((d) => d.$id === $func?.deployment); if (browser) { - sdkForConsole.client.subscribe('console', (message) => { + sdk.forConsole.client.subscribe('console', (message) => { if (message.events.includes('functions.*.deployments.*.create')) { invalidate(Dependencies.DEPLOYMENTS); diff --git a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.ts b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.ts index 9472fd6af..bb1bc9a54 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.ts @@ -1,18 +1,17 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent, depends }) => { +export const load: PageLoad = async ({ params, depends }) => { depends(Dependencies.DEPLOYMENTS); - await parent(); const page = Number(params.page); const offset = pageToOffset(page, PAGE_LIMIT); return { offset, - deployments: await sdkForProject.functions.listDeployments(params.function, [ + deployments: await sdk.forProject.functions.listDeployments(params.function, [ Query.limit(PAGE_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt') diff --git a/src/routes/console/project-[project]/functions/function-[function]/activate.svelte b/src/routes/console/project-[project]/functions/function-[function]/activate.svelte index 8a20db834..292b1f457 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/activate.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/activate.svelte @@ -3,7 +3,7 @@ import { Modal } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import type { Models } from '@aw-labs/appwrite-console'; import { createEventDispatcher } from 'svelte'; @@ -14,7 +14,7 @@ const handleSubmit = async () => { try { - await sdkForProject.functions.updateDeployment( + await sdk.forProject.functions.updateDeployment( selectedDeployment.resourceId, selectedDeployment.$id ); @@ -35,7 +35,7 @@ }; - + Activate Deployment

Are you sure you want to activate this deployment?

diff --git a/src/routes/console/project-[project]/functions/function-[function]/create.svelte b/src/routes/console/project-[project]/functions/function-[function]/create.svelte index 19dbe82fd..3cb64fe27 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/create.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/create.svelte @@ -1,7 +1,7 @@ - + Create Deployment (mode = Mode.CLI)} selected={mode === Mode.CLI} event="deploy_cli"> diff --git a/src/routes/console/project-[project]/functions/function-[function]/delete.svelte b/src/routes/console/project-[project]/functions/function-[function]/delete.svelte index eb0a3f757..eb00d66f7 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/delete.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/delete.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import type { Models } from '@aw-labs/appwrite-console'; export let showDelete = false; @@ -13,7 +13,7 @@ const handleSubmit = async () => { try { - await sdkForProject.functions.deleteDeployment( + await sdk.forProject.functions.deleteDeployment( selectedDeployment.resourceId, selectedDeployment.$id ); @@ -34,7 +34,7 @@ }; - + Delete Deployment

Are you sure you want to delete this deployment?

diff --git a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte index bccdbdd5f..87c946391 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte @@ -7,7 +7,7 @@ import { Button } from '$lib/elements/forms'; import { InputTextarea, FormList, InputChoice } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import type { Models } from '@aw-labs/appwrite-console'; export let selectedFunction: Models.Function = null; @@ -30,7 +30,7 @@ const handleSubmit = async () => { submitting = true; try { - await sdkForProject.functions.createExecution( + await sdk.forProject.functions.createExecution( selectedFunction.$id, data?.length ? data : undefined, true @@ -63,7 +63,7 @@ afterNavigate(close); - + Execute Function diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte index d426d0a33..6267e7c2e 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte @@ -18,7 +18,7 @@ import { calculateTime } from '$lib/helpers/timeConversion'; import { Container } from '$lib/layout'; import { log } from '$lib/stores/logs'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onDestroy, onMount } from 'svelte'; import { func } from '../../store'; import CreateDeployment from '../../create.svelte'; @@ -31,7 +31,7 @@ let unsubscribe: { (): void }; onMount(() => { - unsubscribe = sdkForConsole.client.subscribe('console', (response) => { + unsubscribe = sdk.forConsole.client.subscribe('console', (response) => { if (response.events.includes('functions.*.executions.*')) { invalidate(Dependencies.EXECUTIONS); } diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.ts b/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.ts index 5d5c50f05..c3fea7319 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.ts @@ -1,18 +1,17 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent, depends }) => { - await parent(); +export const load: PageLoad = async ({ params, depends }) => { depends(Dependencies.EXECUTIONS); const page = Number(params.page); const offset = pageToOffset(page, PAGE_LIMIT); return { offset, - executions: await sdkForProject.functions.listExecutions(params.function, [ + executions: await sdk.forProject.functions.listExecutions(params.function, [ Query.limit(PAGE_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt') diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte index 6d33d6d85..9cfeecb66 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/+page.svelte @@ -13,7 +13,7 @@ import { Container } from '$lib/layout'; import { app } from '$lib/stores/app'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import type { Models } from '@aw-labs/appwrite-console'; import { onMount } from 'svelte'; import Variable from '../../createVariable.svelte'; @@ -54,7 +54,7 @@ async function updateName() { try { - await sdkForProject.functions.update( + await sdk.forProject.functions.update( functionId, functionName, $func.execute, @@ -80,7 +80,7 @@ async function updatePermissions() { try { - await sdkForProject.functions.update( + await sdk.forProject.functions.update( functionId, $func.name, permissions, @@ -106,7 +106,7 @@ async function updateSchedule() { try { - await sdkForProject.functions.update( + await sdk.forProject.functions.update( functionId, $func.name, $func.execute, @@ -133,7 +133,7 @@ async function updateTimeout() { try { - await sdkForProject.functions.update( + await sdk.forProject.functions.update( functionId, $func.name, $func.execute, @@ -162,7 +162,7 @@ const variable = event.detail; try { - await sdkForProject.functions.createVariable(functionId, variable.key, variable.value); + await sdk.forProject.functions.createVariable(functionId, variable.key, variable.value); showVariablesModal = false; invalidate(Dependencies.VARIABLES); addNotification({ @@ -182,7 +182,7 @@ async function handleVariableUpdated(event: CustomEvent) { const variable = event.detail; try { - await sdkForProject.functions.updateVariable( + await sdk.forProject.functions.updateVariable( functionId, variable.$id, variable.key, @@ -206,7 +206,7 @@ } async function handleVariableDeleted(variable: Models.Variable) { try { - await sdkForProject.functions.deleteVariable(variable.functionId, variable.$id); + await sdk.forProject.functions.deleteVariable(variable.functionId, variable.$id); invalidate(Dependencies.VARIABLES); addNotification({ type: 'success', @@ -282,7 +282,7 @@ - + Update Name @@ -305,7 +305,7 @@ -
+ Execute Access

@@ -330,7 +330,7 @@ - + Update Schedule

@@ -452,7 +452,7 @@ - + Update Timeout

diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/+page.ts b/src/routes/console/project-[project]/functions/function-[function]/settings/+page.ts index 897dbb058..803c98e16 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/+page.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/+page.ts @@ -1,12 +1,11 @@ -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { Dependencies } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent, depends }) => { - await parent(); +export const load: PageLoad = async ({ params, depends }) => { depends(Dependencies.VARIABLES); return { - variables: await sdkForProject.functions.listVariables(params.function) + variables: await sdk.forProject.functions.listVariables(params.function) }; }; diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/delete.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/delete.svelte index 9771c4592..b4151270c 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/delete.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/delete.svelte @@ -6,14 +6,14 @@ import { Modal } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; export let showDelete = false; const functionId = $page.params.function; const handleSubmit = async () => { try { - await sdkForProject.functions.delete(functionId); + await sdk.forProject.functions.delete(functionId); showDelete = false; addNotification({ type: 'success', @@ -31,7 +31,7 @@ }; - + Delete Function

Are you sure you want to delete this function and all associated deployments from your diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte index 8e325d085..1ad30f4af 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/updateEvents.svelte @@ -12,7 +12,7 @@ import TableList from '$lib/elements/table/tableList.svelte'; import { symmetricDifference } from '$lib/helpers/array'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { writable, type Writable } from 'svelte/store'; import { func } from '../store'; import { EventModal } from '$lib/components'; @@ -29,7 +29,7 @@ async function updateEvents() { try { - await sdkForProject.functions.update( + await sdk.forProject.functions.update( functionId, $func.name, $func.execute, @@ -76,7 +76,7 @@ } - + Update Events

Set the events that will trigger your function. Maximum 100 events allowed.

diff --git a/src/routes/console/project-[project]/functions/function-[function]/settings/uploadVariables.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/uploadVariables.svelte index 5c6122235..617f40b46 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/settings/uploadVariables.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/settings/uploadVariables.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, InputFile } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { createEventDispatcher } from 'svelte'; export let show = false; @@ -20,7 +20,7 @@ const variables = await parseFile(files[0]); for (const variable of variables) { try { - await sdkForProject.functions.createVariable( + await sdk.forProject.functions.createVariable( functionId, variable.key, variable.value @@ -59,7 +59,7 @@ } - + Upload Variables

Upload multiple variables via a .env file that will be passed to your function at runtime. diff --git a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts index e0947d7bd..629426127 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/usage/[[period]]/+page.ts @@ -1,10 +1,9 @@ import type { Models } from '@aw-labs/appwrite-console'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent }) => { - await parent(); - const response = await sdkForProject.functions.getFunctionUsage( +export const load: PageLoad = async ({ params }) => { + const response = await sdk.forProject.functions.getFunctionUsage( params.function, params.period ?? '30d' ); diff --git a/src/routes/console/project-[project]/functions/wizard/step1.svelte b/src/routes/console/project-[project]/functions/wizard/step1.svelte index 61e7ad9c8..b27348164 100644 --- a/src/routes/console/project-[project]/functions/wizard/step1.svelte +++ b/src/routes/console/project-[project]/functions/wizard/step1.svelte @@ -3,7 +3,7 @@ import { Pill } from '$lib/elements'; import { InputText, InputSelect, FormList } from '$lib/elements/forms'; import { WizardStep } from '$lib/layout'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { createFunction } from './store'; @@ -12,7 +12,7 @@ let options = []; onMount(async () => { - let runtimes = await sdkForProject.functions.listRuntimes(); + let runtimes = await sdk.forProject.functions.listRuntimes(); options = runtimes.runtimes.map((runtime) => ({ label: `${runtime.name} - ${runtime.version}`, value: runtime.$id diff --git a/src/routes/console/project-[project]/overview/keys/+page.ts b/src/routes/console/project-[project]/overview/keys/+page.ts index 3a04f91f2..160a52560 100644 --- a/src/routes/console/project-[project]/overview/keys/+page.ts +++ b/src/routes/console/project-[project]/overview/keys/+page.ts @@ -1,5 +1,5 @@ import { Dependencies } from '$lib/constants'; -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { selectedTab } from '../store'; import type { PageLoad } from './$types'; @@ -8,6 +8,6 @@ selectedTab.set('keys'); export const load: PageLoad = async ({ params, depends }) => { depends(Dependencies.KEYS); return { - keys: await sdkForConsole.projects.listKeys(params.project) + keys: await sdk.forConsole.projects.listKeys(params.project) }; }; diff --git a/src/routes/console/project-[project]/overview/keys/[key]/+page.ts b/src/routes/console/project-[project]/overview/keys/[key]/+page.ts index 62c8a4fdb..1c8f8a44d 100644 --- a/src/routes/console/project-[project]/overview/keys/[key]/+page.ts +++ b/src/routes/console/project-[project]/overview/keys/[key]/+page.ts @@ -1,13 +1,13 @@ import Header from './header.svelte'; import Breadcrumbs from './breadcrumbs.svelte'; -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { Dependencies } from '$lib/constants'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, depends }) => { depends(Dependencies.KEY); - const key = await sdkForConsole.projects.getKey(params.project, params.key); + const key = await sdk.forConsole.projects.getKey(params.project, params.key); if (key.expire) { key.expire = new Date(key.expire).toISOString().slice(0, 23); } diff --git a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte index f79064632..5a3c88dc8 100644 --- a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte +++ b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte @@ -8,7 +8,7 @@ import { toLocaleDateTime } from '$lib/helpers/date'; import { Container } from '$lib/layout'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { project } from '../../../store'; import Scopes from '../scopes.svelte'; @@ -29,7 +29,7 @@ async function updateName() { try { - await sdkForConsole.projects.updateKey( + await sdk.forConsole.projects.updateKey( $project.$id, $key.$id, name, @@ -53,7 +53,7 @@ async function updateScopes() { try { - await sdkForConsole.projects.updateKey( + await sdk.forConsole.projects.updateKey( $project.$id, $key.$id, $key.name, @@ -103,7 +103,7 @@ - + Update Name

Choose any name that will help you distinguish between API keys.

@@ -123,7 +123,7 @@
-
+ Update Scopes

diff --git a/src/routes/console/project-[project]/overview/keys/[key]/delete.svelte b/src/routes/console/project-[project]/overview/keys/[key]/delete.svelte index c85542144..e7b7090fd 100644 --- a/src/routes/console/project-[project]/overview/keys/[key]/delete.svelte +++ b/src/routes/console/project-[project]/overview/keys/[key]/delete.svelte @@ -6,7 +6,7 @@ import { Dependencies } from '$lib/constants'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { project } from '../../../store'; import { key } from './store'; @@ -14,7 +14,7 @@ async function handleDelete() { try { - await sdkForConsole.projects.deleteKey($project.$id, $key.$id); + await sdk.forConsole.projects.deleteKey($project.$id, $key.$id); showDelete = false; addNotification({ type: 'success', @@ -33,7 +33,7 @@ } - + Delete API Key

The API Key will be permanently deleted. This action is irreversible.

diff --git a/src/routes/console/project-[project]/overview/keys/[key]/updateExpirationDate.svelte b/src/routes/console/project-[project]/overview/keys/[key]/updateExpirationDate.svelte index 427da9b0c..5d5bb58bb 100644 --- a/src/routes/console/project-[project]/overview/keys/[key]/updateExpirationDate.svelte +++ b/src/routes/console/project-[project]/overview/keys/[key]/updateExpirationDate.svelte @@ -6,7 +6,7 @@ import { Button, Form, FormList } from '$lib/elements/forms'; import { diffDays } from '$lib/helpers/date'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { project } from '../../../store'; import ExpirationInput from '../expirationInput.svelte'; import { key } from './store'; @@ -15,7 +15,7 @@ async function updateExpire() { try { - await sdkForConsole.projects.updateKey( + await sdk.forConsole.projects.updateKey( $project.$id, $key.$id, $key.name, @@ -43,7 +43,7 @@ $: isExpired = !alertsDismissed && $key.expire !== null && new Date($key.expire) < new Date(); - + Update Expiration Date

Set a date after which your API Key will expire.

diff --git a/src/routes/console/project-[project]/overview/keys/wizard.svelte b/src/routes/console/project-[project]/overview/keys/wizard.svelte index 3cd11d777..a1e41169d 100644 --- a/src/routes/console/project-[project]/overview/keys/wizard.svelte +++ b/src/routes/console/project-[project]/overview/keys/wizard.svelte @@ -6,7 +6,7 @@ import Step1 from './wizard/step1.svelte'; import Step2 from './wizard/step2.svelte'; import { key } from './wizard/store'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { page } from '$app/stores'; import { addNotification } from '$lib/stores/notifications'; import { onDestroy } from 'svelte'; @@ -16,7 +16,7 @@ async function onFinish() { try { - const { $id } = await sdkForConsole.projects.createKey( + const { $id } = await sdk.forConsole.projects.createKey( $page.params.project, $key.name, $key.scopes, diff --git a/src/routes/console/project-[project]/overview/platforms/+page.ts b/src/routes/console/project-[project]/overview/platforms/+page.ts index de8582eaa..5ef5a94ed 100644 --- a/src/routes/console/project-[project]/overview/platforms/+page.ts +++ b/src/routes/console/project-[project]/overview/platforms/+page.ts @@ -1,5 +1,5 @@ import { Dependencies } from '$lib/constants'; -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { selectedTab } from '../store'; import type { PageLoad } from './$types'; @@ -8,6 +8,6 @@ selectedTab.set('platforms'); export const load: PageLoad = async ({ params, depends }) => { depends(Dependencies.PLATFORMS); return { - platforms: await sdkForConsole.projects.listPlatforms(params.project) + platforms: await sdk.forConsole.projects.listPlatforms(params.project) }; }; diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/+page.ts b/src/routes/console/project-[project]/overview/platforms/[platform]/+page.ts index ca361d2c3..f102df440 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/+page.ts +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/+page.ts @@ -1,6 +1,6 @@ import Header from './header.svelte'; import Breadcrumbs from './breadcrumbs.svelte'; -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { Dependencies } from '$lib/constants'; import type { PageLoad } from './$types'; @@ -10,6 +10,6 @@ export const load: PageLoad = async ({ params, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - platform: await sdkForConsole.projects.getPlatform(params.project, params.platform) + platform: await sdk.forConsole.projects.getPlatform(params.project, params.platform) }; }; diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte index a4fb03c7d..87002401b 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte @@ -15,7 +15,7 @@ import { Button, Form, FormList, InputText } from '$lib/elements/forms'; import { Container } from '$lib/layout'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount, SvelteComponent } from 'svelte'; import { project } from '../../../store'; import { platform } from './store'; @@ -47,7 +47,7 @@ async function updateName() { updating = true; try { - await sdkForConsole.projects.updatePlatform( + await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, name, @@ -76,7 +76,7 @@ - + Update Name

Choose any name that will help you distinguish between platforms.

diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte index 17a744d99..a4cb030dd 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, FormList, InputText } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { project } from '../../../store'; import { platform } from './store'; @@ -18,7 +18,7 @@ const updateHostname = async () => { try { - await sdkForConsole.projects.updatePlatform( + await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, $platform.name, @@ -44,7 +44,7 @@ }; - + Update Package Name

diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte index b2a963913..5f5114fdc 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, FormList, InputText } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { project } from '../../../store'; import { platform } from './store'; @@ -18,7 +18,7 @@ const updateHostname = async () => { try { - await sdkForConsole.projects.updatePlatform( + await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, $platform.name, @@ -44,7 +44,7 @@ }; - + Update Bundle ID

diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte index 0c860ad94..415fa3232 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, FormList, InputText } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { project } from '../../../store'; import { platform } from './store'; @@ -18,7 +18,7 @@ const updateHostname = async () => { try { - await sdkForConsole.projects.updatePlatform( + await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, $platform.name, @@ -44,7 +44,7 @@ }; - + Update Bundle ID

diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte index 7d1f768f4..8a6cc735a 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, FormList, InputText } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { project } from '../../../store'; import { platform } from './store'; @@ -18,7 +18,7 @@ const updateHostname = async () => { try { - await sdkForConsole.projects.updatePlatform( + await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, $platform.name, @@ -44,7 +44,7 @@ }; - + Update Bundle ID

diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte index 32bc6ea1b..ca6c13315 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, FormList, InputText } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { project } from '../../../store'; import { platform } from './store'; @@ -18,7 +18,7 @@ const updateHostname = async () => { try { - await sdkForConsole.projects.updatePlatform( + await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, $platform.name, @@ -44,7 +44,7 @@ }; - + Update Bundle ID

diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte index e467b3680..b4469a227 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte @@ -6,7 +6,7 @@ import { Dependencies } from '$lib/constants'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { project } from '../../../store'; import { platform } from './store'; @@ -14,7 +14,7 @@ const handleDelete = async () => { try { - await sdkForConsole.projects.deletePlatform($project.$id, $platform.$id); + await sdk.forConsole.projects.deletePlatform($project.$id, $platform.$id); showDelete = false; addNotification({ type: 'success', @@ -33,7 +33,7 @@ }; - + Delete Platform

The Platform will be permanently deleted. This action is irreversible.

diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte index 1cd14eca5..da8bb0676 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, FormList, InputText } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { project } from '../../../store'; import { platform } from './store'; @@ -18,7 +18,7 @@ const updateHostname = async () => { try { - await sdkForConsole.projects.updatePlatform( + await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, $platform.name, @@ -44,7 +44,7 @@ }; - + Update Package Name

diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte index 3b82d6e03..dab964dbd 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, FormList, InputText } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { project } from '../../../store'; import { platform } from './store'; @@ -18,7 +18,7 @@ const updateHostname = async () => { try { - await sdkForConsole.projects.updatePlatform( + await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, $platform.name, @@ -44,7 +44,7 @@ }; - + Update Bundle ID

diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte index 6ee296789..eb5c6e13d 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, FormList, InputText } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { project } from '../../../store'; import { platform } from './store'; @@ -18,7 +18,7 @@ const updateHostname = async () => { try { - await sdkForConsole.projects.updatePlatform( + await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, $platform.name, @@ -44,7 +44,7 @@ }; - + Update Package Name

Your application name.

diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte index 9cdeb2ce9..68e1ef88d 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, FormList, InputText } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { project } from '../../../store'; import { platform } from './store'; @@ -18,7 +18,7 @@ const updateHostname = async () => { try { - await sdkForConsole.projects.updatePlatform( + await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, $platform.name, @@ -44,7 +44,7 @@ }; - + Update Bundle ID

diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte index 975130b62..110403b68 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, FormList, InputText } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { project } from '../../../store'; import { platform } from './store'; @@ -18,7 +18,7 @@ const updateHostname = async () => { try { - await sdkForConsole.projects.updatePlatform( + await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, $platform.name, @@ -44,7 +44,7 @@ }; - + Update Package Name

Your application name.

diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte index 43546c5eb..2e54a8cb1 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte @@ -4,7 +4,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, FormList, InputText } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { project } from '../../../store'; import { platform } from './store'; @@ -17,7 +17,7 @@ const updateHostname = async () => { try { - await sdkForConsole.projects.updatePlatform( + await sdk.forConsole.projects.updatePlatform( $project.$id, $platform.$id, $platform.name, @@ -39,7 +39,7 @@ }; - + Update Hostname

You can use * to allow wildcard hostnames or subdomains.

diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/android/step1.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/android/step1.svelte index 4075336e1..d67b0d872 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/android/step1.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/android/step1.svelte @@ -2,7 +2,7 @@ import { page } from '$app/stores'; import { FormList, InputText } from '$lib/elements/forms'; import { WizardStep } from '$lib/layout'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { createPlatform } from '../store'; import { wizard } from '$lib/stores/wizard'; import { app } from '$lib/stores/app'; @@ -16,7 +16,7 @@ async function beforeSubmit() { if ($createPlatform.$id) { - await sdkForConsole.projects.updatePlatform( + await sdk.forConsole.projects.updatePlatform( projectId, $createPlatform.$id, $createPlatform.name, @@ -28,7 +28,7 @@ return; } - const platform = await sdkForConsole.projects.createPlatform( + const platform = await sdk.forConsole.projects.createPlatform( projectId, 'android', $createPlatform.name, diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/android/step3.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/android/step3.svelte index 08a6581eb..b18f0f23a 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/android/step3.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/android/step3.svelte @@ -1,9 +1,9 @@ - + Delete Project

This project will be deleted, along with all of its metadata, stats, and other diff --git a/src/routes/console/project-[project]/settings/domains/[[page]]/+page.svelte b/src/routes/console/project-[project]/settings/domains/[[page]]/+page.svelte index 222d503eb..56b154268 100644 --- a/src/routes/console/project-[project]/settings/domains/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/settings/domains/[[page]]/+page.svelte @@ -14,7 +14,7 @@ } from '$lib/elements/table'; import { Container } from '$lib/layout'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { wizard } from '$lib/stores/wizard'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; @@ -45,7 +45,7 @@ invalidate(Dependencies.DOMAINS); return; } - await sdkForConsole.projects.updateDomainVerification(projectId, domainId); + await sdk.forConsole.projects.updateDomainVerification(projectId, domainId); invalidate(Dependencies.DOMAINS); trackEvent(Submit.DomainUpdateVerification); } catch (error) { diff --git a/src/routes/console/project-[project]/settings/domains/[[page]]/+page.ts b/src/routes/console/project-[project]/settings/domains/[[page]]/+page.ts index 21650e7ce..c3fb7c723 100644 --- a/src/routes/console/project-[project]/settings/domains/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/settings/domains/[[page]]/+page.ts @@ -1,12 +1,11 @@ import { Dependencies } from '$lib/constants'; -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent, depends }) => { - await parent(); +export const load: PageLoad = async ({ params, depends }) => { depends(Dependencies.DOMAINS); return { - domains: await sdkForConsole.projects.listDomains(params.project) + domains: await sdk.forConsole.projects.listDomains(params.project) }; }; diff --git a/src/routes/console/project-[project]/settings/domains/delete.svelte b/src/routes/console/project-[project]/settings/domains/delete.svelte index 8bf7d436d..cf54c45e9 100644 --- a/src/routes/console/project-[project]/settings/domains/delete.svelte +++ b/src/routes/console/project-[project]/settings/domains/delete.svelte @@ -2,7 +2,7 @@ import { Modal } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { project } from '../../store'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { addNotification } from '$lib/stores/notifications'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; @@ -14,7 +14,7 @@ const deleteDomain = async () => { try { - await sdkForConsole.projects.deleteDomain($project.$id, selectedDomain.$id); + await sdk.forConsole.projects.deleteDomain($project.$id, selectedDomain.$id); invalidate(Dependencies.DOMAINS); showDelete = false; addNotification({ @@ -32,7 +32,7 @@ }; - + Delete Domain {#if selectedDomain}

diff --git a/src/routes/console/project-[project]/settings/domains/wizard/step1.svelte b/src/routes/console/project-[project]/settings/domains/wizard/step1.svelte index 5e4da5988..671284d7f 100644 --- a/src/routes/console/project-[project]/settings/domains/wizard/step1.svelte +++ b/src/routes/console/project-[project]/settings/domains/wizard/step1.svelte @@ -2,17 +2,17 @@ import { Submit, trackEvent } from '$lib/actions/analytics'; import { FormList, InputDomain } from '$lib/elements/forms'; import { WizardStep } from '$lib/layout'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { project } from '../../../store'; import { domain } from './store'; const projectId = $project.$id; const createDomain = async () => { if ($domain.$id) { - await sdkForConsole.projects.deleteDomain(projectId, $domain.$id); + await sdk.forConsole.projects.deleteDomain(projectId, $domain.$id); } - const { $id } = await sdkForConsole.projects.createDomain(projectId, $domain.domain); + const { $id } = await sdk.forConsole.projects.createDomain(projectId, $domain.domain); $domain.$id = $id; trackEvent(Submit.DomainCreate); }; diff --git a/src/routes/console/project-[project]/settings/domains/wizard/step4.svelte b/src/routes/console/project-[project]/settings/domains/wizard/step4.svelte index 0ab0e0b98..91b0a575a 100644 --- a/src/routes/console/project-[project]/settings/domains/wizard/step4.svelte +++ b/src/routes/console/project-[project]/settings/domains/wizard/step4.svelte @@ -1,6 +1,6 @@ - + Delete Webhook

Are you sure you want to delete {$webhook.name} from '{$project.name}'? diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/regenerate.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/regenerate.svelte index 6d350f0ac..1dd0588f2 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/regenerate.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/regenerate.svelte @@ -6,7 +6,7 @@ import { Dependencies } from '$lib/constants'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { webhook } from './store'; export let show = false; @@ -14,7 +14,7 @@ async function regenerate() { try { - await sdkForConsole.projects.updateWebhookSignature(projectId, $webhook.$id); + await sdk.forConsole.projects.updateWebhookSignature(projectId, $webhook.$id); invalidate(Dependencies.WEBHOOK); show = false; addNotification({ @@ -32,7 +32,7 @@ } - + Regenerate Key

Are you sure you want to generate a new Signature Key? diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte index 44aaa1a44..a26aaf0a3 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte @@ -8,7 +8,7 @@ import { TableCell, TableCellText, TableList } from '$lib/elements/table'; import { symmetricDifference } from '$lib/helpers/array'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { writable, type Writable } from 'svelte/store'; import { webhook } from './store'; @@ -25,7 +25,7 @@ async function updateEvents() { try { - await sdkForConsole.projects.updateWebhook( + await sdk.forConsole.projects.updateWebhook( projectId, $webhook.$id, $webhook.name, @@ -64,7 +64,7 @@ } - + Update Events

diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte index 89439f8e9..027836963 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte @@ -6,7 +6,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, FormList, InputText } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { webhook } from './store'; @@ -19,7 +19,7 @@ async function updateName() { try { - await sdkForConsole.projects.updateWebhook( + await sdk.forConsole.projects.updateWebhook( projectId, $webhook.$id, name, @@ -45,7 +45,7 @@ } - + Update Name

Choose any name that will help you distinguish between Webhooks.

diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte index 8fc343a53..5d39ade82 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte @@ -13,7 +13,7 @@ InputText } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { webhook } from './store'; @@ -30,7 +30,7 @@ async function updateSecurity() { try { - await sdkForConsole.projects.updateWebhook( + await sdk.forConsole.projects.updateWebhook( projectId, $webhook.$id, $webhook.name, @@ -56,7 +56,7 @@ } - + Security

diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte index 4ac8a8fb6..b14c41b80 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte @@ -6,7 +6,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, FormList, InputText } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { webhook } from './store'; @@ -19,7 +19,7 @@ async function updateUrl() { try { - await sdkForConsole.projects.updateWebhook( + await sdk.forConsole.projects.updateWebhook( projectId, $webhook.$id, $webhook.name, @@ -45,7 +45,7 @@ } - + Update Url diff --git a/src/routes/console/project-[project]/settings/webhooks/createWebhook.svelte b/src/routes/console/project-[project]/settings/webhooks/createWebhook.svelte index dc30fdc67..0c34d9420 100644 --- a/src/routes/console/project-[project]/settings/webhooks/createWebhook.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/createWebhook.svelte @@ -4,7 +4,7 @@ import { addNotification } from '$lib/stores/notifications'; import { wizard } from '$lib/stores/wizard'; import { createWebhook } from './wizard/store'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { page } from '$app/stores'; import Step1 from './wizard/step1.svelte'; import Step2 from './wizard/step2.svelte'; @@ -17,7 +17,7 @@ const projectId = $page.params.project; const create = async () => { try { - await sdkForConsole.projects.createWebhook( + await sdk.forConsole.projects.createWebhook( projectId, $createWebhook.name, $createWebhook.events, diff --git a/src/routes/console/project-[project]/storage/[[page]]/+page.ts b/src/routes/console/project-[project]/storage/[[page]]/+page.ts index 30ed7b167..9fbac775a 100644 --- a/src/routes/console/project-[project]/storage/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/storage/[[page]]/+page.ts @@ -1,17 +1,16 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent }) => { - await parent(); +export const load: PageLoad = async ({ params }) => { const page = Number(params.page); const offset = pageToOffset(page, CARD_LIMIT); return { offset, - buckets: await sdkForProject.storage.listBuckets([ + buckets: await sdk.forProject.storage.listBuckets([ Query.limit(CARD_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt') 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 556fea871..5b554f477 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+layout.ts +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/+layout.ts @@ -1,19 +1,18 @@ import type { LayoutLoad } from './$types'; import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { Dependencies } from '$lib/constants'; import { error } from '@sveltejs/kit'; -export const load: LayoutLoad = async ({ params, parent, depends }) => { - await parent(); +export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.BUCKET); try { return { header: Header, breadcrumbs: Breadcrumbs, - bucket: await sdkForProject.storage.getBucket(params.bucket) + bucket: await sdk.forProject.storage.getBucket(params.bucket) }; } catch (e) { throw error(e.code, e.message); diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.svelte index cb1716eb5..8e2c8639f 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.svelte @@ -1,6 +1,6 @@ - + Create File

diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteBucket.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteBucket.svelte index 6f5e8dd4b..1f9cc1f26 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteBucket.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteBucket.svelte @@ -6,14 +6,14 @@ import { Modal } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { bucket } from './store'; export let showDelete = false; const deleteUser = async () => { try { - await sdkForProject.storage.deleteBucket($bucket.$id); + await sdk.forProject.storage.deleteBucket($bucket.$id); showDelete = false; addNotification({ type: 'success', @@ -31,7 +31,7 @@ }; - + Delete Bucket

Are you sure you want to delete {$bucket.name}?

diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteFile.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteFile.svelte index 8f06a2ba2..8e33c161a 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteFile.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteFile.svelte @@ -3,7 +3,7 @@ import { Modal } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import type { Models } from '@aw-labs/appwrite-console'; import { createEventDispatcher } from 'svelte'; @@ -14,7 +14,7 @@ const deleteFile = async () => { try { - await sdkForProject.storage.deleteFile(file.bucketId, file.$id); + await sdk.forProject.storage.deleteFile(file.bucketId, file.$id); showDelete = false; dispatch('deleted', file); addNotification({ @@ -32,7 +32,7 @@ }; - + Delete File

Are you sure you want to delete {file.name}?

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 ec7e4b6a3..38c6ff563 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 @@ -1,19 +1,18 @@ import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { Dependencies } from '$lib/constants'; import type { LayoutLoad } from './$types'; import { error } from '@sveltejs/kit'; -export const load: LayoutLoad = async ({ params, parent, depends }) => { - await parent(); +export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.FILE); try { return { header: Header, breadcrumbs: Breadcrumbs, - file: await sdkForProject.storage.getFile(params.bucket, params.file) + file: await sdk.forProject.storage.getFile(params.bucket, params.file) }; } catch (e) { throw error(e.code, e.message); diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte index 3cab47673..09d1db3f0 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte @@ -5,7 +5,7 @@ import { Pill } from '$lib/elements'; import { file } from './store'; import { toLocaleDate, toLocaleDateTime } from '$lib/helpers/date'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { addNotification } from '$lib/stores/notifications'; import { calculateSize } from '$lib/helpers/sizeConvertion'; import { onMount } from 'svelte'; @@ -27,10 +27,10 @@ let arePermsDisabled = true; const getPreview = (fileId: string) => - sdkForProject.storage.getFilePreview($file.bucketId, fileId, 205, 125).toString() + + sdk.forProject.storage.getFilePreview($file.bucketId, fileId, 205, 125).toString() + '&mode=admin'; const getView = (fileId: string) => - sdkForProject.storage.getFileView($file.bucketId, fileId).toString() + '&mode=admin'; + sdk.forProject.storage.getFileView($file.bucketId, fileId).toString() + '&mode=admin'; $: if (filePermissions) { if (symmetricDifference(filePermissions, $file.$permissions).length) { @@ -40,14 +40,14 @@ function downloadFile() { return ( - sdkForProject.storage.getFileDownload($file.bucketId, $file.$id).toString() + + sdk.forProject.storage.getFileDownload($file.bucketId, $file.$id).toString() + '&mode=admin' ); } async function updatePermissions() { try { - await sdkForProject.storage.updateFile($file.bucketId, $file.$id, filePermissions); + await sdk.forProject.storage.updateFile($file.bucketId, $file.$id, filePermissions); invalidate(Dependencies.FILE); arePermsDisabled = true; addNotification({ diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte index 0d349b410..5f06c029c 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte @@ -6,14 +6,14 @@ import { Modal } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { file } from './store'; export let showDelete = false; const deleteFile = async () => { try { - await sdkForProject.storage.deleteFile($file.bucketId, $file.$id); + await sdk.forProject.storage.deleteFile($file.bucketId, $file.$id); showDelete = false; await goto( `${base}/console/project-${$page.params.project}/storage/bucket-${$file.bucketId}` @@ -33,7 +33,7 @@ }; - + Delete File

Are you sure you want to delete {$file.name}?

diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte index 5cc6174a6..c75558bc8 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte @@ -15,7 +15,7 @@ const values = { ...bucketData, ...updates }; try { - await sdkForProject.storage.updateBucket( + await sdk.forProject.storage.updateBucket( values.$id, values.name, values.$permissions, @@ -71,7 +71,7 @@ import { toLocaleDateTime } from '$lib/helpers/date'; import { Container } from '$lib/layout'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import type { Models } from '@aw-labs/appwrite-console'; import { onMount } from 'svelte'; import { get, writable } from 'svelte/store'; @@ -211,7 +211,7 @@ {#if $bucket} - + {$bucket.name} @@ -234,7 +234,7 @@ -
+ Update Name @@ -256,7 +256,7 @@
-
+ Update Permissions

@@ -280,7 +280,7 @@

-
+ Update File Security @@ -308,7 +308,7 @@
-
+ Update Security Settings

@@ -379,7 +379,7 @@

-
+ Update Compression Algorithm

@@ -404,7 +404,7 @@ - + Update Allowed File Extensions

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 4e6347186..c7b126f14 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 @@ -22,9 +22,9 @@ } - + - Update Maximum File Size + Update Maximum File Size

Set the maximum file size allowed in the bucket.

    diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts index 19e5e71bc..3b6668951 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/usage/[[period]]/+page.ts @@ -1,10 +1,9 @@ -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { Models } from '@aw-labs/appwrite-console'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent }) => { - await parent(); - const response = await sdkForProject.storage.getBucketUsage( +export const load: PageLoad = async ({ params }) => { + const response = await sdk.forProject.storage.getBucketUsage( params.bucket, params.period ?? '30d' ); diff --git a/src/routes/console/project-[project]/storage/create.svelte b/src/routes/console/project-[project]/storage/create.svelte index 586b90e2c..707891928 100644 --- a/src/routes/console/project-[project]/storage/create.svelte +++ b/src/routes/console/project-[project]/storage/create.svelte @@ -4,7 +4,7 @@ import { Pill } from '$lib/elements'; import { Button, InputText, FormList } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { ID } from '@aw-labs/appwrite-console'; import { createEventDispatcher } from 'svelte'; @@ -19,7 +19,7 @@ const create = async () => { try { - const bucket = await sdkForProject.storage.createBucket(id ? id : ID.unique(), name); + const bucket = await sdk.forProject.storage.createBucket(id ? id : ID.unique(), name); showCreate = false; dispatch('created', bucket); addNotification({ @@ -45,7 +45,7 @@ } - + Create Bucket { - await parent(); - const response = await sdkForProject.storage.getUsage(params.period ?? '30d'); +export const load: PageLoad = async ({ params }) => { + const response = await sdk.forProject.storage.getUsage(params.period ?? '30d'); return { count: response.bucketsCount as unknown as Models.Metric[], diff --git a/src/routes/invite/+page.svelte b/src/routes/invite/+page.svelte index 509eb7d3c..ef4e9226e 100644 --- a/src/routes/invite/+page.svelte +++ b/src/routes/invite/+page.svelte @@ -3,7 +3,7 @@ import { base } from '$app/paths'; import { Button, Form, FormList, InputChoice } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { Unauthenticated } from '$lib/layout'; import { page } from '$app/stores'; import { onMount } from 'svelte'; @@ -22,7 +22,7 @@ const acceptInvite = async () => { try { - await sdkForConsole.teams.updateMembershipStatus(teamId, membershipId, userId, secret); + await sdk.forConsole.teams.updateMembershipStatus(teamId, membershipId, userId, secret); addNotification({ type: 'success', message: 'Successfully logged in.' @@ -62,7 +62,7 @@
{:else}

You have been invited to join a team project on Appwrite

- + Sign in - + Password Recovery {#if userId && secret} - + {:else} -
+ Sign up - + {title} - + { + const { container } = render(Form, { + onSubmit: vi.fn() + }); + const form = container.querySelector('form'); + expect(form).toBeInTheDocument(); + expect(form).toHaveClass('form'); + expect(form).toHaveClass('common-section'); + expect(form).not.toHaveClass('modal-form'); +}); + +test('shows form - no margin', () => { + const { container } = render(Form, { + noMargin: true, + onSubmit: vi.fn() + }); + const form = container.querySelector('form'); + expect(form).toHaveClass('form'); + expect(form).not.toHaveClass('common-section'); + expect(form).not.toHaveClass('modal-form'); +}); + +test('shows form - no style', () => { + const { container } = render(Form, { + noStyle: true, + onSubmit: vi.fn() + }); + const form = container.querySelector('form'); + expect(form).toHaveClass('common-section'); + expect(form).not.toHaveClass('form'); + expect(form).not.toHaveClass('modal-form'); +}); + +test('shows form - is modal', () => { + const { container } = render(Form, { + isModal: true, + onSubmit: vi.fn() + }); + const form = container.querySelector('form'); + expect(form).toHaveClass('form'); + expect(form).toHaveClass('common-section'); + expect(form).toHaveClass('modal-form'); +}); + +test('shows form - submitting', async () => { + const callback = vi.fn(); + const { container } = render(Form, { + onSubmit: callback + }); + const form = container.querySelector('form'); + form.requestSubmit(); + expect(callback.mock.calls.length).toBe(1); +}); + +test('shows form - submitting promise', async () => { + const callback = vi.fn(); + const { container } = render(Form, { + onSubmit: async () => { + await sleep(100); + callback(); + } + }); + const form = container.querySelector('form'); + form.requestSubmit(); + expect(callback.mock.calls.length).toBe(0); + await sleep(200); + expect(callback.mock.calls.length).toBe(1); +}); + +test('shows form - prevent double submit', async () => { + const { container } = render(CompleteForm, { + onSubmit: async () => { + await sleep(100); + } + }); + const form = container.querySelector('form'); + const submit = container.querySelector('button[type="submit"]'); + const button = container.querySelector('button[type="button"]'); + expect(submit).toBeEnabled(); + expect(button).toBeEnabled(); + form.requestSubmit(); + await tick(); + expect(submit).toBeDisabled(); + expect(button).toBeEnabled(); + await sleep(200); + expect(submit).toBeEnabled(); + expect(button).toBeEnabled(); +}); diff --git a/tests/unit/helpers/project.test.ts b/tests/unit/helpers/project.test.ts new file mode 100644 index 000000000..6e1d5b6e5 --- /dev/null +++ b/tests/unit/helpers/project.test.ts @@ -0,0 +1,47 @@ +import { getProjectId } from '$lib/helpers/project'; +import { vi } from 'vitest'; + +test('getProjectId', () => { + const tests: Array<{ + pathname: string; + expected: string | null; + }> = [ + { + pathname: '/console/project-6374e9031588b25d1841/databases', + expected: '6374e9031588b25d1841' + }, + { + pathname: '/console/project-/databases', + expected: null + }, + { + pathname: '/console/project-project-project-abc/databases', + expected: 'project-project-abc' + }, + { + pathname: '/console/project-abc/databases', + expected: 'abc' + }, + { + pathname: '/console/project-abc/databases/project-123', + expected: 'abc' + }, + { + pathname: '/console/project-abc/databases/project-123/project-456', + expected: 'abc' + }, + + { + pathname: '/console', + expected: null + } + ]; + + for (const { pathname, expected } of tests) { + vi.stubGlobal('location', { + ...window.location, + pathname + }); + expect(getProjectId()).toBe(expected); + } +}); diff --git a/tests/unit/layout/wizard.test.ts b/tests/unit/layout/wizard.test.ts index 10defbf74..05e353df5 100644 --- a/tests/unit/layout/wizard.test.ts +++ b/tests/unit/layout/wizard.test.ts @@ -1,5 +1,6 @@ import '@testing-library/jest-dom'; import { render } from '@testing-library/svelte'; +import { sleep } from '$lib/helpers/promises'; import { wizard } from '../../../src/lib/stores/wizard'; import { tick } from 'svelte'; import userEvent from '@testing-library/user-event'; @@ -45,12 +46,12 @@ test('shows wizard and hides it', async () => { }); test('shows next step with submit', async () => { - const { container, getByRole, queryByText } = render(WizardContainer); + const { container, queryByText } = render(WizardContainer); wizard.start(WizardComponent); await tick(); - const form = getByRole('form') as HTMLFormElement; + const form = container.querySelector('form') as HTMLFormElement; const step1 = queryByText('step-1'); const step1Required = container.querySelector('#step-1-required'); const step1Optional = container.querySelector('#step-1-optional'); @@ -60,7 +61,7 @@ test('shows next step with submit', async () => { expect(step1Optional).toBeInTheDocument(); form.dispatchEvent(new Event('submit')); - await tick(); + await sleep(100); expect(step1).not.toBeInTheDocument(); @@ -81,12 +82,12 @@ test('shows next step with submit', async () => { }); test('intercepts submit', async () => { - const { container, getByRole, queryByText } = render(WizardContainer); + const { container, queryByText } = render(WizardContainer); wizard.start(WizardComponent); await tick(); - const form = getByRole('form') as HTMLFormElement; + const form = container.querySelector('form') as HTMLFormElement; const step1 = queryByText('step-1'); const step1Required = container.querySelector('#step-1-required'); const step1Optional = container.querySelector('#step-1-optional'); @@ -98,7 +99,7 @@ test('intercepts submit', async () => { await userEvent.type(step1Required, 'fail'); form.dispatchEvent(new Event('submit')); - await tick(); + await sleep(100); expect(step1).toBeInTheDocument(); expect(step1Required).toBeInTheDocument(); @@ -106,7 +107,7 @@ test('intercepts submit', async () => { await userEvent.type(step1Required, 'works'); form.dispatchEvent(new Event('submit')); - await tick(); + await sleep(100); expect(step1).not.toBeInTheDocument();