diff --git a/src/lib/components/avatarInitials.svelte b/src/lib/components/avatarInitials.svelte index 1ce7ecfc6..025dd998c 100644 --- a/src/lib/components/avatarInitials.svelte +++ b/src/lib/components/avatarInitials.svelte @@ -1,11 +1,11 @@ diff --git a/src/lib/components/permissions/row.svelte b/src/lib/components/permissions/row.svelte index e4d369af2..778cc4ae5 100644 --- a/src/lib/components/permissions/row.svelte +++ b/src/lib/components/permissions/row.svelte @@ -1,6 +1,6 @@ {#if $uploader?.isOpen} diff --git a/src/lib/helpers/project.ts b/src/lib/helpers/project.ts new file mode 100644 index 000000000..ff8f887b0 --- /dev/null +++ b/src/lib/helpers/project.ts @@ -0,0 +1,5 @@ +export function getProjectId() { + const pathname = window.location.pathname; + const projectMatch = pathname.match(/\/project-(.*?)\//); + return projectMatch?.[1] || null; +} diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte index 88a9a0b4b..0cc8abfdd 100644 --- a/src/lib/layout/header.svelte +++ b/src/lib/layout/header.svelte @@ -20,7 +20,7 @@ import { slide } from 'svelte/transition'; import { page } from '$app/stores'; import { Submit, trackEvent } from '$lib/actions/analytics'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { goto } from '$app/navigation'; let showDropdown = false; @@ -35,7 +35,7 @@ } async function logout() { - await sdkForConsole.account.deleteSession('current'); + await sdk.forConsole.account.deleteSession('current'); trackEvent(Submit.AccountLogout); await goto(`${base}/login`); } diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte index 4c4049e7b..7d92332af 100644 --- a/src/lib/layout/logs.svelte +++ b/src/lib/layout/logs.svelte @@ -6,7 +6,7 @@ import { Button } from '$lib/elements/forms'; import { base } from '$app/paths'; import { app } from '$lib/stores/app'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { page } from '$app/stores'; import { calculateTime } from '$lib/helpers/timeConversion'; import type { Models } from '@aw-labs/appwrite-console'; @@ -17,7 +17,7 @@ function isDeployment(data: Models.Deployment | Models.Execution): data is Models.Deployment { if ('buildId' in data) { selectedTab = 'logs'; - rawData = `${sdkForConsole.client.config.endpoint}/functions/${$log.func.$id}/deployment/${$log.data.$id}?mode=admin&project=${$page.params.project}`; + rawData = `${sdk.forConsole.client.config.endpoint}/functions/${$log.func.$id}/deployment/${$log.data.$id}?mode=admin&project=${$page.params.project}`; return true; } } @@ -25,7 +25,7 @@ function isExecution(data: Models.Deployment | Models.Execution): data is Models.Execution { if ('trigger' in data) { selectedTab = 'response'; - rawData = `${sdkForConsole.client.config.endpoint}/functions/${$log.func.$id}/execution/${$log.data.$id}?mode=admin&project=${$page.params.project}`; + rawData = `${sdk.forConsole.client.config.endpoint}/functions/${$log.func.$id}/execution/${$log.data.$id}?mode=admin&project=${$page.params.project}`; return true; } } diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts index e453161aa..1578f7d44 100644 --- a/src/lib/stores/sdk.ts +++ b/src/lib/stores/sdk.ts @@ -1,3 +1,4 @@ +import { getProjectId } from '$lib/helpers/project'; import { Project } from '$lib/sdk/project'; import { VARS } from '$lib/system'; import { @@ -23,21 +24,6 @@ clientConsole.setEndpoint(endpoint).setProject('console'); const clientProject = new Client(); clientProject.setEndpoint(endpoint).setMode('admin'); -const setProject = (projectId: string): Client => clientProject.setProject(projectId); - -const sdkForConsole = { - client: clientConsole, - account: new Account(clientConsole), - avatars: new Avatars(clientConsole), - functions: new Functions(clientConsole), - health: new Health(clientConsole), - locale: new Locale(clientConsole), - projects: new Projects(clientConsole), - teams: new Teams(clientConsole), - users: new Users(clientConsole), - billing: new Billing(clientConsole) -}; - const sdkForProject = { client: clientProject, account: new Account(clientProject), @@ -52,4 +38,25 @@ const sdkForProject = { users: new Users(clientProject) }; -export { sdkForConsole, sdkForProject, setProject }; +export const sdk = { + forConsole: { + client: clientConsole, + account: new Account(clientConsole), + avatars: new Avatars(clientConsole), + functions: new Functions(clientConsole), + health: new Health(clientConsole), + locale: new Locale(clientConsole), + projects: new Projects(clientConsole), + teams: new Teams(clientConsole), + users: new Users(clientConsole), + billing: new Billing(clientConsole) + }, + get forProject() { + const projectId = getProjectId(); + if (projectId && projectId !== clientProject.config.project) { + clientProject.setProject(projectId); + } + + return sdkForProject; + } +}; diff --git a/src/lib/stores/uploader.ts b/src/lib/stores/uploader.ts index 9538d0b79..ece61c0b7 100644 --- a/src/lib/stores/uploader.ts +++ b/src/lib/stores/uploader.ts @@ -1,6 +1,6 @@ import type { Models } from '@aw-labs/appwrite-console'; import { writable } from 'svelte/store'; -import { sdkForProject } from './sdk'; +import { sdk } from './sdk'; type UploaderFile = { $id: string; @@ -71,7 +71,7 @@ const createUploader = () => { n.files.unshift(newFile); return n; }); - const uploadedFile = await sdkForProject.storage.createFile( + const uploadedFile = await sdk.forProject.storage.createFile( bucketId, id ?? 'unique()', file, diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 9d628c7ea..de3611aee 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -2,7 +2,7 @@ import '@appwrite.io/pink'; import '@appwrite.io/pink-icons'; import 'tippy.js/dist/tippy.css'; import LogRocket from 'logrocket'; -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { redirect } from '@sveltejs/kit'; import { Dependencies } from '$lib/constants'; import type { LayoutLoad } from './$types'; @@ -12,7 +12,7 @@ export const ssr = false; export const load: LayoutLoad = async ({ depends, url }) => { depends(Dependencies.ACCOUNT); try { - const account = await sdkForConsole.account.get(); + const account = await sdk.forConsole.account.get(); LogRocket.identify(account.$id, { name: account.name, @@ -21,7 +21,7 @@ export const load: LayoutLoad = async ({ depends, url }) => { return { account, - organizations: sdkForConsole.teams.list() + organizations: sdk.forConsole.teams.list() }; } catch (error) { const acceptedRoutes = [ diff --git a/src/routes/console/+layout.ts b/src/routes/console/+layout.ts index 6e464728e..65de11ecd 100644 --- a/src/routes/console/+layout.ts +++ b/src/routes/console/+layout.ts @@ -1,8 +1,8 @@ -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { LayoutLoad } from './$types'; export const load: LayoutLoad = async () => { - const response = await fetch(`${sdkForConsole.client.config.endpoint}/health/version`); + const response = await fetch(`${sdk.forConsole.client.config.endpoint}/health/version`); const data = await response.json(); return { diff --git a/src/routes/console/account/+page.svelte b/src/routes/console/account/+page.svelte index b94dc86cc..66c40a4f2 100644 --- a/src/routes/console/account/+page.svelte +++ b/src/routes/console/account/+page.svelte @@ -4,7 +4,7 @@ import { Container } from '$lib/layout'; import { onMount } from 'svelte'; import { user } from '$lib/stores/user'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { addNotification } from '$lib/stores/notifications'; import { base } from '$app/paths'; import Delete from './delete.svelte'; @@ -26,7 +26,7 @@ async function updateName() { try { - await sdkForConsole.account.updateName(name); + await sdk.forConsole.account.updateName(name); invalidate(Dependencies.ACCOUNT); addNotification({ message: 'Name has been updated', @@ -43,7 +43,7 @@ } async function updateEmail() { try { - await sdkForConsole.account.updateEmail(email, emailPassword); + await sdk.forConsole.account.updateEmail(email, emailPassword); invalidate(Dependencies.ACCOUNT); addNotification({ message: 'Email has been updated', @@ -61,7 +61,7 @@ async function updatePassword() { try { - await sdkForConsole.account.updatePassword(newPassword, oldPassword); + await sdk.forConsole.account.updatePassword(newPassword, oldPassword); newPassword = oldPassword = null; addNotification({ message: 'Password has been updated', diff --git a/src/routes/console/account/activity/[[page]]/+page.ts b/src/routes/console/account/activity/[[page]]/+page.ts index 6ac71de8d..d3fc1b4d0 100644 --- a/src/routes/console/account/activity/[[page]]/+page.ts +++ b/src/routes/console/account/activity/[[page]]/+page.ts @@ -1,5 +1,5 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; import { PAGE_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; @@ -10,6 +10,6 @@ export const load: PageLoad = async ({ params }) => { return { offset, - logs: await sdkForConsole.account.listLogs([Query.offset(offset), Query.limit(PAGE_LIMIT)]) + logs: await sdk.forConsole.account.listLogs([Query.offset(offset), Query.limit(PAGE_LIMIT)]) }; }; diff --git a/src/routes/console/account/delete.svelte b/src/routes/console/account/delete.svelte index cf981d4e9..ae86006b6 100644 --- a/src/routes/console/account/delete.svelte +++ b/src/routes/console/account/delete.svelte @@ -5,13 +5,13 @@ import { Dependencies } from '$lib/constants'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; export let showDelete = false; const deleteAccount = async () => { try { - await sdkForConsole.account.updateStatus(); + await sdk.forConsole.account.updateStatus(); showDelete = false; invalidate(Dependencies.ACCOUNT); addNotification({ diff --git a/src/routes/console/account/header.svelte b/src/routes/console/account/header.svelte index d298924d8..71d54f3d3 100644 --- a/src/routes/console/account/header.svelte +++ b/src/routes/console/account/header.svelte @@ -7,7 +7,7 @@ import { Button } from '$lib/elements/forms'; import { isTabSelected } from '$lib/helpers/load'; import { Cover, CoverTitle } from '$lib/layout'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { user } from '$lib/stores/user'; const path = `/console/account`; @@ -38,7 +38,7 @@ ]; async function logout() { - await sdkForConsole.account.deleteSession('current'); + await sdk.forConsole.account.deleteSession('current'); trackEvent(Submit.AccountLogout); await goto(`${base}/login`); } diff --git a/src/routes/console/account/organizations/[[page]]/+page.svelte b/src/routes/console/account/organizations/[[page]]/+page.svelte index 60d477e6e..69ba0d589 100644 --- a/src/routes/console/account/organizations/[[page]]/+page.svelte +++ b/src/routes/console/account/organizations/[[page]]/+page.svelte @@ -11,14 +11,14 @@ import { Button } from '$lib/elements/forms'; import { Container } from '$lib/layout'; import CreateOrganization from '../../../createOrganization.svelte'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { CARD_LIMIT } from '$lib/constants'; import type { PageData } from './$types'; export let data: PageData; const getMemberships = async (teamId: string) => { - const memberships = await sdkForConsole.teams.listMemberships(teamId); + const memberships = await sdk.forConsole.teams.listMemberships(teamId); return memberships.memberships.map((team) => team.userName); }; diff --git a/src/routes/console/account/organizations/[[page]]/+page.ts b/src/routes/console/account/organizations/[[page]]/+page.ts index e51c4b146..9b602d7b5 100644 --- a/src/routes/console/account/organizations/[[page]]/+page.ts +++ b/src/routes/console/account/organizations/[[page]]/+page.ts @@ -1,5 +1,5 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; @@ -10,7 +10,7 @@ export const load: PageLoad = async ({ params }) => { return { offset, - organizations: await sdkForConsole.teams.list([ + organizations: await sdk.forConsole.teams.list([ Query.offset(offset), Query.limit(CARD_LIMIT), Query.orderDesc('$createdAt') diff --git a/src/routes/console/account/sessions/[[page]]/+page.svelte b/src/routes/console/account/sessions/[[page]]/+page.svelte index 5e6fd5787..6fd4e45cf 100644 --- a/src/routes/console/account/sessions/[[page]]/+page.svelte +++ b/src/routes/console/account/sessions/[[page]]/+page.svelte @@ -12,7 +12,7 @@ TableScroll } from '$lib/elements/table'; import { Container } from '$lib/layout'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { goto, invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import type { Models } from '@aw-labs/appwrite-console'; @@ -23,11 +23,11 @@ export let data: PageData; const getBrowser = (clientCode: string) => { - return sdkForConsole.avatars.getBrowser(clientCode, 40, 40); + return sdk.forConsole.avatars.getBrowser(clientCode, 40, 40); }; const logout = async (session: Models.Session) => { - await sdkForConsole.account.deleteSession(session.$id); + await sdk.forConsole.account.deleteSession(session.$id); trackEvent(Submit.AccountDeleteSession); if (session.current) { await goto(`${base}/login`); @@ -35,7 +35,7 @@ invalidate(Dependencies.ACCOUNT_SESSIONS); }; const logoutAll = async () => { - await sdkForConsole.account.deleteSessions(); + await sdk.forConsole.account.deleteSessions(); trackEvent(Submit.AccountDeleteAllSessions); await goto(`${base}/login`); invalidate(Dependencies.ACCOUNT_SESSIONS); diff --git a/src/routes/console/account/sessions/[[page]]/+page.ts b/src/routes/console/account/sessions/[[page]]/+page.ts index ed1eaba0f..6165d5472 100644 --- a/src/routes/console/account/sessions/[[page]]/+page.ts +++ b/src/routes/console/account/sessions/[[page]]/+page.ts @@ -1,11 +1,11 @@ import { Dependencies } from '$lib/constants'; -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; export const load: PageLoad = async ({ depends }) => { depends(Dependencies.ACCOUNT_SESSIONS); return { - sessions: await sdkForConsole.account.listSessions() + sessions: await sdk.forConsole.account.listSessions() }; }; diff --git a/src/routes/console/createOrganization.svelte b/src/routes/console/createOrganization.svelte index 6fc75f52b..3e72de421 100644 --- a/src/routes/console/createOrganization.svelte +++ b/src/routes/console/createOrganization.svelte @@ -3,7 +3,7 @@ import { Pill } from '$lib/elements'; import { InputText, Button, FormList } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { createEventDispatcher } from 'svelte'; import { goto, invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; @@ -21,7 +21,7 @@ const create = async () => { try { - const org = await sdkForConsole.teams.create(id ?? ID.unique(), name); + const org = await sdk.forConsole.teams.create(id ?? ID.unique(), name); await invalidate(Dependencies.ACCOUNT); dispatch('created'); await goto(`/console/organization-${org.$id}`); diff --git a/src/routes/console/onboarding/+page.svelte b/src/routes/console/onboarding/+page.svelte index 83a4f8063..be0fe4dcb 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 { 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 5695f0e8b..ab4d93894 100644 --- a/src/routes/console/organization-[organization]/+layout.ts +++ b/src/routes/console/organization-[organization]/+layout.ts @@ -1,12 +1,11 @@ import Header from './header.svelte'; import Breadcrumbs from './breadcrumbs.svelte'; -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { LayoutLoad } from './$types'; import { error } from '@sveltejs/kit'; import { Dependencies } from '$lib/constants'; -export const load: LayoutLoad = async ({ params, parent, depends }) => { - await parent(); +export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.ORGANIZATION); depends(Dependencies.PAYMENT_METHODS); @@ -14,8 +13,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 e6f6520c3..d7cbd284d 100644 --- a/src/routes/console/organization-[organization]/[[page]]/+page.ts +++ b/src/routes/console/organization-[organization]/[[page]]/+page.ts @@ -1,5 +1,5 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; @@ -10,7 +10,7 @@ export const load: PageLoad = async ({ params }) => { return { offset, - projects: await sdkForConsole.projects.list([ + projects: await sdk.forConsole.projects.list([ Query.offset(offset), Query.limit(CARD_LIMIT), Query.equal('teamId', params.organization), diff --git a/src/routes/console/organization-[organization]/billing/paymentModal.svelte b/src/routes/console/organization-[organization]/billing/paymentModal.svelte index cbfcb3a45..26e81c39d 100644 --- a/src/routes/console/organization-[organization]/billing/paymentModal.svelte +++ b/src/routes/console/organization-[organization]/billing/paymentModal.svelte @@ -2,7 +2,7 @@ // import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; import { Modal } from '$lib/components'; import { InputText, Button, FormList } from '$lib/elements/forms'; - import { publicKey } from './store'; + import { paymentMethods, publicKey } from './store'; import { loadStripe, type Stripe, @@ -11,7 +11,7 @@ } from '@stripe/stripe-js'; import { onMount } from 'svelte'; import { organization } from '$lib/stores/organization'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { invalidate } from '$app/navigation'; import { Dependencies } from '$lib/constants'; import { app } from '$lib/stores/app'; @@ -82,11 +82,13 @@ onMount(async () => { stripe = await loadStripe(publicKey); - try { - paymentMethod = await sdkForConsole.billing.createPaymentMethod($organization.$id); + const clientSecret = $paymentMethods?.paymentMethods[0]?.clientSecret; + if (!clientSecret) { + paymentMethod = await sdk.forConsole.billing.createPaymentMethod($organization.$id); + } const options = { - clientSecret: paymentMethod.clientSecret, + clientSecret: clientSecret ? clientSecret : paymentMethod.clientSecret, appearance: $app.themeInUse === 'dark' ? apperanceDark : apperanceLight }; console.log(paymentMethod); @@ -124,7 +126,7 @@ // trackError(StripeError, Submit.ProjectCreate); } else if (setupIntent && setupIntent.status === 'succeeded') { try { - await sdkForConsole.billing.updatePaymentMethod( + await sdk.forConsole.billing.updatePaymentMethod( $organization.$id, paymentMethod.$id, setupIntent.payment_method as string diff --git a/src/routes/console/organization-[organization]/createMember.svelte b/src/routes/console/organization-[organization]/createMember.svelte index 1fec569ce..0359d2bcc 100644 --- a/src/routes/console/organization-[organization]/createMember.svelte +++ b/src/routes/console/organization-[organization]/createMember.svelte @@ -3,7 +3,7 @@ import { Modal } from '$lib/components'; import { InputText, InputEmail, Button, FormList } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { createEventDispatcher } from 'svelte'; import { organization } from '$lib/stores/organization'; import { invalidate } from '$app/navigation'; @@ -19,7 +19,7 @@ const create = async () => { try { - const team = await sdkForConsole.teams.createMembership( + const team = await sdk.forConsole.teams.createMembership( $organization.$id, email, ['owner'], diff --git a/src/routes/console/organization-[organization]/createProject.svelte b/src/routes/console/organization-[organization]/createProject.svelte index 288692efd..7314cb430 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 { 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 59ea94346..20de35126 100644 --- a/src/routes/console/organization-[organization]/deleteMember.svelte +++ b/src/routes/console/organization-[organization]/deleteMember.svelte @@ -4,7 +4,7 @@ import { Modal } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import type { Models } from '@aw-labs/appwrite-console'; import { createEventDispatcher } from 'svelte'; import { user } from '$lib/stores/user'; @@ -17,10 +17,10 @@ const deleteMembership = async () => { try { - await sdkForConsole.teams.deleteMembership(selectedMember.teamId, selectedMember.$id); + await sdk.forConsole.teams.deleteMembership(selectedMember.teamId, selectedMember.$id); if (isUser) { - await sdkForConsole.account.deleteSession('current'); + await sdk.forConsole.account.deleteSession('current'); await goto(`${base}/login`); } else { dispatch('deleted'); diff --git a/src/routes/console/organization-[organization]/deleteOrganization.svelte b/src/routes/console/organization-[organization]/deleteOrganization.svelte index a6dc3f020..62bc28d63 100644 --- a/src/routes/console/organization-[organization]/deleteOrganization.svelte +++ b/src/routes/console/organization-[organization]/deleteOrganization.svelte @@ -2,7 +2,7 @@ import { Modal } from '$lib/components'; import { Button } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { organization, organizationList } from '$lib/stores/organization'; import { goto, invalidate } from '$app/navigation'; import { base } from '$app/paths'; @@ -13,7 +13,7 @@ const deleteOrg = async () => { try { - await sdkForConsole.teams.delete($organization.$id); + await sdk.forConsole.teams.delete($organization.$id); addNotification({ type: 'success', message: `${$organization.name} has been deleted` diff --git a/src/routes/console/organization-[organization]/members/[[page]]/+page.svelte b/src/routes/console/organization-[organization]/members/[[page]]/+page.svelte index e9dff9557..1bf9a0a9e 100644 --- a/src/routes/console/organization-[organization]/members/[[page]]/+page.svelte +++ b/src/routes/console/organization-[organization]/members/[[page]]/+page.svelte @@ -18,10 +18,10 @@ import { Container } from '$lib/layout'; import { addNotification } from '$lib/stores/notifications'; import { members, newMemberModal, organization } from '$lib/stores/organization'; - import { sdkForConsole } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import type { Models } from '@aw-labs/appwrite-console'; - import Delete from '../../deleteMember.svelte'; import type { PageData } from './$types'; + import Delete from '../../deleteMember.svelte'; export let data: PageData; @@ -31,7 +31,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 b827b1811..e9abf6be6 100644 --- a/src/routes/console/organization-[organization]/members/[[page]]/+page.ts +++ b/src/routes/console/organization-[organization]/members/[[page]]/+page.ts @@ -1,17 +1,16 @@ import { PAGE_LIMIT } from '$lib/constants'; import { pageToOffset } from '$lib/helpers/load'; -import { sdkForConsole } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { Query } from '@aw-labs/appwrite-console'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent }) => { - await parent(); +export const load: PageLoad = async ({ params }) => { const page = Number(params.page); const offset = pageToOffset(page, PAGE_LIMIT); 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 0af80131b..5863ddeb0 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 { 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 004daed0f..eb2816695 100644 --- a/src/routes/console/project-[project]/+layout.svelte +++ b/src/routes/console/project-[project]/+layout.svelte @@ -1,13 +1,13 @@ diff --git a/src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.ts b/src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.ts index 530b91396..b8fd5d5fb 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/auth/user-[user]/sessions/[[page]]/+page.ts @@ -1,12 +1,10 @@ import { Dependencies } from '$lib/constants'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent, depends }) => { +export const load: PageLoad = async ({ params, depends }) => { depends(Dependencies.SESSIONS); - await parent(); - return { - sessions: await sdkForProject.users.listSessions(params.user) + sessions: await sdk.forProject.users.listSessions(params.user) }; }; diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte index 893d7f726..aa3f99e56 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updateEmail.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, InputEmail } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { user } from './store'; @@ -16,7 +16,7 @@ async function updateEmail() { try { - await sdkForProject.users.updateEmail($user.$id, userEmail); + await sdk.forProject.users.updateEmail($user.$id, userEmail); invalidate(Dependencies.USER); addNotification({ message: 'Email has been updated', diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte index 2767d3027..28c4b3eee 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updateName.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, InputText } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { user } from './store'; @@ -16,7 +16,7 @@ async function updateName() { try { - await sdkForProject.users.updateName($user.$id, userName); + await sdk.forProject.users.updateName($user.$id, userName); invalidate(Dependencies.USER); addNotification({ message: 'Name has been updated', diff --git a/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte b/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte index 9a21b40da..7b7c7943b 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updatePassword.svelte @@ -3,14 +3,14 @@ import { CardGrid, Heading } from '$lib/components'; import { Button, Form, InputPassword } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { user } from './store'; let newPassword: string = null; async function updatePassword() { try { - await sdkForProject.users.updatePassword($user.$id, newPassword); + await sdk.forProject.users.updatePassword($user.$id, newPassword); newPassword = null; addNotification({ message: 'Password has been updated', diff --git a/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte b/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte index de0cb9584..e468b3911 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updatePhone.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form, InputPhone } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { user } from './store'; @@ -16,7 +16,7 @@ async function updatePhone() { try { - await sdkForProject.users.updatePhone($user.$id, userPhone); + await sdk.forProject.users.updatePhone($user.$id, userPhone); invalidate(Dependencies.USER); addNotification({ message: 'Phone has been updated', diff --git a/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte b/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte index 5b2bd623c..7ff5907f8 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updatePrefs.svelte @@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants'; import { Button, Form } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { onMount } from 'svelte'; import { user } from './store'; @@ -35,7 +35,7 @@ try { let updatedPrefs = Object.fromEntries(prefs); - await sdkForProject.users.updatePrefs($user.$id, updatedPrefs); + await sdk.forProject.users.updatePrefs($user.$id, updatedPrefs); invalidate(Dependencies.USER); arePrefsDisabled = true; diff --git a/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte b/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte index 31a38a503..25da5891e 100644 --- a/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte +++ b/src/routes/console/project-[project]/auth/user-[user]/updateStatus.svelte @@ -7,7 +7,7 @@ import { Button } from '$lib/elements/forms'; import { toLocaleDateTime } from '$lib/helpers/date'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { user } from './store'; let showVerifcationDropdown = false; @@ -15,7 +15,7 @@ async function updateVerificationEmail() { showVerifcationDropdown = false; try { - await sdkForProject.users.updateEmailVerification($user.$id, !$user.emailVerification); + await sdk.forProject.users.updateEmailVerification($user.$id, !$user.emailVerification); invalidate(Dependencies.USER); addNotification({ message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${ @@ -35,7 +35,7 @@ async function updateVerificationPhone() { showVerifcationDropdown = false; try { - await sdkForProject.users.updatePhoneVerification($user.$id, !$user.phoneVerification); + await sdk.forProject.users.updatePhoneVerification($user.$id, !$user.phoneVerification); invalidate(Dependencies.USER); addNotification({ message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${ @@ -54,7 +54,7 @@ } async function updateStatus() { try { - await sdkForProject.users.updateStatus($user.$id, !$user.status); + await sdk.forProject.users.updateStatus($user.$id, !$user.status); await invalidate(Dependencies.USER); addNotification({ message: `${$user.name || $user.email || $user.phone || 'The account'} has been ${ diff --git a/src/routes/console/project-[project]/databases/+layout.ts b/src/routes/console/project-[project]/databases/+layout.ts index 12cc3f795..7db345058 100644 --- a/src/routes/console/project-[project]/databases/+layout.ts +++ b/src/routes/console/project-[project]/databases/+layout.ts @@ -2,9 +2,7 @@ import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; import type { LayoutLoad } from './$types'; -export const load: LayoutLoad = async ({ parent }) => { - await parent(); - +export const load: LayoutLoad = async () => { return { header: Header, breadcrumbs: Breadcrumbs diff --git a/src/routes/console/project-[project]/databases/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/[[page]]/+page.ts index 47cc014c6..f8d1e2352 100644 --- a/src/routes/console/project-[project]/databases/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/[[page]]/+page.ts @@ -1,17 +1,16 @@ -import { Query } from '@aw-labs/appwrite-console'; -import { sdkForProject } from '$lib/stores/sdk'; -import { pageToOffset } from '$lib/helpers/load'; import { CARD_LIMIT } from '$lib/constants'; +import { pageToOffset } from '$lib/helpers/load'; +import { sdk } from '$lib/stores/sdk'; +import { Query } from '@aw-labs/appwrite-console'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent }) => { - await parent(); +export const load: PageLoad = async ({ params }) => { const page = Number(params.page); const offset = pageToOffset(page, CARD_LIMIT); return { offset, - databases: await sdkForProject.databases.list([ + databases: await sdk.forProject.databases.list([ Query.limit(CARD_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt') diff --git a/src/routes/console/project-[project]/databases/create.svelte b/src/routes/console/project-[project]/databases/create.svelte index 237ed836a..7094f2d91 100644 --- a/src/routes/console/project-[project]/databases/create.svelte +++ b/src/routes/console/project-[project]/databases/create.svelte @@ -4,7 +4,7 @@ import { Pill } from '$lib/elements'; import { Button, InputText, FormList } from '$lib/elements/forms'; import { addNotification } from '$lib/stores/notifications'; - import { sdkForProject } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { ID } from '@aw-labs/appwrite-console'; import { createEventDispatcher } from 'svelte'; @@ -18,7 +18,7 @@ const create = async () => { try { - const database = await sdkForProject.databases.create(id ? id : ID.unique(), name); + const database = await sdk.forProject.databases.create(id ? id : ID.unique(), name); showCreate = false; dispatch('created', database); addNotification({ 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 fc344a75e..b6cbd509f 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/+layout.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/+layout.ts @@ -1,19 +1,18 @@ -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { Dependencies } from '$lib/constants'; import type { LayoutLoad } from './$types'; import Breadcrumbs from './breadcrumbs.svelte'; import Header from './header.svelte'; import { error } from '@sveltejs/kit'; -export const load: LayoutLoad = async ({ params, parent, depends }) => { - await parent(); +export const load: LayoutLoad = async ({ params, depends }) => { depends(Dependencies.DATABASE); try { return { header: Header, breadcrumbs: Breadcrumbs, - database: await sdkForProject.databases.get(params.database) + database: await sdk.forProject.databases.get(params.database) }; } catch (e) { throw error(e.code, e.message); diff --git a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.ts b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.ts index d7c69f3ca..5f3424e6d 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.ts +++ b/src/routes/console/project-[project]/databases/database-[database]/[[page]]/+page.ts @@ -1,17 +1,16 @@ import { Query } from '@aw-labs/appwrite-console'; -import { sdkForProject } from '$lib/stores/sdk'; +import { sdk } from '$lib/stores/sdk'; import { pageToOffset } from '$lib/helpers/load'; import { CARD_LIMIT } from '$lib/constants'; import type { PageLoad } from './$types'; -export const load: PageLoad = async ({ params, parent }) => { - await parent(); +export const load: PageLoad = async ({ params }) => { const page = Number(params.page); const offset = pageToOffset(page, CARD_LIMIT); return { offset, - collections: await sdkForProject.databases.listCollections(params.database, [ + collections: await sdk.forProject.databases.listCollections(params.database, [ Query.limit(CARD_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt') diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte index eb15b0dca..e8c0d8ccc 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte @@ -1,14 +1,14 @@