Add login and remove created from admin user table

sillsdev · Nov 30, 2023 · 34679d7 · 34679d7
1 parent c6a3a48
commit 34679d7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/frontend/src/lib/i18n/locales/en.json b/frontend/src/lib/i18n/locales/en.json
@@ -2,8 +2,8 @@
   "admin_dashboard": {
     "title": "Admin Dashboard",
     "column_code": "Code",
-    "column_created": "Created",
     "column_email": "Email",
+    "column_login": "Login",
     "column_last_change": "Last Change",
     "column_migrated": "Migrated",
     "column_name": "Name",

diff --git a/frontend/src/routes/(authenticated)/admin/+page.svelte b/frontend/src/routes/(authenticated)/admin/+page.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
   import { Badge } from '$lib/components/Badges';
-  import FormatDate from '$lib/components/FormatDate.svelte';
   import Input from '$lib/forms/Input.svelte';
   import t from '$lib/i18n';
   import type { PageData } from './$types';
@@ -103,16 +102,21 @@
               <th>
                 {$t('admin_dashboard.column_name')}<span class="i-mdi-sort-ascending text-xl align-[-5px] ml-2" />
               </th>
+              <th>{$t('admin_dashboard.column_login')}</th>
               <th>{$t('admin_dashboard.column_email')}</th>
               <th>{$t('admin_dashboard.column_role')}</th>
-              <th>{$t('admin_dashboard.column_created')}</th>
               <th />
             </tr>
           </thead>
           <tbody>
             {#each shownUsers as user}
               <tr>
                 <td>{user.name}</td>
+                <td>
+                  {#if user.username}
+                    {user.username}
+                  {/if}
+                </td>
                 <td>
                   <span class="inline-flex items-center gap-2 text-left">
                     {user.email}
@@ -128,9 +132,6 @@
                 <td class:text-accent={user.isAdmin}>
                   {user.isAdmin ? $t('user_types.admin') : $t('user_types.user')}
                 </td>
-                <td>
-                  <FormatDate date={user.createdDate} />
-                </td>
                 <td class="p-0">
                   <Dropdown let:close>
                     <!-- svelte-ignore a11y-label-has-associated-control -->

diff --git a/frontend/src/routes/(authenticated)/admin/+page.ts b/frontend/src/routes/(authenticated)/admin/+page.ts
@@ -80,8 +80,8 @@ export async function load(event: PageLoadEvent) {
                 id
                 name
                 email
+                username
                 isAdmin
-                createdDate
                 emailVerified
                 projects {
                     id