From b28ea324f9b5ba58f41fab35792dfc43074c8ffc Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 7 Feb 2020 13:06:03 +0100 Subject: [PATCH] Client - update users list - #15 --- .../src/components/Admin/Users/index.jsx | 26 ++++++++++++++----- fittrackee_client/src/locales/en/user.json | 1 + fittrackee_client/src/locales/fr/user.json | 1 + 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/fittrackee_client/src/components/Admin/Users/index.jsx b/fittrackee_client/src/components/Admin/Users/index.jsx index c9a30e71..5e7d3573 100644 --- a/fittrackee_client/src/components/Admin/Users/index.jsx +++ b/fittrackee_client/src/components/Admin/Users/index.jsx @@ -32,6 +32,7 @@ class AdminUsers extends React.Component { {t('user:Email')} {t('user:Registration Date')} {t('activities:Activities')} + {t('user:Admin')} @@ -41,14 +42,27 @@ class AdminUsers extends React.Component { {user.username} {user.email} - {user.created_at - ? format( - new Date(user.created_at), - 'dd/MM/yyyy HH:mm' - ) - : ''} + {format( + new Date(user.created_at), + 'dd/MM/yyyy HH:mm' + )} {user.nb_activities} + + {user.admin ? ( +