diff --git a/src/lib/components/common/Pagination.svelte b/src/lib/components/common/Pagination.svelte index 5ef7e7953..e1ee4766d 100644 --- a/src/lib/components/common/Pagination.svelte +++ b/src/lib/components/common/Pagination.svelte @@ -14,7 +14,7 @@
@@ -25,7 +25,7 @@ {:else} {page.value} @@ -33,7 +33,7 @@ {/each}
diff --git a/src/routes/(app)/admin/+page.svelte b/src/routes/(app)/admin/+page.svelte index 091f4c051..0f40c0f0b 100644 --- a/src/routes/(app)/admin/+page.svelte +++ b/src/routes/(app)/admin/+page.svelte @@ -20,6 +20,7 @@ import AddUserModal from '$lib/components/admin/AddUserModal.svelte'; import ConfirmDialog from '$lib/components/common/ConfirmDialog.svelte'; import Badge from '$lib/components/common/Badge.svelte'; + import Plus from '$lib/components/icons/Plus.svelte'; const i18n = getContext('i18n'); @@ -127,7 +128,7 @@
@@ -135,63 +136,60 @@
-
- - - +
+
+ + - + {#each users .filter((user) => { if (search === '') { @@ -254,8 +252,8 @@ if (a[sortKey] > b[sortKey]) return sortOrder === 'asc' ? 1 : -1; return 0; }) - .slice((page - 1) * 20, page * 20) as user} - + .slice((page - 1) * 20, page * 20) as user, userIdx} +
setSortKey('role')} > {$i18n.t('Role')} {#if sortKey === 'role'} - {sortOrder === 'asc' ? '▲' : '▼'} + {sortOrder === 'asc' ? '▲' : '▼'} {:else} {/if} setSortKey('name')} > {$i18n.t('Name')} {#if sortKey === 'name'} - {sortOrder === 'asc' ? '▲' : '▼'} + {sortOrder === 'asc' ? '▲' : '▼'} {:else} {/if} setSortKey('email')} > {$i18n.t('Email')} {#if sortKey === 'email'} - {sortOrder === 'asc' ? '▲' : '▼'} + {sortOrder === 'asc' ? '▲' : '▼'} {:else} {/if} @@ -199,24 +197,24 @@ setSortKey('last_active_at')} > {$i18n.t('Last Active')} {#if sortKey === 'last_active_at'} - {sortOrder === 'asc' ? '▲' : '▼'} + {sortOrder === 'asc' ? '▲' : '▼'} {:else} {/if} setSortKey('created_at')} > {$i18n.t('Created at')} {#if sortKey === 'created_at'} - {sortOrder === 'asc' ? '▲' : '▼'} + {sortOrder === 'asc' ? '▲' : '▼'} {:else} {/if} @@ -224,12 +222,12 @@ setSortKey('oauth_sub')} > {$i18n.t('OAuth ID')} {#if sortKey === 'oauth_sub'} - {sortOrder === 'asc' ? '▲' : '▼'} + {sortOrder === 'asc' ? '▲' : '▼'} {:else} {/if} @@ -238,7 +236,7 @@
-
+
ⓘ {$i18n.t("Click on the user role button to change a user's role.")}