fix: fix merge breaking changes

This commit is contained in:
tglide
2023-04-17 12:05:43 +01:00
parent 583b4ed2fa
commit 6bb522954d
3 changed files with 13 additions and 12 deletions
+1 -1
View File
@@ -20,7 +20,7 @@ function createWizardStore() {
return {
subscribe,
set,
start: (component: typeof SvelteComponent, media: string = null) =>
start: <CMP extends typeof SvelteComponent>(component: CMP, media: string = null) =>
update((n) => {
n.show = true;
n.component = component;
@@ -1,22 +1,23 @@
import { Query } from '@aw-labs/appwrite-console';
import { sdkForProject } from '$lib/stores/sdk';
import { pageToOffset } from '$lib/helpers/load';
import { Query } from '@appwrite.io/console';
import { sdk } from '$lib/stores/sdk';
import { getLimit, getPage, getSearch, pageToOffset } from '$lib/helpers/load';
import { Dependencies, PAGE_LIMIT } from '$lib/constants';
import type { PageLoad } from './$types';
export const load: PageLoad = async ({ params, parent, depends, url }) => {
await parent();
export const load: PageLoad = async ({ params, depends, url, route }) => {
depends(Dependencies.FILES);
const page = Number(params.page);
const offset = pageToOffset(page, PAGE_LIMIT);
const search = url.search.slice(1) ?? undefined;
const page = getPage(url);
const search = getSearch(url);
const limit = getLimit(url, route, PAGE_LIMIT);
const offset = pageToOffset(page, limit);
return {
offset,
limit,
search,
files: await sdkForProject.storage.listFiles(
files: await sdk.forProject.storage.listFiles(
params.bucket,
[Query.limit(PAGE_LIMIT), Query.offset(offset), Query.orderDesc('$createdAt')],
[Query.limit(limit), Query.offset(offset), Query.orderDesc('$createdAt')],
search
)
};
@@ -8,7 +8,7 @@
import { addNotification } from '$lib/stores/notifications';
import { uploader } from '$lib/stores/uploader';
import { wizard } from '$lib/stores/wizard';
import { ID } from '@aw-labs/appwrite-console';
import { ID } from '@appwrite.io/console';
import Step1 from './step1.svelte';
import Step2 from './step2.svelte';
import { createFile } from './store';