From e3256650bacb812f1ea6ca3633a997750737f71a Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Mon, 20 Feb 2023 21:34:59 +0000 Subject: [PATCH 01/11] refactor: change create file from modal to wizard --- src/lib/elements/forms/inputFile.svelte | 5 ++ .../{[[page]] => }/+page.svelte | 55 ++++++++--------- .../bucket-[bucket]/{[[page]] => }/+page.ts | 0 .../bucket-[bucket]/create/create.svelte | 60 +++++++++++++++++++ .../bucket-[bucket]/create/step1.svelte | 44 ++++++++++++++ .../bucket-[bucket]/create/step2.svelte | 43 +++++++++++++ .../storage/bucket-[bucket]/create/store.ts | 24 ++++++++ 7 files changed, 201 insertions(+), 30 deletions(-) rename src/routes/console/project-[project]/storage/bucket-[bucket]/{[[page]] => }/+page.svelte (93%) rename src/routes/console/project-[project]/storage/bucket-[bucket]/{[[page]] => }/+page.ts (100%) create mode 100644 src/routes/console/project-[project]/storage/bucket-[bucket]/create/create.svelte create mode 100644 src/routes/console/project-[project]/storage/bucket-[bucket]/create/step1.svelte create mode 100644 src/routes/console/project-[project]/storage/bucket-[bucket]/create/step2.svelte create mode 100644 src/routes/console/project-[project]/storage/bucket-[bucket]/create/store.ts diff --git a/src/lib/elements/forms/inputFile.svelte b/src/lib/elements/forms/inputFile.svelte index 2db31eaef4..c5e29f0a04 100644 --- a/src/lib/elements/forms/inputFile.svelte +++ b/src/lib/elements/forms/inputFile.svelte @@ -1,6 +1,7 @@ + import { invalidate } from '$app/navigation'; + import { base } from '$app/paths'; import { page } from '$app/stores'; - import { sdkForProject } from '$lib/stores/sdk'; - import { Pill } from '$lib/elements'; - import { Button } from '$lib/elements/forms'; + import { Submit, trackError, trackEvent } from '$lib/actions/analytics'; import { - Empty, - EmptySearch, - Pagination, Avatar, DropList, DropListItem, DropListLink, + Empty, + EmptySearch, + Pagination, SearchQuery } from '$lib/components'; - import Create from '../create.svelte'; - import Delete from '../deleteFile.svelte'; + import { Dependencies, PAGE_LIMIT } from '$lib/constants'; + import { Pill } from '$lib/elements'; + import { Button } from '$lib/elements/forms'; import { Table, - TableHeader, TableBody, - TableRowLink, - TableRow, + TableCell, TableCellHead, TableCellText, - TableCell + TableHeader, + TableRow, + TableRowLink } from '$lib/elements/table'; import { toLocaleDate } from '$lib/helpers/date'; import { calculateSize } from '$lib/helpers/sizeConvertion'; import { Container } from '$lib/layout'; - import { base } from '$app/paths'; - import type { Models } from '@aw-labs/appwrite-console'; - import { uploader } from '$lib/stores/uploader'; import { addNotification } from '$lib/stores/notifications'; + import { sdkForProject } from '$lib/stores/sdk'; + import { uploader } from '$lib/stores/uploader'; + import { wizard } from '$lib/stores/wizard'; + import type { Models } from '@aw-labs/appwrite-console'; import type { PageData } from './$types'; - import { invalidate } from '$app/navigation'; - import { Dependencies, PAGE_LIMIT } from '$lib/constants'; - import { Submit, trackEvent, trackError } from '$lib/actions/analytics'; + import CreateWizard from './create/create.svelte'; + import Delete from './deleteFile.svelte'; export let data: PageData; - let showCreate = false; let showDelete = false; let showDropdown = []; let selectedFile: Models.File = null; @@ -49,11 +49,6 @@ const getPreview = (fileId: string) => sdkForProject.storage.getFilePreview(bucketId, fileId, 32, 32).toString() + '&mode=admin'; - function fileCreated() { - showCreate = false; - invalidate(Dependencies.FILES); - } - function fileDeleted(event: CustomEvent) { showDelete = false; uploader.removeFile(event.detail); @@ -78,8 +73,9 @@ - @@ -97,7 +93,7 @@ {#if file.chunksTotal / file.chunksUploaded !== 1} -
+
{file.name} @@ -136,7 +132,7 @@ -
+
{file.name}
@@ -213,11 +209,10 @@ single href="https://appwrite.io/docs/storage#createFile" target="file" - on:click={() => (showCreate = true)} /> + on:click={() => wizard.start(CreateWizard)} /> {/if} - {#if selectedFile} {/if} diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.ts b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts similarity index 100% rename from src/routes/console/project-[project]/storage/bucket-[bucket]/[[page]]/+page.ts rename to src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create/create.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/create/create.svelte new file mode 100644 index 0000000000..2fb30235c2 --- /dev/null +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/create/create.svelte @@ -0,0 +1,60 @@ + + + diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create/step1.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/create/step1.svelte new file mode 100644 index 0000000000..9dd49dc1e6 --- /dev/null +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/create/step1.svelte @@ -0,0 +1,44 @@ + + + + Upload a File + Upload a file to add it to your bucket. + +
+ +
+ + {#if !showCustomId} +
+ (showCustomId = !showCustomId)}> + +
+ {:else} +
+ +
+ {/if} +
+
+ + diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create/step2.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/create/step2.svelte new file mode 100644 index 0000000000..8ea672ecfc --- /dev/null +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/create/step2.svelte @@ -0,0 +1,43 @@ + + + + Update Permissions + Choose who can get access to your buckets and files. For more information, check out the + Permissions Guide in our documentation. + +

+ Choose who can access your buckets and files. For more information, check out the + + Permissions Guide + . +

+ {#if $bucket.fileSecurity} +
+ + File security enabled + Users will be able to access this file if they have been granted + either File or Bucket permissions. + +
+
+ +
+ {:else} + + File security disabled + If you want to assign file permissions, navigate to Bucket settings and enable file security. + Otherwise, only Bucket permissions will be used. + + {/if} +
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create/store.ts b/src/routes/console/project-[project]/storage/bucket-[bucket]/create/store.ts new file mode 100644 index 0000000000..6a6eb9248d --- /dev/null +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/create/store.ts @@ -0,0 +1,24 @@ +import { writable } from 'svelte/store'; + +type CreateFile = { + files: FileList | null; + id: string | null; + permissions: string[]; +}; + +const initialState: CreateFile = { + files: null, + id: null, + permissions: [] +}; + +export const createFile = (function initialize() { + const store = writable({ ...initialState }); + + return { + ...store, + reset() { + store.set({ ...initialState }); + } + }; +})(); From 46de1b802af695b9d7106d4631c665a1bdd9b597 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Wed, 22 Feb 2023 18:15:52 +0000 Subject: [PATCH 02/11] fix: text and small changes --- .../storage/bucket-[bucket]/+page.svelte | 2 +- .../{create => create-file}/create.svelte | 0 .../{create => create-file}/step1.svelte | 0 .../{create => create-file}/step2.svelte | 10 +- .../{create => create-file}/store.ts | 0 .../storage/bucket-[bucket]/create.svelte | 106 ------------------ 6 files changed, 4 insertions(+), 114 deletions(-) rename src/routes/console/project-[project]/storage/bucket-[bucket]/{create => create-file}/create.svelte (100%) rename src/routes/console/project-[project]/storage/bucket-[bucket]/{create => create-file}/step1.svelte (100%) rename src/routes/console/project-[project]/storage/bucket-[bucket]/{create => create-file}/step2.svelte (85%) rename src/routes/console/project-[project]/storage/bucket-[bucket]/{create => create-file}/store.ts (100%) delete mode 100644 src/routes/console/project-[project]/storage/bucket-[bucket]/create.svelte diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte index 498883b73e..84cf437ab5 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte @@ -35,7 +35,7 @@ import { wizard } from '$lib/stores/wizard'; import type { Models } from '@aw-labs/appwrite-console'; import type { PageData } from './$types'; - import CreateWizard from './create/create.svelte'; + import CreateWizard from './create-file/create.svelte'; import Delete from './deleteFile.svelte'; export let data: PageData; diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create/create.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/create.svelte similarity index 100% rename from src/routes/console/project-[project]/storage/bucket-[bucket]/create/create.svelte rename to src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/create.svelte diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create/step1.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte similarity index 100% rename from src/routes/console/project-[project]/storage/bucket-[bucket]/create/step1.svelte rename to src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create/step2.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/step2.svelte similarity index 85% rename from src/routes/console/project-[project]/storage/bucket-[bucket]/create/step2.svelte rename to src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/step2.svelte index 8ea672ecfc..4b1943da82 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/create/step2.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/step2.svelte @@ -8,11 +8,7 @@ Update Permissions - Choose who can get access to your buckets and files. For more information, check out the - Permissions Guide in our documentation. - -

+ Choose who can access your buckets and files. For more information, check out the Permissions Guide - . -

+ . + {#if $bucket.fileSecurity}
diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create/store.ts b/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/store.ts similarity index 100% rename from src/routes/console/project-[project]/storage/bucket-[bucket]/create/store.ts rename to src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/store.ts diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/create.svelte deleted file mode 100644 index 5bdc48bf38..0000000000 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/create.svelte +++ /dev/null @@ -1,106 +0,0 @@ - - - - Create File - -
- -
- - {#if !showCustomId} -
- (showCustomId = !showCustomId)}> - -
- {:else} - - {/if} - Update Permissions -

- Choose who can access your buckets and files. For more information, check out the - - Permissions Guide - . -

- {#if $bucket.fileSecurity} -
- - File security enabled - Users will be able to access this file if they have been granted - either File or Bucket permissions. - -
-
- -
- {:else} - - File security disabled - If you want to assign file permissions, navigate to Bucket settings and enable file security. - Otherwise, only Bucket permissions will be used. - - {/if} -
- - - - -
From affc5298a5e19e1c0c05890cb8a4bd547b4e836c Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Thu, 23 Feb 2023 16:52:34 +0000 Subject: [PATCH 03/11] fix: file input element and state not syncing --- src/lib/elements/forms/inputFile.svelte | 29 ++++++++++++++++--------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/src/lib/elements/forms/inputFile.svelte b/src/lib/elements/forms/inputFile.svelte index c5e29f0a04..e28c36b2d4 100644 --- a/src/lib/elements/forms/inputFile.svelte +++ b/src/lib/elements/forms/inputFile.svelte @@ -6,7 +6,7 @@ export let label: string = null; export let files: FileList; - export let list = new DataTransfer(); + export let allowedFileExtensions: string[] = []; export let maxSize: number = null; export let required = false; @@ -15,16 +15,25 @@ let input: HTMLInputElement; let hovering = false; + function setFiles(value: FileList) { + files = value; + input.files = value; + } + + function resetFiles() { + setFiles(new DataTransfer().files); + } + function dropHandler(ev: DragEvent) { ev.dataTransfer.dropEffect = 'move'; hovering = false; - if (ev.dataTransfer.items) { - for (let i = 0; i < ev.dataTransfer.items.length; i++) { - if (ev.dataTransfer.items[i].kind === 'file') { - list.items.clear(); - list.items.add(ev.dataTransfer.items[i].getAsFile()); - files = list.files; - } + if (!ev.dataTransfer.items) return; + + for (let i = 0; i < ev.dataTransfer.items.length; i++) { + if (ev.dataTransfer.items[i].kind === 'file') { + const dataTransfer = new DataTransfer(); + dataTransfer.items.add(ev.dataTransfer.items[i].getAsFile()); + setFiles(dataTransfer.files); } } } @@ -50,7 +59,7 @@ $: fileArray = files?.length ? Array.from(files) : []; onMount(() => { - input.files = files; + setFiles(files); }); @@ -128,7 +137,7 @@ {fileSize.value + fileSize.unit}

And add this to your project's build.gradle file:

- +
+ +
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..81d857bb65 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 @@ -21,11 +21,14 @@ val client = Client(context) Now that you've downloaded the SDK, it's time to initialze it. Use your project ID, which can be found in your project settings page.

- +
+ +
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step2.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/apple/step2.svelte index 8884288816..31d99d5b84 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step2.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/apple/step2.svelte @@ -71,9 +71,25 @@ {:else if method === Method.Swift}

Add this to your Package.swift file:

- +
+ +

Then add the dependency to your target:

- +
+ +
{/if}
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 ca35a8faac..5adcc84eb3 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 @@ -20,7 +20,16 @@ let client = Client() Now that you've downloaded the SDK, it's time to initialze it. Use your project ID, which can be found in your project settings page.

- +
+ +

Before sending any API calls to your new Appwrite project, make sure your device or emulator has network access to your Appwrite project's hostname or IP address. diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step2.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step2.svelte index fa2fb7330c..b49863fbf6 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step2.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step2.svelte @@ -15,8 +15,11 @@

+

You can also install the SDK using the Dart package manager from your terminal:

- +
+ +
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/web/step2.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/web/step2.svelte index aeab08e592..fa0e144930 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/web/step2.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/web/step2.svelte @@ -58,13 +58,23 @@ class="link">Rollup), import the Appwrite module when you need it:

- +
+ +
{:else if method === Method.CDN}

To install with a CDN (content delivery network) add the following scripts to the bottom of your tag, but before you use any Appwrite services:

- +
+ +
{/if}
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..2f2a22296d 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 @@ -19,5 +19,14 @@ client Now that you've downloaded the SDK, it's time to initialze it. Use your project ID, which can be found in your project settings page.

- +
+ +
From 192bb8cee9ae2936b9982f82e5364a055e5e29b7 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Thu, 9 Mar 2023 11:29:54 +0000 Subject: [PATCH 07/11] refactor: change wizard title --- .../storage/bucket-[bucket]/create-file/create.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/create.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/create.svelte index 2fb30235c2..5824898f5e 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/create.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/create.svelte @@ -57,4 +57,4 @@ } - + From 800d5c0a418ee6c51474b71d52205c74ffa11226 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Wed, 22 Mar 2023 16:22:24 +0000 Subject: [PATCH 08/11] fix: file input overflow --- .../storage/bucket-[bucket]/create-file/step1.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte index 9dd49dc1e6..3d0e4f5407 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte @@ -13,7 +13,7 @@ Upload a File Upload a file to add it to your bucket. -
+
Date: Mon, 17 Apr 2023 11:50:40 +0100 Subject: [PATCH 09/11] refactor: update copy --- .../storage/bucket-[bucket]/create-file/create.svelte | 2 +- .../storage/bucket-[bucket]/create-file/step1.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/create.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/create.svelte index 5824898f5e..736c2f25a0 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/create.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/create.svelte @@ -19,7 +19,7 @@ stepComponents.set(1, { component: Step1, - label: 'Upload a file' + label: 'Create file' }); stepComponents.set(2, { diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte index 3d0e4f5407..3a9290472f 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/step1.svelte @@ -10,7 +10,7 @@ - Upload a File + Create file Upload a file to add it to your bucket.
From 6bb522954d6ef11b77aabb4bdcac366a06eafc21 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Mon, 17 Apr 2023 12:05:43 +0100 Subject: [PATCH 10/11] fix: fix merge breaking changes --- src/lib/stores/wizard.ts | 2 +- .../storage/bucket-[bucket]/+page.ts | 21 ++++++++++--------- .../bucket-[bucket]/create-file/create.svelte | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/lib/stores/wizard.ts b/src/lib/stores/wizard.ts index 355eb7afce..b349d62063 100644 --- a/src/lib/stores/wizard.ts +++ b/src/lib/stores/wizard.ts @@ -20,7 +20,7 @@ function createWizardStore() { return { subscribe, set, - start: (component: typeof SvelteComponent, media: string = null) => + start: (component: CMP, media: string = null) => update((n) => { n.show = true; n.component = component; diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts index 0c15a026ef..219c82b34a 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.ts @@ -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 ) }; diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/create.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/create.svelte index 736c2f25a0..df3f4494e3 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/create.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/create-file/create.svelte @@ -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'; From ce4863822ec7025706387a760d6ed03d02140011 Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 12 Dec 2023 12:55:57 +0100 Subject: [PATCH 11/11] fix: some stuff after merge --- .../storage/bucket-[bucket]/+page.svelte | 11 ++--------- .../storage/bucket-[bucket]/create-file/create.svelte | 4 ++-- .../storage/bucket-[bucket]/create-file/step2.svelte | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte index 132b1ddce2..23efd27e2b 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/+page.svelte @@ -1,6 +1,4 @@