diff --git a/client/coral-admin/src/components/AccountHistory.css b/client/coral-admin/src/components/AccountHistory.css index 7e2ef0109..09b324f08 100644 --- a/client/coral-admin/src/components/AccountHistory.css +++ b/client/coral-admin/src/components/AccountHistory.css @@ -1,13 +1,21 @@ +.table { + flex-direction: column; +} + .table, .headerRow, .row { display: flex; } .headerRowItem, .item { flex: 1; + padding: 20px; + + &:nth-child(2) { + flex: 2; + } } .headerRowItem { - text-align: center; color: #595959; font-weight: bold; } diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js index 140774eae..8160d9566 100644 --- a/client/coral-admin/src/components/UserDetail.js +++ b/client/coral-admin/src/components/UserDetail.js @@ -13,6 +13,7 @@ import {getReliability} from 'coral-framework/utils/user'; import ApproveButton from './ApproveButton'; import RejectButton from './RejectButton'; import {getErrorMessages} from 'coral-framework/utils'; +import AccountHistory from './AccountHistory'; export default class UserDetail extends React.Component { @@ -82,12 +83,8 @@ export default class UserDetail extends React.Component { } } - showAll = () => { - this.props.changeStatus('all'); - } - - showRejected = () => { - this.props.changeStatus('rejected'); + show = (content) => { + this.props.changeStatus(content); } renderLoading() { @@ -179,8 +176,9 @@ export default class UserDetail extends React.Component { selectedCommentIds.length === 0 ? ( ) : ( @@ -208,25 +206,32 @@ export default class UserDetail extends React.Component { -
- { - nodes.map((comment) => { - const selected = selectedCommentIds.indexOf(comment.id) !== -1; - return ; - }) - } -
+ + { + activeTab !== 'history' ? +
+ { + nodes.map((comment) => { + const selected = selectedCommentIds.indexOf(comment.id) !== -1; + return ; + }) + } +
+ : + + } +