From 7a930147dbce77152722f4c09982663bf4b67651 Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 4 Nov 2022 10:48:31 +0100 Subject: [PATCH 1/4] fix: permission disabled button --- .../collection-[collection]/document-[document]/+page.svelte | 5 ++++- .../storage/bucket-[bucket]/file-[file]/+page.svelte | 5 ++++- .../storage/bucket-[bucket]/settings/+page.svelte | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte index 2b52ed462..afb7b82db 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/document-[document]/+page.svelte @@ -41,7 +41,10 @@ } $: if (permissions) { - if (difference(permissions, $doc.$permissions).length) { + if ( + difference(permissions, $doc.$permissions).length || + difference($doc.$permissions, permissions).length + ) { arePermsDisabled = false; } else arePermsDisabled = true; } diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte index b30a47db2..ab2bbc8cf 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/file-[file]/+page.svelte @@ -30,7 +30,10 @@ sdkForProject.storage.getFileView($file.bucketId, fileId).toString() + '&mode=admin'; $: if (filePermissions) { - if (difference(filePermissions, $file.$permissions).length) { + if ( + difference(filePermissions, $file.$permissions).length || + difference($file.$permissions, filePermissions).length + ) { arePermsDisabled = false; } else arePermsDisabled = true; } diff --git a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte index 498eb674b..2eb438dff 100644 --- a/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte +++ b/src/routes/console/project-[project]/storage/bucket-[bucket]/settings/+page.svelte @@ -58,7 +58,10 @@ if (bucketFileSecurity !== $bucket.fileSecurity) { arePermsDisabled = false; } else if (bucketPermissions) { - if (difference(bucketPermissions, $bucket.$permissions).length) { + if ( + difference(bucketPermissions, $bucket.$permissions).length || + difference($bucket.$permissions, bucketPermissions).length + ) { arePermsDisabled = false; } else arePermsDisabled = true; } From 110b84717fedd904aa7b886f146e75b6b9225cdf Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 4 Nov 2022 10:51:54 +0100 Subject: [PATCH 2/4] chore: update css --- package-lock.json | 28 ++++++++++++++-------------- package.json | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1eb26ab2d..c34874549 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,8 @@ "version": "0.0.1", "dependencies": { "@aw-labs/appwrite-console": "^10.0.0", - "@aw-labs/icons": "0.0.0-68", - "@aw-labs/ui": "0.0.0-68", + "@aw-labs/icons": "0.0.0-69", + "@aw-labs/ui": "0.0.0-69", "@popperjs/core": "^2.11.6", "echarts": "^5.4.0", "prismjs": "^1.29.0", @@ -80,14 +80,14 @@ } }, "node_modules/@aw-labs/icons": { - "version": "0.0.0-68", - "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-68.tgz", - "integrity": "sha512-sLaaDCjVUysdfatBtis/p8ggphEi1GlhJHnYAzERBJ9iX6lyvT61UXDADOk27GxL8h9fJJ+J1Q8BEF0QfTHooQ==" + "version": "0.0.0-69", + "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-69.tgz", + "integrity": "sha512-gJvWRgRLM2auSgWs6aP1r46ClVeSm0sfS/Zi9ouu4LAmpcjqlJigK5H3x7/G9gPctKFYZo46ZMEDzKWpn8vwEw==" }, "node_modules/@aw-labs/ui": { - "version": "0.0.0-68", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-68.tgz", - "integrity": "sha512-1MdyKxo/8tETxp5CKCI56IhadAUxGBTT6bGxr/IfMORWQkDdGLF+y2xwjLq8md+tEBxQv7akkXu1jCzpl6Wf/Q==", + "version": "0.0.0-69", + "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-69.tgz", + "integrity": "sha512-LDf6hcYDd8YJpp9rRYHv1mFm8LEryWxFAV3AI8NPx7Z1lRlNs1XKlD0jqn1Q9x4NhT7ehwiTETYdCK1k9exdCg==", "dependencies": { "@aw-labs/icons": "*", "normalize.css": "^8.0.1", @@ -7455,14 +7455,14 @@ } }, "@aw-labs/icons": { - "version": "0.0.0-68", - "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-68.tgz", - "integrity": "sha512-sLaaDCjVUysdfatBtis/p8ggphEi1GlhJHnYAzERBJ9iX6lyvT61UXDADOk27GxL8h9fJJ+J1Q8BEF0QfTHooQ==" + "version": "0.0.0-69", + "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-69.tgz", + "integrity": "sha512-gJvWRgRLM2auSgWs6aP1r46ClVeSm0sfS/Zi9ouu4LAmpcjqlJigK5H3x7/G9gPctKFYZo46ZMEDzKWpn8vwEw==" }, "@aw-labs/ui": { - "version": "0.0.0-68", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-68.tgz", - "integrity": "sha512-1MdyKxo/8tETxp5CKCI56IhadAUxGBTT6bGxr/IfMORWQkDdGLF+y2xwjLq8md+tEBxQv7akkXu1jCzpl6Wf/Q==", + "version": "0.0.0-69", + "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-69.tgz", + "integrity": "sha512-LDf6hcYDd8YJpp9rRYHv1mFm8LEryWxFAV3AI8NPx7Z1lRlNs1XKlD0jqn1Q9x4NhT7ehwiTETYdCK1k9exdCg==", "requires": { "@aw-labs/icons": "*", "normalize.css": "^8.0.1", diff --git a/package.json b/package.json index 1c2a77635..c332b80f2 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ }, "dependencies": { "@aw-labs/appwrite-console": "^10.0.0", - "@aw-labs/icons": "0.0.0-68", - "@aw-labs/ui": "0.0.0-68", + "@aw-labs/icons": "0.0.0-69", + "@aw-labs/ui": "0.0.0-69", "@popperjs/core": "^2.11.6", "echarts": "^5.4.0", "prismjs": "^1.29.0", From c96e51c5b90b2d57d00257710ce753ade7f9b451 Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 4 Nov 2022 11:05:13 +0100 Subject: [PATCH 3/4] feat: add page title for onboarding --- src/routes/console/onboarding/+layout.svelte | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/routes/console/onboarding/+layout.svelte b/src/routes/console/onboarding/+layout.svelte index 4fa864ce7..3fad2e9ed 100644 --- a/src/routes/console/onboarding/+layout.svelte +++ b/src/routes/console/onboarding/+layout.svelte @@ -1 +1,5 @@ + + Onboarding - Appwrite + + From 673096e005340070382f52d4242c41ed7cd5a8bd Mon Sep 17 00:00:00 2001 From: Arman Date: Fri, 4 Nov 2022 11:12:36 +0100 Subject: [PATCH 4/4] fix: remove session number --- src/routes/console/project-[project]/overview/+layout.svelte | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/console/project-[project]/overview/+layout.svelte index 6e9ded3b4..2443f8e87 100644 --- a/src/routes/console/project-[project]/overview/+layout.svelte +++ b/src/routes/console/project-[project]/overview/+layout.svelte @@ -230,10 +230,6 @@
Users
- -
-
Sessions: XX
-