{$title} -
- - - -
+ {#if $tabs.length} +
+ + + +
+ {/if} {#key $page.routeId}
diff --git a/src/routes/console/[project]/database/__layout.svelte b/src/routes/console/[project]/database/__layout.svelte index 5a41d46614..2579cf50c7 100644 --- a/src/routes/console/[project]/database/__layout.svelte +++ b/src/routes/console/[project]/database/__layout.svelte @@ -1,25 +1,22 @@ Appwrite - Database -{#if !$page.url.pathname.startsWith(`${base}/console/${project}/database/collection`)} - - - Home - - Database - - -{/if} - diff --git a/src/routes/console/[project]/database/_tabs.svelte b/src/routes/console/[project]/database/_tabs.svelte deleted file mode 100644 index 0e90abf99b..0000000000 --- a/src/routes/console/[project]/database/_tabs.svelte +++ /dev/null @@ -1,25 +0,0 @@ - - - diff --git a/src/routes/console/[project]/database/collection/[collection]/__layout.svelte b/src/routes/console/[project]/database/collection/[collection]/__layout.svelte index baa5070c04..08850637c2 100644 --- a/src/routes/console/[project]/database/collection/[collection]/__layout.svelte +++ b/src/routes/console/[project]/database/collection/[collection]/__layout.svelte @@ -1,37 +1,47 @@ Appwrite - {$collection?.name ?? 'Collection'} -{#if $collection} - {#if !$page.url.pathname.startsWith(`/console/${project}/database/collection/${collectionId}/document`)} - - - Database - - {$collection.name} - - - {/if} - -{:else} -
-{/if} + diff --git a/src/routes/console/[project]/database/collection/[collection]/_tabs.svelte b/src/routes/console/[project]/database/collection/[collection]/_tabs.svelte deleted file mode 100644 index 0f7de03fbb..0000000000 --- a/src/routes/console/[project]/database/collection/[collection]/_tabs.svelte +++ /dev/null @@ -1,41 +0,0 @@ - - - diff --git a/src/routes/console/[project]/functions/__layout.svelte b/src/routes/console/[project]/functions/__layout.svelte index 6998ad013e..49f2510e26 100644 --- a/src/routes/console/[project]/functions/__layout.svelte +++ b/src/routes/console/[project]/functions/__layout.svelte @@ -1,23 +1,12 @@ Appwrite - Functions -{#if !$page.url.pathname.startsWith(`/console/${project}/functions/function`)} - - - Home - - Functions - - -{/if} + diff --git a/src/routes/console/[project]/functions/_tabs.svelte b/src/routes/console/[project]/functions/_tabs.svelte deleted file mode 100644 index 77ee018b8b..0000000000 --- a/src/routes/console/[project]/functions/_tabs.svelte +++ /dev/null @@ -1,18 +0,0 @@ - - - diff --git a/src/routes/console/[project]/functions/function/[function]/__layout.svelte b/src/routes/console/[project]/functions/function/[function]/__layout.svelte index a366bd9af9..ef001d8432 100644 --- a/src/routes/console/[project]/functions/function/[function]/__layout.svelte +++ b/src/routes/console/[project]/functions/function/[function]/__layout.svelte @@ -1,30 +1,44 @@ {#if $func} - - - Functions - - {$func.name} - - - {/if} diff --git a/src/routes/console/[project]/functions/function/[function]/_tabs.svelte b/src/routes/console/[project]/functions/function/[function]/_tabs.svelte deleted file mode 100644 index 2492e06305..0000000000 --- a/src/routes/console/[project]/functions/function/[function]/_tabs.svelte +++ /dev/null @@ -1,41 +0,0 @@ - - - diff --git a/src/routes/console/[project]/keys/__layout.svelte b/src/routes/console/[project]/keys/__layout.svelte index df96cc6b9c..fdbeb5f7c0 100644 --- a/src/routes/console/[project]/keys/__layout.svelte +++ b/src/routes/console/[project]/keys/__layout.svelte @@ -1,15 +1,8 @@ - - - Home - - API Keys - diff --git a/src/routes/console/[project]/settings/__layout.svelte b/src/routes/console/[project]/settings/__layout.svelte index 57a76442f9..eba5eb43e0 100644 --- a/src/routes/console/[project]/settings/__layout.svelte +++ b/src/routes/console/[project]/settings/__layout.svelte @@ -1,22 +1,30 @@ Appwrite - Settings - - - Home - - Settings - - diff --git a/src/routes/console/[project]/settings/_tabs.svelte b/src/routes/console/[project]/settings/_tabs.svelte deleted file mode 100644 index bca0281b13..0000000000 --- a/src/routes/console/[project]/settings/_tabs.svelte +++ /dev/null @@ -1,42 +0,0 @@ - - - diff --git a/src/routes/console/[project]/storage/__layout.svelte b/src/routes/console/[project]/storage/__layout.svelte index 3253557f29..7c8037d5ba 100644 --- a/src/routes/console/[project]/storage/__layout.svelte +++ b/src/routes/console/[project]/storage/__layout.svelte @@ -1,25 +1,22 @@ Appwrite - Storage -{#if !$page.url.pathname.startsWith(`${base}/console/${project}/storage/bucket`)} - - - Home - - Storage - - -{/if} diff --git a/src/routes/console/[project]/storage/_tabs.svelte b/src/routes/console/[project]/storage/_tabs.svelte deleted file mode 100644 index 3163cf2a90..0000000000 --- a/src/routes/console/[project]/storage/_tabs.svelte +++ /dev/null @@ -1,26 +0,0 @@ - - - diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/__layout.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/__layout.svelte index b5e6bea969..1e372dba04 100644 --- a/src/routes/console/[project]/storage/bucket/[bucket]/__layout.svelte +++ b/src/routes/console/[project]/storage/bucket/[bucket]/__layout.svelte @@ -1,32 +1,42 @@ Appwrite - Bucket -{#if $bucket} - - - Storage - - {$bucket.name} - - - -{/if} + + diff --git a/src/routes/console/[project]/storage/bucket/[bucket]/_tabs.svelte b/src/routes/console/[project]/storage/bucket/[bucket]/_tabs.svelte deleted file mode 100644 index 902ebe8cf9..0000000000 --- a/src/routes/console/[project]/storage/bucket/[bucket]/_tabs.svelte +++ /dev/null @@ -1,36 +0,0 @@ - - - diff --git a/src/routes/console/[project]/users/teams/[team]/__layout.svelte b/src/routes/console/[project]/users/teams/[team]/__layout.svelte index 4a5f822ea5..7ed181390b 100644 --- a/src/routes/console/[project]/users/teams/[team]/__layout.svelte +++ b/src/routes/console/[project]/users/teams/[team]/__layout.svelte @@ -1,22 +1,30 @@ Appwrite - Team - - - Users - - - diff --git a/src/routes/console/[project]/users/teams/[team]/store.ts b/src/routes/console/[project]/users/teams/[team]/store.ts new file mode 100644 index 0000000000..7ccd2e40bc --- /dev/null +++ b/src/routes/console/[project]/users/teams/[team]/store.ts @@ -0,0 +1,17 @@ +import { sdkForProject } from '$lib/stores/sdk'; +import type { Models } from 'src/sdk'; +import { writable } from 'svelte/store'; + +function createTeamStore() { + const { subscribe, set } = writable>>(); + + return { + subscribe, + set, + load: async (teamId: string) => { + set(await sdkForProject.teams.get(teamId)); + } + }; +} + +export const team = createTeamStore(); diff --git a/src/routes/console/[project]/webhooks/__layout.svelte b/src/routes/console/[project]/webhooks/__layout.svelte index 9d475b8811..1a21654399 100644 --- a/src/routes/console/[project]/webhooks/__layout.svelte +++ b/src/routes/console/[project]/webhooks/__layout.svelte @@ -1,16 +1,8 @@ - - - Home - - Webhooks - From 98395e2a22a0a8280bb3d23852a041482cc6fd06 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 18 May 2022 16:23:19 +0200 Subject: [PATCH 05/22] chore: modified last layout --- .../document/[document]/__layout.svelte | 43 +++++++++---------- .../document/[document]/_tabs.svelte | 26 ----------- 2 files changed, 21 insertions(+), 48 deletions(-) delete mode 100644 src/routes/console/[project]/database/collection/[collection]/document/[document]/_tabs.svelte diff --git a/src/routes/console/[project]/database/collection/[collection]/document/[document]/__layout.svelte b/src/routes/console/[project]/database/collection/[collection]/document/[document]/__layout.svelte index 7c19f08f60..93c7fae79f 100644 --- a/src/routes/console/[project]/database/collection/[collection]/document/[document]/__layout.svelte +++ b/src/routes/console/[project]/database/collection/[collection]/document/[document]/__layout.svelte @@ -1,40 +1,39 @@ Appwrite - Database Document -{#if $doc && $collection} - - - Collection - {$collection.name} - -

{$doc.$id}

- - - - - - -{:else} -
-{/if} + diff --git a/src/routes/console/[project]/database/collection/[collection]/document/[document]/_tabs.svelte b/src/routes/console/[project]/database/collection/[collection]/document/[document]/_tabs.svelte deleted file mode 100644 index e4e6677cd7..0000000000 --- a/src/routes/console/[project]/database/collection/[collection]/document/[document]/_tabs.svelte +++ /dev/null @@ -1,26 +0,0 @@ - - - From 0af6da8fb10dbc452a60dab148a01f3db89f8297 Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 18 May 2022 16:29:43 +0200 Subject: [PATCH 06/22] fix: teams store type error --- src/routes/console/[project]/users/teams/[team]/store.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/console/[project]/users/teams/[team]/store.ts b/src/routes/console/[project]/users/teams/[team]/store.ts index 7ccd2e40bc..171dd20c83 100644 --- a/src/routes/console/[project]/users/teams/[team]/store.ts +++ b/src/routes/console/[project]/users/teams/[team]/store.ts @@ -3,7 +3,7 @@ import type { Models } from 'src/sdk'; import { writable } from 'svelte/store'; function createTeamStore() { - const { subscribe, set } = writable>>(); + const { subscribe, set } = writable(); return { subscribe, From 8a6af22ae9ffe36eebf600f0e288bb9094f1783b Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Wed, 18 May 2022 23:09:37 +0200 Subject: [PATCH 07/22] fix: collection route --- .../database/collection/[collection]/__layout.svelte | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/routes/console/[project]/database/collection/[collection]/__layout.svelte b/src/routes/console/[project]/database/collection/[collection]/__layout.svelte index 08850637c2..8325cb632e 100644 --- a/src/routes/console/[project]/database/collection/[collection]/__layout.svelte +++ b/src/routes/console/[project]/database/collection/[collection]/__layout.svelte @@ -44,4 +44,6 @@ Appwrite - {$collection?.name ?? 'Collection'} - +{#if $collection} + +{/if} From e69bd66ac15b894705d93a920e6a9b0dd0bd5e53 Mon Sep 17 00:00:00 2001 From: Arman Date: Thu, 19 May 2022 11:31:26 +0200 Subject: [PATCH 08/22] fix: double cover on home page (WIP) --- src/routes/console/[project]/index.svelte | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/routes/console/[project]/index.svelte b/src/routes/console/[project]/index.svelte index b367882559..8ea099022b 100644 --- a/src/routes/console/[project]/index.svelte +++ b/src/routes/console/[project]/index.svelte @@ -1,4 +1,5 @@
@@ -33,13 +49,17 @@
- -
- {#await request} -
- {:then response} - {#if response.total} - - - - Name - E-Mail - Status - Joined - - - {#each response.users as user} - - -
- {user.name} -
- - - {user.name ? user.name : 'n/a'} - - {user.email} - - - {user.emailVerification ? 'Verified' : 'Unverified'} - - - {toLocaleDate(user.registration)} - - {/each} - -
-
-

Total results: {response.total}

- -
- {:else if search} - - No results found for {search} - - {:else} - - No Users Found - Create your first user to get started. - - {/if} - {/await} + {#if $usersList?.response?.total} + + + + Name + E-Mail + Status + Joined + + + {#each $usersList.response.users as user} + + +
+ {user.name} +
+ + + {user.name ? user.name : 'n/a'} + + {user.email} + + + {user.emailVerification ? 'Verified' : 'Unverified'} + + + + {toLocaleDate(user.registration)} + + + {/each} + +
+
+

Total results: {$usersList.response.total}

+ +
+ {:else if search} + + No results found for {search} + + {:else} + + No Users Found + Create your first user to get started. + + {/if} diff --git a/src/routes/console/[project]/users/store.ts b/src/routes/console/[project]/users/store.ts new file mode 100644 index 0000000000..12ee08fd7e --- /dev/null +++ b/src/routes/console/[project]/users/store.ts @@ -0,0 +1,45 @@ +import { sdkForProject } from '$lib/stores/sdk'; +import { writable } from 'svelte/store'; +import type { Models } from 'src/sdk'; +import { browser } from '$app/env'; + +export type UsersList = { + loading: boolean; + response?: Models.UserList>; +}; + +function createUserStore() { + const { subscribe, set } = writable({ + loading: true, + response: browser ? JSON.parse(sessionStorage.getItem('users')) : null + }); + + return { + subscribe, + set, + load: async (search: string, limit: number, offset: number) => { + try { + const response = await sdkForProject.users.list( + search, + limit, + offset, + undefined, + undefined, + 'DESC' + ); + set({ + loading: false, + response + }); + } catch (error) { + //TODO: take care what happens here + } + } + }; +} + +export const usersList = createUserStore(); + +if (browser) { + usersList.subscribe((n) => sessionStorage?.setItem('users', JSON.stringify(n.response ?? ''))); +} From 13720e4ee96743e48adbc426e2402e056ad3411e Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 20 May 2022 14:00:02 +0200 Subject: [PATCH 14/22] chore: update ui library --- package-lock.json | 19 ++++++++++--------- package.json | 3 ++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 467e6d8adb..6ae2c59c6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,8 @@ "name": "@appwrite/console", "version": "0.0.1", "dependencies": { - "@aw-labs/ui": "*" + "@aw-labs/icons": "^0.0.0-2", + "@aw-labs/ui": "^0.0.0-2" }, "devDependencies": { "@playwright/test": "^1.22.1", @@ -56,14 +57,14 @@ } }, "node_modules/@aw-labs/icons": { - "version": "0.0.0-1", + "version": "0.0.0-2", "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-1.tgz", "integrity": "sha512-R9y70SYD9nE5LtHd6ghj2XqpRec08s+lOObRVrINHRMZnh44ATUkUsnceaIfr+Sc8v7qPXfVepU+lwAR+DODDA==" }, "node_modules/@aw-labs/ui": { - "version": "0.0.0-1", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-1.tgz", - "integrity": "sha512-zuF87wkB1ExVhfS9QgrtpATrzbz+elTEzP0ZDfApX/ILk0Drbp5+eogv2D/3iQUZFwWwJbhR1q1VdRLc9UUnMQ==", + "version": "0.0.0-2", + "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-2.tgz", + "integrity": "sha512-ttb0f1hKKSw1tY+XuE3o+nXhHumSIESNgpWdre8niRCJ6E4L9CC5dwz9z7YK04bgSIGnF5gGcPQVkh6otJZHOQ==", "dependencies": { "@aw-labs/icons": "*" } @@ -7015,14 +7016,14 @@ } }, "@aw-labs/icons": { - "version": "0.0.0-1", + "version": "0.0.0-2", "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-1.tgz", "integrity": "sha512-R9y70SYD9nE5LtHd6ghj2XqpRec08s+lOObRVrINHRMZnh44ATUkUsnceaIfr+Sc8v7qPXfVepU+lwAR+DODDA==" }, "@aw-labs/ui": { - "version": "0.0.0-1", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-1.tgz", - "integrity": "sha512-zuF87wkB1ExVhfS9QgrtpATrzbz+elTEzP0ZDfApX/ILk0Drbp5+eogv2D/3iQUZFwWwJbhR1q1VdRLc9UUnMQ==", + "version": "0.0.0-2", + "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-2.tgz", + "integrity": "sha512-ttb0f1hKKSw1tY+XuE3o+nXhHumSIESNgpWdre8niRCJ6E4L9CC5dwz9z7YK04bgSIGnF5gGcPQVkh6otJZHOQ==", "requires": { "@aw-labs/icons": "*" } diff --git a/package.json b/package.json index 7908bf5e9a..69dc399deb 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,8 @@ "e2e": "playwright test tests/e2e" }, "dependencies": { - "@aw-labs/ui": "*" + "@aw-labs/ui": "^0.0.0-2", + "@aw-labs/icons": "^0.0.0-2" }, "devDependencies": { "@playwright/test": "^1.22.1", From 91ba8df02640087944913ad0d79da6d52da2278c Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 20 May 2022 14:52:47 +0200 Subject: [PATCH 15/22] chore: update ui library --- 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 6ae2c59c6a..47ca99fcd2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,8 +8,8 @@ "name": "@appwrite/console", "version": "0.0.1", "dependencies": { - "@aw-labs/icons": "^0.0.0-2", - "@aw-labs/ui": "^0.0.0-2" + "@aw-labs/icons": "^0.0.0-3", + "@aw-labs/ui": "^0.0.0-3" }, "devDependencies": { "@playwright/test": "^1.22.1", @@ -57,14 +57,14 @@ } }, "node_modules/@aw-labs/icons": { - "version": "0.0.0-2", - "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-1.tgz", - "integrity": "sha512-R9y70SYD9nE5LtHd6ghj2XqpRec08s+lOObRVrINHRMZnh44ATUkUsnceaIfr+Sc8v7qPXfVepU+lwAR+DODDA==" + "version": "0.0.0-3", + "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-3.tgz", + "integrity": "sha512-AjJkXKBCMgzF4/UoQVfQXcBOs3Im45wTfCAEO/Pd449KB4vB2PGexodVQRDl4DXk9yW/mJc5bRoFA3XWDyD58g==" }, "node_modules/@aw-labs/ui": { - "version": "0.0.0-2", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-2.tgz", - "integrity": "sha512-ttb0f1hKKSw1tY+XuE3o+nXhHumSIESNgpWdre8niRCJ6E4L9CC5dwz9z7YK04bgSIGnF5gGcPQVkh6otJZHOQ==", + "version": "0.0.0-3", + "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-3.tgz", + "integrity": "sha512-1uGj9BgqepUfH8eg0hHf2HnhiBuf5xhcPM1X4VZMLby6ayTkD0swgLtzQIJbMbcbB38RqylExjb8fesWDohuTQ==", "dependencies": { "@aw-labs/icons": "*" } @@ -7016,14 +7016,14 @@ } }, "@aw-labs/icons": { - "version": "0.0.0-2", - "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-1.tgz", - "integrity": "sha512-R9y70SYD9nE5LtHd6ghj2XqpRec08s+lOObRVrINHRMZnh44ATUkUsnceaIfr+Sc8v7qPXfVepU+lwAR+DODDA==" + "version": "0.0.0-3", + "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-3.tgz", + "integrity": "sha512-AjJkXKBCMgzF4/UoQVfQXcBOs3Im45wTfCAEO/Pd449KB4vB2PGexodVQRDl4DXk9yW/mJc5bRoFA3XWDyD58g==" }, "@aw-labs/ui": { - "version": "0.0.0-2", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-2.tgz", - "integrity": "sha512-ttb0f1hKKSw1tY+XuE3o+nXhHumSIESNgpWdre8niRCJ6E4L9CC5dwz9z7YK04bgSIGnF5gGcPQVkh6otJZHOQ==", + "version": "0.0.0-3", + "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-3.tgz", + "integrity": "sha512-1uGj9BgqepUfH8eg0hHf2HnhiBuf5xhcPM1X4VZMLby6ayTkD0swgLtzQIJbMbcbB38RqylExjb8fesWDohuTQ==", "requires": { "@aw-labs/icons": "*" } diff --git a/package.json b/package.json index 69dc399deb..0fe6ac1091 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,8 @@ "e2e": "playwright test tests/e2e" }, "dependencies": { - "@aw-labs/ui": "^0.0.0-2", - "@aw-labs/icons": "^0.0.0-2" + "@aw-labs/ui": "^0.0.0-3", + "@aw-labs/icons": "^0.0.0-3" }, "devDependencies": { "@playwright/test": "^1.22.1", From 3f144db22ee8d0e89fca58ac8882c192c2ae62b7 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 20 May 2022 16:01:06 +0200 Subject: [PATCH 16/22] fix table for users --- src/lib/components/card.svelte | 2 +- src/lib/components/modal.svelte | 2 +- src/lib/elements/table/cellHead.svelte | 6 + src/lib/helpers/date.ts | 13 ++ .../console/[project]/users/index.svelte | 23 +++- src/routes/console/[project]/users/store.ts | 41 +++++- .../console/[project]/users/teams.svelte | 121 ++++++++++-------- 7 files changed, 142 insertions(+), 66 deletions(-) diff --git a/src/lib/components/card.svelte b/src/lib/components/card.svelte index e2d373f06d..931aee3142 100644 --- a/src/lib/components/card.svelte +++ b/src/lib/components/card.svelte @@ -1,3 +1,3 @@ -
+
diff --git a/src/lib/components/modal.svelte b/src/lib/components/modal.svelte index 17166c362b..8b164689e8 100644 --- a/src/lib/components/modal.svelte +++ b/src/lib/components/modal.svelte @@ -48,7 +48,7 @@ aria-label="Close Modal" title="Close Modal" on:click={closeModal}> -