From 60d819d70cc78df3a3ac88b3ca87facc1194498c Mon Sep 17 00:00:00 2001 From: Arman Date: Tue, 11 Mar 2025 19:21:27 +0100 Subject: [PATCH] feat: replace input file with dropzone --- package.json | 2 +- pnpm-lock.yaml | 18 +++---- src/lib/stores/upload.ts | 10 ++++ .../sites/create-site/manual/+page.svelte | 54 ++++++++++++++++--- .../createManualDeploymentModal.svelte | 47 +++++++++++++--- 5 files changed, 108 insertions(+), 23 deletions(-) create mode 100644 src/lib/stores/upload.ts diff --git a/package.json b/package.json index 48266d7b8..790df22af 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "@appwrite.io/pink-icons": "0.25.0", "@appwrite.io/pink-icons-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3fd919a0", "@appwrite.io/pink-legacy": "^1.0.2", - "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3fd919a0", + "@appwrite.io/pink-svelte": "https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@51b7272", "@popperjs/core": "^2.11.8", "@sentry/sveltekit": "^8.38.0", "@stripe/stripe-js": "^3.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4ffde2176..923268bdc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -21,8 +21,8 @@ importers: specifier: ^1.0.2 version: 1.0.2 '@appwrite.io/pink-svelte': - specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3fd919a0 - version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3fd919a0(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) + specifier: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@51b7272 + version: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@51b7272(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19) '@popperjs/core': specifier: ^2.11.8 version: 2.11.8 @@ -221,8 +221,8 @@ packages: peerDependencies: svelte: ^4.0.0 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3fd919a00b71d85d8b630f22953d28aa28ae0050': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3fd919a00b71d85d8b630f22953d28aa28ae0050} + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@51b7272ae59cc5b4f1c9238285c718d162944bc0': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@51b7272ae59cc5b4f1c9238285c718d162944bc0} version: 1.0.0-next.7 peerDependencies: svelte: ^4.0.0 @@ -236,8 +236,8 @@ packages: '@appwrite.io/pink-legacy@1.0.2': resolution: {integrity: sha512-1AYNcfbV+x0Tyj56CoieSq5g7+u+7F5/LDVN/z+Hx1kp9gj7xc1eT39Dy832xxfihImF6ksjp0FXEMVSBR8cew==} - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3fd919a0': - resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3fd919a0} + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@51b7272': + resolution: {tarball: https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@51b7272} version: 1.0.0-next.85 peerDependencies: react-dom: ^18.0.0 @@ -4103,7 +4103,7 @@ snapshots: dependencies: svelte: 4.2.19 - '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3fd919a00b71d85d8b630f22953d28aa28ae0050(svelte@4.2.19)': + '@appwrite.io/pink-icons-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@51b7272ae59cc5b4f1c9238285c718d162944bc0(svelte@4.2.19)': dependencies: svelte: 4.2.19 @@ -4116,9 +4116,9 @@ snapshots: '@appwrite.io/pink-icons': 1.0.0 the-new-css-reset: 1.11.3 - '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@3fd919a0(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': + '@appwrite.io/pink-svelte@https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-svelte@51b7272(react-dom@18.3.1(react@18.3.1))(svelte@4.2.19)': dependencies: - '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@3fd919a00b71d85d8b630f22953d28aa28ae0050(svelte@4.2.19) + '@appwrite.io/pink-icons-svelte': https://pkg.pr.new/appwrite/pink/@appwrite.io/pink-icons-svelte@51b7272ae59cc5b4f1c9238285c718d162944bc0(svelte@4.2.19) '@floating-ui/dom': 1.6.13 '@melt-ui/pp': 0.3.2(@melt-ui/svelte@0.86.3(svelte@4.2.19))(svelte@4.2.19) '@melt-ui/svelte': 0.86.3(svelte@4.2.19) diff --git a/src/lib/stores/upload.ts b/src/lib/stores/upload.ts new file mode 100644 index 000000000..6e96a4c45 --- /dev/null +++ b/src/lib/stores/upload.ts @@ -0,0 +1,10 @@ +export function removeFile(file: File, files: FileList) { + const filteredFiles = Array.from(files).filter((f) => f.name !== file.name); + const dataTransfer = new DataTransfer(); + + filteredFiles.forEach((file) => { + dataTransfer.items.add(file); + }); + + files = dataTransfer.files; +} diff --git a/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte b/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte index 2fcf97d0d..22b6dde9b 100644 --- a/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte +++ b/src/routes/(console)/project-[project]/sites/create-site/manual/+page.svelte @@ -7,7 +7,7 @@ import { Wizard } from '$lib/layout'; import { addNotification } from '$lib/stores/notifications'; import { sdk } from '$lib/stores/sdk'; - import { Layout } from '@appwrite.io/pink-svelte'; + import { Icon, Layout, Tooltip, Typography, Upload } from '@appwrite.io/pink-svelte'; import { writable } from 'svelte/store'; import Details from '../details.svelte'; import Aside from './aside.svelte'; @@ -19,6 +19,8 @@ import { project } from '$routes/(console)/project-[project]/store'; import { organization } from '$lib/stores/organization'; import { consoleVariables } from '$routes/(console)/store'; + import { IconInfo } from '@appwrite.io/pink-icons-svelte'; + import { removeFile } from '$lib/stores/upload'; export let data; let showExitModal = false; @@ -108,6 +110,14 @@ trackError(e, Submit.SiteCreate); } } + + $: filesList = files?.length + ? Array.from(files).map((file) => { + let f = file as Partial & { removable: boolean }; + f.removable = true; + return f; + }) + : []; @@ -121,12 +131,42 @@ confirmExit>
- - + + + Upload a zip file (tar.gz) containing your function source code + + + + + + + Drag and drop file here or click to upload + + + + + + Only .tar.gz files allowed + + + Max file size 10MB + + + + {#if files?.length} + removeFile(e.detail, files)} /> + {/if}
diff --git a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createManualDeploymentModal.svelte b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createManualDeploymentModal.svelte index cb070b279..96a0478c4 100644 --- a/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createManualDeploymentModal.svelte +++ b/src/routes/(console)/project-[project]/sites/site-[site]/deployments/createManualDeploymentModal.svelte @@ -7,6 +7,8 @@ import { addNotification } from '$lib/stores/notifications'; import { uploader } from '$lib/stores/uploader'; import type { Models } from '@appwrite.io/console'; + import { IconInfo } from '@appwrite.io/pink-icons-svelte'; + import { Icon, Layout, Tooltip, Typography, Upload } from '@appwrite.io/pink-svelte'; export let show = false; export let site: Models.Site; @@ -30,16 +32,49 @@ }); } } + + $: filesList = files?.length + ? Array.from(files).map((file) => { + let f = file as Partial & { removable: boolean }; + f.removable = true; + return f; + }) + : []; Manually deploy a site by uploading any file(s) or folder. - - + + + Upload a zip file (tar.gz) containing your function source code + + + + + + + Drag and drop file here or click to upload + + + + + + Only .tar.gz files allowed + + + Max file size 10MB + + + + {#if files?.length} + removeFile(e.detail, files)} /> + {/if} +