coop-cloud-chaos-patchs/outline
coop-cloud-chaos-patchs
/
outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/rylxes/outline into rylxes-master

This commit is contained in:
Tom Moor 2019-09-21 13:11:31 -07:00
parent dd5e30f414 02f2868d06
commit 1797a0e90c
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.sample
View File

@ -55,4 +55,4 @@ SMTP_PORT=
SMTP_USERNAME= SMTP_USERNAME=
SMTP_PASSWORD= SMTP_PASSWORD=
SMTP_FROM_EMAIL= SMTP_FROM_EMAIL=
SMTP_REPLY_EMAIL= SMTP_REPLY_EMAIL=

1
app/models/User.js
View File

@ -7,6 +7,7 @@ class User extends BaseModel {
name: string; name: string;
email: string; email: string;
isAdmin: boolean; isAdmin: boolean;
lastActiveAt: string;
isSuspended: boolean; isSuspended: boolean;
createdAt: string; createdAt: string;
} }

2
app/scenes/Settings/components/UserListItem.js
View File

@ -51,7 +51,7 @@ class UserListItem extends React.Component<Props> {
subtitle={ subtitle={
<React.Fragment> <React.Fragment>
{user.email ? `${user.email} · ` : undefined} {user.email ? `${user.email} · ` : undefined}
Joined <Time dateTime={user.createdAt} /> ago Last Active <Time dateTime={user.lastActiveAt} /> ago
{user.isAdmin && <Badge admin={user.isAdmin}>Admin</Badge>} {user.isAdmin && <Badge admin={user.isAdmin}>Admin</Badge>}
{user.isSuspended && <Badge>Suspended</Badge>} {user.isSuspended && <Badge>Suspended</Badge>}
</React.Fragment> </React.Fragment>

1
server/presenters/user.js
View File

@ -18,6 +18,7 @@ export default (user: User, options: Options = {}): ?UserPresentation => {
const userData = {}; const userData = {};
userData.id = user.id; userData.id = user.id;
userData.createdAt = user.createdAt; userData.createdAt = user.createdAt;
userData.lastActiveAt = user.lastActiveAt;
userData.name = user.name; userData.name = user.name;
userData.isAdmin = user.isAdmin; userData.isAdmin = user.isAdmin;
userData.isSuspended = user.isSuspended; userData.isSuspended = user.isSuspended;