From 9f51d455f5af2572298aff1d23284092de223d35 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 24 Jun 2022 13:09:26 +0200 Subject: [PATCH 1/5] feat: table row link component --- src/lib/elements/table/index.ts | 1 + src/lib/elements/table/rowLink.svelte | 21 +++++++++++++++++++ .../console/[project]/users/index.svelte | 14 ++++++------- 3 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 src/lib/elements/table/rowLink.svelte diff --git a/src/lib/elements/table/index.ts b/src/lib/elements/table/index.ts index 1d1f55669..e67c95b54 100644 --- a/src/lib/elements/table/index.ts +++ b/src/lib/elements/table/index.ts @@ -3,6 +3,7 @@ export { default as TableBody } from './body.svelte'; export { default as TableHeader } from './header.svelte'; export { default as TableFooter } from './footer.svelte'; export { default as TableRow } from './row.svelte'; +export { default as TableRowLink } from './rowLink.svelte'; export { default as TableCell } from './cell.svelte'; export { default as TableCellHead } from './cellHead.svelte'; export { default as TableCellLink } from './cellLink.svelte'; diff --git a/src/lib/elements/table/rowLink.svelte b/src/lib/elements/table/rowLink.svelte new file mode 100644 index 000000000..d5e72f51f --- /dev/null +++ b/src/lib/elements/table/rowLink.svelte @@ -0,0 +1,21 @@ + + + + + + + diff --git a/src/routes/console/[project]/users/index.svelte b/src/routes/console/[project]/users/index.svelte index fd9f23d90..1de479725 100644 --- a/src/routes/console/[project]/users/index.svelte +++ b/src/routes/console/[project]/users/index.svelte @@ -10,8 +10,8 @@ TableBody, TableRow, TableCellHead, - TableCellLink, - TableCellText + TableCellText, + TableRowLink } from '$lib/elements/table'; import Create from './_createUser.svelte'; import type { Models } from 'src/sdk'; @@ -93,10 +93,8 @@ {#each $usersList.response.users as user} - - + +
{user.name} {user.name ? user.name : 'n/a'}
- + {user.email} {#if user.status} @@ -125,7 +123,7 @@ {toLocaleDateTime(user.registration)} - + {/each} From ba9acab1d706e2c54a613dafa04dd95d512ec6c8 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 24 Jun 2022 13:09:52 +0200 Subject: [PATCH 2/5] fix: remove unused import --- src/routes/console/[project]/users/index.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/src/routes/console/[project]/users/index.svelte b/src/routes/console/[project]/users/index.svelte index 1de479725..d17a1e0af 100644 --- a/src/routes/console/[project]/users/index.svelte +++ b/src/routes/console/[project]/users/index.svelte @@ -8,7 +8,6 @@ Table, TableHeader, TableBody, - TableRow, TableCellHead, TableCellText, TableRowLink From db56eb127fb61796460f6bd38b0fb43854b54228 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 24 Jun 2022 13:15:01 +0200 Subject: [PATCH 3/5] fix: copy button --- src/routes/console/[project]/users/index.svelte | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/routes/console/[project]/users/index.svelte b/src/routes/console/[project]/users/index.svelte index d17a1e0af..acc559e71 100644 --- a/src/routes/console/[project]/users/index.svelte +++ b/src/routes/console/[project]/users/index.svelte @@ -50,7 +50,9 @@ } }); - const copy = async (value: string) => { + const copy = async (event: Event, value: string) => { + event.preventDefault(); + event.stopPropagation(); try { await navigator.clipboard.writeText(value); addNotification({ @@ -115,7 +117,7 @@ {/if} - copy(user.$id)} + copy(e, user.$id)} >User ID From f6aa2ec1fb37f4ac03fa01986ebe01673e8c2e94 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 30 Jun 2022 15:42:29 +0200 Subject: [PATCH 4/5] fix: format --- src/routes/console/[project]/users/index.svelte | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/routes/console/[project]/users/index.svelte b/src/routes/console/[project]/users/index.svelte index efdc18de7..07257535d 100644 --- a/src/routes/console/[project]/users/index.svelte +++ b/src/routes/console/[project]/users/index.svelte @@ -96,9 +96,7 @@ {/each} -
+

Total results: {$usersList.response.total}

From bf3fc152427027de269cc997ea00d35a62ee256e Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Thu, 30 Jun 2022 15:55:35 +0200 Subject: [PATCH 5/5] fix: add new tables --- package-lock.json | 28 +++++++++---------- package.json | 4 +-- src/lib/elements/table/body.svelte | 4 +-- src/lib/elements/table/cell.svelte | 8 ++++-- src/lib/elements/table/cellHead.svelte | 12 ++------ src/lib/elements/table/cellLink.svelte | 4 +-- src/lib/elements/table/cellText.svelte | 4 +-- src/lib/elements/table/header.svelte | 8 +++--- src/lib/elements/table/row.svelte | 4 +-- src/lib/elements/table/rowLink.svelte | 14 ---------- src/lib/elements/table/table.svelte | 4 +-- .../console/[project]/users/index.svelte | 4 +-- 12 files changed, 41 insertions(+), 57 deletions(-) diff --git a/package-lock.json b/package-lock.json index ba1cbfdb2..13a35c6b2 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-20", - "@aw-labs/ui": "^0.0.0-20", + "@aw-labs/icons": "^0.0.0-22", + "@aw-labs/ui": "^0.0.0-22", "echarts": "^5.3.3" }, "devDependencies": { @@ -58,14 +58,14 @@ } }, "node_modules/@aw-labs/icons": { - "version": "0.0.0-20", - "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-20.tgz", - "integrity": "sha512-NgUu2b6ZKtK96uI5XQ1omo+4/2Qa1p6dnJgDzAMwXSNkU2r0OXAk2XPDuLy1FKGvF4j5EvZ8pzgUb/LDstBN1w==" + "version": "0.0.0-22", + "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-22.tgz", + "integrity": "sha512-lSMJ2+muE3tiNtEh5I5FhK89nq06OIkzHnvYHGKTm4mnQWLIDRI8N63LjFmddhLjAuiet6QeuTv/YDMe6IvkHA==" }, "node_modules/@aw-labs/ui": { - "version": "0.0.0-20", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-20.tgz", - "integrity": "sha512-yCd8zdqvbGQwhUSIIoWktEX31t+sL+ZrRFl4lyN+1rziozDJpvZd4PMeQsiO03LZYJDbuYYNLEjhk52xI1mAVw==", + "version": "0.0.0-22", + "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-22.tgz", + "integrity": "sha512-0Pux3lVJ3YL4f++aAmpEj21qlU6l2+qRSoYTITGyGFXz0bL7a3ejrlUsM91uG6zo23danbaJy8MfnGvFQ8Qtpg==", "dependencies": { "@aw-labs/icons": "*" } @@ -7807,14 +7807,14 @@ } }, "@aw-labs/icons": { - "version": "0.0.0-20", - "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-20.tgz", - "integrity": "sha512-NgUu2b6ZKtK96uI5XQ1omo+4/2Qa1p6dnJgDzAMwXSNkU2r0OXAk2XPDuLy1FKGvF4j5EvZ8pzgUb/LDstBN1w==" + "version": "0.0.0-22", + "resolved": "https://registry.npmjs.org/@aw-labs/icons/-/icons-0.0.0-22.tgz", + "integrity": "sha512-lSMJ2+muE3tiNtEh5I5FhK89nq06OIkzHnvYHGKTm4mnQWLIDRI8N63LjFmddhLjAuiet6QeuTv/YDMe6IvkHA==" }, "@aw-labs/ui": { - "version": "0.0.0-20", - "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-20.tgz", - "integrity": "sha512-yCd8zdqvbGQwhUSIIoWktEX31t+sL+ZrRFl4lyN+1rziozDJpvZd4PMeQsiO03LZYJDbuYYNLEjhk52xI1mAVw==", + "version": "0.0.0-22", + "resolved": "https://registry.npmjs.org/@aw-labs/ui/-/ui-0.0.0-22.tgz", + "integrity": "sha512-0Pux3lVJ3YL4f++aAmpEj21qlU6l2+qRSoYTITGyGFXz0bL7a3ejrlUsM91uG6zo23danbaJy8MfnGvFQ8Qtpg==", "requires": { "@aw-labs/icons": "*" } diff --git a/package.json b/package.json index 94012bf48..6275a7ab9 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,8 @@ "e2e": "playwright test tests/e2e" }, "dependencies": { - "@aw-labs/icons": "^0.0.0-20", - "@aw-labs/ui": "^0.0.0-20", + "@aw-labs/icons": "^0.0.0-22", + "@aw-labs/ui": "^0.0.0-22", "echarts": "^5.3.3" }, "devDependencies": { diff --git a/src/lib/elements/table/body.svelte b/src/lib/elements/table/body.svelte index 1766ff31c..635b587f2 100644 --- a/src/lib/elements/table/body.svelte +++ b/src/lib/elements/table/body.svelte @@ -1,3 +1,3 @@ - +
- +
diff --git a/src/lib/elements/table/cell.svelte b/src/lib/elements/table/cell.svelte index 340e89064..4a5259d0f 100644 --- a/src/lib/elements/table/cell.svelte +++ b/src/lib/elements/table/cell.svelte @@ -3,6 +3,10 @@ export let width: number = null; - +
- +
diff --git a/src/lib/elements/table/cellHead.svelte b/src/lib/elements/table/cellHead.svelte index c1245fa71..1ff8ade15 100644 --- a/src/lib/elements/table/cellHead.svelte +++ b/src/lib/elements/table/cellHead.svelte @@ -2,14 +2,8 @@ export let width: number = null; - - +
+ - - - +
diff --git a/src/lib/elements/table/cellLink.svelte b/src/lib/elements/table/cellLink.svelte index 305c702b5..99da3e2f6 100644 --- a/src/lib/elements/table/cellLink.svelte +++ b/src/lib/elements/table/cellLink.svelte @@ -3,6 +3,6 @@ export let title: string; - +
- +
diff --git a/src/lib/elements/table/cellText.svelte b/src/lib/elements/table/cellText.svelte index 28c556455..bfc7c564e 100644 --- a/src/lib/elements/table/cellText.svelte +++ b/src/lib/elements/table/cellText.svelte @@ -2,6 +2,6 @@ export let title: string; - +
- +
diff --git a/src/lib/elements/table/header.svelte b/src/lib/elements/table/header.svelte index 3d0dd582a..bad3f122b 100644 --- a/src/lib/elements/table/header.svelte +++ b/src/lib/elements/table/header.svelte @@ -1,5 +1,5 @@ - - +
+
- - +
+
diff --git a/src/lib/elements/table/row.svelte b/src/lib/elements/table/row.svelte index 22e3bea12..3a9808d96 100644 --- a/src/lib/elements/table/row.svelte +++ b/src/lib/elements/table/row.svelte @@ -1,3 +1,3 @@ - +
- +
diff --git a/src/lib/elements/table/rowLink.svelte b/src/lib/elements/table/rowLink.svelte index d5e72f51f..7a8249bc7 100644 --- a/src/lib/elements/table/rowLink.svelte +++ b/src/lib/elements/table/rowLink.svelte @@ -5,17 +5,3 @@ - - diff --git a/src/lib/elements/table/table.svelte b/src/lib/elements/table/table.svelte index 5aa7d827f..465d4c8f9 100644 --- a/src/lib/elements/table/table.svelte +++ b/src/lib/elements/table/table.svelte @@ -1,3 +1,3 @@ - +
-
+
diff --git a/src/routes/console/[project]/users/index.svelte b/src/routes/console/[project]/users/index.svelte index 07257535d..6d2032619 100644 --- a/src/routes/console/[project]/users/index.svelte +++ b/src/routes/console/[project]/users/index.svelte @@ -69,9 +69,9 @@ {#each $usersList.response.users as user} -
+
- {user.name ? user.name : 'n/a'} + {user.name ? user.name : 'n/a'}
{user.email}