From 16843f3dedb04e967fcc46ad9ec0893c35d06fee Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Wed, 8 Mar 2023 10:57:27 +0000 Subject: [PATCH 01/40] refactor: remove empty parent awaits --- .../console/organization-[organization]/+layout.ts | 1 - .../members/[[page]]/+page.ts | 1 - src/routes/console/project-[project]/auth/+layout.ts | 2 -- .../console/project-[project]/auth/[[page]]/+page.ts | 1 - .../project-[project]/auth/teams/[[page]]/+page.ts | 1 - .../project-[project]/auth/teams/team-[team]/+layout.ts | 1 - .../auth/teams/team-[team]/activity/[[page]]/+page.ts | 1 - .../auth/teams/team-[team]/members/[[page]]/+page.ts | 1 - .../project-[project]/auth/usage/[[period]]/+page.ts | 1 - .../project-[project]/auth/user-[user]/+layout.ts | 1 - .../auth/user-[user]/activity/[[page]]/+page.ts | 1 - .../auth/user-[user]/memberships/[[page]]/+page.ts | 2 -- .../auth/user-[user]/sessions/[[page]]/+page.ts | 2 -- .../console/project-[project]/databases/+layout.ts | 2 -- .../project-[project]/databases/[[page]]/+page.ts | 1 - .../databases/database-[database]/+layout.ts | 1 - .../databases/database-[database]/[[page]]/+page.ts | 1 - .../collection-[collection]/+layout.ts | 2 -- .../collection-[collection]/[[page]]/+page.ts | 9 ++++----- .../collection-[collection]/activity/[[page]]/+page.ts | 1 - .../document-[document]/activity/[[page]]/+page.ts | 1 - .../collection-[collection]/usage/[[period]]/+page.ts | 1 - .../database-[database]/usage/[[period]]/+page.ts | 1 - .../databases/usage/[[period]]/+page.ts | 1 - .../console/project-[project]/functions/+layout.ts | 2 -- .../project-[project]/functions/[[page]]/+page.ts | 1 - .../functions/function-[function]/+layout.ts | 1 - .../functions/function-[function]/[[page]]/+page.ts | 1 - .../function-[function]/executions/[[page]]/+page.ts | 1 - .../functions/function-[function]/settings/+page.ts | 1 - .../function-[function]/usage/[[period]]/+page.ts | 1 - .../project-[project]/settings/domains/[[page]]/+page.ts | 1 - .../console/project-[project]/storage/[[page]]/+page.ts | 1 - .../project-[project]/storage/bucket-[bucket]/+layout.ts | 1 - .../storage/bucket-[bucket]/[[page]]/+page.ts | 1 - .../storage/bucket-[bucket]/file-[file]/+layout.ts | 1 - .../storage/bucket-[bucket]/usage/[[period]]/+page.ts | 1 - .../project-[project]/storage/usage/[[period]]/+page.ts | 1 - 38 files changed, 4 insertions(+), 48 deletions(-) diff --git a/src/routes/console/organization-[organization]/+layout.ts b/src/routes/console/organization-[organization]/+layout.ts index 97de8b900d..2059a4ba7c 100644 --- a/src/routes/console/organization-[organization]/+layout.ts +++ b/src/routes/console/organization-[organization]/+layout.ts @@ -6,7 +6,6 @@ import { error } from '@sveltejs/kit'; import { Dependencies } from '$lib/constants'; export const load: LayoutLoad = async ({ params, parent, depends }) => { - await parent(); depends(Dependencies.ORGANIZATION); try { diff --git a/src/routes/console/organization-[organization]/members/[[page]]/+page.ts b/src/routes/console/organization-[organization]/members/[[page]]/+page.ts index b827b1811f..c54f8fc1cb 100644 --- a/src/routes/console/organization-[organization]/members/[[page]]/+page.ts +++ b/src/routes/console/organization-[organization]/members/[[page]]/+page.ts @@ -5,7 +5,6 @@ import { Query } from '@aw-labs/appwrite-console'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - await parent(); const page = Number(params.page); const offset = pageToOffset(page, PAGE_LIMIT); diff --git a/src/routes/console/project-[project]/auth/+layout.ts b/src/routes/console/project-[project]/auth/+layout.ts index 12cc3f7957..0c1e468a2b 100644 --- a/src/routes/console/project-[project]/auth/+layout.ts +++ b/src/routes/console/project-[project]/auth/+layout.ts @@ -3,8 +3,6 @@ import Header from './header.svelte'; import type { LayoutLoad } from './$types'; export const load: LayoutLoad = async ({ parent }) => { - await parent(); - return { header: Header, breadcrumbs: Breadcrumbs diff --git a/src/routes/console/project-[project]/auth/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/[[page]]/+page.ts index 132a73b2ee..45476870b5 100644 --- a/src/routes/console/project-[project]/auth/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/auth/[[page]]/+page.ts @@ -5,7 +5,6 @@ import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent, url }) => { - await parent(); const page = Number(params.page); const offset = pageToOffset(page, PAGE_LIMIT); const search = url.search.slice(1) ?? undefined; 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 dfd5d40df2..131a8d47d4 100644 --- a/src/routes/console/project-[project]/auth/teams/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/auth/teams/[[page]]/+page.ts @@ -5,7 +5,6 @@ import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent, url }) => { - await parent(); const page = Number(params.page); const offset = pageToOffset(page, PAGE_LIMIT); const search = url.search.slice(1) ?? undefined; 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 f7b8997b63..398174114a 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 @@ -6,7 +6,6 @@ import { Dependencies } from '$lib/constants'; import { error } from '@sveltejs/kit'; export const load: LayoutLoad = async ({ params, parent, depends }) => { - await parent(); depends(Dependencies.TEAM); try { return { 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 a3a5fa8d06..9979d57aad 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 @@ -5,7 +5,6 @@ import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - await parent(); const page = Number(params.page); const offset = pageToOffset(page, PAGE_LIMIT); 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 38c6fd9300..1540776a9f 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 @@ -5,7 +5,6 @@ import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent, depends, url }) => { - await parent(); depends(Dependencies.MEMBERSHIPS); const teamId = params.team; const page = Number(params.page); 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 fbc99f7084..c8eeda0ab7 100644 --- a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts @@ -3,7 +3,6 @@ import { sdkForProject } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - await parent(); const { period } = params; const response = await sdkForProject.users.getUsage(period ?? '30d'); return { 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 2cbe498c24..eecf7a8b8b 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/+layout.ts +++ b/src/routes/console/project-[project]/auth/user-[user]/+layout.ts @@ -6,7 +6,6 @@ import { Dependencies } from '$lib/constants'; import { error } from '@sveltejs/kit'; export const load: LayoutLoad = async ({ params, parent, depends }) => { - await parent(); depends(Dependencies.USER); try { 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 829f37d4a8..ce59455408 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 @@ -5,7 +5,6 @@ import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - await parent(); const page = Number(params.page); const offset = pageToOffset(page, PAGE_LIMIT); 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 6d3659337a..b70edc4876 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 @@ -2,8 +2,6 @@ import { sdkForProject } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - await parent(); - return { memberships: await sdkForProject.users.listMemberships(params.user) }; 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 530b913961..f9cc52783f 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 @@ -4,8 +4,6 @@ import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent, depends }) => { depends(Dependencies.SESSIONS); - await parent(); - return { sessions: await sdkForProject.users.listSessions(params.user) }; diff --git a/src/routes/console/project-[project]/databases/+layout.ts b/src/routes/console/project-[project]/databases/+layout.ts index 12cc3f7957..0c1e468a2b 100644 --- a/src/routes/console/project-[project]/databases/+layout.ts +++ b/src/routes/console/project-[project]/databases/+layout.ts @@ -3,8 +3,6 @@ import Header from './header.svelte'; import type { LayoutLoad } from './$types'; export const load: LayoutLoad = async ({ parent }) => { - await parent(); - 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 47cc014c6a..76d58c6f61 100644 --- a/src/routes/console/project-[project]/databases/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/[[page]]/+page.ts @@ -5,7 +5,6 @@ import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - await parent(); const page = Number(params.page); const offset = pageToOffset(page, CARD_LIMIT); diff --git a/src/routes/console/project-[project]/databases/database-[database]/+layout.ts b/src/routes/console/project-[project]/databases/database-[database]/+layout.ts index fc344a75ea..ce30615486 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/+layout.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/+layout.ts @@ -6,7 +6,6 @@ import Header from './header.svelte'; import { error } from '@sveltejs/kit'; export const load: LayoutLoad = async ({ params, parent, depends }) => { - await parent(); depends(Dependencies.DATABASE); try { 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 d7c69f3caf..a34b1c4e15 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 @@ -5,7 +5,6 @@ import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - await parent(); const page = Number(params.page); const offset = pageToOffset(page, CARD_LIMIT); diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts index 4cff24c2d1..1f30d16525 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts @@ -7,8 +7,6 @@ import { error } from '@sveltejs/kit'; export const load: LayoutLoad = async ({ params, parent, depends }) => { depends(Dependencies.COLLECTION); - await parent(); - try { return { header: Header, diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.ts index 7c19bb9dca..bc36a50bfd 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.ts @@ -1,11 +1,10 @@ -import { Query } from '@aw-labs/appwrite-console'; -import { sdkForProject } from '$lib/stores/sdk'; -import { pageToOffset } from '$lib/helpers/load'; import { Dependencies, PAGE_LIMIT } from '$lib/constants'; +import { pageToOffset } from '$lib/helpers/load'; +import { sdkForProject } from '$lib/stores/sdk'; +import { Query } from '@aw-labs/appwrite-console'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent, depends }) => { - await parent(); +export const load: PageLoad = async ({ params, depends }) => { depends(Dependencies.DOCUMENTS); const page = Number(params.page); const offset = pageToOffset(page, PAGE_LIMIT); diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/[[page]]/+page.ts index 8269c058b5..6908c3c211 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/[[page]]/+page.ts @@ -5,7 +5,6 @@ import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - await parent(); const page = Number(params.page); const offset = pageToOffset(page, PAGE_LIMIT); 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 a6606dde69..e2008458c8 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 @@ -5,7 +5,6 @@ import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - await parent(); const page = Number(params.page); const offset = pageToOffset(page, PAGE_LIMIT); 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 cf4a899cf1..0229362763 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 @@ -3,7 +3,6 @@ import { sdkForProject } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - await parent(); const response = await sdkForProject.databases.getCollectionUsage( params.database, params.collection, 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 bc1023198b..9c4a4096f1 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 @@ -3,7 +3,6 @@ import { sdkForProject } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - await parent(); const response = await sdkForProject.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 9017a1b246..b5c047e925 100644 --- a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts @@ -3,7 +3,6 @@ import { sdkForProject } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - await parent(); const { period } = params; const response = await sdkForProject.databases.getUsage(period ?? '30d'); diff --git a/src/routes/console/project-[project]/functions/+layout.ts b/src/routes/console/project-[project]/functions/+layout.ts index 12cc3f7957..0c1e468a2b 100644 --- a/src/routes/console/project-[project]/functions/+layout.ts +++ b/src/routes/console/project-[project]/functions/+layout.ts @@ -3,8 +3,6 @@ import Header from './header.svelte'; import type { LayoutLoad } from './$types'; export const load: LayoutLoad = async ({ parent }) => { - await parent(); - return { header: Header, breadcrumbs: Breadcrumbs diff --git a/src/routes/console/project-[project]/functions/[[page]]/+page.ts b/src/routes/console/project-[project]/functions/[[page]]/+page.ts index 3c3b826a6a..2f055a4520 100644 --- a/src/routes/console/project-[project]/functions/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/functions/[[page]]/+page.ts @@ -5,7 +5,6 @@ import { CARD_LIMIT, Dependencies } from '$lib/constants'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent, depends }) => { - await parent(); depends(Dependencies.FUNCTIONS); const page = Number(params.page); const offset = pageToOffset(page, CARD_LIMIT); 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 d91cd63008..f11140fe83 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/+layout.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/+layout.ts @@ -6,7 +6,6 @@ import Header from './header.svelte'; import { error } from '@sveltejs/kit'; export const load: LayoutLoad = async ({ params, parent, depends }) => { - await parent(); depends(Dependencies.FUNCTION); try { 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 9472fd6af1..a23bc41931 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 @@ -6,7 +6,6 @@ import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent, depends }) => { depends(Dependencies.DEPLOYMENTS); - await parent(); const page = Number(params.page); const offset = pageToOffset(page, PAGE_LIMIT); 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 5d5c50f056..0f5db63484 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 @@ -5,7 +5,6 @@ import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent, depends }) => { - await parent(); depends(Dependencies.EXECUTIONS); const page = Number(params.page); const offset = pageToOffset(page, PAGE_LIMIT); 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 897dbb0586..631f94d4b4 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 @@ -3,7 +3,6 @@ import { Dependencies } from '$lib/constants'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent, depends }) => { - await parent(); depends(Dependencies.VARIABLES); return { 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 e0947d7bda..8d9e2f2e1e 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 @@ -3,7 +3,6 @@ import { sdkForProject } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - await parent(); const response = await sdkForProject.functions.getFunctionUsage( params.function, params.period ?? '30d' 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 21650e7ce1..c6329c4091 100644 --- a/src/routes/console/project-[project]/settings/domains/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/settings/domains/[[page]]/+page.ts @@ -3,7 +3,6 @@ import { sdkForConsole } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent, depends }) => { - await parent(); depends(Dependencies.DOMAINS); return { diff --git a/src/routes/console/project-[project]/storage/[[page]]/+page.ts b/src/routes/console/project-[project]/storage/[[page]]/+page.ts index 30ed7b167c..1719d9ef4e 100644 --- a/src/routes/console/project-[project]/storage/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/storage/[[page]]/+page.ts @@ -5,7 +5,6 @@ import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - await parent(); const page = Number(params.page); const offset = pageToOffset(page, CARD_LIMIT); 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 556fea8713..3021f76a62 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+layout.ts +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/+layout.ts @@ -6,7 +6,6 @@ import { Dependencies } from '$lib/constants'; import { error } from '@sveltejs/kit'; export const load: LayoutLoad = async ({ params, parent, depends }) => { - await parent(); depends(Dependencies.BUCKET); try { diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.ts b/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.ts index 0c15a026ef..33b71db96c 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.ts @@ -5,7 +5,6 @@ import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent, depends, url }) => { - await parent(); depends(Dependencies.FILES); const page = Number(params.page); const offset = pageToOffset(page, PAGE_LIMIT); 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 ec7e4b6a38..c7a134faec 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 @@ -6,7 +6,6 @@ import type { LayoutLoad } from './$types'; import { error } from '@sveltejs/kit'; export const load: LayoutLoad = async ({ params, parent, depends }) => { - await parent(); depends(Dependencies.FILE); try { 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 19e5e71bc2..171fed37a5 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 @@ -3,7 +3,6 @@ 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( params.bucket, params.period ?? '30d' diff --git a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts index 245f790eab..e11dcb3e8a 100644 --- a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts @@ -3,7 +3,6 @@ import { sdkForProject } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - await parent(); const response = await sdkForProject.storage.getUsage(params.period ?? '30d'); return { From d171b33a8e143c2cb7ae6b4a31c6d6b5dd7daa5a Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Wed, 8 Mar 2023 16:42:56 +0000 Subject: [PATCH 02/40] refactor: change sdkForProject to a function --- src/lib/components/permissions/row.svelte | 4 +- src/lib/components/permissions/team.svelte | 2 +- src/lib/components/permissions/user.svelte | 2 +- src/lib/components/uploadBox.svelte | 2 +- src/lib/stores/sdk.ts | 44 +++++++++++-------- src/lib/stores/uploader.ts | 2 +- .../console/project-[project]/+layout.ts | 6 +-- .../project-[project]/auth/[[page]]/+page.ts | 2 +- .../project-[project]/auth/createTeam.svelte | 2 +- .../project-[project]/auth/createUser.svelte | 2 +- .../auth/teams/[[page]]/+page.ts | 2 +- .../auth/teams/team-[team]/+layout.ts | 2 +- .../auth/teams/team-[team]/+page.svelte | 2 +- .../team-[team]/activity/[[page]]/+page.ts | 2 +- .../teams/team-[team]/createMembership.svelte | 2 +- .../teams/team-[team]/deleteMembership.svelte | 2 +- .../auth/teams/team-[team]/deleteTeam.svelte | 2 +- .../team-[team]/members/[[page]]/+page.ts | 2 +- .../auth/usage/[[period]]/+page.ts | 2 +- .../auth/user-[user]/+layout.ts | 2 +- .../user-[user]/activity/[[page]]/+page.ts | 2 +- .../auth/user-[user]/deleteAllSessions.svelte | 2 +- .../auth/user-[user]/deleteMembership.svelte | 2 +- .../auth/user-[user]/deleteSession.svelte | 2 +- .../auth/user-[user]/deleteUser.svelte | 2 +- .../user-[user]/memberships/[[page]]/+page.ts | 2 +- .../sessions/[[page]]/+page.svelte | 3 +- .../user-[user]/sessions/[[page]]/+page.ts | 2 +- .../auth/user-[user]/updateEmail.svelte | 2 +- .../auth/user-[user]/updateName.svelte | 2 +- .../auth/user-[user]/updatePassword.svelte | 2 +- .../auth/user-[user]/updatePhone.svelte | 2 +- .../auth/user-[user]/updatePrefs.svelte | 2 +- .../auth/user-[user]/updateStatus.svelte | 12 +++-- .../databases/[[page]]/+page.ts | 10 ++--- .../project-[project]/databases/create.svelte | 2 +- .../databases/database-[database]/+layout.ts | 2 +- .../database-[database]/[[page]]/+page.ts | 2 +- .../collection-[collection]/+layout.ts | 2 +- .../collection-[collection]/[[page]]/+page.ts | 10 ++--- .../activity/[[page]]/+page.ts | 9 ++-- .../attributes/boolean.svelte | 2 +- .../attributes/datetime.svelte | 2 +- .../attributes/deleteAttribute.svelte | 2 +- .../attributes/email.svelte | 2 +- .../attributes/enum.svelte | 2 +- .../attributes/float.svelte | 2 +- .../attributes/integer.svelte | 2 +- .../attributes/ip.svelte | 2 +- .../attributes/string.svelte | 2 +- .../attributes/url.svelte | 2 +- .../createDocument.svelte | 2 +- .../document-[document]/+layout.ts | 2 +- .../document-[document]/+page.svelte | 2 +- .../activity/[[page]]/+page.ts | 2 +- .../document-[document]/delete.svelte | 2 +- .../document-[document]/document.svelte | 2 +- .../indexes/createIndex.svelte | 2 +- .../indexes/deleteIndex.svelte | 2 +- .../settings/deleteCollection.svelte | 2 +- .../settings/updateName.svelte | 2 +- .../settings/updatePermissions.svelte | 2 +- .../settings/updateSecurity.svelte | 2 +- .../settings/updateStatus.svelte | 2 +- .../usage/[[period]]/+page.ts | 2 +- .../database-[database]/create.svelte | 2 +- .../database-[database]/delete.svelte | 2 +- .../database-[database]/settings/+page.svelte | 2 +- .../usage/[[period]]/+page.ts | 2 +- .../databases/usage/[[period]]/+page.ts | 2 +- .../functions/[[page]]/+page.ts | 2 +- .../functions/createFunction.svelte | 4 +- .../functions/function-[function]/+layout.ts | 2 +- .../function-[function]/[[page]]/+page.ts | 2 +- .../function-[function]/activate.svelte | 2 +- .../function-[function]/create.svelte | 2 +- .../function-[function]/delete.svelte | 2 +- .../function-[function]/execute.svelte | 2 +- .../executions/[[page]]/+page.ts | 2 +- .../function-[function]/settings/+page.svelte | 18 +++++--- .../function-[function]/settings/+page.ts | 2 +- .../settings/delete.svelte | 2 +- .../settings/updateEvents.svelte | 2 +- .../settings/uploadVariables.svelte | 2 +- .../usage/[[period]]/+page.ts | 2 +- .../functions/wizard/step1.svelte | 2 +- .../platforms/wizard/android/step3.svelte | 2 +- .../platforms/wizard/apple/step3.svelte | 2 +- .../platforms/wizard/flutter/step3.svelte | 2 +- .../platforms/wizard/web/step3.svelte | 2 +- .../project-[project]/overview/store.ts | 2 +- .../storage/[[page]]/+page.ts | 2 +- .../storage/bucket-[bucket]/+layout.ts | 2 +- .../bucket-[bucket]/[[page]]/+page.svelte | 4 +- .../storage/bucket-[bucket]/[[page]]/+page.ts | 2 +- .../bucket-[bucket]/deleteBucket.svelte | 2 +- .../storage/bucket-[bucket]/deleteFile.svelte | 2 +- .../bucket-[bucket]/file-[file]/+layout.ts | 2 +- .../bucket-[bucket]/file-[file]/+page.svelte | 8 ++-- .../file-[file]/deleteFile.svelte | 2 +- .../bucket-[bucket]/settings/+page.svelte | 2 +- .../bucket-[bucket]/usage/[[period]]/+page.ts | 2 +- .../project-[project]/storage/create.svelte | 2 +- .../storage/usage/[[period]]/+page.ts | 2 +- 104 files changed, 165 insertions(+), 151 deletions(-) diff --git a/src/lib/components/permissions/row.svelte b/src/lib/components/permissions/row.svelte index e4d369af22..6154495368 100644 --- a/src/lib/components/permissions/row.svelte +++ b/src/lib/components/permissions/row.svelte @@ -18,11 +18,11 @@ const role = permission.split(':')[0]; const id = permission.split(':')[1].split('/')[0]; if (role === 'user') { - const user = await sdkForProject.users.get(id); + const user = await sdkForProject().users.get(id); return user; } if (role === 'team') { - const team = await sdkForProject.teams.get(id); + const team = await sdkForProject().teams.get(id); return team; } } diff --git a/src/lib/components/permissions/team.svelte b/src/lib/components/permissions/team.svelte index d8d636401b..b165691f6f 100644 --- a/src/lib/components/permissions/team.svelte +++ b/src/lib/components/permissions/team.svelte @@ -31,7 +31,7 @@ async function request() { if (!show) return; - results = await sdkForProject.teams.list([Query.limit(5), Query.offset(offset)], search); + results = await sdkForProject().teams.list([Query.limit(5), Query.offset(offset)], search); } function onSelection(event: Event, role: string) { diff --git a/src/lib/components/permissions/user.svelte b/src/lib/components/permissions/user.svelte index d5468b47d9..86cdf95052 100644 --- a/src/lib/components/permissions/user.svelte +++ b/src/lib/components/permissions/user.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 sdkForProject().users.list([Query.limit(5), Query.offset(offset)], search); } function onSelection(event: Event, role: string) { diff --git a/src/lib/components/uploadBox.svelte b/src/lib/components/uploadBox.svelte index d074bf2e0c..d7c16a2288 100644 --- a/src/lib/components/uploadBox.svelte +++ b/src/lib/components/uploadBox.svelte @@ -9,7 +9,7 @@ let hovering = false; const getPreview = (fileId: string, bucketId: string) => - sdkForProject.storage.getFilePreview(bucketId, fileId, 32, 32).toString() + '&mode=admin'; + sdkForProject().storage.getFilePreview(bucketId, fileId, 32, 32).toString() + '&mode=admin'; {#if $uploader?.isOpen} diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts index d3fb4455c9..cc86005373 100644 --- a/src/lib/stores/sdk.ts +++ b/src/lib/stores/sdk.ts @@ -19,11 +19,6 @@ const endpoint = VARS.APPWRITE_ENDPOINT ?? `${globalThis?.location?.origin}/v1`; const clientConsole = new Client(); 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), @@ -36,18 +31,29 @@ const sdkForConsole = { users: new Users(clientConsole) }; -const sdkForProject = { - client: clientProject, - account: new Account(clientProject), - avatars: new Avatars(clientProject), - databases: new Databases(clientProject), - functions: new Functions(clientProject), - health: new Health(clientProject), - locale: new Locale(clientProject), - project: new Project(clientProject), - storage: new Storage(clientProject), - teams: new Teams(clientProject), - users: new Users(clientProject) -}; +function sdkForProject() { + const clientProject = new Client(); + clientProject.setEndpoint(endpoint).setMode('admin'); + + const pathname = window.location.pathname; + const projectMatch = pathname.match(/project-([a-zA-Z0-9]+)/); + if (projectMatch) { + clientProject.setProject(projectMatch[1]); + } + + return { + client: clientProject, + account: new Account(clientProject), + avatars: new Avatars(clientProject), + databases: new Databases(clientProject), + functions: new Functions(clientProject), + health: new Health(clientProject), + locale: new Locale(clientProject), + project: new Project(clientProject), + storage: new Storage(clientProject), + teams: new Teams(clientProject), + users: new Users(clientProject) + }; +} -export { sdkForConsole, sdkForProject, setProject }; +export { sdkForConsole, sdkForProject }; diff --git a/src/lib/stores/uploader.ts b/src/lib/stores/uploader.ts index 9538d0b793..95c5389e7f 100644 --- a/src/lib/stores/uploader.ts +++ b/src/lib/stores/uploader.ts @@ -71,7 +71,7 @@ const createUploader = () => { n.files.unshift(newFile); return n; }); - const uploadedFile = await sdkForProject.storage.createFile( + const uploadedFile = await sdkForProject().storage.createFile( bucketId, id ?? 'unique()', file, diff --git a/src/routes/console/project-[project]/+layout.ts b/src/routes/console/project-[project]/+layout.ts index a4cd803fef..bb8b95a3e3 100644 --- a/src/routes/console/project-[project]/+layout.ts +++ b/src/routes/console/project-[project]/+layout.ts @@ -1,15 +1,11 @@ import { Dependencies } from '$lib/constants'; -import { sdkForConsole, sdkForProject, setProject } from '$lib/stores/sdk'; +import { sdkForConsole } from '$lib/stores/sdk'; import { error } from '@sveltejs/kit'; import type { LayoutLoad } from './$types'; export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.PROJECT); - if (sdkForProject.client.config.project !== params.project) { - setProject(params.project); - } - try { const project = await sdkForConsole.projects.get(params.project); localStorage.setItem('project', project.$id); diff --git a/src/routes/console/project-[project]/auth/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/[[page]]/+page.ts index 45476870b5..bb0081d16e 100644 --- a/src/routes/console/project-[project]/auth/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/auth/[[page]]/+page.ts @@ -13,7 +13,7 @@ export const load: PageLoad = async ({ params, parent, url }) => { offset, search, page, - users: await sdkForProject.users.list( + users: await sdkForProject().users.list( [Query.limit(PAGE_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt')], search ) diff --git a/src/routes/console/project-[project]/auth/createTeam.svelte b/src/routes/console/project-[project]/auth/createTeam.svelte index 73a109d139..d5a9ad70ea 100644 --- a/src/routes/console/project-[project]/auth/createTeam.svelte +++ b/src/routes/console/project-[project]/auth/createTeam.svelte @@ -17,7 +17,7 @@ const create = async () => { try { - const team = await sdkForProject.teams.create(id ?? ID.unique(), name); + const team = await sdkForProject().teams.create(id ?? ID.unique(), name); name = ''; showCreate = false; showCustomId = false; diff --git a/src/routes/console/project-[project]/auth/createUser.svelte b/src/routes/console/project-[project]/auth/createUser.svelte index 13e4108a38..349563ae83 100644 --- a/src/routes/console/project-[project]/auth/createUser.svelte +++ b/src/routes/console/project-[project]/auth/createUser.svelte @@ -25,7 +25,7 @@ const create = async () => { try { - const user = await sdkForProject.users.create( + const user = await sdkForProject().users.create( id ?? ID.unique(), mail, phone, 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 131a8d47d4..734178da97 100644 --- a/src/routes/console/project-[project]/auth/teams/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/auth/teams/[[page]]/+page.ts @@ -13,7 +13,7 @@ export const load: PageLoad = async ({ params, parent, url }) => { offset, search, page, - teams: await sdkForProject.teams.list( + teams: await sdkForProject().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 398174114a..05860b6a95 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 @@ -11,7 +11,7 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - team: await sdkForProject.teams.get(params.team) + team: await sdkForProject().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 10dd00347e..220cc9e6fd 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 @@ -22,7 +22,7 @@ async function updateName() { try { - await sdkForProject.teams.update($page.params.team, teamName); + await sdkForProject().teams.update($page.params.team, teamName); invalidate(Dependencies.TEAM); addNotification({ message: 'Name has been updated', 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 9979d57aad..10f80b2951 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 @@ -10,7 +10,7 @@ export const load: PageLoad = async ({ params, parent }) => { return { offset, - logs: await sdkForProject.teams.listLogs(params.team, [ + logs: await sdkForProject().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 d7b50dfb17..5ff2b386e8 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 @@ -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 sdkForProject().teams.createMembership( teamId, email, roles, diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/deleteMembership.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/deleteMembership.svelte index e6ff3ca9f3..d734a2d0ca 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/deleteMembership.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/deleteMembership.svelte @@ -17,7 +17,7 @@ const deleteMembership = async () => { try { - await sdkForProject.teams.deleteMembership( + await sdkForProject().teams.deleteMembership( selectedMembership.teamId, selectedMembership.$id ); 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 32bccf7128..684dfe8d59 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 @@ -14,7 +14,7 @@ const deleteTeam = async () => { try { - await sdkForProject.teams.delete(team.$id); + await sdkForProject().teams.delete(team.$id); showDelete = false; trackEvent(Submit.TeamDelete); await goto(`${base}/console/project-${$page.params.project}/auth/teams`); 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 1540776a9f..456a8bf797 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 @@ -14,7 +14,7 @@ export const load: PageLoad = async ({ params, parent, depends, url }) => { return { offset, search, - memberships: await sdkForProject.teams.listMemberships( + memberships: await sdkForProject().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 c8eeda0ab7..91ad8a2cb4 100644 --- a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts @@ -4,7 +4,7 @@ import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { const { period } = params; - const response = await sdkForProject.users.getUsage(period ?? '30d'); + const response = await sdkForProject().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 eecf7a8b8b..487c8ee38f 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/+layout.ts +++ b/src/routes/console/project-[project]/auth/user-[user]/+layout.ts @@ -12,7 +12,7 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - user: await sdkForProject.users.get(params.user) + user: await sdkForProject().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 ce59455408..3201531da7 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 @@ -10,7 +10,7 @@ export const load: PageLoad = async ({ params, parent }) => { return { offset, - logs: await sdkForProject.users.listLogs(params.user, [ + logs: await sdkForProject().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 8f02e4a922..be9996fb4e 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/deleteAllSessions.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteAllSessions.svelte @@ -13,7 +13,7 @@ const deleteAllSessions = async () => { try { - await sdkForProject.users.deleteSessions($page.params.user); + await sdkForProject().users.deleteSessions($page.params.user); invalidate(Dependencies.SESSIONS); showDeleteAll = false; addNotification({ 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 25a1f760cd..a5860a949c 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte @@ -15,7 +15,7 @@ const deleteMembership = async () => { try { - await sdkForProject.teams.deleteMembership( + await sdkForProject().teams.deleteMembership( selectedMembership.teamId, selectedMembership.$id ); 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 72b97f33c0..867340c1a5 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/deleteSession.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteSession.svelte @@ -13,7 +13,7 @@ const deleteSession = async () => { try { - await sdkForProject.users.deleteSession($page.params.user, selectedSessionId); + await sdkForProject().users.deleteSession($page.params.user, selectedSessionId); invalidate(Dependencies.SESSIONS); addNotification({ type: 'success', 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 e48a4b9c43..145549ba58 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/deleteUser.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteUser.svelte @@ -14,7 +14,7 @@ const deleteUser = async () => { try { - await sdkForProject.users.delete($user.$id); + await sdkForProject().users.delete($user.$id); showDelete = false; addNotification({ type: 'success', 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 b70edc4876..badf0a4868 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 @@ -3,6 +3,6 @@ import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { return { - memberships: await sdkForProject.users.listMemberships(params.user) + memberships: await sdkForProject().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 e4af11842d..157da0271d 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 @@ -23,7 +23,8 @@ let showDeleteAll = false; let selectedSessionId: string; - const getBrowser = (clientCode: string) => sdkForProject.avatars.getBrowser(clientCode, 40, 40); + const getBrowser = (clientCode: string) => + sdkForProject().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 f9cc52783f..2601ef1c68 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 @@ -5,6 +5,6 @@ import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent, depends }) => { depends(Dependencies.SESSIONS); return { - sessions: await sdkForProject.users.listSessions(params.user) + sessions: await sdkForProject().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 893d7f726f..eb45ce7fad 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte @@ -16,7 +16,7 @@ async function updateEmail() { try { - await sdkForProject.users.updateEmail($user.$id, userEmail); + await sdkForProject().users.updateEmail($user.$id, userEmail); invalidate(Dependencies.USER); addNotification({ message: 'Email has been updated', 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 03cac6582a..8f263adc90 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte @@ -16,7 +16,7 @@ async function updateName() { try { - await sdkForProject.users.updateName($user.$id, userName); + await sdkForProject().users.updateName($user.$id, userName); invalidate(Dependencies.USER); addNotification({ message: 'Name has been updated', 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 9a21b40da9..301e10cb49 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte @@ -10,7 +10,7 @@ async function updatePassword() { try { - await sdkForProject.users.updatePassword($user.$id, newPassword); + await sdkForProject().users.updatePassword($user.$id, newPassword); newPassword = null; addNotification({ message: 'Password has been updated', 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 de0cb95840..fa51266e04 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte @@ -16,7 +16,7 @@ async function updatePhone() { try { - await sdkForProject.users.updatePhone($user.$id, userPhone); + await sdkForProject().users.updatePhone($user.$id, userPhone); invalidate(Dependencies.USER); addNotification({ message: 'Phone has been updated', 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 5b2bd623c4..49b9fe7739 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte @@ -35,7 +35,7 @@ try { let updatedPrefs = Object.fromEntries(prefs); - await sdkForProject.users.updatePrefs($user.$id, updatedPrefs); + await sdkForProject().users.updatePrefs($user.$id, updatedPrefs); invalidate(Dependencies.USER); arePrefsDisabled = true; 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 aed011f7cc..d35948759f 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte @@ -15,7 +15,10 @@ async function updateVerificationEmail() { showVerifcationDropdown = false; try { - await sdkForProject.users.updateEmailVerification($user.$id, !$user.emailVerification); + await sdkForProject().users.updateEmailVerification( + $user.$id, + !$user.emailVerification + ); invalidate(Dependencies.USER); addNotification({ message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${ @@ -35,7 +38,10 @@ async function updateVerificationPhone() { showVerifcationDropdown = false; try { - await sdkForProject.users.updatePhoneVerification($user.$id, !$user.phoneVerification); + await sdkForProject().users.updatePhoneVerification( + $user.$id, + !$user.phoneVerification + ); invalidate(Dependencies.USER); addNotification({ message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${ @@ -54,7 +60,7 @@ } async function updateStatus() { try { - await sdkForProject.users.updateStatus($user.$id, !$user.status); + await sdkForProject().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/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/[[page]]/+page.ts index 76d58c6f61..a34dc79fb9 100644 --- a/src/routes/console/project-[project]/databases/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/[[page]]/+page.ts @@ -1,16 +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 { sdkForProject } from '$lib/stores/sdk'; +import { Query } from '@aw-labs/appwrite-console'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, 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 sdkForProject().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 237ed836a3..b2343ab093 100644 --- a/src/routes/console/project-[project]/databases/create.svelte +++ b/src/routes/console/project-[project]/databases/create.svelte @@ -18,7 +18,7 @@ const create = async () => { try { - const database = await sdkForProject.databases.create(id ? id : ID.unique(), name); + const database = await sdkForProject().databases.create(id ? id : ID.unique(), name); showCreate = false; dispatch('created', database); addNotification({ diff --git a/src/routes/console/project-[project]/databases/database-[database]/+layout.ts b/src/routes/console/project-[project]/databases/database-[database]/+layout.ts index ce30615486..16499a9df4 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/+layout.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/+layout.ts @@ -12,7 +12,7 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - database: await sdkForProject.databases.get(params.database) + database: await sdkForProject().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 a34b1c4e15..62a5ffe864 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 @@ -10,7 +10,7 @@ export const load: PageLoad = async ({ params, parent }) => { return { offset, - collections: await sdkForProject.databases.listCollections(params.database, [ + collections: await sdkForProject().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.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts index 1f30d16525..267f3d55ce 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts @@ -11,7 +11,7 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - collection: await sdkForProject.databases.getCollection( + collection: await sdkForProject().databases.getCollection( params.database, params.collection ) diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.ts index bc36a50bfd..597c1821e6 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.ts @@ -11,10 +11,10 @@ export const load: PageLoad = async ({ params, depends }) => { return { offset, - documents: await sdkForProject.databases.listDocuments(params.database, params.collection, [ - Query.limit(PAGE_LIMIT), - Query.offset(offset), - Query.orderDesc('$createdAt') - ]) + documents: await sdkForProject().databases.listDocuments( + params.database, + params.collection, + [Query.limit(PAGE_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt')] + ) }; }; diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/[[page]]/+page.ts index 6908c3c211..97f36aed78 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/[[page]]/+page.ts @@ -10,9 +10,10 @@ export const load: PageLoad = async ({ params, parent }) => { return { offset, - logs: await sdkForProject.databases.listCollectionLogs(params.database, params.collection, [ - Query.limit(PAGE_LIMIT), - Query.offset(offset) - ]) + logs: await sdkForProject().databases.listCollectionLogs( + params.database, + params.collection, + [Query.limit(PAGE_LIMIT), Query.offset(offset)] + ) }; }; diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte index a2ab210709..22ab952e85 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte @@ -8,7 +8,7 @@ key: string, data: Partial ) { - await sdkForProject.databases.createBooleanAttribute( + await sdkForProject().databases.createBooleanAttribute( databaseId, collectionId, key, diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte index bd79b66437..65c7691945 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/datetime.svelte @@ -8,7 +8,7 @@ key: string, data: Partial ) { - await sdkForProject.databases.createDatetimeAttribute( + await sdkForProject().databases.createDatetimeAttribute( databaseId, collectionId, key, diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte index 02bed780e1..f143435e22 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/deleteAttribute.svelte @@ -17,7 +17,7 @@ const handleDelete = async () => { try { - await sdkForProject.databases.deleteAttribute( + await sdkForProject().databases.deleteAttribute( databaseId, $collection.$id, selectedAttribute.key 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 6e5d4d13ef..ff86ac438c 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 @@ -9,7 +9,7 @@ key: string, data: Partial ) { - await sdkForProject.databases.createEmailAttribute( + await sdkForProject().databases.createEmailAttribute( databaseId, collectionId, key, diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte index e61b3c0304..8afcedd436 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/enum.svelte @@ -8,7 +8,7 @@ key: string, data: Partial ) { - await sdkForProject.databases.createEnumAttribute( + await sdkForProject().databases.createEnumAttribute( databaseId, collectionId, key, diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte index 23249d9515..12162723a8 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/float.svelte @@ -8,7 +8,7 @@ key: string, data: Partial ) { - await sdkForProject.databases.createFloatAttribute( + await sdkForProject().databases.createFloatAttribute( databaseId, collectionId, key, diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte index b45a1a6fb2..76cd5d729f 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/integer.svelte @@ -8,7 +8,7 @@ key: string, data: Partial ) { - await sdkForProject.databases.createIntegerAttribute( + await sdkForProject().databases.createIntegerAttribute( databaseId, collectionId, key, diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte index 154be4e573..1849c1597d 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/ip.svelte @@ -8,7 +8,7 @@ key: string, data: Partial ) { - await sdkForProject.databases.createIpAttribute( + await sdkForProject().databases.createIpAttribute( databaseId, collectionId, key, diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte index 9ecc9c5130..3f7ac914f7 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/string.svelte @@ -8,7 +8,7 @@ key: string, data: Partial ) { - await sdkForProject.databases.createStringAttribute( + await sdkForProject().databases.createStringAttribute( databaseId, collectionId, key, diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte index d8fd016338..aa99790b67 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/url.svelte @@ -8,7 +8,7 @@ key: string, data: Partial ) { - await sdkForProject.databases.createUrlAttribute( + await sdkForProject().databases.createUrlAttribute( databaseId, collectionId, key, 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 7819f11f4c..1229c4ac73 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 @@ -33,7 +33,7 @@ async function create() { try { - await sdkForProject.databases.createDocument( + await sdkForProject().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 d6d43fcc95..b0e1cae7a5 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 @@ -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 sdkForProject().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 c4c9a7c72a..4be911e43a 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 @@ -22,7 +22,7 @@ async function updatePermissions() { try { - await sdkForProject.databases.updateDocument( + await sdkForProject().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 e2008458c8..ff44b3f787 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 @@ -10,7 +10,7 @@ export const load: PageLoad = async ({ params, parent }) => { return { offset, - logs: await sdkForProject.databases.listDocumentLogs( + logs: await sdkForProject().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 591a45be34..7b7251e394 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 @@ -15,7 +15,7 @@ const handleDelete = async () => { try { - await sdkForProject.databases.deleteDocument( + await sdkForProject().databases.deleteDocument( databaseId, $page.params.collection, $page.params.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 b832db6328..cc36f051f1 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 @@ -52,7 +52,7 @@ async function updateData() { try { - await sdkForProject.databases.updateDocument( + await sdkForProject().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 604f85a586..c1dae2009a 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 @@ -59,7 +59,7 @@ creating = true; try { - await sdkForProject.databases.createIndex( + await sdkForProject().databases.createIndex( databaseId, $collection.$id, key, 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 57ed823840..07127c396e 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 @@ -17,7 +17,7 @@ const handleDelete = async () => { try { - await sdkForProject.databases.deleteIndex( + await sdkForProject().databases.deleteIndex( databaseId, $collection.$id, selectedIndex.key 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 56629e2a08..ff853e908f 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 @@ -15,7 +15,7 @@ const handleDelete = async () => { try { - await sdkForProject.databases.deleteCollection(databaseId, $collection.$id); + await sdkForProject().databases.deleteCollection(databaseId, $collection.$id); showDelete = false; addNotification({ type: 'success', 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 24ccc11996..59061d5558 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 @@ -20,7 +20,7 @@ async function updateName() { try { - await sdkForProject.databases.updateCollection( + await sdkForProject().databases.updateCollection( databaseId, $collection.$id, collectionName, 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 418052dde0..ad78412b3b 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 @@ -24,7 +24,7 @@ async function updatePermissions() { try { - await sdkForProject.databases.updateCollection( + await sdkForProject().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 e34406fb8c..348bbcb459 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 @@ -20,7 +20,7 @@ async function updateSecurity() { try { - await sdkForProject.databases.updateCollection( + await sdkForProject().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 ea064ebda1..ba2f31b3c9 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 @@ -21,7 +21,7 @@ async function toggleCollection() { try { - await sdkForProject.databases.updateCollection( + await sdkForProject().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 0229362763..9cb3a697cc 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 @@ -3,7 +3,7 @@ import { sdkForProject } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - const response = await sdkForProject.databases.getCollectionUsage( + const response = await sdkForProject().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 32c4bfa2ca..aa152ff46c 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/create.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/create.svelte @@ -21,7 +21,7 @@ const create = async () => { try { - const collection = await sdkForProject.databases.createCollection( + const collection = await sdkForProject().databases.createCollection( databaseId, id ? id : ID.unique(), name diff --git a/src/routes/console/project-[project]/databases/database-[database]/delete.svelte b/src/routes/console/project-[project]/databases/database-[database]/delete.svelte index bfbdb1916f..c1572a6361 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/delete.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/delete.svelte @@ -14,7 +14,7 @@ const handleDelete = async () => { try { - await sdkForProject.databases.delete(databaseId); + await sdkForProject().databases.delete(databaseId); showDelete = false; addNotification({ type: 'success', 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 2d07e248b8..78ef67458f 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 @@ -31,7 +31,7 @@ async function updateName() { try { - await sdkForProject.databases.update($page.params.database, databaseName); + await sdkForProject().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 9c4a4096f1..783c3753e8 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 @@ -3,7 +3,7 @@ import { sdkForProject } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - const response = await sdkForProject.databases.getDatabaseUsage( + const response = await sdkForProject().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 b5c047e925..d68f97faac 100644 --- a/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/databases/usage/[[period]]/+page.ts @@ -4,7 +4,7 @@ import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { const { period } = params; - const response = await sdkForProject.databases.getUsage(period ?? '30d'); + const response = await sdkForProject().databases.getUsage(period ?? '30d'); return { count: response.databasesCount as unknown as Models.Metric[], diff --git a/src/routes/console/project-[project]/functions/[[page]]/+page.ts b/src/routes/console/project-[project]/functions/[[page]]/+page.ts index 2f055a4520..86c61a5f9f 100644 --- a/src/routes/console/project-[project]/functions/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/functions/[[page]]/+page.ts @@ -11,7 +11,7 @@ export const load: PageLoad = async ({ params, parent, depends }) => { return { offset, - functions: await sdkForProject.functions.list([ + functions: await sdkForProject().functions.list([ Query.limit(CARD_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt') diff --git a/src/routes/console/project-[project]/functions/createFunction.svelte b/src/routes/console/project-[project]/functions/createFunction.svelte index 17b88d4cd0..5e69bfae9e 100644 --- a/src/routes/console/project-[project]/functions/createFunction.svelte +++ b/src/routes/console/project-[project]/functions/createFunction.svelte @@ -25,7 +25,7 @@ } async function create() { try { - const response = await sdkForProject.functions.create( + const response = await sdkForProject().functions.create( $createFunction.id ?? ID.unique(), $createFunction.name, $createFunction.execute, @@ -36,7 +36,7 @@ ); $createFunction.vars.forEach( async (v) => - await sdkForProject.functions.createVariable(response.$id, v.key, v.value) + await sdkForProject().functions.createVariable(response.$id, v.key, v.value) ); await invalidate(Dependencies.FUNCTIONS); goto(`${base}/console/project-${projectId}/functions/function-${response.$id}`); 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 f11140fe83..840b9bfbc0 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/+layout.ts +++ b/src/routes/console/project-[project]/functions/function-[function]/+layout.ts @@ -12,7 +12,7 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - function: await sdkForProject.functions.get(params.function) + function: await sdkForProject().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.ts b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.ts index a23bc41931..1ca13b57d4 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 @@ -11,7 +11,7 @@ export const load: PageLoad = async ({ params, parent, depends }) => { return { offset, - deployments: await sdkForProject.functions.listDeployments(params.function, [ + deployments: await sdkForProject().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 8a20db8342..0cdb487224 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/activate.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/activate.svelte @@ -14,7 +14,7 @@ const handleSubmit = async () => { try { - await sdkForProject.functions.updateDeployment( + await sdkForProject().functions.updateDeployment( selectedDeployment.resourceId, selectedDeployment.$id ); 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 19dbe82fde..c084f5cfdd 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/create.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/create.svelte @@ -91,7 +91,7 @@ async function create() { try { - await sdkForProject.functions.createDeployment( + await sdkForProject().functions.createDeployment( functionId, entrypoint, files[0], 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 08c2a6c45a..508a9fa616 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/delete.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/delete.svelte @@ -13,7 +13,7 @@ const handleSubmit = async () => { try { - await sdkForProject.functions.deleteDeployment( + await sdkForProject().functions.deleteDeployment( selectedDeployment.resourceId, selectedDeployment.$id ); 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 bccdbdd5f4..20b79c524d 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte @@ -30,7 +30,7 @@ const handleSubmit = async () => { submitting = true; try { - await sdkForProject.functions.createExecution( + await sdkForProject().functions.createExecution( selectedFunction.$id, data?.length ? data : undefined, true 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 0f5db63484..e2bc744f73 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 @@ -11,7 +11,7 @@ export const load: PageLoad = async ({ params, parent, depends }) => { return { offset, - executions: await sdkForProject.functions.listExecutions(params.function, [ + executions: await sdkForProject().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 6d33d6d857..8f78fb744d 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 @@ -54,7 +54,7 @@ async function updateName() { try { - await sdkForProject.functions.update( + await sdkForProject().functions.update( functionId, functionName, $func.execute, @@ -80,7 +80,7 @@ async function updatePermissions() { try { - await sdkForProject.functions.update( + await sdkForProject().functions.update( functionId, $func.name, permissions, @@ -106,7 +106,7 @@ async function updateSchedule() { try { - await sdkForProject.functions.update( + await sdkForProject().functions.update( functionId, $func.name, $func.execute, @@ -133,7 +133,7 @@ async function updateTimeout() { try { - await sdkForProject.functions.update( + await sdkForProject().functions.update( functionId, $func.name, $func.execute, @@ -162,7 +162,11 @@ const variable = event.detail; try { - await sdkForProject.functions.createVariable(functionId, variable.key, variable.value); + await sdkForProject().functions.createVariable( + functionId, + variable.key, + variable.value + ); showVariablesModal = false; invalidate(Dependencies.VARIABLES); addNotification({ @@ -182,7 +186,7 @@ async function handleVariableUpdated(event: CustomEvent) { const variable = event.detail; try { - await sdkForProject.functions.updateVariable( + await sdkForProject().functions.updateVariable( functionId, variable.$id, variable.key, @@ -206,7 +210,7 @@ } async function handleVariableDeleted(variable: Models.Variable) { try { - await sdkForProject.functions.deleteVariable(variable.functionId, variable.$id); + await sdkForProject().functions.deleteVariable(variable.functionId, variable.$id); invalidate(Dependencies.VARIABLES); addNotification({ type: 'success', 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 631f94d4b4..dce04e5e42 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 @@ -6,6 +6,6 @@ export const load: PageLoad = async ({ params, parent, depends }) => { depends(Dependencies.VARIABLES); return { - variables: await sdkForProject.functions.listVariables(params.function) + variables: await sdkForProject().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 23cd9145ef..dd139c24b8 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 @@ -13,7 +13,7 @@ const handleSubmit = async () => { try { - await sdkForProject.functions.delete(functionId); + await sdkForProject().functions.delete(functionId); showDelete = false; addNotification({ type: 'success', 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 8e325d0852..606f5e8cfb 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 @@ -29,7 +29,7 @@ async function updateEvents() { try { - await sdkForProject.functions.update( + await sdkForProject().functions.update( functionId, $func.name, $func.execute, 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 5c61222359..4f7019cc1a 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 @@ -20,7 +20,7 @@ const variables = await parseFile(files[0]); for (const variable of variables) { try { - await sdkForProject.functions.createVariable( + await sdkForProject().functions.createVariable( functionId, variable.key, variable.value 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 8d9e2f2e1e..33819cee70 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 @@ -3,7 +3,7 @@ import { sdkForProject } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - const response = await sdkForProject.functions.getFunctionUsage( + const response = await sdkForProject().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 61e7ad9c89..e7a295fa0e 100644 --- a/src/routes/console/project-[project]/functions/wizard/step1.svelte +++ b/src/routes/console/project-[project]/functions/wizard/step1.svelte @@ -12,7 +12,7 @@ let options = []; onMount(async () => { - let runtimes = await sdkForProject.functions.listRuntimes(); + let runtimes = await sdkForProject().functions.listRuntimes(); options = runtimes.runtimes.map((runtime) => ({ label: `${runtime.name} - ${runtime.version}`, value: runtime.$id 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 08a6581eba..9542a8f7ae 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 @@ -3,7 +3,7 @@ import { WizardStep } from '$lib/layout'; import { sdkForProject } from '$lib/stores/sdk'; - const { endpoint, project } = sdkForProject.client.config; + const { endpoint, project } = sdkForProject().client.config; const code = `import io.appwrite.Client import io.appwrite.services.Account diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step3.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/apple/step3.svelte index fe5be13fcc..841b6791f9 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step3.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/apple/step3.svelte @@ -3,7 +3,7 @@ import { WizardStep } from '$lib/layout'; import { sdkForProject } from '$lib/stores/sdk'; - const { endpoint, project } = sdkForProject.client.config; + const { endpoint, project } = sdkForProject().client.config; const code = `import Appwrite let client = Client() diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step3.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step3.svelte index 6f46f657d4..9456c487ae 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step3.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step3.svelte @@ -3,7 +3,7 @@ import { WizardStep } from '$lib/layout'; import { sdkForProject } from '$lib/stores/sdk'; - const { endpoint, project } = sdkForProject.client.config; + const { endpoint, project } = sdkForProject().client.config; const code = `import 'package:appwrite/appwrite.dart'; Client client = Client(); diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/web/step3.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/web/step3.svelte index c9685da2ef..7df5823b93 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/web/step3.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/web/step3.svelte @@ -3,7 +3,7 @@ import { WizardStep } from '$lib/layout'; import { sdkForProject } from '$lib/stores/sdk'; - const { endpoint, project } = sdkForProject.client.config; + const { endpoint, project } = sdkForProject().client.config; const code = `const client = new Client(); client diff --git a/src/routes/console/project-[project]/overview/store.ts b/src/routes/console/project-[project]/overview/store.ts index aa4bf90d56..4e29c49066 100644 --- a/src/routes/console/project-[project]/overview/store.ts +++ b/src/routes/console/project-[project]/overview/store.ts @@ -13,7 +13,7 @@ export const usage = cachedStore< return { load: async (projectId, range) => { const usages = isCloud - ? await sdkForProject.project.getUsage(range) + ? await sdkForProject().project.getUsage(range) : await sdkForConsole.projects.getUsage(projectId, range); set(usages); } diff --git a/src/routes/console/project-[project]/storage/[[page]]/+page.ts b/src/routes/console/project-[project]/storage/[[page]]/+page.ts index 1719d9ef4e..b9b1d1cb09 100644 --- a/src/routes/console/project-[project]/storage/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/storage/[[page]]/+page.ts @@ -10,7 +10,7 @@ export const load: PageLoad = async ({ params, parent }) => { return { offset, - buckets: await sdkForProject.storage.listBuckets([ + buckets: await sdkForProject().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 3021f76a62..5d706b0bc2 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+layout.ts +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/+layout.ts @@ -12,7 +12,7 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - bucket: await sdkForProject.storage.getBucket(params.bucket) + bucket: await sdkForProject().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 cb1716eb53..70d76b59e9 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 @@ -47,7 +47,7 @@ const projectId = $page.params.project; const bucketId = $page.params.bucket; const getPreview = (fileId: string) => - sdkForProject.storage.getFilePreview(bucketId, fileId, 32, 32).toString() + '&mode=admin'; + sdkForProject().storage.getFilePreview(bucketId, fileId, 32, 32).toString() + '&mode=admin'; function fileCreated() { showCreate = false; @@ -62,7 +62,7 @@ async function deleteFile(file: Models.File) { try { - await sdkForProject.storage.deleteFile(file.bucketId, file.$id); + await sdkForProject().storage.deleteFile(file.bucketId, file.$id); uploader.removeFile(file); invalidate(Dependencies.FILES); trackEvent(Submit.FileDelete); diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.ts b/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.ts index 33b71db96c..a95f219312 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.ts @@ -13,7 +13,7 @@ export const load: PageLoad = async ({ params, parent, depends, url }) => { return { offset, search, - files: await sdkForProject.storage.listFiles( + files: await sdkForProject().storage.listFiles( params.bucket, [Query.limit(PAGE_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt')], search 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 bb8644cd52..58eec0864d 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteBucket.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteBucket.svelte @@ -13,7 +13,7 @@ const deleteUser = async () => { try { - await sdkForProject.storage.deleteBucket($bucket.$id); + await sdkForProject().storage.deleteBucket($bucket.$id); showDelete = false; addNotification({ type: 'success', 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 445c9a7238..67d7002f79 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteFile.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteFile.svelte @@ -14,7 +14,7 @@ const deleteFile = async () => { try { - await sdkForProject.storage.deleteFile(file.bucketId, file.$id); + await sdkForProject().storage.deleteFile(file.bucketId, file.$id); showDelete = false; dispatch('deleted', file); addNotification({ 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 c7a134faec..3f51c26d99 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 @@ -12,7 +12,7 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => { return { header: Header, breadcrumbs: Breadcrumbs, - file: await sdkForProject.storage.getFile(params.bucket, params.file) + file: await sdkForProject().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 f3689a5a58..a2cfbf3b62 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 @@ -27,10 +27,10 @@ let arePermsDisabled = true; const getPreview = (fileId: string) => - sdkForProject.storage.getFilePreview($file.bucketId, fileId, 205, 125).toString() + + sdkForProject().storage.getFilePreview($file.bucketId, fileId, 205, 125).toString() + '&mode=admin'; const getView = (fileId: string) => - sdkForProject.storage.getFileView($file.bucketId, fileId).toString() + '&mode=admin'; + sdkForProject().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() + + sdkForProject().storage.getFileDownload($file.bucketId, $file.$id).toString() + '&mode=admin' ); } async function updatePermissions() { try { - await sdkForProject.storage.updateFile($file.bucketId, $file.$id, filePermissions); + await sdkForProject().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 c58bbb12e6..2891d5e0a3 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 @@ -13,7 +13,7 @@ const deleteFile = async () => { try { - await sdkForProject.storage.deleteFile($file.bucketId, $file.$id); + await sdkForProject().storage.deleteFile($file.bucketId, $file.$id); showDelete = false; await goto( `${base}/console/project-${$page.params.project}/storage/bucket-${$file.bucketId}` 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 5cc6174a63..dbf1bdb6d4 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 sdkForProject().storage.updateBucket( values.$id, values.name, values.$permissions, 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 171fed37a5..a5f58d575f 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 @@ -3,7 +3,7 @@ import type { Models } from '@aw-labs/appwrite-console'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - const response = await sdkForProject.storage.getBucketUsage( + const response = await sdkForProject().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 586b90e2c8..84ce5e543b 100644 --- a/src/routes/console/project-[project]/storage/create.svelte +++ b/src/routes/console/project-[project]/storage/create.svelte @@ -19,7 +19,7 @@ const create = async () => { try { - const bucket = await sdkForProject.storage.createBucket(id ? id : ID.unique(), name); + const bucket = await sdkForProject().storage.createBucket(id ? id : ID.unique(), name); showCreate = false; dispatch('created', bucket); addNotification({ diff --git a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts index e11dcb3e8a..1b62f833dd 100644 --- a/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/storage/usage/[[period]]/+page.ts @@ -3,7 +3,7 @@ import { sdkForProject } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { - const response = await sdkForProject.storage.getUsage(params.period ?? '30d'); + const response = await sdkForProject().storage.getUsage(params.period ?? '30d'); return { count: response.bucketsCount as unknown as Models.Metric[], From 53c77dd0e29f530b4311115a6266295abe307df3 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Wed, 8 Mar 2023 17:14:25 +0000 Subject: [PATCH 03/40] refactor: add sdk export --- src/lib/stores/sdk.ts | 42 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts index cc86005373..4cf8605528 100644 --- a/src/lib/stores/sdk.ts +++ b/src/lib/stores/sdk.ts @@ -19,7 +19,7 @@ const endpoint = VARS.APPWRITE_ENDPOINT ?? `${globalThis?.location?.origin}/v1`; const clientConsole = new Client(); clientConsole.setEndpoint(endpoint).setProject('console'); -const sdkForConsole = { +export const sdkForConsole = { client: clientConsole, account: new Account(clientConsole), avatars: new Avatars(clientConsole), @@ -31,7 +31,7 @@ const sdkForConsole = { users: new Users(clientConsole) }; -function sdkForProject() { +export function sdkForProject() { const clientProject = new Client(); clientProject.setEndpoint(endpoint).setMode('admin'); @@ -56,4 +56,40 @@ function sdkForProject() { }; } -export { sdkForConsole, sdkForProject }; +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 clientProject = new Client(); + clientProject.setEndpoint(endpoint).setMode('admin'); + + const pathname = window.location.pathname; + const projectMatch = pathname.match(/project-([a-zA-Z0-9]+)/); + if (projectMatch) { + clientProject.setProject(projectMatch[1]); + } + + return { + client: clientProject, + account: new Account(clientProject), + avatars: new Avatars(clientProject), + databases: new Databases(clientProject), + functions: new Functions(clientProject), + health: new Health(clientProject), + locale: new Locale(clientProject), + project: new Project(clientProject), + storage: new Storage(clientProject), + teams: new Teams(clientProject), + users: new Users(clientProject) + }; + } +}; From 3ae953a1c8b0b79b5e231d3500f53ef471f0cd00 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Wed, 8 Mar 2023 17:15:14 +0000 Subject: [PATCH 04/40] refactor: import sdk everywhere --- src/lib/components/avatarInitials.svelte | 2 +- src/lib/components/permissions/row.svelte | 2 +- src/lib/components/permissions/team.svelte | 2 +- src/lib/components/permissions/user.svelte | 2 +- src/lib/components/uploadBox.svelte | 2 +- src/lib/layout/header.svelte | 2 +- src/lib/layout/logs.svelte | 2 +- src/routes/+layout.ts | 2 +- src/routes/console/+layout.ts | 2 +- src/routes/console/account/+page.svelte | 2 +- src/routes/console/account/activity/[[page]]/+page.ts | 2 +- src/routes/console/account/delete.svelte | 2 +- src/routes/console/account/header.svelte | 2 +- src/routes/console/account/organizations/[[page]]/+page.svelte | 2 +- src/routes/console/account/organizations/[[page]]/+page.ts | 2 +- src/routes/console/account/sessions/[[page]]/+page.svelte | 2 +- src/routes/console/account/sessions/[[page]]/+page.ts | 2 +- src/routes/console/createOrganization.svelte | 2 +- src/routes/console/onboarding/+page.svelte | 2 +- src/routes/console/organization-[organization]/+layout.ts | 2 +- .../console/organization-[organization]/[[page]]/+page.ts | 2 +- .../console/organization-[organization]/createMember.svelte | 2 +- .../console/organization-[organization]/createProject.svelte | 2 +- .../console/organization-[organization]/deleteMember.svelte | 2 +- .../organization-[organization]/deleteOrganization.svelte | 2 +- .../organization-[organization]/members/[[page]]/+page.svelte | 2 +- .../organization-[organization]/members/[[page]]/+page.ts | 2 +- .../console/organization-[organization]/settings/+page.svelte | 2 +- src/routes/console/project-[project]/+layout.svelte | 2 +- src/routes/console/project-[project]/+layout.ts | 2 +- src/routes/console/project-[project]/auth/[[page]]/+page.ts | 2 +- src/routes/console/project-[project]/auth/appleOAuth.svelte | 2 +- src/routes/console/project-[project]/auth/auth0OAuth.svelte | 2 +- src/routes/console/project-[project]/auth/authentikOAuth.svelte | 2 +- src/routes/console/project-[project]/auth/createTeam.svelte | 2 +- src/routes/console/project-[project]/auth/createUser.svelte | 2 +- src/routes/console/project-[project]/auth/gitlabOAuth.svelte | 2 +- src/routes/console/project-[project]/auth/mainOAuth.svelte | 2 +- src/routes/console/project-[project]/auth/microsoftOAuth.svelte | 2 +- src/routes/console/project-[project]/auth/oktaOAuth.svelte | 2 +- .../project-[project]/auth/security/updateSessionLength.svelte | 2 +- .../project-[project]/auth/security/updateSessionsLimit.svelte | 2 +- .../project-[project]/auth/security/updateUsersLimit.svelte | 2 +- src/routes/console/project-[project]/auth/settings/+page.svelte | 2 +- .../console/project-[project]/auth/teams/[[page]]/+page.ts | 2 +- .../console/project-[project]/auth/teams/team-[team]/+layout.ts | 2 +- .../project-[project]/auth/teams/team-[team]/+page.svelte | 2 +- .../auth/teams/team-[team]/activity/[[page]]/+page.ts | 2 +- .../auth/teams/team-[team]/createMembership.svelte | 2 +- .../auth/teams/team-[team]/deleteMembership.svelte | 2 +- .../project-[project]/auth/teams/team-[team]/deleteTeam.svelte | 2 +- .../auth/teams/team-[team]/members/[[page]]/+page.ts | 2 +- .../console/project-[project]/auth/usage/[[period]]/+page.ts | 2 +- .../console/project-[project]/auth/user-[user]/+layout.ts | 2 +- .../auth/user-[user]/activity/[[page]]/+page.ts | 2 +- .../project-[project]/auth/user-[user]/deleteAllSessions.svelte | 2 +- .../project-[project]/auth/user-[user]/deleteMembership.svelte | 2 +- .../project-[project]/auth/user-[user]/deleteSession.svelte | 2 +- .../project-[project]/auth/user-[user]/deleteUser.svelte | 2 +- .../auth/user-[user]/memberships/[[page]]/+page.ts | 2 +- .../auth/user-[user]/sessions/[[page]]/+page.svelte | 2 +- .../auth/user-[user]/sessions/[[page]]/+page.ts | 2 +- .../project-[project]/auth/user-[user]/updateEmail.svelte | 2 +- .../project-[project]/auth/user-[user]/updateName.svelte | 2 +- .../project-[project]/auth/user-[user]/updatePassword.svelte | 2 +- .../project-[project]/auth/user-[user]/updatePhone.svelte | 2 +- .../project-[project]/auth/user-[user]/updatePrefs.svelte | 2 +- .../project-[project]/auth/user-[user]/updateStatus.svelte | 2 +- .../console/project-[project]/databases/[[page]]/+page.ts | 2 +- src/routes/console/project-[project]/databases/create.svelte | 2 +- .../project-[project]/databases/database-[database]/+layout.ts | 2 +- .../databases/database-[database]/[[page]]/+page.ts | 2 +- .../database-[database]/collection-[collection]/+layout.svelte | 2 +- .../database-[database]/collection-[collection]/+layout.ts | 2 +- .../collection-[collection]/[[page]]/+page.ts | 2 +- .../collection-[collection]/activity/[[page]]/+page.ts | 2 +- .../collection-[collection]/attributes/boolean.svelte | 2 +- .../collection-[collection]/attributes/datetime.svelte | 2 +- .../collection-[collection]/attributes/deleteAttribute.svelte | 2 +- .../collection-[collection]/attributes/email.svelte | 2 +- .../collection-[collection]/attributes/enum.svelte | 2 +- .../collection-[collection]/attributes/float.svelte | 2 +- .../collection-[collection]/attributes/integer.svelte | 2 +- .../collection-[collection]/attributes/ip.svelte | 2 +- .../collection-[collection]/attributes/string.svelte | 2 +- .../collection-[collection]/attributes/url.svelte | 2 +- .../collection-[collection]/createDocument.svelte | 2 +- .../collection-[collection]/document-[document]/+layout.ts | 2 +- .../collection-[collection]/document-[document]/+page.svelte | 2 +- .../document-[document]/activity/[[page]]/+page.ts | 2 +- .../collection-[collection]/document-[document]/delete.svelte | 2 +- .../collection-[collection]/document-[document]/document.svelte | 2 +- .../collection-[collection]/indexes/createIndex.svelte | 2 +- .../collection-[collection]/indexes/deleteIndex.svelte | 2 +- .../collection-[collection]/settings/deleteCollection.svelte | 2 +- .../collection-[collection]/settings/updateName.svelte | 2 +- .../collection-[collection]/settings/updatePermissions.svelte | 2 +- .../collection-[collection]/settings/updateSecurity.svelte | 2 +- .../collection-[collection]/settings/updateStatus.svelte | 2 +- .../collection-[collection]/usage/[[period]]/+page.ts | 2 +- .../databases/database-[database]/create.svelte | 2 +- .../databases/database-[database]/delete.svelte | 2 +- .../databases/database-[database]/settings/+page.svelte | 2 +- .../databases/database-[database]/usage/[[period]]/+page.ts | 2 +- .../project-[project]/databases/usage/[[period]]/+page.ts | 2 +- src/routes/console/project-[project]/functions/+layout.svelte | 2 +- .../console/project-[project]/functions/[[page]]/+page.ts | 2 +- .../console/project-[project]/functions/createFunction.svelte | 2 +- .../project-[project]/functions/function-[function]/+layout.ts | 2 +- .../functions/function-[function]/[[page]]/+page.svelte | 2 +- .../functions/function-[function]/[[page]]/+page.ts | 2 +- .../functions/function-[function]/activate.svelte | 2 +- .../functions/function-[function]/create.svelte | 2 +- .../functions/function-[function]/delete.svelte | 2 +- .../functions/function-[function]/execute.svelte | 2 +- .../function-[function]/executions/[[page]]/+page.svelte | 2 +- .../functions/function-[function]/executions/[[page]]/+page.ts | 2 +- .../functions/function-[function]/settings/+page.svelte | 2 +- .../functions/function-[function]/settings/+page.ts | 2 +- .../functions/function-[function]/settings/delete.svelte | 2 +- .../functions/function-[function]/settings/updateEvents.svelte | 2 +- .../function-[function]/settings/uploadVariables.svelte | 2 +- .../functions/function-[function]/usage/[[period]]/+page.ts | 2 +- .../console/project-[project]/functions/wizard/step1.svelte | 2 +- src/routes/console/project-[project]/overview/keys/+page.ts | 2 +- .../console/project-[project]/overview/keys/[key]/+page.ts | 2 +- .../overview/keys/[key]/+page@project-[project].svelte | 2 +- .../console/project-[project]/overview/keys/[key]/delete.svelte | 2 +- .../overview/keys/[key]/updateExpirationDate.svelte | 2 +- .../console/project-[project]/overview/keys/wizard.svelte | 2 +- .../console/project-[project]/overview/platforms/+page.ts | 2 +- .../project-[project]/overview/platforms/[platform]/+page.ts | 2 +- .../platforms/[platform]/+page@project-[project].svelte | 2 +- .../overview/platforms/[platform]/android.svelte | 2 +- .../overview/platforms/[platform]/appleIOS.svelte | 2 +- .../overview/platforms/[platform]/appleMacOS.svelte | 2 +- .../overview/platforms/[platform]/appleTvOS.svelte | 2 +- .../overview/platforms/[platform]/appleWatchOS.svelte | 2 +- .../overview/platforms/[platform]/delete.svelte | 2 +- .../overview/platforms/[platform]/flutterAndroid.svelte | 2 +- .../overview/platforms/[platform]/flutterIOS.svelte | 2 +- .../overview/platforms/[platform]/flutterLinux.svelte | 2 +- .../overview/platforms/[platform]/flutterMacOS.svelte | 2 +- .../overview/platforms/[platform]/flutterWindows.svelte | 2 +- .../project-[project]/overview/platforms/[platform]/web.svelte | 2 +- .../overview/platforms/wizard/android/step1.svelte | 2 +- .../overview/platforms/wizard/android/step3.svelte | 2 +- .../overview/platforms/wizard/apple/step1.svelte | 2 +- .../overview/platforms/wizard/apple/step3.svelte | 2 +- .../overview/platforms/wizard/flutter/step1.svelte | 2 +- .../overview/platforms/wizard/flutter/step3.svelte | 2 +- .../project-[project]/overview/platforms/wizard/store.ts | 2 +- .../overview/platforms/wizard/web/step1.svelte | 2 +- .../overview/platforms/wizard/web/step3.svelte | 2 +- src/routes/console/project-[project]/overview/store.ts | 2 +- src/routes/console/project-[project]/settings/+page.svelte | 2 +- .../console/project-[project]/settings/deleteProject.svelte | 2 +- .../project-[project]/settings/domains/[[page]]/+page.svelte | 2 +- .../project-[project]/settings/domains/[[page]]/+page.ts | 2 +- .../console/project-[project]/settings/domains/delete.svelte | 2 +- .../project-[project]/settings/domains/wizard/step1.svelte | 2 +- .../project-[project]/settings/domains/wizard/step4.svelte | 2 +- .../settings/domains/wizard/verificationBox.svelte | 2 +- src/routes/console/project-[project]/settings/webhooks/+page.ts | 2 +- .../project-[project]/settings/webhooks/[webhook]/+layout.ts | 2 +- .../project-[project]/settings/webhooks/[webhook]/delete.svelte | 2 +- .../settings/webhooks/[webhook]/regenerate.svelte | 2 +- .../settings/webhooks/[webhook]/updateEvents.svelte | 2 +- .../settings/webhooks/[webhook]/updateName.svelte | 2 +- .../settings/webhooks/[webhook]/updateSecurity.svelte | 2 +- .../settings/webhooks/[webhook]/updateURL.svelte | 2 +- .../project-[project]/settings/webhooks/createWebhook.svelte | 2 +- src/routes/console/project-[project]/storage/[[page]]/+page.ts | 2 +- .../project-[project]/storage/bucket-[bucket]/+layout.ts | 2 +- .../storage/bucket-[bucket]/[[page]]/+page.svelte | 2 +- .../project-[project]/storage/bucket-[bucket]/[[page]]/+page.ts | 2 +- .../storage/bucket-[bucket]/deleteBucket.svelte | 2 +- .../project-[project]/storage/bucket-[bucket]/deleteFile.svelte | 2 +- .../storage/bucket-[bucket]/file-[file]/+layout.ts | 2 +- .../storage/bucket-[bucket]/file-[file]/+page.svelte | 2 +- .../storage/bucket-[bucket]/file-[file]/deleteFile.svelte | 2 +- .../storage/bucket-[bucket]/settings/+page.svelte | 2 +- .../storage/bucket-[bucket]/usage/[[period]]/+page.ts | 2 +- src/routes/console/project-[project]/storage/create.svelte | 2 +- .../console/project-[project]/storage/usage/[[period]]/+page.ts | 2 +- src/routes/invite/+page.svelte | 2 +- src/routes/login/+page.svelte | 2 +- src/routes/recover/+page.svelte | 2 +- src/routes/register/+page.svelte | 2 +- src/routes/register/invite/[slug]/+page.svelte | 2 +- 190 files changed, 190 insertions(+), 190 deletions(-) diff --git a/src/lib/components/avatarInitials.svelte b/src/lib/components/avatarInitials.svelte index 1ce7ecfc6a..5e8a253721 100644 --- a/src/lib/components/avatarInitials.svelte +++ b/src/lib/components/avatarInitials.svelte @@ -1,5 +1,5 @@ diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte index d0041ca89f..0cc8abfdd2 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 { sdk, 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 1799f69054..4883168530 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 { sdk, 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/stores/sdk.ts b/src/lib/stores/sdk.ts index 4cf8605528..8ed0b46965 100644 --- a/src/lib/stores/sdk.ts +++ b/src/lib/stores/sdk.ts @@ -19,18 +19,6 @@ const endpoint = VARS.APPWRITE_ENDPOINT ?? `${globalThis?.location?.origin}/v1`; const clientConsole = new Client(); clientConsole.setEndpoint(endpoint).setProject('console'); -export 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) -}; - export function sdkForProject() { const clientProject = new Client(); clientProject.setEndpoint(endpoint).setMode('admin'); diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 5288e2300d..596e79f153 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -1,7 +1,7 @@ import '@appwrite.io/pink'; import '@appwrite.io/pink-icons'; import 'tippy.js/dist/tippy.css'; -import { sdk, 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'; @@ -11,11 +11,11 @@ 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(); 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 0d77b07b40..65de11ecdd 100644 --- a/src/routes/console/+layout.ts +++ b/src/routes/console/+layout.ts @@ -1,8 +1,8 @@ -import { sdk, 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 229112c517..66c40a4f29 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 { sdk, 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', diff --git a/src/routes/console/account/activity/[[page]]/+page.ts b/src/routes/console/account/activity/[[page]]/+page.ts index 0814c74e54..d3fc1b4d0e 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 { sdk, 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 7550908ef3..ae86006b64 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 { sdk, 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({ diff --git a/src/routes/console/account/header.svelte b/src/routes/console/account/header.svelte index ae42246da0..71d54f3d3b 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 { sdk, 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 5b7a3ceecd..69ba0d5893 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 { sdk, 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 147fcac37e..9b602d7b54 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 { sdk, 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 46666c02d5..6fd4e45cf5 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 { sdk, 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 49ecca7cc7..6165d5472d 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 { sdk, 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 64d4abaff5..3e72de4214 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 { sdk, 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}`); diff --git a/src/routes/console/onboarding/+page.svelte b/src/routes/console/onboarding/+page.svelte index e34074b714..be0fe4dcb3 100644 --- a/src/routes/console/onboarding/+page.svelte +++ b/src/routes/console/onboarding/+page.svelte @@ -9,7 +9,7 @@ import FormList from '$lib/elements/forms/formList.svelte'; import { Container } from '$lib/layout'; import { addNotification } from '$lib/stores/notifications'; - import { sdk, sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { ID } from '@aw-labs/appwrite-console'; let name: string; @@ -21,7 +21,7 @@ try { loading = true; const org = await createOrganization(); - const project = await sdkForConsole.projects.create( + const project = await sdk.forConsole.projects.create( id ?? ID.unique(), name, org.$id, @@ -44,7 +44,7 @@ } async function createOrganization() { - return await sdkForConsole.teams.create(ID.unique(), 'Personal Projects'); + return await sdk.forConsole.teams.create(ID.unique(), 'Personal Projects'); } diff --git a/src/routes/console/organization-[organization]/+layout.ts b/src/routes/console/organization-[organization]/+layout.ts index a4ea6fa421..7d0fbf6471 100644 --- a/src/routes/console/organization-[organization]/+layout.ts +++ b/src/routes/console/organization-[organization]/+layout.ts @@ -1,6 +1,6 @@ import Header from './header.svelte'; import Breadcrumbs from './breadcrumbs.svelte'; -import { sdk, 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'; @@ -12,8 +12,8 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => { 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 fc08ffaeb2..d7cbd284d2 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 { sdk, 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 a3bbec3ce6..0359d2bcc2 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 { sdk, 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'], diff --git a/src/routes/console/organization-[organization]/createProject.svelte b/src/routes/console/organization-[organization]/createProject.svelte index 58b53eded6..7314cb4308 100644 --- a/src/routes/console/organization-[organization]/createProject.svelte +++ b/src/routes/console/organization-[organization]/createProject.svelte @@ -5,7 +5,7 @@ import { Pill } from '$lib/elements'; import { InputText, Button, FormList } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdk, sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { ID } from '@aw-labs/appwrite-console'; import { createEventDispatcher } from 'svelte'; @@ -23,7 +23,7 @@ async function create() { try { isCreating = true; - const project = await sdkForConsole.projects.create( + const project = await sdk.forConsole.projects.create( id ?? ID.unique(), name, teamId, diff --git a/src/routes/console/organization-[organization]/deleteMember.svelte b/src/routes/console/organization-[organization]/deleteMember.svelte index 86813b12bf..fb596d656a 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 { sdk, 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'); diff --git a/src/routes/console/organization-[organization]/deleteOrganization.svelte b/src/routes/console/organization-[organization]/deleteOrganization.svelte index 81b7638a80..62bc28d631 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 { sdk, 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` diff --git a/src/routes/console/organization-[organization]/members/[[page]]/+page.svelte b/src/routes/console/organization-[organization]/members/[[page]]/+page.svelte index 231a553fc6..da3f38381a 100644 --- a/src/routes/console/organization-[organization]/members/[[page]]/+page.svelte +++ b/src/routes/console/organization-[organization]/members/[[page]]/+page.svelte @@ -13,7 +13,7 @@ import { Button } from '$lib/elements/forms'; import { Container } from '$lib/layout'; import { organization, members, newMemberModal } from '$lib/stores/organization'; - import { sdk, sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { page } from '$app/stores'; import { addNotification } from '$lib/stores/notifications'; import { invalidate } from '$app/navigation'; @@ -32,7 +32,7 @@ const deleted = () => invalidate(Dependencies.ACCOUNT); const resend = async (member: Models.Membership) => { try { - await sdkForConsole.teams.createMembership( + await sdk.forConsole.teams.createMembership( $organization.$id, member.userEmail, member.roles, diff --git a/src/routes/console/organization-[organization]/members/[[page]]/+page.ts b/src/routes/console/organization-[organization]/members/[[page]]/+page.ts index d611210d72..1fccd64693 100644 --- a/src/routes/console/organization-[organization]/members/[[page]]/+page.ts +++ b/src/routes/console/organization-[organization]/members/[[page]]/+page.ts @@ -1,6 +1,6 @@ import { PAGE_LIMIT } from '$lib/constants'; import { pageToOffset } from '$lib/helpers/load'; -import { sdk, sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { Query } from '@aw-labs/appwrite-console'; import type { PageLoad } from './$types'; @@ -10,7 +10,7 @@ export const load: PageLoad = async ({ params, parent }) => { return { offset, - organizationMembers: await sdkForConsole.teams.listMemberships(params.organization, [ + organizationMembers: await sdk.forConsole.teams.listMemberships(params.organization, [ Query.limit(PAGE_LIMIT), Query.offset(offset) ]) diff --git a/src/routes/console/organization-[organization]/settings/+page.svelte b/src/routes/console/organization-[organization]/settings/+page.svelte index ff8f54e849..5863ddeb0d 100644 --- a/src/routes/console/organization-[organization]/settings/+page.svelte +++ b/src/routes/console/organization-[organization]/settings/+page.svelte @@ -3,7 +3,7 @@ import { InputText, Form, Button } from '$lib/elements/forms'; import { Container } from '$lib/layout'; import { addNotification } from '$lib/stores/notifications'; - import { sdk, sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { members, organization } from '$lib/stores/organization'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; @@ -20,7 +20,7 @@ async function updateName() { try { - await sdkForConsole.teams.update($organization.$id, name); + await sdk.forConsole.teams.update($organization.$id, name); await invalidate(Dependencies.ORGANIZATION); addNotification({ message: 'Name has been updated', diff --git a/src/routes/console/project-[project]/+layout.svelte b/src/routes/console/project-[project]/+layout.svelte index b8c9f66fa0..eb28166959 100644 --- a/src/routes/console/project-[project]/+layout.svelte +++ b/src/routes/console/project-[project]/+layout.svelte @@ -1,13 +1,13 @@ {#if $uploader?.isOpen} diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts index 8ed0b46965..78429a0c42 100644 --- a/src/lib/stores/sdk.ts +++ b/src/lib/stores/sdk.ts @@ -19,30 +19,21 @@ const endpoint = VARS.APPWRITE_ENDPOINT ?? `${globalThis?.location?.origin}/v1`; const clientConsole = new Client(); clientConsole.setEndpoint(endpoint).setProject('console'); -export function sdkForProject() { - const clientProject = new Client(); - clientProject.setEndpoint(endpoint).setMode('admin'); - - const pathname = window.location.pathname; - const projectMatch = pathname.match(/project-([a-zA-Z0-9]+)/); - if (projectMatch) { - clientProject.setProject(projectMatch[1]); - } - - return { - client: clientProject, - account: new Account(clientProject), - avatars: new Avatars(clientProject), - databases: new Databases(clientProject), - functions: new Functions(clientProject), - health: new Health(clientProject), - locale: new Locale(clientProject), - project: new Project(clientProject), - storage: new Storage(clientProject), - teams: new Teams(clientProject), - users: new Users(clientProject) - }; -} +const clientProject = new Client(); +clientProject.setEndpoint(endpoint).setMode('admin'); +const sdkForProject = { + client: clientProject, + account: new Account(clientProject), + avatars: new Avatars(clientProject), + databases: new Databases(clientProject), + functions: new Functions(clientProject), + health: new Health(clientProject), + locale: new Locale(clientProject), + project: new Project(clientProject), + storage: new Storage(clientProject), + teams: new Teams(clientProject), + users: new Users(clientProject) +}; export const sdk = { forConsole: { @@ -57,27 +48,12 @@ export const sdk = { users: new Users(clientConsole) }, get forProject() { - const clientProject = new Client(); - clientProject.setEndpoint(endpoint).setMode('admin'); - const pathname = window.location.pathname; const projectMatch = pathname.match(/project-([a-zA-Z0-9]+)/); - if (projectMatch) { + if (projectMatch && projectMatch[1] !== clientProject.config.project) { clientProject.setProject(projectMatch[1]); } - return { - client: clientProject, - account: new Account(clientProject), - avatars: new Avatars(clientProject), - databases: new Databases(clientProject), - functions: new Functions(clientProject), - health: new Health(clientProject), - locale: new Locale(clientProject), - project: new Project(clientProject), - storage: new Storage(clientProject), - teams: new Teams(clientProject), - users: new Users(clientProject) - }; + return sdkForProject; } }; diff --git a/src/lib/stores/uploader.ts b/src/lib/stores/uploader.ts index 95c5389e7f..ece61c0b7d 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/console/project-[project]/auth/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/[[page]]/+page.ts index 145ac31b69..24b536ce05 100644 --- a/src/routes/console/project-[project]/auth/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/auth/[[page]]/+page.ts @@ -1,5 +1,5 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdk, 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'; @@ -13,7 +13,7 @@ export const load: PageLoad = async ({ params, parent, url }) => { offset, search, page, - users: await sdkForProject().users.list( + users: await sdk.forProject.users.list( [Query.limit(PAGE_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt')], search ) diff --git a/src/routes/console/project-[project]/auth/createTeam.svelte b/src/routes/console/project-[project]/auth/createTeam.svelte index b7feb9f303..7e94055461 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 { sdk, 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; diff --git a/src/routes/console/project-[project]/auth/createUser.svelte b/src/routes/console/project-[project]/auth/createUser.svelte index 54f9bdc5c5..26fde00677 100644 --- a/src/routes/console/project-[project]/auth/createUser.svelte +++ b/src/routes/console/project-[project]/auth/createUser.svelte @@ -11,7 +11,7 @@ FormList } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdk, sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { ID } from '@aw-labs/appwrite-console'; import { createEventDispatcher } from 'svelte'; @@ -25,7 +25,7 @@ const create = async () => { try { - const user = await sdkForProject().users.create( + const user = await sdk.forProject.users.create( id ?? ID.unique(), mail, phone, 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 f46745f06f..afe5e385d9 100644 --- a/src/routes/console/project-[project]/auth/teams/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/auth/teams/[[page]]/+page.ts @@ -1,5 +1,5 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdk, 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'; @@ -13,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 42b7a5c43c..bc2f0c5ee3 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,6 +1,6 @@ import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; -import { sdk, 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'; @@ -11,7 +11,7 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => { 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 b84cc0aa43..1b3f71eb3b 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 { sdk, 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', 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 4eda8a92fa..dce42c4a44 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,5 +1,5 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdk, 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'; @@ -10,7 +10,7 @@ export const load: PageLoad = async ({ params, parent }) => { 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 3be371135e..417f5a1f45 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 { sdk, 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, diff --git a/src/routes/console/project-[project]/auth/teams/team-[team]/deleteMembership.svelte b/src/routes/console/project-[project]/auth/teams/team-[team]/deleteMembership.svelte index 7f1224fa6d..8a1823979c 100644 --- a/src/routes/console/project-[project]/auth/teams/team-[team]/deleteMembership.svelte +++ b/src/routes/console/project-[project]/auth/teams/team-[team]/deleteMembership.svelte @@ -6,7 +6,7 @@ import { Modal } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdk, sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import type { Models } from '@aw-labs/appwrite-console'; import { createEventDispatcher } from 'svelte'; @@ -17,7 +17,7 @@ const deleteMembership = async () => { try { - await sdkForProject().teams.deleteMembership( + await sdk.forProject.teams.deleteMembership( selectedMembership.teamId, selectedMembership.$id ); 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 1e5d0a1b65..e41e96d07f 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 { sdk, 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`); 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 44e7fee36d..9c36c458bc 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,5 +1,5 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdk, 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'; @@ -14,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 03bce866ba..6ebeaaab35 100644 --- a/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts +++ b/src/routes/console/project-[project]/auth/usage/[[period]]/+page.ts @@ -1,10 +1,10 @@ import type { Models } from '@aw-labs/appwrite-console'; -import { sdk, sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { 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 54fb8183af..a7a135a2fd 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/+layout.ts +++ b/src/routes/console/project-[project]/auth/user-[user]/+layout.ts @@ -1,7 +1,7 @@ import type { LayoutLoad } from './$types'; import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; -import { sdk, sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { Dependencies } from '$lib/constants'; import { error } from '@sveltejs/kit'; @@ -12,7 +12,7 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => { 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 24f69907f0..e9724b06a6 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,5 +1,5 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdk, 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'; @@ -10,7 +10,7 @@ export const load: PageLoad = async ({ params, parent }) => { 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 1446253fe5..889f888f47 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 { sdk, 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({ 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 7b29ca9a30..f10addedc9 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 { sdk, 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 ); 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 09ad05f7b1..791e95aa38 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 { sdk, 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', 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 f406fa83f3..f86b9d0fc6 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 { sdk, 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', 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 ff402fd8ac..34fc693aca 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,8 +1,8 @@ -import { sdk, sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent }) => { 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 5b56eae294..b032bb51c3 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 { sdk, 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'; @@ -24,7 +24,7 @@ let selectedSessionId: string; const getBrowser = (clientCode: string) => - sdkForProject().avatars.getBrowser(clientCode, 40, 40); + 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 1764043f76..95aede5a46 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,10 +1,10 @@ import { Dependencies } from '$lib/constants'; -import { sdk, sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ params, parent, depends }) => { depends(Dependencies.SESSIONS); 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 26e3a9f314..aa3f99e561 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 { sdk, 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', 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 5612f47c7e..66f2f64768 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 { sdk, 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', 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 424da49b31..7b7c7943b7 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 { sdk, 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', 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 12ecd3939f..e468b3911e 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 { sdk, 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', 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 d76231916b..7ff5907f83 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 { sdk, 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; 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 3a0251b828..68a6cae22f 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 { sdk, sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { user } from './store'; let showVerifcationDropdown = false; @@ -15,10 +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 ${ @@ -38,10 +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 ${ @@ -60,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/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/[[page]]/+page.ts index 12e48402c0..f8d1e2352b 100644 --- a/src/routes/console/project-[project]/databases/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/[[page]]/+page.ts @@ -1,6 +1,6 @@ import { CARD_LIMIT } from '$lib/constants'; import { pageToOffset } from '$lib/helpers/load'; -import { sdk, sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { Query } from '@aw-labs/appwrite-console'; import type { PageLoad } from './$types'; @@ -10,7 +10,7 @@ export const load: PageLoad = async ({ params }) => { 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 e39563f230..7094f2d910 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 { sdk, 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({ diff --git a/src/routes/console/project-[project]/databases/database-[database]/+layout.ts b/src/routes/console/project-[project]/databases/database-[database]/+layout.ts index fb0c3f3595..a8453793c5 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/+layout.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/+layout.ts @@ -1,4 +1,4 @@ -import { sdk, 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'; @@ -12,7 +12,7 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => { 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 b0a07cef28..a66deed97c 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,5 +1,5 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdk, 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'; @@ -10,7 +10,7 @@ export const load: PageLoad = async ({ params, parent }) => { 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.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts index 6a5e5f2fc2..2e13c0e012 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.ts @@ -1,4 +1,4 @@ -import { sdk, 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 }) => { return { header: Header, breadcrumbs: Breadcrumbs, - collection: await sdkForProject().databases.getCollection( + collection: await sdk.forProject.databases.getCollection( params.database, params.collection ) diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.ts index f615fc96af..d8e454aaf3 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.ts @@ -1,6 +1,6 @@ import { Dependencies, PAGE_LIMIT } from '$lib/constants'; import { pageToOffset } from '$lib/helpers/load'; -import { sdk, sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { Query } from '@aw-labs/appwrite-console'; import type { PageLoad } from './$types'; @@ -11,7 +11,7 @@ export const load: PageLoad = async ({ params, depends }) => { return { offset, - documents: await sdkForProject().databases.listDocuments( + documents: await sdk.forProject.databases.listDocuments( params.database, params.collection, [Query.limit(PAGE_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt')] diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/[[page]]/+page.ts index 1f0d3c7b62..ba566d504a 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/activity/[[page]]/+page.ts @@ -1,5 +1,5 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdk, 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'; @@ -10,7 +10,7 @@ export const load: PageLoad = async ({ params, parent }) => { return { offset, - logs: await sdkForProject().databases.listCollectionLogs( + logs: await sdk.forProject.databases.listCollectionLogs( params.database, params.collection, [Query.limit(PAGE_LIMIT), Query.offset(offset)] diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte index 2e918934c9..a9e9cae914 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/boolean.svelte @@ -1,6 +1,6 @@ + - -
+ From c21085f67db3cecbfdf319e144806d3db694a92a Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 10 Mar 2023 03:10:16 +0530 Subject: [PATCH 12/40] feat: implement smart forms everywhere --- src/lib/components/eventModal.svelte | 2 +- src/lib/components/feedbackGeneral.svelte | 2 +- src/lib/components/feedbackNPS.svelte | 2 +- src/lib/components/modal.svelte | 9 ++++++--- src/lib/components/permissions/custom.svelte | 2 +- src/lib/components/permissions/team.svelte | 2 +- src/lib/components/permissions/user.svelte | 2 +- src/lib/layout/wizard.svelte | 2 +- src/lib/layout/wizardExitModal.svelte | 2 +- src/routes/console/account/+page.svelte | 8 ++++---- src/routes/console/account/delete.svelte | 2 +- src/routes/console/createOrganization.svelte | 2 +- src/routes/console/onboarding/+page.svelte | 2 +- .../createMember.svelte | 2 +- .../createProject.svelte | 2 +- .../deleteMember.svelte | 2 +- .../deleteOrganization.svelte | 2 +- .../settings/+page.svelte | 2 +- .../project-[project]/auth/appleOAuth.svelte | 2 +- .../project-[project]/auth/auth0OAuth.svelte | 2 +- .../project-[project]/auth/authentikOAuth.svelte | 2 +- .../project-[project]/auth/createTeam.svelte | 2 +- .../project-[project]/auth/createUser.svelte | 2 +- .../project-[project]/auth/gitlabOAuth.svelte | 2 +- .../project-[project]/auth/mainOAuth.svelte | 2 +- .../project-[project]/auth/microsoftOAuth.svelte | 2 +- .../project-[project]/auth/oktaOAuth.svelte | 2 +- .../auth/security/updateSessionsLimit.svelte | 2 +- .../auth/teams/team-[team]/+page.svelte | 2 +- .../auth/teams/team-[team]/createMembership.svelte | 2 +- .../auth/teams/team-[team]/deleteMembership.svelte | 2 +- .../auth/teams/team-[team]/deleteTeam.svelte | 2 +- .../auth/user-[user]/deleteAllSessions.svelte | 2 +- .../auth/user-[user]/deleteMembership.svelte | 2 +- .../auth/user-[user]/deleteSession.svelte | 2 +- .../auth/user-[user]/deleteUser.svelte | 2 +- .../auth/user-[user]/updateEmail.svelte | 2 +- .../auth/user-[user]/updateName.svelte | 2 +- .../auth/user-[user]/updatePassword.svelte | 2 +- .../auth/user-[user]/updatePhone.svelte | 2 +- .../auth/user-[user]/updatePrefs.svelte | 2 +- .../project-[project]/databases/create.svelte | 2 +- .../attributes/deleteAttribute.svelte | 2 +- .../collection-[collection]/createAttribute.svelte | 2 +- .../document-[document]/delete.svelte | 2 +- .../indexes/createIndex.svelte | 2 +- .../indexes/deleteIndex.svelte | 2 +- .../settings/deleteCollection.svelte | 2 +- .../settings/updateName.svelte | 2 +- .../databases/database-[database]/create.svelte | 2 +- .../databases/database-[database]/delete.svelte | 2 +- .../functions/createVariable.svelte | 2 +- .../functions/function-[function]/activate.svelte | 2 +- .../functions/function-[function]/create.svelte | 2 +- .../functions/function-[function]/delete.svelte | 2 +- .../functions/function-[function]/execute.svelte | 2 +- .../function-[function]/settings/+page.svelte | 8 ++++---- .../function-[function]/settings/delete.svelte | 2 +- .../settings/updateEvents.svelte | 2 +- .../settings/uploadVariables.svelte | 2 +- .../keys/[key]/+page@project-[project].svelte | 4 ++-- .../overview/keys/[key]/delete.svelte | 2 +- .../keys/[key]/updateExpirationDate.svelte | 2 +- .../[platform]/+page@project-[project].svelte | 2 +- .../overview/platforms/[platform]/android.svelte | 2 +- .../overview/platforms/[platform]/appleIOS.svelte | 2 +- .../platforms/[platform]/appleMacOS.svelte | 2 +- .../overview/platforms/[platform]/appleTvOS.svelte | 2 +- .../platforms/[platform]/appleWatchOS.svelte | 2 +- .../overview/platforms/[platform]/delete.svelte | 2 +- .../platforms/[platform]/flutterAndroid.svelte | 2 +- .../platforms/[platform]/flutterIOS.svelte | 2 +- .../platforms/[platform]/flutterLinux.svelte | 2 +- .../platforms/[platform]/flutterMacOS.svelte | 2 +- .../platforms/[platform]/flutterWindows.svelte | 2 +- .../overview/platforms/[platform]/web.svelte | 2 +- .../project-[project]/settings/+page.svelte | 2 +- .../settings/deleteProject.svelte | 2 +- .../settings/domains/delete.svelte | 2 +- .../settings/webhooks/[webhook]/delete.svelte | 2 +- .../settings/webhooks/[webhook]/regenerate.svelte | 2 +- .../webhooks/[webhook]/updateEvents.svelte | 2 +- .../settings/webhooks/[webhook]/updateName.svelte | 2 +- .../webhooks/[webhook]/updateSecurity.svelte | 2 +- .../settings/webhooks/[webhook]/updateURL.svelte | 2 +- .../storage/bucket-[bucket]/create.svelte | 2 +- .../storage/bucket-[bucket]/deleteBucket.svelte | 2 +- .../storage/bucket-[bucket]/deleteFile.svelte | 2 +- .../bucket-[bucket]/file-[file]/deleteFile.svelte | 2 +- .../storage/bucket-[bucket]/settings/+page.svelte | 14 +++++++------- .../settings/updateMaxFileSize.svelte | 2 +- .../project-[project]/storage/create.svelte | 2 +- src/routes/invite/+page.svelte | 2 +- src/routes/login/+page.svelte | 2 +- src/routes/recover/+page.svelte | 4 ++-- src/routes/register/+page.svelte | 2 +- src/routes/register/invite/[slug]/+page.svelte | 2 +- 97 files changed, 116 insertions(+), 113 deletions(-) diff --git a/src/lib/components/eventModal.svelte b/src/lib/components/eventModal.svelte index 7d728dcdbb..b7a00370ab 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 fc380d0b10..aa9bdc42fd 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 8e38955ab2..7f70c5842a 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 aecd660684..19fed216dd 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 diff --git a/src/lib/components/permissions/team.svelte b/src/lib/components/permissions/team.svelte index d8d636401b..c9e36f2693 100644 --- a/src/lib/components/permissions/team.svelte +++ b/src/lib/components/permissions/team.svelte @@ -58,7 +58,7 @@ } - + Select teams

Grant access to any member of a specific team. To grant access to team members with specific diff --git a/src/lib/components/permissions/user.svelte b/src/lib/components/permissions/user.svelte index d5468b47d9..b6d5fd9f9e 100644 --- a/src/lib/components/permissions/user.svelte +++ b/src/lib/components/permissions/user.svelte @@ -58,7 +58,7 @@ } - + Select users

Grant access to any authenticated or anonymous user.

-
+ {#each sortedSteps as [step, { component }]} {#if currentStep === step} diff --git a/src/lib/layout/wizardExitModal.svelte b/src/lib/layout/wizardExitModal.svelte index 8f29e59d94..6019a58985 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/routes/console/account/+page.svelte b/src/routes/console/account/+page.svelte index b94dc86cc8..6b6626efa3 100644 --- a/src/routes/console/account/+page.svelte +++ b/src/routes/console/account/+page.svelte @@ -27,7 +27,7 @@ async function updateName() { try { await sdkForConsole.account.updateName(name); - invalidate(Dependencies.ACCOUNT); + await invalidate(Dependencies.ACCOUNT); addNotification({ message: 'Name has been updated', type: 'success' @@ -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/delete.svelte b/src/routes/console/account/delete.svelte index cf981d4e94..0395f969d5 100644 --- a/src/routes/console/account/delete.svelte +++ b/src/routes/console/account/delete.svelte @@ -29,7 +29,7 @@ }; - + Delete Account

Are you sure you want to delete your account?

diff --git a/src/routes/console/createOrganization.svelte b/src/routes/console/createOrganization.svelte index 6fc75f52b3..4dd3225537 100644 --- a/src/routes/console/createOrganization.svelte +++ b/src/routes/console/createOrganization.svelte @@ -42,7 +42,7 @@ }; - + Create New Organization - + - + Invite Member - + Create Project - + {isUser ? 'Leave Organization' : 'Delete Member'} diff --git a/src/routes/console/organization-[organization]/deleteOrganization.svelte b/src/routes/console/organization-[organization]/deleteOrganization.svelte index a6dc3f0209..c9d1d33607 100644 --- a/src/routes/console/organization-[organization]/deleteOrganization.svelte +++ b/src/routes/console/organization-[organization]/deleteOrganization.svelte @@ -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]/settings/+page.svelte b/src/routes/console/organization-[organization]/settings/+page.svelte index 0af80131b1..0bf76f7c76 100644 --- a/src/routes/console/organization-[organization]/settings/+page.svelte +++ b/src/routes/console/organization-[organization]/settings/+page.svelte @@ -41,7 +41,7 @@ {#if $organization} - + Update Name diff --git a/src/routes/console/project-[project]/auth/appleOAuth.svelte b/src/routes/console/project-[project]/auth/appleOAuth.svelte index d741025ccb..cec9ca497f 100644 --- a/src/routes/console/project-[project]/auth/appleOAuth.svelte +++ b/src/routes/console/project-[project]/auth/appleOAuth.svelte @@ -57,7 +57,7 @@ $: secret = keyID && teamID && p8 ? JSON.stringify({ keyID, teamID, p8 }) : provider.secret; - + {provider.name} OAuth2 Settings

diff --git a/src/routes/console/project-[project]/auth/auth0OAuth.svelte b/src/routes/console/project-[project]/auth/auth0OAuth.svelte index a8a190cdad..43a2eb6f77 100644 --- a/src/routes/console/project-[project]/auth/auth0OAuth.svelte +++ b/src/routes/console/project-[project]/auth/auth0OAuth.svelte @@ -58,7 +58,7 @@ : provider.secret; - + {provider.name} OAuth2 Settings

diff --git a/src/routes/console/project-[project]/auth/authentikOAuth.svelte b/src/routes/console/project-[project]/auth/authentikOAuth.svelte index fa6929b101..32c2cce200 100644 --- a/src/routes/console/project-[project]/auth/authentikOAuth.svelte +++ b/src/routes/console/project-[project]/auth/authentikOAuth.svelte @@ -58,7 +58,7 @@ : provider.secret; - + {provider.name} OAuth2 Settings

diff --git a/src/routes/console/project-[project]/auth/createTeam.svelte b/src/routes/console/project-[project]/auth/createTeam.svelte index 73a109d139..060dc3d6e4 100644 --- a/src/routes/console/project-[project]/auth/createTeam.svelte +++ b/src/routes/console/project-[project]/auth/createTeam.svelte @@ -41,7 +41,7 @@ } - + Create Team - + Create User - + {provider.name} OAuth2 Settings

diff --git a/src/routes/console/project-[project]/auth/mainOAuth.svelte b/src/routes/console/project-[project]/auth/mainOAuth.svelte index 12b84ca977..361e7bc31d 100644 --- a/src/routes/console/project-[project]/auth/mainOAuth.svelte +++ b/src/routes/console/project-[project]/auth/mainOAuth.svelte @@ -54,7 +54,7 @@ }; - + {provider.name} OAuth2 Settings

diff --git a/src/routes/console/project-[project]/auth/microsoftOAuth.svelte b/src/routes/console/project-[project]/auth/microsoftOAuth.svelte index 41dc6f1b2f..6e07380585 100644 --- a/src/routes/console/project-[project]/auth/microsoftOAuth.svelte +++ b/src/routes/console/project-[project]/auth/microsoftOAuth.svelte @@ -57,7 +57,7 @@ clientSecret && tenantID ? JSON.stringify({ clientSecret, tenantID }) : provider.secret; - + {provider.name} OAuth2 Settings

diff --git a/src/routes/console/project-[project]/auth/oktaOAuth.svelte b/src/routes/console/project-[project]/auth/oktaOAuth.svelte index 39e3a3c04f..9e1be017fa 100644 --- a/src/routes/console/project-[project]/auth/oktaOAuth.svelte +++ b/src/routes/console/project-[project]/auth/oktaOAuth.svelte @@ -62,7 +62,7 @@ : provider.secret; - + {provider.name} OAuth2 Settings

diff --git a/src/routes/console/project-[project]/auth/security/updateSessionsLimit.svelte b/src/routes/console/project-[project]/auth/security/updateSessionsLimit.svelte index 46e8e3f3d5..9593570430 100644 --- a/src/routes/console/project-[project]/auth/security/updateSessionsLimit.svelte +++ b/src/routes/console/project-[project]/auth/security/updateSessionsLimit.svelte @@ -29,7 +29,7 @@ } - + Sessions Limit

Maximum number of active sessions allowed per user.

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 10dd00347e..566bffc05c 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 @@ -55,7 +55,7 @@ - + Update Name 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 d7b50dfb17..583fd57e1f 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 @@ -42,7 +42,7 @@ }; - + Create Membership - + 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 95b6ad3188..4769675875 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 @@ -28,7 +28,7 @@ }; - + Delete Team

Are you sure you want to delete {team.name}? 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 aa6e4b5b3a..dae55e7d00 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/deleteAllSessions.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteAllSessions.svelte @@ -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 5df57af76e..d0eb1b8897 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteMembership.svelte @@ -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 72b97f33c0..5e157257c2 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/deleteSession.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteSession.svelte @@ -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 c18f0d2202..29d7baabb8 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/deleteUser.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/deleteUser.svelte @@ -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]/updateEmail.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte index 893d7f726f..654da9ad82 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte @@ -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 2767d30273..4211a23c97 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte @@ -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 9a21b40da9..5a4aad6575 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte @@ -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 de0cb95840..d59740972c 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte @@ -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 5b2bd623c4..1e308507da 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte @@ -54,7 +54,7 @@ } - + User Preferences

diff --git a/src/routes/console/project-[project]/databases/create.svelte b/src/routes/console/project-[project]/databases/create.svelte index 237ed836a3..80c4db6445 100644 --- a/src/routes/console/project-[project]/databases/create.svelte +++ b/src/routes/console/project-[project]/databases/create.svelte @@ -39,7 +39,7 @@ }; - + Create Database - + 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]/createAttribute.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte index 197ade1ffe..6b7d0039cb 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/createAttribute.svelte @@ -62,7 +62,7 @@ } - + Create Attribute

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 692265075e..84a4dede01 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 @@ -39,7 +39,7 @@ }; - + Delete Document

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 604f85a586..4c4d7ede64 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 @@ -101,7 +101,7 @@ } - + Create Index 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 a8c97dd1d2..1cb8fbcc6d 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 @@ -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 bdd85c1f99..fed6e6f311 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 @@ -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 24ccc11996..e54293597a 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 @@ -44,7 +44,7 @@ } - + Update Name 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 32c4bfa2ca..a15dcd145d 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/create.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/create.svelte @@ -46,7 +46,7 @@ }; - + Create Collection - + Delete Database

Are you sure you want to delete {$database.name}? diff --git a/src/routes/console/project-[project]/functions/createVariable.svelte b/src/routes/console/project-[project]/functions/createVariable.svelte index bbedb5fbc0..5287955b8f 100644 --- a/src/routes/console/project-[project]/functions/createVariable.svelte +++ b/src/routes/console/project-[project]/functions/createVariable.svelte @@ -31,7 +31,7 @@ } - + {selectedVar ? 'Update' : 'Create'} Variable 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 8a20db8342..136d7a473e 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/activate.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/activate.svelte @@ -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 19dbe82fde..1290f3a16f 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/create.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/create.svelte @@ -133,7 +133,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 eb0a3f757c..b31cd5c3eb 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/delete.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/delete.svelte @@ -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 bccdbdd5f4..cf20c83f5b 100644 --- a/src/routes/console/project-[project]/functions/function-[function]/execute.svelte +++ b/src/routes/console/project-[project]/functions/function-[function]/execute.svelte @@ -63,7 +63,7 @@ afterNavigate(close); - + Execute Function 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 6d33d6d857..1cd71a9a7d 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 @@ -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/delete.svelte b/src/routes/console/project-[project]/functions/function-[function]/settings/delete.svelte index 9771c45929..b972727999 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 @@ -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 8e325d0852..3817c833fd 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 @@ -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 5c61222359..bf116703f6 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 @@ -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]/overview/keys/[key]/+page@project-[project].svelte b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte index f790646328..e1c3220374 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 @@ -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 c85542144f..db36c2ecb3 100644 --- a/src/routes/console/project-[project]/overview/keys/[key]/delete.svelte +++ b/src/routes/console/project-[project]/overview/keys/[key]/delete.svelte @@ -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 427da9b0c9..376ada2a43 100644 --- a/src/routes/console/project-[project]/overview/keys/[key]/updateExpirationDate.svelte +++ b/src/routes/console/project-[project]/overview/keys/[key]/updateExpirationDate.svelte @@ -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/platforms/[platform]/+page@project-[project].svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte index a4fb03c7d9..0bcf53dcd5 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 @@ -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 17a744d99e..207940e058 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte @@ -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 b2a963913b..1c2d982d9e 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte @@ -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 0c860ad949..a53dd7d92a 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte @@ -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 7d1f768f46..f4707d62c8 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte @@ -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 32bc6ea1b5..e8424ed462 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte @@ -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 e467b36800..8966eee16b 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte @@ -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 1cd14eca59..5a33b9f0fa 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte @@ -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 3b82d6e035..2a01c520df 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte @@ -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 6ee2967891..3387418aa2 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte @@ -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 9cdeb2ce92..c449148d1d 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte @@ -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 975130b62e..0a09a22ff1 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte @@ -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 43546c5ebc..7b62656c35 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte @@ -39,7 +39,7 @@ }; - + Update Hostname

You can use * to allow wildcard hostnames or subdomains.

diff --git a/src/routes/console/project-[project]/settings/+page.svelte b/src/routes/console/project-[project]/settings/+page.svelte index 21fc98f7aa..d260fba678 100644 --- a/src/routes/console/project-[project]/settings/+page.svelte +++ b/src/routes/console/project-[project]/settings/+page.svelte @@ -82,7 +82,7 @@ {#if $project} - + API Credentials

Access Appwrite services using your API Endpoint and Project ID.

diff --git a/src/routes/console/project-[project]/settings/deleteProject.svelte b/src/routes/console/project-[project]/settings/deleteProject.svelte index 8d8c311b89..dcb5831399 100644 --- a/src/routes/console/project-[project]/settings/deleteProject.svelte +++ b/src/routes/console/project-[project]/settings/deleteProject.svelte @@ -33,7 +33,7 @@ }; - + 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/delete.svelte b/src/routes/console/project-[project]/settings/domains/delete.svelte index 8bf7d436dc..059eb52710 100644 --- a/src/routes/console/project-[project]/settings/domains/delete.svelte +++ b/src/routes/console/project-[project]/settings/domains/delete.svelte @@ -32,7 +32,7 @@ }; - + Delete Domain {#if selectedDomain}

diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/delete.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/delete.svelte index de503a24dd..25898525b8 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/delete.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/delete.svelte @@ -33,7 +33,7 @@ } - + 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 6d350f0acc..e49b4f8fae 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/regenerate.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/regenerate.svelte @@ -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 44aaa1a445..d19af0f34e 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte @@ -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 89439f8e93..542683663d 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte @@ -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 8fc343a535..818b35e79c 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte @@ -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 4ac8a8fb67..bbc9636699 100644 --- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte +++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte @@ -45,7 +45,7 @@ } - + Update Url diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/create.svelte index 5bdc48bf38..84552b5de0 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/create.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/create.svelte @@ -48,7 +48,7 @@ } - + 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 6f5e8dd4b4..7c9d1eb78b 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteBucket.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteBucket.svelte @@ -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 8f06a2ba2e..157f824660 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteFile.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/deleteFile.svelte @@ -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]/deleteFile.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/deleteFile.svelte index 0d349b4100..fef38859de 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 @@ -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 5cc6174a63..4890e6148e 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 @@ -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 4e63471863..0877b85b2a 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,7 +22,7 @@ } - + Update Maximum File Size

