Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

admin(ui): actually get avatar for users

Browse source
This commit is contained in:
Matthew Penner 2021-01-07 09:55:04 -07:00
parent 56c098a316
commit 9eed88b430
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Transformers/Api/Application/UserTransformer.php
View file

@ -43,9 +43,11 @@ class UserTransformer extends BaseTransformer
'language' => $model->language, 'language' => $model->language,
'root_admin' => (bool) $model->root_admin, 'root_admin' => (bool) $model->root_admin,
'2fa' => (bool) $model->use_totp, '2fa' => (bool) $model->use_totp,
'role_name' => $model->root_admin ? 'Super Administrator' : 'None', 'avatar_url' => 'https://www.gravatar.com/avatar/' . md5($model->email) . '.jpg?s=40',
'role_name' => $model->root_admin ? 'Super Administrator' : null,
'created_at' => $this->formatTimestamp($model->created_at), 'created_at' => $this->formatTimestamp($model->created_at),
'updated_at' => $this->formatTimestamp($model->updated_at), 'updated_at' => $this->formatTimestamp($model->updated_at),
'avatar'
]; ];
} }

4
resources/scripts/api/admin/users/getUsers.ts
View file

@ -13,7 +13,8 @@ export interface User {
language: string; language: string;
rootAdmin: boolean; rootAdmin: boolean;
tfa: boolean; tfa: boolean;
roleName: string; avatarURL: string;
roleName: string | null;
createdAt: Date; createdAt: Date;
updatedAt: Date; updatedAt: Date;
} }
@ -29,6 +30,7 @@ export const rawDataToUser = ({ attributes }: FractalResponseData): User => ({
language: attributes.language, language: attributes.language,
rootAdmin: attributes.root_admin, rootAdmin: attributes.root_admin,
tfa: attributes['2fa'], tfa: attributes['2fa'],
avatarURL: attributes.avatar_url,
roleName: attributes.role_name, roleName: attributes.role_name,
createdAt: new Date(attributes.created_at), createdAt: new Date(attributes.created_at),
updatedAt: new Date(attributes.updated_at), updatedAt: new Date(attributes.updated_at),

4
resources/scripts/components/admin/users/UsersContainer.tsx
View file

@ -117,7 +117,7 @@ const UsersContainer = () => {
<NavLink to={`${match.url}/${user.id}`}> <NavLink to={`${match.url}/${user.id}`}>
<div css={tw`flex items-center`}> <div css={tw`flex items-center`}>
<div css={tw`flex-shrink-0 h-10 w-10`}> <div css={tw`flex-shrink-0 h-10 w-10`}>
<img css={tw`h-10 w-10 rounded-full`} alt="" src="https://www.gravatar.com/avatar/92623b66155f7e475250b549226a5023"/> <img css={tw`h-10 w-10 rounded-full`} alt="" src={user.avatarURL}/>
</div> </div>
<div css={tw`ml-4`}> <div css={tw`ml-4`}>
@ -141,7 +141,7 @@ const UsersContainer = () => {
</span> </span>
</td> </td>
<td css={tw`px-6 text-sm text-neutral-200 text-left whitespace-nowrap`}>{user.roleName}</td> <td css={tw`px-6 text-sm text-neutral-200 text-left whitespace-nowrap`}>{user.roleName || 'None'}</td>
</tr> </tr>
)) ))
} }