From a540dfe8d4ba499de90bc7c31f092be019f77a2e Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Mon, 21 Aug 2017 16:21:39 -0300 Subject: [PATCH 1/4] Adding hasParent on Comment to the Graph --- client/coral-admin/src/routes/Moderation/components/Comment.js | 2 +- client/coral-admin/src/routes/Moderation/containers/Comment.js | 1 + graph/resolvers/comment.js | 3 +++ graph/typeDefs.graphql | 3 +++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js index 1335a8c52..71642e3c2 100644 --- a/client/coral-admin/src/routes/Moderation/components/Comment.js +++ b/client/coral-admin/src/routes/Moderation/components/Comment.js @@ -69,7 +69,7 @@ class Comment extends React.Component { let selectionStateCSS = selected ? 'mdl-shadow--16dp' : 'mdl-shadow--2dp'; const queryData = {root, comment, asset: comment.asset}; - + console.log(comment); return (
  • Date: Mon, 21 Aug 2017 17:09:26 -0300 Subject: [PATCH 2/4] Adding Reply Badge --- .../routes/Moderation/components/Comment.js | 4 +++- .../Moderation/components/ReplyBadge.js | 11 +++++++++++ .../routes/Moderation/containers/Comment.js | 3 +++ client/coral-ui/components/Badge.css | 19 +++++++++++++++++++ client/coral-ui/components/Badge.js | 13 +++++++++++++ client/coral-ui/index.js | 1 + locales/en.yml | 1 + locales/es.yml | 1 + 8 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 client/coral-admin/src/routes/Moderation/components/ReplyBadge.js create mode 100644 client/coral-ui/components/Badge.css create mode 100644 client/coral-ui/components/Badge.js diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js index 71642e3c2..2ca18d928 100644 --- a/client/coral-admin/src/routes/Moderation/components/Comment.js +++ b/client/coral-admin/src/routes/Moderation/components/Comment.js @@ -15,6 +15,7 @@ import CommentBodyHighlighter from 'coral-admin/src/components/CommentBodyHighli import IfHasLink from 'coral-admin/src/components/IfHasLink'; import cn from 'classnames'; import {getCommentType} from 'coral-admin/src/utils/comment'; +import ReplyBadge from './ReplyBadge'; import t, {timeago} from 'coral-framework/services/i18n'; @@ -69,7 +70,7 @@ class Comment extends React.Component { let selectionStateCSS = selected ? 'mdl-shadow--16dp' : 'mdl-shadow--2dp'; const queryData = {root, comment, asset: comment.asset}; - console.log(comment); + return (
  • }
    + hasParent ? + + {t('modqueue.reply')} + + : null; + +export default ReplyBadge; diff --git a/client/coral-admin/src/routes/Moderation/containers/Comment.js b/client/coral-admin/src/routes/Moderation/containers/Comment.js index 11b648a0b..cc127ef4b 100644 --- a/client/coral-admin/src/routes/Moderation/containers/Comment.js +++ b/client/coral-admin/src/routes/Moderation/containers/Comment.js @@ -37,6 +37,7 @@ export default withFragments({ count ... on FlagActionSummary { reason + __typename } } actions { @@ -48,7 +49,9 @@ export default withFragments({ id username } + __typename } + __typename } editing { edited diff --git a/client/coral-ui/components/Badge.css b/client/coral-ui/components/Badge.css new file mode 100644 index 000000000..fd725cf14 --- /dev/null +++ b/client/coral-ui/components/Badge.css @@ -0,0 +1,19 @@ +.badge { + display: inline-block; + color: white; + background-color: #3D73D5; + box-sizing: border-box; + padding: 0px 5px; + font-size: 12px; + height: 24px; + letter-spacing: 0.4px; + margin-bottom: 1px; + margin-right: 2px; +} + +.icon { + font-size: 14px; + vertical-align: text-top; + margin: 0; + margin-right: 4px; +} \ No newline at end of file diff --git a/client/coral-ui/components/Badge.js b/client/coral-ui/components/Badge.js new file mode 100644 index 000000000..c1ba8100b --- /dev/null +++ b/client/coral-ui/components/Badge.js @@ -0,0 +1,13 @@ +import React from 'react'; +import styles from './Badge.css'; +import Icon from './Icon'; +import cn from 'classnames'; + +const Badge = ({className, children, icon, props}) => ( + + {icon && } + {children} + +); + +export default Badge; diff --git a/client/coral-ui/index.js b/client/coral-ui/index.js index 8a538d120..8f261bcca 100644 --- a/client/coral-ui/index.js +++ b/client/coral-ui/index.js @@ -26,3 +26,4 @@ export {default as Option} from './components/Option'; export {default as SnackBar} from './components/SnackBar'; export {default as TextArea} from './components/TextArea'; export {default as Drawer} from './components/Drawer'; +export {default as Badge} from './components/Badge'; diff --git a/locales/en.yml b/locales/en.yml index 54d5315d5..2ec0c816c 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -281,6 +281,7 @@ en: prev_comment: "Go to the previous comment" reject: "Reject" rejected: "Rejected" + reply: "Reply" select_stream: "Select Stream" shift_key: "⇧" shortcuts: "Shortcuts" diff --git a/locales/es.yml b/locales/es.yml index 8c3e7927b..877a42841 100644 --- a/locales/es.yml +++ b/locales/es.yml @@ -272,6 +272,7 @@ es: prev_comment: "Ir al comentario anterior" reject: "Rechazar" rejected: "rechazado" + reply: "Respuesta" select_stream: "Seleccionar hilo de comentarios" shift_key: ⇧ shortcuts: Atajos From c4026272807602fe35e3d48aa1b7e765bcc9d7e9 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Mon, 21 Aug 2017 17:27:32 -0300 Subject: [PATCH 3/4] Adding Reply Badge to User History --- client/coral-admin/src/components/CommentType.css | 5 ++--- .../src/{routes/Moderation => }/components/ReplyBadge.js | 0 client/coral-admin/src/components/UserDetailComment.css | 2 +- client/coral-admin/src/components/UserDetailComment.js | 7 ++++++- client/coral-admin/src/containers/UserDetailComment.js | 1 + .../src/routes/Moderation/components/Comment.js | 2 +- client/coral-ui/components/Badge.css | 9 +++++---- 7 files changed, 16 insertions(+), 10 deletions(-) rename client/coral-admin/src/{routes/Moderation => }/components/ReplyBadge.js (100%) diff --git a/client/coral-admin/src/components/CommentType.css b/client/coral-admin/src/components/CommentType.css index e4851275e..969d9511d 100644 --- a/client/coral-admin/src/components/CommentType.css +++ b/client/coral-admin/src/components/CommentType.css @@ -3,12 +3,11 @@ color: white; background: grey; box-sizing: border-box; - padding: 0px 5px; - border-radius: 2px; + padding: 2px 5px; font-size: 12px; height: 24px; letter-spacing: 0.4px; - margin-bottom: 1px; + line-height: 22px; > i { font-size: 14px; diff --git a/client/coral-admin/src/routes/Moderation/components/ReplyBadge.js b/client/coral-admin/src/components/ReplyBadge.js similarity index 100% rename from client/coral-admin/src/routes/Moderation/components/ReplyBadge.js rename to client/coral-admin/src/components/ReplyBadge.js diff --git a/client/coral-admin/src/components/UserDetailComment.css b/client/coral-admin/src/components/UserDetailComment.css index b042aea39..2dfd61cf3 100644 --- a/client/coral-admin/src/components/UserDetailComment.css +++ b/client/coral-admin/src/components/UserDetailComment.css @@ -55,7 +55,7 @@ position: relative; } -.commentType { +.badgeBar { position: absolute; right: 0px; } diff --git a/client/coral-admin/src/components/UserDetailComment.js b/client/coral-admin/src/components/UserDetailComment.js index 9b4936847..3d92c0365 100644 --- a/client/coral-admin/src/components/UserDetailComment.js +++ b/client/coral-admin/src/components/UserDetailComment.js @@ -3,6 +3,7 @@ import {Link} from 'react-router'; import {Icon} from 'coral-ui'; import FlagBox from './FlagBox'; +import ReplyBadge from './ReplyBadge'; import styles from './UserDetailComment.css'; import CommentType from './CommentType'; import {getActionSummary} from 'coral-framework/utils'; @@ -56,7 +57,11 @@ class UserDetailComment extends React.Component { ?  ({t('comment.edited')}) : null } - + +
    + + +
    Story: {comment.asset.title} diff --git a/client/coral-admin/src/containers/UserDetailComment.js b/client/coral-admin/src/containers/UserDetailComment.js index a70a9394d..9f0e3a793 100644 --- a/client/coral-admin/src/containers/UserDetailComment.js +++ b/client/coral-admin/src/containers/UserDetailComment.js @@ -9,6 +9,7 @@ export default withFragments({ body created_at status + hasParent asset { id title diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js index 2ca18d928..6980105c3 100644 --- a/client/coral-admin/src/routes/Moderation/components/Comment.js +++ b/client/coral-admin/src/routes/Moderation/components/Comment.js @@ -2,6 +2,7 @@ import React, {PropTypes} from 'react'; import {Link} from 'react-router'; import {Icon} from 'coral-ui'; +import ReplyBadge from 'coral-admin/src/components/ReplyBadge'; import FlagBox from 'coral-admin/src/components/FlagBox'; import styles from './styles.css'; import CommentType from 'coral-admin/src/components/CommentType'; @@ -15,7 +16,6 @@ import CommentBodyHighlighter from 'coral-admin/src/components/CommentBodyHighli import IfHasLink from 'coral-admin/src/components/IfHasLink'; import cn from 'classnames'; import {getCommentType} from 'coral-admin/src/utils/comment'; -import ReplyBadge from './ReplyBadge'; import t, {timeago} from 'coral-framework/services/i18n'; diff --git a/client/coral-ui/components/Badge.css b/client/coral-ui/components/Badge.css index fd725cf14..db68ebd58 100644 --- a/client/coral-ui/components/Badge.css +++ b/client/coral-ui/components/Badge.css @@ -1,14 +1,15 @@ .badge { display: inline-block; color: white; - background-color: #3D73D5; + background: grey; box-sizing: border-box; - padding: 0px 5px; + padding: 2px 5px; font-size: 12px; height: 24px; letter-spacing: 0.4px; - margin-bottom: 1px; - margin-right: 2px; + line-height: 22px; + background-color: #3D73D5; + margin-right: 4px; } .icon { From cb4d2998f608aa32c02ea573a290a3f4ba9d63bc Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Tue, 22 Aug 2017 09:40:49 -0300 Subject: [PATCH 4/4] Removing logic from ReplyBadge --- client/coral-admin/src/components/ReplyBadge.js | 4 ++-- client/coral-admin/src/components/UserDetailComment.js | 2 +- .../coral-admin/src/routes/Moderation/components/Comment.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/coral-admin/src/components/ReplyBadge.js b/client/coral-admin/src/components/ReplyBadge.js index ccdb79b3a..5c8bb88ba 100644 --- a/client/coral-admin/src/components/ReplyBadge.js +++ b/client/coral-admin/src/components/ReplyBadge.js @@ -2,10 +2,10 @@ import React from 'react'; import {Badge} from 'coral-ui'; import t from 'coral-framework/services/i18n'; -const ReplyBadge = ({hasParent}) => hasParent ? +const ReplyBadge = () => ( {t('modqueue.reply')} - : null; +); export default ReplyBadge; diff --git a/client/coral-admin/src/components/UserDetailComment.js b/client/coral-admin/src/components/UserDetailComment.js index 3d92c0365..dc809b9c7 100644 --- a/client/coral-admin/src/components/UserDetailComment.js +++ b/client/coral-admin/src/components/UserDetailComment.js @@ -59,7 +59,7 @@ class UserDetailComment extends React.Component { }
    - + {comment.hasParent && }
    diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js index 6980105c3..c73d15eaa 100644 --- a/client/coral-admin/src/routes/Moderation/components/Comment.js +++ b/client/coral-admin/src/routes/Moderation/components/Comment.js @@ -108,7 +108,7 @@ class Comment extends React.Component { }
    - + {comment.hasParent && }