diff --git a/client/coral-admin/src/containers/Community/Community.css b/client/coral-admin/src/containers/Community/Community.css index 6460c50d2..57a6a3c60 100644 --- a/client/coral-admin/src/containers/Community/Community.css +++ b/client/coral-admin/src/containers/Community/Community.css @@ -138,15 +138,21 @@ .listItem { border-bottom: 1px solid #e0e0e0; - font-size: 16px; + font-size: 18px; width: 100%; max-width: 660px; min-width: 400px; margin: 0 auto; - padding: 16px 14px; position: relative; - transition: box-shadow 200ms; + transition: all 200ms; + padding: 10px 0 0; + min-height: 220px; + .container { + display: block; + padding: 0 14px; + min-height: 180px; + } &:hover { box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23); @@ -156,6 +162,14 @@ border-bottom: none; } + .context { + a { + color: #f36451; + text-decoration: underline; + float: right; + } + } + .sideActions { position: absolute; right: 0; @@ -166,18 +180,30 @@ } .itemHeader { - display: inline; + display: flex; + align-items: center; + justify-content: space-between; .author { - font-size: 24px; - min-width: 50px; - align-items: left; - margin-bottom: 15px; + min-width: 230px; + display: flex; + align-items: center; } } .itemBody { - display: block; + display: flex; + justify-content: space-between; + } + + .avatar { + margin-right: 16px; + height: 40px; + width: 40px; + border-radius: 50%; + background-color: #757575; + font-size: 40px; + color: #fff; } .created { @@ -186,11 +212,18 @@ margin-left: 40px; } + .actionButton { + transform: scale(.8); + margin: 0; + } + .body { - margin-top: 20px; + margin-top: 0px; flex: 1; - font-size: 0.88em; color: black; + max-width: 500px; + word-wrap: break-word; + font-weight: 300; } .flagged { diff --git a/client/coral-admin/src/containers/Community/CommunityContainer.js b/client/coral-admin/src/containers/Community/CommunityContainer.js index 4056b6008..a7e59a14a 100644 --- a/client/coral-admin/src/containers/Community/CommunityContainer.js +++ b/client/coral-admin/src/containers/Community/CommunityContainer.js @@ -89,7 +89,10 @@ class CommunityContainer extends Component { error={community.errorPeople} totalPages={community.totalPagesPeople} page={community.pagePeople} - {...this} + onKeyDown={this.onKeyDownHandler} + onChange={this.onChangeHandler} + onHeaderClickHandler={this.onHeaderClickHandler} + onNewPageHandler={this.onNewPageHandler} /> ); } @@ -104,7 +107,6 @@ class CommunityContainer extends Component { approveUser={props.approveUser} suspendUser={props.suspendUser} showSuspendUserDialog={props.showSuspendUserDialog} - {...this} /> { // Do not display unless the user status is 'pending' or 'banned'. // This means that they have already been reviewed and approved. return (userStatus === 'PENDING' || userStatus === 'BANNED') && -
  • -
    - {user.username} - -
    -
    -
    - flagFlags({ user.actions.length }): - { user.action_summaries.map( - (action, i ) => { - return - {lang.t(`community.${action.reason}`)} ({action.count}) - ; - } - )} +
  • +
    +
    +
    + + {user.username} + + +
    -
    - {user.actions.map( - (action, i) => { - return - {action.reason} - {/* action.user.username */} - ; - } - )} -
    -
    -
    - {modActionButtons.map( + +
    +
    +
    + flagFlags({ user.actions.length }): + { user.action_summaries.map( + (action, i ) => { + return + {lang.t(`community.${action.reason}`)} ({action.count}) + ; + } + )} +
    +
    + {user.actions.map( (action, i) => { - return ; + return + {action.id} + {action.reason} + {action.user && action.user.username} + ; } )}
    +
    +
    + {modActionButtons.map( + (action, i) => { + return ; + } + )} +
    +
    +
  • ; }; diff --git a/client/coral-admin/src/containers/Community/components/styles.css b/client/coral-admin/src/containers/Community/components/styles.css index e2fd31911..2cd3f7b50 100644 --- a/client/coral-admin/src/containers/Community/components/styles.css +++ b/client/coral-admin/src/containers/Community/components/styles.css @@ -141,7 +141,6 @@ span { position: fixed; bottom: 60px; left: 25%; - margin: 0 auto; display: flex; justify-content: space-around; width: 50%; @@ -156,16 +155,20 @@ span { .listItem { border-bottom: 1px solid #e0e0e0; - font-size: 16px; + font-size: 18px; width: 100%; max-width: 660px; min-width: 400px; margin: 0 auto; - padding: 16px 14px; position: relative; - transition: box-shadow 200ms; - margin-top: 0; + transition: all 200ms; + padding: 10px 0 0; + min-height: 220px; + .container { + padding: 0 14px; + min-height: 180px; + } &:hover { box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23); @@ -233,10 +236,10 @@ span { .body { margin-top: 0px; flex: 1; - font-size: 0.88em; color: black; max-width: 500px; word-wrap: break-word; + font-weight: 300; } .flagged { diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js index 36ff7763a..f68bab2b7 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js @@ -21,19 +21,19 @@ const Comment = ({actions = [], ...props}) => { const links = linkify.getMatches(props.comment.body); const actionSummaries = props.comment.action_summaries; return ( -
  • +
  • - - {props.comment.user.name} - - - {timeago().format(props.comment.created_at || (Date.now() - props.index * 60 * 1000), lang.getLocale().replace('-', '_'))} - - props.showBanUserDialog(props.comment.user, props.comment.id, props.comment.status !== 'REJECTED')} /> - -
    + + {props.comment.user.name} + + + {timeago().format(props.comment.created_at || (Date.now() - props.index * 60 * 1000), lang.getLocale().replace('-', '_'))} + + props.showBanUserDialog(props.comment.user, props.comment.id, props.comment.status !== 'REJECTED')} /> + +
    {props.comment.user.status === 'banned' ?