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/components/copy.svelte b/src/lib/components/copy.svelte index ef8ab77b3..0841f7792 100644 --- a/src/lib/components/copy.svelte +++ b/src/lib/components/copy.svelte @@ -19,6 +19,6 @@ }; - + 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/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/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 new file mode 100644 index 000000000..7a8249bc7 --- /dev/null +++ b/src/lib/elements/table/rowLink.svelte @@ -0,0 +1,7 @@ + + + + + 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 8f9ee833f..2f4917996 100644 --- a/src/routes/console/[project]/users/index.svelte +++ b/src/routes/console/[project]/users/index.svelte @@ -7,10 +7,9 @@ Table, TableHeader, TableBody, - TableRow, TableCellHead, - TableCellLink, - TableCellText + TableCellText, + TableRowLink } from '$lib/elements/table'; import Create from './_createUser.svelte'; import type { Models } from 'src/sdk'; @@ -28,7 +27,7 @@ const limit = 5; const project = $page.params.project; - const getAvatar = (name: string) => sdkForProject.avatars.getInitials(name, 40, 40).toString(); + const getAvatar = (name: string) => sdkForProject.avatars.getInitials(name, 32, 32).toString(); const userCreated = async (event: CustomEvent>>) => { await goto(`${base}/console/${project}/users/user/${event.detail.$id}`); }; @@ -68,15 +67,13 @@ {#each $usersList.response.users as user} - - -
- - {user.name ? user.name : 'n/a'} + + +
+ + {user.name ? user.name : 'n/a'}
- +
{user.email} {#if user.status} @@ -95,13 +92,11 @@ {toLocaleDateTime(user.registration)} - +
{/each} -
+

Total results: {$usersList.response.total}

diff --git a/src/routes/console/[project]/users/teams.svelte b/src/routes/console/[project]/users/teams.svelte index 21806e6a6..3a245ef82 100644 --- a/src/routes/console/[project]/users/teams.svelte +++ b/src/routes/console/[project]/users/teams.svelte @@ -5,9 +5,8 @@ Table, TableHeader, TableBody, - TableRow, + TableRowLink, TableCellHead, - TableCellLink, TableCellText } from '$lib/elements/table'; import { Button } from '$lib/elements/forms'; @@ -27,7 +26,7 @@ const limit = 25; const project = $page.params.project; - const getAvatar = (name: string) => sdkForProject.avatars.getInitials(name, 40, 40).toString(); + const getAvatar = (name: string) => sdkForProject.avatars.getInitials(name, 32, 32).toString(); const teamCreated = async (event: CustomEvent) => { await goto(`${base}/console/${project}/users/teams/${event.detail.$id}`); }; @@ -61,26 +60,22 @@ {#each $teamsList.response.teams as team} - - + +
- + {team.name}
-
+ {team.total} members {toLocaleDateTime(team.dateCreated)} -
+ {/each}
-
+

Total results: {$teamsList.response.total}

diff --git a/src/routes/console/[project]/users/teams/[team]/members.svelte b/src/routes/console/[project]/users/teams/[team]/members.svelte index 9f51506ea..2da72e6b1 100644 --- a/src/routes/console/[project]/users/teams/[team]/members.svelte +++ b/src/routes/console/[project]/users/teams/[team]/members.svelte @@ -5,9 +5,8 @@ Table, TableHeader, TableBody, - TableRow, + TableRowLink, TableCellHead, - TableCellLink, TableCellText } from '$lib/elements/table'; import { Button } from '$lib/elements/forms'; @@ -21,7 +20,7 @@ import CreateMember from './_createMember.svelte'; import DeleteMembership from './_deleteMembership.svelte'; - const getAvatar = (name: string) => sdkForProject.avatars.getInitials(name, 40, 40).toString(); + const getAvatar = (name: string) => sdkForProject.avatars.getInitials(name, 32, 32).toString(); const deleted = () => memberships.load($page.params.team, search, limit, offset ?? 0); const project = $page.params.project; @@ -59,19 +58,18 @@ {#each $memberships.response.memberships as membership} - - + +
{membership.userName ? membership.userName : 'n/a'}
-
+ {membership.roles} {toLocaleDateTime(membership.joined)} @@ -79,14 +77,14 @@ -
+ {/each}
diff --git a/src/routes/console/[project]/users/user/[user]/index.svelte b/src/routes/console/[project]/users/user/[user]/index.svelte index 7213e6d4b..57316dc51 100644 --- a/src/routes/console/[project]/users/user/[user]/index.svelte +++ b/src/routes/console/[project]/users/user/[user]/index.svelte @@ -29,7 +29,8 @@ newKey: string = null, newValue: string = null; let showVerifcationDropdown = false; - let prefs = Object.entries($user.response.prefs); + //TODO: check correct type + let prefs: [string, unknown][] = null; let arePrefsDisabled = true; onMount(async () => { diff --git a/src/routes/console/[project]/users/user/[user]/memberships.svelte b/src/routes/console/[project]/users/user/[user]/memberships.svelte index 1cd819af3..af50ea893 100644 --- a/src/routes/console/[project]/users/user/[user]/memberships.svelte +++ b/src/routes/console/[project]/users/user/[user]/memberships.svelte @@ -5,9 +5,8 @@ Table, TableHeader, TableBody, - TableRow, + TableRowLink, TableCellHead, - TableCellLink, TableCellText } from '$lib/elements/table'; import { Button } from '$lib/elements/forms'; @@ -18,7 +17,7 @@ import DeleteAllMemberships from './_deleteAllMemberships.svelte'; import type { Models } from 'src/sdk'; - const getAvatar = (name: string) => sdkForProject.avatars.getInitials(name, 40, 40).toString(); + const getAvatar = (name: string) => sdkForProject.avatars.getInitials(name, 32, 32).toString(); const deleted = () => (request = sdkForProject.users.getMemberships($page.params.user)); const project = $page.params.project; @@ -50,31 +49,30 @@ {#each response.memberships as membership} - - + +
{membership.userName ? membership.userName : 'n/a'}
-
+ {membership.roles} -
+ {/each}