From eef30cd5b6848e01a2a8b6ba79a1db4acf14e381 Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 17 Jun 2022 17:25:17 +0200 Subject: [PATCH 01/87] feat: implement most of setting page logic --- .../storage/bucket/[bucket]/settings.svelte | 414 +++++++++++++++++- 1 file changed, 410 insertions(+), 4 deletions(-) diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte index c270642c7..9c3355296 100644 --- a/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte +++ b/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte @@ -1,10 +1,416 @@ - -

Settings

+ {#if $bucket} + +
+

{$bucket.name}

+
+

Created: {toLocaleDate($bucket.dateCreated)}

+

Last Updated: {toLocaleDate($bucket.dateUpdated)}

+
+
+
    + +
+
+
- +
+ +
+
+ +
+
+
Update Name
+

Update your bucket name.

+
+
    + + {#if showError === 'name'} + {errorMessage} + {/if} +
+
+
+ +
+
+ +
+
+
Update Permissions
+

+ Assign read or write permissions at the Bucket Level or + File Level. If Bucket Level permissions are assigned, file + permissions will be ignored. +

+
+
+
    +
  • + +
  • +
  • + +
  • +
+ +

+ Tip: Add role:all for wildcards access. Check out our + documentation for more on Permissions +

+
+ {#if bucketPermissions === 'bucket'} +
    + + +
+ {/if} +
+
+
+ +
+
+ +
+
+

Update Security Settings

+

+ Enable or disable security services for the bucket including + Ecryption + and Antivirus scanning. +

+
+
+
    + + +
  • + This parameter allows you to configure whether or not the files inside + the bucket will be encrypted. We don't encrypt files bigger than 20MB. +
  • + + +
  • + This parameter allows you to configure whether or not the files inside + the bucket should be scanned by the Appwrite Antivirus scanner. +
  • +
+
+
+
+ +
+ +
+
+
+

Session Length

+

+ If you reduce the limit, users who are currently logged in will be + logged out of the application. +

+
+
+
    + + +
+
+
+ +
+
+ +
+
+
Update Allowed File Extensions
+

+ A maxiumum of 100 file extensions can be added. Leave blank to allow all + file types. +

+
+
+ +

+ Tip: Commonly added extensions include JPG, PNG, SVG, GIF, HTML, PDF, + MP4. +

+
+
    + +
+
+
+
+ +
+
+ {/if}
From 6269fd361ee90ca4f3df310fbacb6096c1af0270 Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 17 Jun 2022 17:26:32 +0200 Subject: [PATCH 02/87] TODO: implement delete bucket --- .../console/[project]/storage/bucket/[bucket]/settings.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte index 9c3355296..098673495 100644 --- a/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte +++ b/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte @@ -412,5 +412,6 @@ }}>Update + {/if} From e814f412f249dfe0941e545ed95b69daf26a613f Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 20 Jun 2022 09:34:32 +0200 Subject: [PATCH 03/87] feat: bucket can be deleted --- .../bucket/[bucket]/_deleteBucket.svelte | 36 +++++++++++++++++++ .../storage/bucket/[bucket]/settings.svelte | 28 ++++++++++++++- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 src/routes/console/[project]/storage/bucket/[bucket]/_deleteBucket.svelte diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/_deleteBucket.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/_deleteBucket.svelte new file mode 100644 index 000000000..83969bd44 --- /dev/null +++ b/src/routes/console/[project]/storage/bucket/[bucket]/_deleteBucket.svelte @@ -0,0 +1,36 @@ + + +
+ + Delete Bucket +

Are you sure you want to delete {$bucket.name}?

+ + + + +
+
diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte index 098673495..e1962a110 100644 --- a/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte +++ b/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte @@ -14,7 +14,10 @@ import { toLocaleDate } from '$lib/helpers/date'; import { sdkForProject } from '$lib/stores/sdk'; import { addNotification } from '$lib/stores/notifications'; + import Delete from './_deleteBucket.svelte'; + import { bind } from 'svelte/internal'; + let showDelete = false; let showError: false | 'name' | 'size' = false; let errorMessage = 'Something went wrong'; let errorType: 'error' | 'warning' | 'success' = 'error'; @@ -412,6 +415,29 @@ }}>Update - + +
+
+
Danger Zone
+

+ The user will be permanently deleted, including all data associated with + this user. This action is irreversible. +

+
+
+ +
+
+
+ +
+
{/if} + + From ba1d33f3ae8b5543148f060472cad282508d8584 Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 20 Jun 2022 09:42:39 +0200 Subject: [PATCH 04/87] fix: update file extention placeholder --- .../console/[project]/storage/bucket/[bucket]/settings.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte index e1962a110..eddee23ad 100644 --- a/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte +++ b/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte @@ -402,7 +402,7 @@ From 5c331f25ef439288fefda411ba9f1aa35bcb735d Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 20 Jun 2022 10:22:10 +0200 Subject: [PATCH 05/87] fix: update delete text --- .../[project]/storage/bucket/[bucket]/settings.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte index eddee23ad..a3f8da78a 100644 --- a/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte +++ b/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte @@ -418,10 +418,10 @@
-
Danger Zone
+
Delete Bucket

