diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.ts index 1437a0244..89af3efbc 100644 --- a/apps/api/src/app/admin/admin.service.ts +++ b/apps/api/src/app/admin/admin.service.ts @@ -108,7 +108,7 @@ export class AdminService { createdAt: true, id: true }, - take: 20, + take: 30, where: { NOT: { Analytics: null diff --git a/apps/client/src/app/pages/admin/admin-page.html b/apps/client/src/app/pages/admin/admin-page.html index ac0806faf..5fdc96666 100644 --- a/apps/client/src/app/pages/admin/admin-page.html +++ b/apps/client/src/app/pages/admin/admin-page.html @@ -73,26 +73,40 @@ <table class="gf-table"> <thead> <tr class="mat-header-row"> + <th class="mat-header-cell px-1 py-2 text-center" i18n>#</th> <th class="mat-header-cell px-1 py-2" i18n>User</th> - <th class="mat-header-cell px-1 py-2" i18n>Registration Date</th> - <th class="mat-header-cell px-1 py-2" i18n>Accounts</th> - <th class="mat-header-cell px-1 py-2" i18n>Transactions</th> - <th class="mat-header-cell px-1 py-2" i18n>Engagement</th> + <th class="mat-header-cell px-1 py-2 text-center" i18n> + Registration Date + </th> + <th class="mat-header-cell px-1 py-2 text-center" i18n> + Accounts + </th> + <th class="mat-header-cell px-1 py-2 text-center" i18n> + Transactions + </th> + <th class="mat-header-cell px-1 py-2 text-center" i18n> + Engagement + </th> <th class="mat-header-cell px-1 py-2" i18n>Last Activitiy</th> <th class="mat-header-cell px-1 py-2"></th> </tr> </thead> <tbody> - <tr *ngFor="let userItem of users" class="mat-row"> + <tr *ngFor="let userItem of users; let i = index" class="mat-row"> + <td class="mat-cell px-1 py-2 text-right">{{ i + 1 }}</td> <td class="mat-cell px-1 py-2"> {{ userItem.alias || userItem.id }} </td> - <td class="mat-cell px-1 py-2"> + <td class="mat-cell px-1 py-2 text-right"> {{ userItem.createdAt | date: defaultDateFormat }} </td> - <td class="mat-cell px-1 py-2">{{ userItem._count?.Account }}</td> - <td class="mat-cell px-1 py-2">{{ userItem._count?.Order }}</td> - <td class="mat-cell px-1 py-2"> + <td class="mat-cell px-1 py-2 text-right"> + {{ userItem._count?.Account }} + </td> + <td class="mat-cell px-1 py-2 text-right"> + {{ userItem._count?.Order }} + </td> + <td class="mat-cell px-1 py-2 text-right"> {{ userItem.Analytics?.activityCount }} </td> <td class="mat-cell px-1 py-2">