From d5b46f219ed81cd1fa05c0eec0dd676de37c69aa Mon Sep 17 00:00:00 2001 From: David Jay Date: Tue, 7 Mar 2017 11:54:44 -0500 Subject: [PATCH 01/21] Adding load more button. --- .../ModerationQueue/ModerationContainer.js | 16 ++++++-- .../ModerationQueue/ModerationQueue.js | 12 +++++- .../components/ModerationMenu.js | 15 ++------ .../coral-admin/src/graphql/queries/index.js | 38 ++++++++++++++++++- .../src/graphql/queries/loadMore.graphql | 13 +++++++ 5 files changed, 76 insertions(+), 18 deletions(-) create mode 100644 client/coral-admin/src/graphql/queries/loadMore.graphql diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js index 25a7a9511..99a1ec656 100644 --- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js +++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js @@ -21,7 +21,8 @@ import ModerationKeysModal from '../../components/ModerationKeysModal'; class ModerationContainer extends Component { state = { - selectedIndex: 0 + selectedIndex: 0, + sort: 'REVERSE_CHRONOLOGICAL' } componentWillMount() { @@ -53,6 +54,11 @@ class ModerationContainer extends Component { } + selectSort = (sort) => { + this.setState({sort}); + this.props.modQueueResort(sort); + } + componentWillUnmount() { key.unbind('s'); key.unbind('shift+/'); @@ -71,7 +77,7 @@ class ModerationContainer extends Component { } render () { - const {data, moderation, settings, assets, modQueueResort, onClose, ...props} = this.props; + const {data, moderation, settings, assets, onClose, ...props} = this.props; const providedAssetId = this.props.params.id; const activeTab = this.props.route.path === ':id' ? 'premod' : this.props.route.path; @@ -103,7 +109,8 @@ class ModerationContainer extends Component { premodCount={data.premodCount} rejectedCount={data.rejectedCount} flaggedCount={data.flaggedCount} - modQueueResort={modQueueResort} + selectSort={this.selectSort} + sort={this.state.sort} /> { +const ModerationQueue = ({comments, selectedIndex, singleView, loadMore, activeTab, sort, ...props}) => { return (
    @@ -20,7 +20,7 @@ const ModerationQueue = ({comments, selectedIndex, singleView, ...props}) => { key={i} index={i} comment={comment} - commentType={props.activeTab} + commentType={activeTab} selected={i === selectedIndex} suspectWords={props.suspectWords} actions={actionsMap[status]} @@ -33,6 +33,14 @@ const ModerationQueue = ({comments, selectedIndex, singleView, ...props}) => { : {lang.t('modqueue.emptyqueue')} }
+
); }; diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js index f9b0c266f..8d6a0e883 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js @@ -9,10 +9,6 @@ import {Link} from 'react-router'; const lang = new I18n(translations); class ModerationMenu extends Component { - state = { - sort: 'REVERSE_CHRONOLOGICAL', - } - static propTypes = { premodCount: PropTypes.number.isRequired, rejectedCount: PropTypes.number.isRequired, @@ -22,13 +18,8 @@ class ModerationMenu extends Component { }) } - selectSort = (sort) => { - this.setState({sort}); - this.props.modQueueResort(sort); - } - render() { - const {asset, premodCount, rejectedCount, flaggedCount} = this.props; + const {asset, premodCount, rejectedCount, flaggedCount, selectSort, sort} = this.props; const premodPath = asset ? `/admin/moderate/premod/${asset.id}` : '/admin/moderate/premod'; const rejectPath = asset ? `/admin/moderate/rejected/${asset.id}` : '/admin/moderate/rejected'; const flagPath = asset ? `/admin/moderate/flagged/${asset.id}` : '/admin/moderate/flagged'; @@ -50,8 +41,8 @@ class ModerationMenu extends Component { this.selectSort(sort)}> + value={sort} + onChange={sort => selectSort(sort)}> diff --git a/client/coral-admin/src/graphql/queries/index.js b/client/coral-admin/src/graphql/queries/index.js index c4a30ad44..13164bca2 100644 --- a/client/coral-admin/src/graphql/queries/index.js +++ b/client/coral-admin/src/graphql/queries/index.js @@ -1,6 +1,7 @@ import {graphql} from 'react-apollo'; import MOD_QUEUE_QUERY from './modQueueQuery.graphql'; +import MOD_QUEUE_LOAD_MORE from './loadMore.graphql'; import METRICS from './metricsQuery.graphql'; export const modQueueQuery = graphql(MOD_QUEUE_QUERY, { @@ -14,7 +15,8 @@ export const modQueueQuery = graphql(MOD_QUEUE_QUERY, { }, props: ({ownProps: {params: {id = null}}, data}) => ({ data, - modQueueResort: modQueueResort(id, data.fetchMore) + modQueueResort: modQueueResort(id, data.fetchMore), + loadMore: loadMore(data.fetchMore) }) }); @@ -30,6 +32,40 @@ export const getMetrics = graphql(METRICS, { } }); +export const loadMore = (fetchMore) => ({limit, cursor, sort, tab, asset_id}) => { + let statuses; + switch(tab) { + case 'premod': + statuses = ['PREMOD']; + break; + case 'flagged': + statuses = ['NONE', 'PREMOD']; + break; + case 'rejected': + statuses = ['REJECTED']; + break; + } + return fetchMore({ + query: MOD_QUEUE_LOAD_MORE, + variables: { + limit, + cursor, + sort, + statuses, + asset_id + }, + updateQuery: (oldData, {fetchMoreResult:{data:{comments}}}) => { + return { + ...oldData, + [tab]: [ + ...oldData[tab], + ...comments + ] + }; + } + }); +}; + export const modQueueResort = (id, fetchMore) => (sort) => { return fetchMore({ query: MOD_QUEUE_QUERY, diff --git a/client/coral-admin/src/graphql/queries/loadMore.graphql b/client/coral-admin/src/graphql/queries/loadMore.graphql new file mode 100644 index 000000000..56966a804 --- /dev/null +++ b/client/coral-admin/src/graphql/queries/loadMore.graphql @@ -0,0 +1,13 @@ +#import "../fragments/commentView.graphql" + +query LoadMoreModQueue($limit: Int = 10, $cursor: Date, $sort: SORT_ORDER, $asset_id: ID, $statuses:[COMMENT_STATUS!]) { + comments(query: {limit: $limit, cursor: $cursor, asset_id: $asset_id, statuses: $statuses, sort: $sort}) { + ...commentView + action_summaries { + count + ... on FlagActionSummary { + reason + } + } + } +} From 54aa3bc8fa4a0e3fb0c67a16704409b22c7ba55f Mon Sep 17 00:00:00 2001 From: David Jay Date: Tue, 7 Mar 2017 12:31:43 -0500 Subject: [PATCH 02/21] Styling load more button. --- .../ModerationQueue/ModerationContainer.js | 13 +++++++++++ .../ModerationQueue/ModerationQueue.js | 19 ++++++++-------- .../ModerationQueue/components/LoadMore.js | 22 +++++++++++++++++++ .../ModerationQueue/components/styles.css | 20 +++++++++++++++++ 4 files changed, 65 insertions(+), 9 deletions(-) create mode 100644 client/coral-admin/src/containers/ModerationQueue/components/LoadMore.js diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js index 99a1ec656..16de8a32e 100644 --- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js +++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js @@ -100,6 +100,18 @@ class ModerationContainer extends Component { } const comments = data[activeTab]; + let activeTabCount; + switch(activeTab) { + case 'premod': + activeTabCount = data.premodCount; + break; + case 'flagged': + activeTabCount = data.flaggedCount; + break; + case 'rejected': + activeTabCount = data.rejectedCount; + break; + } return (
@@ -125,6 +137,7 @@ class ModerationContainer extends Component { loadMore={props.loadMore} assetId={providedAssetId} sort={this.state.sort} + commentCount={activeTabCount} /> { +const ModerationQueue = ({comments, selectedIndex, commentCount, singleView, loadMore, activeTab, sort, ...props}) => { return (
    @@ -33,14 +34,14 @@ const ModerationQueue = ({comments, selectedIndex, singleView, loadMore, activeT : {lang.t('modqueue.emptyqueue')} }
- +
); }; diff --git a/client/coral-admin/src/containers/ModerationQueue/components/LoadMore.js b/client/coral-admin/src/containers/ModerationQueue/components/LoadMore.js new file mode 100644 index 000000000..5ac193525 --- /dev/null +++ b/client/coral-admin/src/containers/ModerationQueue/components/LoadMore.js @@ -0,0 +1,22 @@ +import React from 'react'; +import {Button} from 'coral-ui'; +import styles from './styles.css'; + +const LoadMore = ({comments, loadMore, sort, tab, assetId, showLoadMore}) => +
+ { + showLoadMore && + } +
; + +export default LoadMore; diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css index 59f47faad..5abbb6b7d 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css +++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css @@ -387,3 +387,23 @@ span { cursor: pointer; } } + +.loadMoreContainer { + display: flex; + justify-content: center; + width: 100%; +}; + +.loadMore { + width: 100%; + text-align: center; + color: #FFF; + max-width: 660px; + margin-bottom: 30px; + background-color: #2376D8; + cursor: pointer; +} + +.loadMore:hover { + background-color: #4399FF; +} From 2a6236b61823525d181bbd4c97c25467d5cd7f35 Mon Sep 17 00:00:00 2001 From: David Jay Date: Tue, 7 Mar 2017 12:37:12 -0500 Subject: [PATCH 03/21] Moving ModerationMenu to a stateless compenent. --- .../components/ModerationMenu.js | 81 +++++++++---------- 1 file changed, 39 insertions(+), 42 deletions(-) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js index 8d6a0e883..b8160e21b 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationMenu.js @@ -1,4 +1,4 @@ -import React, {PropTypes, Component} from 'react'; +import React, {PropTypes} from 'react'; import CommentCount from './CommentCount'; import styles from './styles.css'; import {SelectField, Option} from 'react-mdl-selectfield'; @@ -8,48 +8,45 @@ import {Link} from 'react-router'; const lang = new I18n(translations); -class ModerationMenu extends Component { - static propTypes = { - premodCount: PropTypes.number.isRequired, - rejectedCount: PropTypes.number.isRequired, - flaggedCount: PropTypes.number.isRequired, - asset: PropTypes.shape({ - id: PropTypes.string - }) - } - - render() { - const {asset, premodCount, rejectedCount, flaggedCount, selectSort, sort} = this.props; - const premodPath = asset ? `/admin/moderate/premod/${asset.id}` : '/admin/moderate/premod'; - const rejectPath = asset ? `/admin/moderate/rejected/${asset.id}` : '/admin/moderate/rejected'; - const flagPath = asset ? `/admin/moderate/flagged/${asset.id}` : '/admin/moderate/flagged'; - return ( -
-
-
-
- - {lang.t('modqueue.premod')} - - - {lang.t('modqueue.rejected')} - - - {lang.t('modqueue.flagged')} - -
- selectSort(sort)}> - - - +const ModerationMenu = ({asset, premodCount, rejectedCount, flaggedCount, selectSort, sort}) => { + const premodPath = asset ? `/admin/moderate/premod/${asset.id}` : '/admin/moderate/premod'; + const rejectPath = asset ? `/admin/moderate/rejected/${asset.id}` : '/admin/moderate/rejected'; + const flagPath = asset ? `/admin/moderate/flagged/${asset.id}` : '/admin/moderate/flagged'; + return ( +
+
+
+
+ + {lang.t('modqueue.premod')} + + + {lang.t('modqueue.rejected')} + + + {lang.t('modqueue.flagged')} +
+ selectSort(sort)}> + + +
- ); - } -} +
+ ); +}; + +ModerationMenu.propTypes = { + premodCount: PropTypes.number.isRequired, + rejectedCount: PropTypes.number.isRequired, + flaggedCount: PropTypes.number.isRequired, + asset: PropTypes.shape({ + id: PropTypes.string + }) +}; export default ModerationMenu; From 95aa89faed81ed5b1530d19f5ffb1a7acae877ec Mon Sep 17 00:00:00 2001 From: David Jay Date: Tue, 7 Mar 2017 14:16:44 -0500 Subject: [PATCH 04/21] Switching premod status update to updateQueries function. --- .../src/graphql/mutations/index.js | 43 ++++++++++++++++++- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/client/coral-admin/src/graphql/mutations/index.js b/client/coral-admin/src/graphql/mutations/index.js index fe3a1faf9..884e30e0c 100644 --- a/client/coral-admin/src/graphql/mutations/index.js +++ b/client/coral-admin/src/graphql/mutations/index.js @@ -22,7 +22,26 @@ export const setCommentStatus = graphql(SET_COMMENT_STATUS, { commentId, status: 'ACCEPTED' }, - refetchQueries: ['ModQueue'] + updateQueries: { + ModQueue: (oldData) => { + const premod = oldData.premod.filter(c => c.id !== commentId); + const flagged = oldData.flagged.filter(c => c.id !== commentId); + const rejected = oldData.rejected.filter(c => c.id !== commentId); + const premodCount = premod.length < oldData.premod.length ? oldData.premodCount - 1 : oldData.premodCount; + const flaggedCount = flagged.length < oldData.flagged.length ? oldData.flaggedCount - 1 : oldData.flaggedCount; + const rejectedCount = rejected.length < oldData.rejected.length ? oldData.rejectedCount - 1 : oldData.rejectedCount; + + return { + ...oldData, + premodCount, + flaggedCount, + rejectedCount, + premod, + flagged, + rejected, + }; + } + } }); }, rejectComment: ({commentId}) => { @@ -31,7 +50,27 @@ export const setCommentStatus = graphql(SET_COMMENT_STATUS, { commentId, status: 'REJECTED' }, - refetchQueries: ['ModQueue'] + updateQueries: { + ModQueue: (oldData) => { + const comment = oldData.premod.concat(oldData.flagged).filter(c => c.id === commentId)[0]; + const rejected = [comment].concat(oldData.rejected); + const premod = oldData.premod.filter(c => c.id !== commentId); + const flagged = oldData.flagged.filter(c => c.id !== commentId); + const premodCount = premod.length < oldData.premod.length ? oldData.premodCount - 1 : oldData.premodCount; + const flaggedCount = flagged.length < oldData.flagged.length ? oldData.flaggedCount - 1 : oldData.flaggedCount; + const rejectedCount = oldData.rejectedCount + 1; + + return { + ...oldData, + premodCount, + flaggedCount, + rejectedCount, + premod, + flagged, + rejected + }; + } + } }); } }) From e578f901b2c01cf463b4420a03f8334c32154c79 Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Tue, 7 Mar 2017 13:38:01 -0700 Subject: [PATCH 05/21] fix some firefox display things --- .../coral-admin/src/containers/Configure/StreamSettings.js | 1 + client/coral-admin/src/containers/Dashboard/FlagWidget.js | 3 ++- client/coral-admin/src/containers/Dashboard/LikeWidget.js | 5 +++-- client/coral-admin/src/containers/Dashboard/Widget.css | 4 ++++ client/coral-admin/src/containers/Streams/Streams.js | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/client/coral-admin/src/containers/Configure/StreamSettings.js b/client/coral-admin/src/containers/Configure/StreamSettings.js index 5530bc6cd..f77013bc0 100644 --- a/client/coral-admin/src/containers/Configure/StreamSettings.js +++ b/client/coral-admin/src/containers/Configure/StreamSettings.js @@ -171,6 +171,7 @@ const StreamSettings = ({updateSettings, settingsError, settings, errors}) => {
+ {/* the above card should be the last one if at all possible because of z-index issues with the selects */}
); }; diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js index da71ac04a..5ce93f11b 100644 --- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js +++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js @@ -3,6 +3,7 @@ import {Link} from 'react-router'; import styles from './Widget.css'; import I18n from 'coral-framework/modules/i18n/i18n'; import translations from 'coral-admin/src/translations'; +import range from 'lodash/range'; const lang = new I18n(translations); @@ -44,7 +45,7 @@ const FlagWidget = (props) => { } { /* rows in a table with a fixed height will expand and ignore height. this extra row will expand to fill the extra space. */ - assets.length < 10 ? : null + range(10 - Math.max(assets.length, 1)).map(() => ) } diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js index 25e851966..39ee708f8 100644 --- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js +++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js @@ -3,6 +3,7 @@ import {Link} from 'react-router'; import styles from './Widget.css'; import I18n from 'coral-framework/modules/i18n/i18n'; import translations from 'coral-admin/src/translations'; +import range from 'lodash/range'; const lang = new I18n(translations); @@ -44,8 +45,8 @@ const LikeWidget = (props) => { : {lang.t('dashboard.no_likes')} } { /* rows in a table with a fixed height will expand and ignore height. - this extra row will expand to fill the extra space. */ - assets.length < 10 ? : null + put in some extra rows. */ + range(10 - Math.max(assets.length, 1)).map(() => ) } diff --git a/client/coral-admin/src/containers/Dashboard/Widget.css b/client/coral-admin/src/containers/Dashboard/Widget.css index cb764d9cc..96c773bef 100644 --- a/client/coral-admin/src/containers/Dashboard/Widget.css +++ b/client/coral-admin/src/containers/Dashboard/Widget.css @@ -43,6 +43,10 @@ height: var(--row-height); } +.emptyRow { + height: var(--row-height); +} + .rowLinkify:last-child { border-bottom: none; } diff --git a/client/coral-admin/src/containers/Streams/Streams.js b/client/coral-admin/src/containers/Streams/Streams.js index 96130fcba..bd5ce6e85 100644 --- a/client/coral-admin/src/containers/Streams/Streams.js +++ b/client/coral-admin/src/containers/Streams/Streams.js @@ -80,8 +80,8 @@ class Streams extends Component {
- {closed ? lang.t('streams.closed') : lang.t('streams.open')} {!statusMenuOpen && } + {closed ? lang.t('streams.closed') : lang.t('streams.open')}
{ statusMenuOpen && From f563bcf1191617b9d5a6014e2b8f9765094118f2 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Tue, 7 Mar 2017 16:35:01 -0500 Subject: [PATCH 06/21] Adding fix for long text --- .../ModerationQueue/components/ModerationHeader.js | 2 +- .../containers/ModerationQueue/components/styles.css | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationHeader.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationHeader.js index c5a11b642..29e720337 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationHeader.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationHeader.js @@ -11,7 +11,7 @@ const ModerationHeader = props => (
All Streams - {props.asset.title} + {props.asset.title} Select Stream diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css index 59f47faad..fd0eb4b9c 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css +++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css @@ -114,7 +114,15 @@ span { } &:nth-child(2) { - text-align: center; + span { + text-align: center; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + max-width: 344px; + display: inline-block; + vertical-align: top; + } } &:last-child { From af4a69a67704581d7f92ab14a393e46af059e636 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Tue, 7 Mar 2017 16:50:36 -0500 Subject: [PATCH 07/21] Changing icon and link --- .../ModerationQueue/components/ModerationHeader.js | 8 ++++---- .../src/containers/ModerationQueue/components/styles.css | 8 +++----- client/coral-ui/components/Icon.js | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationHeader.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationHeader.js index 29e720337..260097979 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationHeader.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationHeader.js @@ -10,10 +10,10 @@ const ModerationHeader = props => ( props.asset ? : diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css index fd0eb4b9c..d3e811b53 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css +++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css @@ -84,11 +84,9 @@ span { margin-bottom: -1px; .settingsButton { - i { - vertical-align: middle; - margin-left: 10px; - margin-top: -4px; - } + vertical-align: middle; + margin-left: 10px; + margin-top: -4px; } .moderateAsset { diff --git a/client/coral-ui/components/Icon.js b/client/coral-ui/components/Icon.js index 65bf52f72..11432c753 100644 --- a/client/coral-ui/components/Icon.js +++ b/client/coral-ui/components/Icon.js @@ -1,7 +1,7 @@ import React from 'react'; import {Icon as IconMDL} from 'react-mdl'; -const Icon = ({className, name}) => ( +const Icon = ({className = '', name}) => ( ); From cceeafadeccfbdd52817313f2ba5df60f161ae21 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Tue, 7 Mar 2017 16:53:42 -0500 Subject: [PATCH 08/21] Indent --- .../ModerationQueue/components/ModerationHeader.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/ModerationHeader.js b/client/coral-admin/src/containers/ModerationQueue/components/ModerationHeader.js index 260097979..8d9f6b7e0 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/ModerationHeader.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/ModerationHeader.js @@ -10,10 +10,10 @@ const ModerationHeader = props => ( props.asset ? : From 47f6f4cb6c1736f86105dee782c607df777f3fab Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Tue, 7 Mar 2017 16:51:22 -0700 Subject: [PATCH 09/21] styles and auto-update Dashboard --- .../src/containers/Dashboard/Dashboard.css | 25 ++++++++++ .../src/containers/Dashboard/Dashboard.js | 47 +++++++++++++++++-- .../src/containers/Dashboard/Widget.css | 10 ++-- client/coral-admin/src/translations.json | 4 ++ 4 files changed, 79 insertions(+), 7 deletions(-) diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.css b/client/coral-admin/src/containers/Dashboard/Dashboard.css index 72b9bd90c..1bd1599b4 100644 --- a/client/coral-admin/src/containers/Dashboard/Dashboard.css +++ b/client/coral-admin/src/containers/Dashboard/Dashboard.css @@ -7,3 +7,28 @@ font-size: 1.5rem; font-weight: bold; } + +.autoUpdate { + background-color: #ffdb87; + padding: 3px 10px 10px 10px; + margin-bottom: 0; + + i { + position: relative; + top: 7px; + } + + b { + float: right; + border-radius: 20px; + cursor: pointer; + background-color: #e6ba52; + width: 30px; + height: 30px; + text-align: center; + top: 4px; + position: relative; + line-height: 1.7em; + font-size: 1.3em; + } +} diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js index 96e837a9e..5b4a20282 100644 --- a/client/coral-admin/src/containers/Dashboard/Dashboard.js +++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js @@ -6,11 +6,41 @@ import {getMetrics} from 'coral-admin/src/graphql/queries'; import FlagWidget from './FlagWidget'; import LikeWidget from './LikeWidget'; import {showBanUserDialog, hideBanUserDialog} from 'coral-admin/src/actions/moderation'; +import I18n from 'coral-framework/modules/i18n/i18n'; +import translations from 'coral-admin/src/translations'; +import {Spinner, Icon} from 'coral-ui'; -import {Spinner} from 'coral-ui'; +const lang = new I18n(translations); +const refreshIntervalSeconds = 60 * 5; class Dashboard extends React.Component { + state = { + noteHidden: false, + secondsUntilRefresh: refreshIntervalSeconds + } + + componentWillMount () { + setInterval(() => { // the countdown timer + let nextCount = this.state.secondsUntilRefresh - 1; + if (nextCount < 0) { + nextCount = refreshIntervalSeconds; + this.props.data.refetch(); + } + this.setState({secondsUntilRefresh: nextCount}); + }, 1000); + } + + formatTime = () => { + const minutes = Math.floor(this.state.secondsUntilRefresh / 60); + let seconds = (this.state.secondsUntilRefresh % 60).toString(); + if (seconds.length < 2) { + seconds = `0${seconds}`; + } + + return `${minutes}:${seconds}`; + } + render () { if (this.props.data && this.props.data.loading) { @@ -20,9 +50,18 @@ class Dashboard extends React.Component { const {data: {assetsByLike, assetsByFlag}} = this.props; return ( -
- - +
+

this.setState({noteHidden: true})}> + × + {lang.t('dashboard.next-update', this.formatTime())} {lang.t('dashboard.auto-update')} +

+
+ + +
); } diff --git a/client/coral-admin/src/containers/Dashboard/Widget.css b/client/coral-admin/src/containers/Dashboard/Widget.css index cb764d9cc..42e7e2056 100644 --- a/client/coral-admin/src/containers/Dashboard/Widget.css +++ b/client/coral-admin/src/containers/Dashboard/Widget.css @@ -3,12 +3,15 @@ } .widget { - box-sizing: border-box; margin: 10px 5px 5px 5px; box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.2); - padding: 15px; flex: 1; background-color: white; + box-sizing: border-box; +} + +.widget * { + box-sizing: border-box; } .heading { @@ -16,12 +19,13 @@ padding-left: 10px; font-size: 1.5rem; font-weight: bold; + background-color: #e0e0e0; } .widgetTable { - width: 100%; border-collapse: collapse; user-select: none; + margin: 5px 15px 15px 15px; height: calc(var(--row-height) * 10); } diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json index ac9131685..0278d37da 100644 --- a/client/coral-admin/src/translations.json +++ b/client/coral-admin/src/translations.json @@ -117,6 +117,8 @@ "write_message": "Write a message" }, "dashboard": { + "next-update": "{0} minutes until next update.", + "auto-update": "Data automatically updates every five minutes or when you Reload.", "no_flags": "There have been no flags in the last 5 minutes! Hooray!", "no_likes": "There have been no likes in the last 5 minutes. All quiet.", "flags": "Flags", @@ -235,6 +237,8 @@ "yes_ban_user": "Si, Suspendan el usuario" }, "dashbord": { + "next-update": "", + "auto-update": "", "no_flags": "¡Nadie ha marcado nada en los últimos 5 minutos! ¡Bravo!", "no_likes": "A nadie le ha gustado algún comentario en los últimos 5 minutos. Todo tranquilo.", "flags": "Marcados", From ec634fa3c0f1f1ea18621694c190fb4ddc040527 Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Wed, 8 Mar 2017 11:12:44 -0700 Subject: [PATCH 10/21] add translations --- client/coral-admin/src/translations.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json index 0278d37da..257148837 100644 --- a/client/coral-admin/src/translations.json +++ b/client/coral-admin/src/translations.json @@ -237,8 +237,8 @@ "yes_ban_user": "Si, Suspendan el usuario" }, "dashbord": { - "next-update": "", - "auto-update": "", + "next-update": "{0} minutos hasta la siguiente actualización.", + "auto-update": "Los datos se actualizan automaticamente cada 5 minutos o cuando Recargas.", "no_flags": "¡Nadie ha marcado nada en los últimos 5 minutos! ¡Bravo!", "no_likes": "A nadie le ha gustado algún comentario en los últimos 5 minutos. Todo tranquilo.", "flags": "Marcados", From 3262d136b730d7b046984396fbdbb4ea6c4ee51e Mon Sep 17 00:00:00 2001 From: David Jay Date: Wed, 8 Mar 2017 15:44:19 -0500 Subject: [PATCH 11/21] Resetting report menu on close. --- client/coral-plugin-flags/FlagButton.js | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/client/coral-plugin-flags/FlagButton.js b/client/coral-plugin-flags/FlagButton.js index 537d899cd..45110f407 100644 --- a/client/coral-plugin-flags/FlagButton.js +++ b/client/coral-plugin-flags/FlagButton.js @@ -32,18 +32,30 @@ class FlagButton extends Component { if (flagged) { this.setState((prev) => prev.localPost ? {...prev, localPost: null, step: 0} : {...prev, localDelete: true}); deleteAction(localPost || flag.current_user.id); + } else if (this.state.showMenu){ + this.closeMenu(); } else { - this.setState({showMenu: !this.state.showMenu}); + this.setState({showMenu: true}); } } + closeMenu = () => { + this.setState({ + showMenu: false, + itemType: '', + reason: '', + message: '', + step: 0 + }); + } + onPopupContinue = () => { const {postFlag, postDontAgree, id, author_id} = this.props; const {itemType, reason, step, posted, message} = this.state; // Proceed to the next step or close the menu if we've reached the end if (step + 1 >= this.props.getPopupMenu.length) { - this.setState({showMenu: false}); + this.closeMenu(); } else { this.setState({step: step + 1}); } @@ -114,7 +126,7 @@ class FlagButton extends Component { } handleClickOutside () { - this.setState({showMenu: false}); + this.closeMenu(); } render () { From e4cdc73bf82569a55f4100e5a825e05e79c8123d Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Wed, 8 Mar 2017 13:53:39 -0700 Subject: [PATCH 12/21] fix for react-mdn-selectfield in FF --- client/coral-admin/src/containers/Configure/Configure.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/client/coral-admin/src/containers/Configure/Configure.css b/client/coral-admin/src/containers/Configure/Configure.css index 6cb623978..b1b1ebbaf 100644 --- a/client/coral-admin/src/containers/Configure/Configure.css +++ b/client/coral-admin/src/containers/Configure/Configure.css @@ -90,6 +90,11 @@ .configTimeoutSelect { display: inline-block; margin-left: 20px; + + i { /* fix for firefox and react-mdl-selectfield@0.2.0 */ + padding: 20px 0; + vertical-align: top; + } } .charCountTexfield { From d203a9afe0e7af60f47dd16e5e2c7123b489e30d Mon Sep 17 00:00:00 2001 From: David Jay Date: Wed, 8 Mar 2017 16:06:34 -0500 Subject: [PATCH 13/21] Auto-rejecting comments on ban. --- client/coral-admin/src/components/BanUserDialog.js | 10 ++++++++-- .../containers/ModerationQueue/ModerationContainer.js | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/client/coral-admin/src/components/BanUserDialog.js b/client/coral-admin/src/components/BanUserDialog.js index b23d8f9d1..f6a7227b8 100644 --- a/client/coral-admin/src/components/BanUserDialog.js +++ b/client/coral-admin/src/components/BanUserDialog.js @@ -8,7 +8,13 @@ import I18n from 'coral-framework/modules/i18n/i18n'; import translations from '../translations'; const lang = new I18n(translations); -const BanUserDialog = ({open, handleClose, handleBanUser, user}) => ( +const onBanClick = (userId, commentId, handleBanUser, rejectComment) => (e) => { + e.preventDefault(); + handleBanUser({userId}) + .then(() => rejectComment({commentId})); +}; + +const BanUserDialog = ({open, handleClose, handleBanUser, rejectComment, user, commentId}) => ( ( -
diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js index 2f43911b1..1d716ff41 100644 --- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js +++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js @@ -26,7 +26,7 @@ class ModerationContainer extends Component { componentWillMount() { const {toggleModal, singleView} = this.props; - + this.props.fetchSettings(); key('s', () => singleView()); key('shift+/', () => toggleModal(true)); @@ -140,8 +140,10 @@ class ModerationContainer extends Component { Date: Wed, 8 Mar 2017 14:16:20 -0700 Subject: [PATCH 14/21] incorrectly using dispatch now that we do pym directly --- client/coral-embed-stream/src/Embed.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-embed-stream/src/Embed.js b/client/coral-embed-stream/src/Embed.js index 1c52fb68c..0b9bc4fc5 100644 --- a/client/coral-embed-stream/src/Embed.js +++ b/client/coral-embed-stream/src/Embed.js @@ -256,7 +256,7 @@ const mapStateToProps = state => ({ const mapDispatchToProps = dispatch => ({ requestConfirmEmail: () => dispatch(requestConfirmEmail()), loadAsset: (asset) => dispatch(fetchAssetSuccess(asset)), - addNotification: (type, text) => dispatch(addNotification(type, text)), + addNotification: (type, text) => addNotification(type, text), clearNotification: () => dispatch(clearNotification()), editName: (username) => dispatch(editName(username)), showSignInDialog: (offset) => dispatch(showSignInDialog(offset)), From fac3d26c2278cbc92a009352ed9a295f097d3b83 Mon Sep 17 00:00:00 2001 From: David Jay Date: Wed, 8 Mar 2017 16:39:53 -0500 Subject: [PATCH 15/21] Closing ban dialog after ban is complete. --- client/coral-admin/src/components/BanUserDialog.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/client/coral-admin/src/components/BanUserDialog.js b/client/coral-admin/src/components/BanUserDialog.js index f6a7227b8..4f2296409 100644 --- a/client/coral-admin/src/components/BanUserDialog.js +++ b/client/coral-admin/src/components/BanUserDialog.js @@ -8,9 +8,10 @@ import I18n from 'coral-framework/modules/i18n/i18n'; import translations from '../translations'; const lang = new I18n(translations); -const onBanClick = (userId, commentId, handleBanUser, rejectComment) => (e) => { +const onBanClick = (userId, commentId, handleBanUser, rejectComment, handleClose) => (e) => { e.preventDefault(); handleBanUser({userId}) + .then(handleClose) .then(() => rejectComment({commentId})); }; @@ -35,7 +36,7 @@ const BanUserDialog = ({open, handleClose, handleBanUser, rejectComment, user, c -
From eaf035acd6ae4ccd1f065acd223a4cb06abd02d5 Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Wed, 8 Mar 2017 14:51:50 -0700 Subject: [PATCH 16/21] simplify dashboard table rendering --- .../src/containers/Dashboard/FlagWidget.js | 44 +++++++------------ .../src/containers/Dashboard/LikeWidget.js | 44 +++++++------------ .../src/containers/Dashboard/Widget.css | 25 +++++------ 3 files changed, 44 insertions(+), 69 deletions(-) diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js index 5ce93f11b..48f39fc9e 100644 --- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js +++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js @@ -13,42 +13,30 @@ const FlagWidget = (props) => { return (

Articles with the most flags

- - - - - - - - +
+
+

{lang.t('streams.article')}

+

{lang.t('dashboard.flags')}

+
+
{ assets.length ? assets.map(asset => { const flagSummary = asset.action_summaries.find(s => s.type === 'FlagAssetActionSummary'); return ( -
- - - +
+

{flagSummary ? flagSummary.actionCount : 0}

+ +

{asset.title}

+

{asset.author} — Published: {new Date(asset.created_at).toLocaleDateString()}

+ +
); }) - : + :
{lang.t('dashboard.no_flags')}
} - { /* rows in a table with a fixed height will expand and ignore height. - this extra row will expand to fill the extra space. */ - range(10 - Math.max(assets.length, 1)).map(() => ) - } - -
{lang.t('streams.article')}{lang.t('dashboard.flags')}
- -

{asset.title}

-

{asset.author} — Published: {new Date(asset.created_at).toLocaleDateString()}

- - 		- -

{flagSummary ? flagSummary.actionCount : 0}

- -
{lang.t('dashboard.no_flags')}
+
+
); }; diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js index 39ee708f8..e627daece 100644 --- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js +++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js @@ -14,42 +14,30 @@ const LikeWidget = (props) => { return (

Articles with the most likes

- - - - - - - - +
+
+

{lang.t('streams.article')}

+

{lang.t('modqueue.likes')}

+
+
{ assets.length ? assets.map(asset => { const likeSummary = asset.action_summaries.find(s => s.type === 'LikeAssetActionSummary'); return ( -
- - - +
+

{likeSummary ? likeSummary.actionCount : 0}

+ +

{asset.title}

+

{asset.author} — Published: {new Date(asset.created_at).toLocaleDateString()}

+ +
); }) - : + :
{lang.t('dashboard.no_likes')}
} - { /* rows in a table with a fixed height will expand and ignore height. - put in some extra rows. */ - range(10 - Math.max(assets.length, 1)).map(() => ) - } - -
{lang.t('streams.article')}{lang.t('modqueue.likes')}
- -

{asset.title}

-

{asset.author} — Published: {new Date(asset.created_at).toLocaleDateString()}

- - 		- -

{likeSummary ? likeSummary.actionCount : 0}

- -
{lang.t('dashboard.no_likes')}
+
+ ); }; diff --git a/client/coral-admin/src/containers/Dashboard/Widget.css b/client/coral-admin/src/containers/Dashboard/Widget.css index 96c773bef..16f86336b 100644 --- a/client/coral-admin/src/containers/Dashboard/Widget.css +++ b/client/coral-admin/src/containers/Dashboard/Widget.css @@ -1,5 +1,5 @@ :root { - --row-height: 80px; + --row-height: 50px; } .widget { @@ -19,20 +19,25 @@ } .widgetTable { - width: 100%; - border-collapse: collapse; user-select: none; height: calc(var(--row-height) * 10); } -.widgetTable thead th { +.widgetHead p { color: rgb(35, 102, 223); padding: 10px; text-align: left; text-transform: capitalize; + display: inline-block; + box-sizing: border-box; + margin-bottom: 0; } -.widgetTable thead th:last-child { +.widgetHead p:first-child { + width: 90%; +} + +.widgetHead p:last-child { width: 10%; } @@ -41,10 +46,7 @@ border-bottom: 1px solid lightgrey; color: #555; height: var(--row-height); -} - -.emptyRow { - height: var(--row-height); + padding: 10px; } .rowLinkify:last-child { @@ -55,10 +57,6 @@ background-color: #f8f8f8; } -.widgetTable tbody td { - padding: 10px; -} - .linkToAsset { display: block; text-decoration: none; @@ -85,4 +83,5 @@ color: #555; font-size: 1.3em; font-weight: 400; + float: right; } From b34758e8cce417ac96d3e25d8cf9813a070e27ff Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Wed, 8 Mar 2017 14:59:55 -0700 Subject: [PATCH 17/21] unused vars --- client/coral-admin/src/containers/Dashboard/FlagWidget.js | 1 - client/coral-admin/src/containers/Dashboard/LikeWidget.js | 1 - 2 files changed, 2 deletions(-) diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js index 48f39fc9e..aab70ddaf 100644 --- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js +++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js @@ -3,7 +3,6 @@ import {Link} from 'react-router'; import styles from './Widget.css'; import I18n from 'coral-framework/modules/i18n/i18n'; import translations from 'coral-admin/src/translations'; -import range from 'lodash/range'; const lang = new I18n(translations); diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js index e627daece..9c72be02e 100644 --- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js +++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js @@ -3,7 +3,6 @@ import {Link} from 'react-router'; import styles from './Widget.css'; import I18n from 'coral-framework/modules/i18n/i18n'; import translations from 'coral-admin/src/translations'; -import range from 'lodash/range'; const lang = new I18n(translations); From ce7a2d54d09781eab1696536b3689c04030465e9 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Thu, 9 Mar 2017 10:59:28 -0500 Subject: [PATCH 18/21] Font Size --- .../src/containers/ModerationQueue/components/styles.css | 1 + 1 file changed, 1 insertion(+) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css index d3e811b53..627cde5e4 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css +++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css @@ -87,6 +87,7 @@ span { vertical-align: middle; margin-left: 10px; margin-top: -4px; + font-size: 16px; } .moderateAsset { From 0db92974c4ff100131ed64024656c913e28a78d1 Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Thu, 9 Mar 2017 11:05:18 -0700 Subject: [PATCH 19/21] make only the title clickable --- client/coral-admin/src/containers/Dashboard/FlagWidget.js | 2 +- client/coral-admin/src/containers/Dashboard/LikeWidget.js | 2 +- client/coral-admin/src/containers/Dashboard/Widget.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/coral-admin/src/containers/Dashboard/FlagWidget.js b/client/coral-admin/src/containers/Dashboard/FlagWidget.js index 6412df7f0..7d2ffe17a 100644 --- a/client/coral-admin/src/containers/Dashboard/FlagWidget.js +++ b/client/coral-admin/src/containers/Dashboard/FlagWidget.js @@ -27,8 +27,8 @@ const FlagWidget = (props) => {

{flagSummary ? flagSummary.actionCount : 0}

{asset.title}

-

{asset.author} — Published: {new Date(asset.created_at).toLocaleDateString()}

+

{asset.author} — Published: {new Date(asset.created_at).toLocaleDateString()}

); }) diff --git a/client/coral-admin/src/containers/Dashboard/LikeWidget.js b/client/coral-admin/src/containers/Dashboard/LikeWidget.js index d01259c5d..436fbcaf3 100644 --- a/client/coral-admin/src/containers/Dashboard/LikeWidget.js +++ b/client/coral-admin/src/containers/Dashboard/LikeWidget.js @@ -28,8 +28,8 @@ const LikeWidget = (props) => {

{likeSummary ? likeSummary.actionCount : 0}

{asset.title}

-

{asset.author} — Published: {new Date(asset.created_at).toLocaleDateString()}

+

{asset.author} — Published: {new Date(asset.created_at).toLocaleDateString()}

); }) diff --git a/client/coral-admin/src/containers/Dashboard/Widget.css b/client/coral-admin/src/containers/Dashboard/Widget.css index db4041dbd..124663cea 100644 --- a/client/coral-admin/src/containers/Dashboard/Widget.css +++ b/client/coral-admin/src/containers/Dashboard/Widget.css @@ -64,7 +64,7 @@ } .linkToAsset { - display: block; + display: inline-block; text-decoration: none; } From a0953c068906209a3265d1d5458185a35f372ac0 Mon Sep 17 00:00:00 2001 From: David Jay Date: Thu, 9 Mar 2017 13:33:00 -0500 Subject: [PATCH 20/21] Adding proptypes to loadmore component. --- .../containers/ModerationQueue/components/LoadMore.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/LoadMore.js b/client/coral-admin/src/containers/ModerationQueue/components/LoadMore.js index 5ac193525..f8d3f0ed4 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/LoadMore.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/LoadMore.js @@ -1,4 +1,4 @@ -import React from 'react'; +import React, {PropTypes} from 'react'; import {Button} from 'coral-ui'; import styles from './styles.css'; @@ -19,4 +19,13 @@ const LoadMore = ({comments, loadMore, sort, tab, assetId, showLoadMore}) => } ; +LoadMore.propTypes = { + comments: PropTypes.array.isRequired, + loadMore: PropTypes.func.isRequired, + sort: PropTypes.oneOf(['CHRONOLOGICAL', 'REVERSE_CHRONOLOGICAL']).isRequired, + tab: PropTypes.oneOf(['rejected', 'premod', 'flagged']).isRequired, + assetId: PropTypes.string, + showLoadMore: PropTypes.bool.isRequired +}; + export default LoadMore; From cb10de6c7a17530e5299de00d476188cdeba4807 Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Thu, 9 Mar 2017 12:57:54 -0700 Subject: [PATCH 21/21] modify to light grey --- client/coral-admin/src/containers/Dashboard/Dashboard.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.css b/client/coral-admin/src/containers/Dashboard/Dashboard.css index 1bd1599b4..cdad990ba 100644 --- a/client/coral-admin/src/containers/Dashboard/Dashboard.css +++ b/client/coral-admin/src/containers/Dashboard/Dashboard.css @@ -9,7 +9,7 @@ } .autoUpdate { - background-color: #ffdb87; + background-color: #d5d5d5; padding: 3px 10px 10px 10px; margin-bottom: 0; @@ -22,7 +22,7 @@ float: right; border-radius: 20px; cursor: pointer; - background-color: #e6ba52; + background-color: #c0c0c0; width: 30px; height: 30px; text-align: center;