- The user will be permanently deleted, including all data associated with - this user. This action is irreversible. + The bucket will be permanently deleted, including all the files within it. + This action is irreversible.

From 382f35c5a59ea92104133b09607a844726db4d7e Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 20 Jun 2022 10:56:46 +0200 Subject: [PATCH 06/87] update create modal --- .../storage/bucket/[bucket]/_create.svelte | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/_create.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/_create.svelte index a885da6ee..b758228fd 100644 --- a/src/routes/console/[project]/storage/bucket/[bucket]/_create.svelte +++ b/src/routes/console/[project]/storage/bucket/[bucket]/_create.svelte @@ -1,6 +1,6 @@
Upload File - +

Max file size: 10MB

+ +

Permissions

+ +

+ Tip: Add role:all for wildcard access. Check out our documentation for more on + Permissions +

+
+ From f1d4cbb059142c8d07bdd4ea09cbe6e3613add03 Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 20 Jun 2022 11:03:47 +0200 Subject: [PATCH 07/87] fix: remove wrong import --- .../console/[project]/storage/bucket/[bucket]/settings.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte index a3f8da78a..21490941d 100644 --- a/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte +++ b/src/routes/console/[project]/storage/bucket/[bucket]/settings.svelte @@ -15,7 +15,6 @@ import { sdkForProject } from '$lib/stores/sdk'; import { addNotification } from '$lib/stores/notifications'; import Delete from './_deleteBucket.svelte'; - import { bind } from 'svelte/internal'; let showDelete = false; let showError: false | 'name' | 'size' = false; From 5428dc2b633d28dccc389ae153f82ea43615e050 Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 20 Jun 2022 13:48:29 +0200 Subject: [PATCH 08/87] feat: link to file page, remove modal --- .../storage/bucket/[bucket]/_update.svelte | 54 ------------------- .../storage/bucket/[bucket]/index.svelte | 36 ++++++------- 2 files changed, 18 insertions(+), 72 deletions(-) delete mode 100644 src/routes/console/[project]/storage/bucket/[bucket]/_update.svelte diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/_update.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/_update.svelte deleted file mode 100644 index 07f20996b..000000000 --- a/src/routes/console/[project]/storage/bucket/[bucket]/_update.svelte +++ /dev/null @@ -1,54 +0,0 @@ - - - - - Update File - - - - - - - - - diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/index.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/index.svelte index 1e702de74..2d31b2563 100644 --- a/src/routes/console/[project]/storage/bucket/[bucket]/index.svelte +++ b/src/routes/console/[project]/storage/bucket/[bucket]/index.svelte @@ -12,10 +12,12 @@ TableBody, TableRow, TableCellHead, - TableCellText + TableCellText, + TableCellLink } from '$lib/elements/table'; import { toLocaleDate } from '$lib/helpers/date'; import { Container } from '$lib/layout'; + import { base } from '$app/paths'; let search = ''; let showCreate = false; @@ -23,14 +25,12 @@ let offset = 0; let currentFile: Models.File; - const limit = 25; + const limit = 5; + const project = $page.params.project; const bucket = $page.params.bucket; - const openFile = (file: Models.File) => { - currentFile = file; - showUpdate = true; - }; + const getPreview = (fileId: string) => - sdkForProject.storage.getFilePreview(bucket, fileId, 30, 30).toString() + '&mode=admin'; + sdkForProject.storage.getFilePreview(bucket, fileId, 40, 40).toString() + '&mode=admin'; $: request = sdkForProject.storage.listFiles(bucket, search, limit, offset); $: if (search) offset = 0; @@ -66,19 +66,19 @@ {#each response.files as file} - +
- openFile(file)}> - {file.name} - {file.name} - + {file.name} + {file.name}
-
+ {file.mimeType} {file.sizeOriginal} Date: Mon, 20 Jun 2022 13:49:11 +0200 Subject: [PATCH 09/87] fix: remove unused import & variables --- .../console/[project]/storage/bucket/[bucket]/index.svelte | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/index.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/index.svelte index 2d31b2563..d9c3114c3 100644 --- a/src/routes/console/[project]/storage/bucket/[bucket]/index.svelte +++ b/src/routes/console/[project]/storage/bucket/[bucket]/index.svelte @@ -3,9 +3,7 @@ import { sdkForProject } from '$lib/stores/sdk'; import { Button } from '$lib/elements/forms'; import { Empty, Pagination } from '$lib/components'; - import type { Models } from 'src/sdk'; import Create from './_create.svelte'; - import Update from './_update.svelte'; import { Table, TableHeader, @@ -21,9 +19,7 @@ let search = ''; let showCreate = false; - let showUpdate = false; let offset = 0; - let currentFile: Models.File; const limit = 5; const project = $page.params.project; @@ -128,4 +124,3 @@ - From 6bbef011f60c5ba5d3a92f23e3ae997b892473a2 Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 20 Jun 2022 14:32:12 +0200 Subject: [PATCH 10/87] feat: create file route --- .../[bucket]/file/[file]/__layout.svelte | 36 ++++ .../[bucket]/file/[file]/_deleteFile.svelte | 36 ++++ .../bucket/[bucket]/file/[file]/index.svelte | 172 ++++++++++++++++++ .../bucket/[bucket]/file/[file]/store.ts | 17 ++ 4 files changed, 261 insertions(+) create mode 100644 src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/__layout.svelte create mode 100644 src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/_deleteFile.svelte create mode 100644 src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/index.svelte create mode 100644 src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/store.ts diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/__layout.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/__layout.svelte new file mode 100644 index 000000000..f8813a0b4 --- /dev/null +++ b/src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/__layout.svelte @@ -0,0 +1,36 @@ + + + + Appwrite - File + + + diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/_deleteFile.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/_deleteFile.svelte new file mode 100644 index 000000000..0057507d1 --- /dev/null +++ b/src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/_deleteFile.svelte @@ -0,0 +1,36 @@ + + +
+ + Delete File +

Are you sure you want to delete {$file.name}?

+ + + + +
+
diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/index.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/index.svelte new file mode 100644 index 000000000..5cad7589c --- /dev/null +++ b/src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/index.svelte @@ -0,0 +1,172 @@ + + + + {#if $file} + +
+
+ {$file.name} +
+

{$file.name}

+ copy(getView($file.$id))} + >File URL + +
+
+
+

MIME Type: {$file.mimeType}

+

Size: {$file.sizeOriginal}

+

Created: {toLocaleDate($file.dateCreated)}

+

Last Updated: {toLocaleDate($file?.dateUpdated)}

+
+
+ +
+ +
+
+ + +
+
+
Update Permissions
+

+ Assign read or write permissions at the Bucket Level or File Level. If + Bucket Level permissions are enabled, file permissions will be ignored. +

+
+
+ + + You have Bucket Level permissions enabled + +

+ If you want to assign permissions specific to this file, you will need + to update your Bucket Settings to enable File + Level permissions. +

+
+
    + + +
+
+
+
+ +
+
+ + +
+
+
Delete file
+

+ The file will be permanently deleted, including all the files within it. + This action is irreversible. +

+
+
+ +
+
+
+ +
+
+ {/if} +
+ + diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/store.ts b/src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/store.ts new file mode 100644 index 000000000..b49f3ffba --- /dev/null +++ b/src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/store.ts @@ -0,0 +1,17 @@ +import { sdkForProject } from '$lib/stores/sdk'; +import type { Models } from 'src/sdk'; +import { writable } from 'svelte/store'; + +function createFileStore() { + const { subscribe, set } = writable(); + + return { + subscribe, + set, + load: async (bucketId: string, fileId: string) => { + set(await sdkForProject.storage.getFile(bucketId, fileId)); + } + }; +} + +export const file = createFileStore(); From f7d7ff64671b5ac5dab0479d9989280e4bb95cde Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 20 Jun 2022 15:38:31 +0200 Subject: [PATCH 11/87] fix: remove yet to implement parameters --- .../storage/bucket/[bucket]/file/[file]/index.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/index.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/index.svelte index 5cad7589c..d3cec71db 100644 --- a/src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/index.svelte +++ b/src/routes/console/[project]/storage/bucket/[bucket]/file/[file]/index.svelte @@ -90,7 +90,7 @@

MIME Type: {$file.mimeType}

Size: {$file.sizeOriginal}

Created: {toLocaleDate($file.dateCreated)}

-

Last Updated: {toLocaleDate($file?.dateUpdated)}

+

Last Updated (to implement): {toLocaleDate($file.dateCreated)}

@@ -157,7 +157,7 @@ From 21680aee8b521c07627d88b2668090bc0a2799ed Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 20 Jun 2022 15:39:04 +0200 Subject: [PATCH 12/87] feat: file list is cached --- .../storage/bucket/[bucket]/index.svelte | 152 +++++++++--------- .../storage/bucket/[bucket]/store.ts | 39 +++++ 2 files changed, 117 insertions(+), 74 deletions(-) diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/index.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/index.svelte index d9c3114c3..d6f21afb2 100644 --- a/src/routes/console/[project]/storage/bucket/[bucket]/index.svelte +++ b/src/routes/console/[project]/storage/bucket/[bucket]/index.svelte @@ -16,6 +16,7 @@ import { toLocaleDate } from '$lib/helpers/date'; import { Container } from '$lib/layout'; import { base } from '$app/paths'; + import { files } from './store'; let search = ''; let showCreate = false; @@ -28,8 +29,15 @@ const getPreview = (fileId: string) => sdkForProject.storage.getFilePreview(bucket, fileId, 40, 40).toString() + '&mode=admin'; - $: request = sdkForProject.storage.listFiles(bucket, search, limit, offset); + const fileCreated = () => { + showCreate = false; + files.load(bucket, search, limit, offset); + }; + + $: files.load(bucket, search, limit, offset); $: if (search) offset = 0; + + console.log($files); @@ -47,80 +55,76 @@