From 1b1f2a3608e54e027b71fcc76c5309cc389050a5 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Wed, 21 Jun 2017 10:42:01 -0300 Subject: [PATCH 1/5] Changing moderation keys: d approve and f reject --- .../src/routes/Moderation/components/Moderation.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js index 63c9e13ab..63fbac6df 100644 --- a/client/coral-admin/src/routes/Moderation/components/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js @@ -31,8 +31,8 @@ export default class Moderation extends Component { key('esc', () => toggleModal(false)); key('j', this.select(true)); key('k', this.select(false)); - key('r', this.moderate(false)); - key('t', this.moderate(true)); + key('f', this.moderate(false)); + key('d', this.moderate(true)); } onClose = () => { From b0156fa11f2d8ecd8a937e6351873a2d75860898 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Wed, 21 Jun 2017 10:53:12 -0300 Subject: [PATCH 2/5] missing header css --- .../src/routes/Configure/components/StreamSettings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-admin/src/routes/Configure/components/StreamSettings.js b/client/coral-admin/src/routes/Configure/components/StreamSettings.js index 2de82ec1f..e8c522ae0 100644 --- a/client/coral-admin/src/routes/Configure/components/StreamSettings.js +++ b/client/coral-admin/src/routes/Configure/components/StreamSettings.js @@ -165,7 +165,7 @@ const StreamSettings = ({updateSettings, settingsError, settings, errors}) => { checked={settings.autoCloseStream} />
- {t('configure.close_after')} +
{t('configure.comment_count_header')}

Date: Wed, 21 Jun 2017 11:04:45 -0300 Subject: [PATCH 3/5] Show user details from flag history --- .../src/routes/Moderation/components/Comment.js | 1 + .../src/routes/Moderation/components/FlagBox.css | 14 ++++++++++++++ .../src/routes/Moderation/components/FlagBox.js | 13 +++++++++---- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js index 3d946f9fc..3d3e2803f 100644 --- a/client/coral-admin/src/routes/Moderation/components/Comment.js +++ b/client/coral-admin/src/routes/Moderation/components/Comment.js @@ -217,6 +217,7 @@ class Comment extends React.Component { ? viewUserDetail(comment.user.id)} /> : null} diff --git a/client/coral-admin/src/routes/Moderation/components/FlagBox.css b/client/coral-admin/src/routes/Moderation/components/FlagBox.css index 5b8ea4f91..402a88045 100644 --- a/client/coral-admin/src/routes/Moderation/components/FlagBox.css +++ b/client/coral-admin/src/routes/Moderation/components/FlagBox.css @@ -67,3 +67,17 @@ color: black; } } + +.username { + color: #393B44; + text-decoration: none; + cursor: pointer; + font-weight: 600; + padding: 2px 5px; + border-radius: 2px; + margin-left: -5px; + transition: background-color 200ms ease; +&:hover { + background-color: #E0E0E0; + } +} diff --git a/client/coral-admin/src/routes/Moderation/components/FlagBox.js b/client/coral-admin/src/routes/Moderation/components/FlagBox.js index 7dff51fdb..caa8b3fbc 100644 --- a/client/coral-admin/src/routes/Moderation/components/FlagBox.js +++ b/client/coral-admin/src/routes/Moderation/components/FlagBox.js @@ -33,7 +33,7 @@ class FlagBox extends Component { } render() { - const {actionSummaries, actions} = this.props; + const {actionSummaries, actions, viewUserDetail} = this.props; const {showDetail} = this.state; return ( @@ -59,9 +59,14 @@ class FlagBox extends Component {
  • {this.reasonMap(summary.reason)} ({summary.count})
      - { - actionList.map((action, j) =>
    • {action.user.username} {action.message}
      • ) - } + {actionList.map((action, j) => +
    • + + {action.user.username} + + {action.message} +
      • + )}
    • ); From 2ab2b41b55c766dd6f994bcf3fc1b2771773b0ec Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Fri, 23 Jun 2017 09:54:21 -0300 Subject: [PATCH 4/5] unbind --- .../src/routes/Moderation/components/Moderation.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js index a1fa97a2e..703131aa1 100644 --- a/client/coral-admin/src/routes/Moderation/components/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js @@ -88,8 +88,8 @@ export default class Moderation extends Component { key.unbind('esc'); key.unbind('j'); key.unbind('k'); - key.unbind('r'); - key.unbind('t'); + key.unbind('f'); + key.unbind('d'); } componentDidUpdate(_, prevState) { From ea030af440e5432877839270abf21f8a3798c594 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Fri, 23 Jun 2017 09:59:05 -0300 Subject: [PATCH 5/5] missing keys --- client/coral-admin/src/components/ModerationList.js | 4 ++-- .../routes/Moderation/helpers/moderationQueueActionsMap.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/coral-admin/src/components/ModerationList.js b/client/coral-admin/src/components/ModerationList.js index fae85e492..e2b536f2c 100644 --- a/client/coral-admin/src/components/ModerationList.js +++ b/client/coral-admin/src/components/ModerationList.js @@ -8,8 +8,8 @@ import SuspendUserModal from './SuspendUserModal'; // Each action has different meaning and configuration const menuOptionsMap = { - 'reject': {status: 'REJECTED', icon: 'close', key: 'r'}, - 'approve': {status: 'ACCEPTED', icon: 'done', key: 't'}, + 'reject': {status: 'REJECTED', icon: 'close', key: 'f'}, + 'approve': {status: 'ACCEPTED', icon: 'done', key: 'd'}, 'flag': {status: 'FLAGGED', icon: 'flag', filter: 'Untouched'}, 'ban': {status: 'BANNED', icon: 'not interested'} }; diff --git a/client/coral-admin/src/routes/Moderation/helpers/moderationQueueActionsMap.js b/client/coral-admin/src/routes/Moderation/helpers/moderationQueueActionsMap.js index 32b79a35c..95b0ecb55 100644 --- a/client/coral-admin/src/routes/Moderation/helpers/moderationQueueActionsMap.js +++ b/client/coral-admin/src/routes/Moderation/helpers/moderationQueueActionsMap.js @@ -5,9 +5,9 @@ export const actionsMap = { }; export const menuActionsMap = { - 'REJECT': {status: 'REJECTED', text: 'reject', icon: 'close', key: 'r'}, + 'REJECT': {status: 'REJECTED', text: 'reject', icon: 'close', key: 'f'}, 'REJECTED': {status: 'REJECTED', text: 'rejected', icon: 'close'}, - 'APPROVE': {status: 'ACCEPTED', text: 'approve', icon: 'done', key: 't'}, + 'APPROVE': {status: 'ACCEPTED', text: 'approve', icon: 'done', key: 'd'}, 'FLAGGED': {status: 'FLAGGED', text: 'flag', icon: 'flag', filter: 'Untouched'}, 'BAN': {status: 'BANNED', text: 'ban_user', icon: 'not interested'}, '': {icon: 'done'}