Set the maximum file size allowed in the bucket.

diff --git a/src/routes/console/project-[project]/storage/create.svelte b/src/routes/console/project-[project]/storage/create.svelte index 586b90e2c8..046e33ee17 100644 --- a/src/routes/console/project-[project]/storage/create.svelte +++ b/src/routes/console/project-[project]/storage/create.svelte @@ -45,7 +45,7 @@ } - + Create Bucket {:else}

You have been invited to join a team project on Appwrite

- + Sign in - + Password Recovery {#if userId && secret} - + {:else} -
+ Sign up - + {title} - + Date: Fri, 10 Mar 2023 03:28:51 +0530 Subject: [PATCH 13/40] tests: fix tests --- src/lib/elements/forms/button.svelte | 12 +++++++----- src/lib/helpers/promises.ts | 3 +++ tests/unit/layout/wizard.test.ts | 15 ++++++++------- 3 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 src/lib/helpers/promises.ts diff --git a/src/lib/elements/forms/button.svelte b/src/lib/elements/forms/button.svelte index c6a07f40f7..1e01950c57 100644 --- a/src/lib/elements/forms/button.svelte +++ b/src/lib/elements/forms/button.svelte @@ -1,6 +1,6 @@ @@ -69,7 +43,6 @@ Name Email - Role @@ -87,17 +60,6 @@
{member.userEmail} - - {#if member.invited && !member.joined} - - {:else} - {member.roles} - {/if} - - + {/if} +
From e108b9ac1bc1e8345aa3c436d962a91e9cbf59df Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Wed, 15 Mar 2023 20:34:15 +0000 Subject: [PATCH 26/40] refactor: make table sticky scroll only when overflowing --- src/lib/elements/table/tableScroll.svelte | 24 +++++++++++++++++-- src/lib/layout/shell.svelte | 5 ++++ .../[[page]]/+page.svelte | 2 +- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/lib/elements/table/tableScroll.svelte b/src/lib/elements/table/tableScroll.svelte index d2dd9c53e1..814fe00e51 100644 --- a/src/lib/elements/table/tableScroll.svelte +++ b/src/lib/elements/table/tableScroll.svelte @@ -1,10 +1,30 @@
-
- +
(isOverflowing = v)}> +
diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte index aad0da6e01..a0c5899708 100644 --- a/src/lib/layout/shell.svelte +++ b/src/lib/layout/shell.svelte @@ -81,9 +81,14 @@ .main-side { z-index: 25; } + @media (max-width: 550.99px), (min-width: 551px) and (max-width: 1198.99px) { .main-side { top: 4.5rem; } } + + .main-content { + overflow: hidden; + } diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.svelte index 14e3aa5c32..3fe33f0bd5 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/[[page]]/+page.svelte @@ -91,7 +91,7 @@ {#if data.documents.total} - Document ID + Document ID {#each columns as column} {column.title} {/each} From 3c4e4955c14a0c6bb6e4d52c038a09dd46c55483 Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 17 Mar 2023 12:05:34 +0100 Subject: [PATCH 27/40] fix: wrong heading max file size --- .../storage/bucket-[bucket]/settings/updateMaxFileSize.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4e63471863..d87a22cf73 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 @@ -24,7 +24,7 @@ - Update Maximum File Size + Update Maximum File Size

Set the maximum file size allowed in the bucket.