Merge branch 'develop' into feature/MED-129

packages/features/admin/src/components/admin-account-page.tsx

@@ -170,6 +170,7 @@ async function TeamAccountPage(props: {
     <>
       <PageHeader
         className="border-b"
+        title={'Account'}
         description={
           <AppBreadcrumbs
             values={{

packages/features/admin/src/components/admin-create-user-dialog.tsx

@@ -48,7 +48,7 @@ export function AdminCreateUserDialog(props: React.PropsWithChildren) {
       email: '',
       password: '',
       emailConfirm: false,
-      personalCode: ''
+      personalCode: '',
     },
     mode: 'onBlur',
   });
@@ -163,7 +163,7 @@ export function AdminCreateUserDialog(props: React.PropsWithChildren) {
             <FormField
               name={'emailConfirm'}
               render={({ field }) => (
-                <FormItem className="flex flex-row items-start space-x-3 space-y-0 rounded-md border p-4">
+                <FormItem className="flex flex-row items-start space-y-0 space-x-3 rounded-md border p-4">
                   <FormControl>
                     <Checkbox
                       checked={field.value}

packages/features/admin/src/components/admin-dashboard.tsx

@@ -18,8 +18,8 @@ export async function AdminDashboard() {
         ' xl:grid-cols-4'
       }
     >
-      <Card>
-        <CardHeader>
+      <Card className="flex flex-col">
+        <CardHeader className="flex-1">
           <CardTitle>Users</CardTitle>
 
           <CardDescription>
@@ -34,8 +34,8 @@ export async function AdminDashboard() {
         </CardContent>
       </Card>
 
-      <Card>
-        <CardHeader>
+      <Card className="flex flex-col">
+        <CardHeader className="flex-1">
           <CardTitle>Company Accounts</CardTitle>
 
           <CardDescription>

packages/features/admin/src/components/admin-members-table.tsx

@@ -4,6 +4,7 @@ import Link from 'next/link';
 
 import { ColumnDef } from '@tanstack/react-table';
 
+import { formatDateAndTime } from '@kit/shared/utils';
 import { Database } from '@kit/supabase/database';
 import { DataTable } from '@kit/ui/enhanced-data-table';
 import { ProfileAvatar } from '@kit/ui/profile-avatar';
@@ -17,10 +18,6 @@ export function AdminMembersTable(props: { members: Memberships[] }) {
 
 function getColumns(): ColumnDef<Memberships>[] {
   return [
-    {
-      header: 'User ID',
-      accessorKey: 'user_id',
-    },
     {
       header: 'Name',
       cell: ({ row }) => {
@@ -58,10 +55,16 @@ function getColumns(): ColumnDef<Memberships>[] {
     {
       header: 'Created At',
       accessorKey: 'created_at',
+      cell: ({ row }) => {
+        return formatDateAndTime(row.original.created_at);
+      },
     },
     {
       header: 'Updated At',
       accessorKey: 'updated_at',
+      cell: ({ row }) => {
+        return formatDateAndTime(row.original.updated_at);
+      },
     },
   ];
 }