diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.css b/client/coral-admin/src/containers/Dashboard/Dashboard.css
index a23927d8a..72b9bd90c 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.css
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.css
@@ -1,6 +1,5 @@
.Dashboard {
display: flex;
- flex-wrap: wrap;
}
.heading {
diff --git a/client/coral-admin/src/containers/Dashboard/Dashboard.js b/client/coral-admin/src/containers/Dashboard/Dashboard.js
index 74bbce9fb..10d3b3ba3 100644
--- a/client/coral-admin/src/containers/Dashboard/Dashboard.js
+++ b/client/coral-admin/src/containers/Dashboard/Dashboard.js
@@ -1,12 +1,13 @@
import React from 'react';
import styles from './Dashboard.css';
-import {graphql} from 'react-apollo';
+import {graphql, compose} from 'react-apollo';
import {connect} from 'react-redux';
import FlagWidget from './FlagWidget';
import LikeWidget from './LikeWidget';
import METRICS from 'coral-admin/src/graphql/queries/metrics.graphql';
-// import MostLikedCommentsWidget from './MostLikedCommentsWidget';
+import MostLikedCommentsWidget from './MostLikedCommentsWidget';
import {showBanUserDialog, hideBanUserDialog} from 'coral-admin/src/actions/moderation';
+import {banUser, setCommentStatus} from 'coral-admin/src/graphql/mutations';
import {Spinner} from 'coral-ui';
class Dashboard extends React.Component {
@@ -19,30 +20,34 @@ class Dashboard extends React.Component {
console.log(this.props.data);
- const {data: {assetsByLike, assetsByFlag}} = this.props;
+ const {data: {assetsByLike, assetsByFlag, mostLikedComments}} = this.props;
console.log('assetsByLike', assetsByLike);
console.log('assetsByFlag', assetsByFlag);
- // const {moderation, settings} = this.props;
+ const {moderation, settings} = this.props;
return (
- {assetsByFlag && }
- {/*
+ */}
- {assetsByLike && }
+ hideBanUserDialog={this.props.hideBanUserDialog} />
+
);
}
}
-let fiveMinutesAgo = new Date();
-fiveMinutesAgo.setMinutes(fiveMinutesAgo.getMinutes() - 5);
-fiveMinutesAgo = fiveMinutesAgo.toISOString();
+let then = new Date();
+then.setMinutes(then.getMinutes() - 205);
+then = then.toISOString();
const now = new Date().toISOString();
const getMetrics = graphql(METRICS, {
@@ -50,16 +55,14 @@ const getMetrics = graphql(METRICS, {
return {
variables: {
- from: fiveMinutesAgo,
- // from: '2017-02-23T16:09:44.235Z',
+ from: then,
to: now
- // to: '2017-02-23T19:30:23.251Z'
}
};
}
});
-const DashboardWithData = getMetrics(Dashboard);
+const DashboardWithData = compose(getMetrics, setCommentStatus, banUser)(Dashboard);
const mapStateToProps = state => {
return {
diff --git a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
index 600a09c13..5b0427acb 100644
--- a/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
+++ b/client/coral-admin/src/containers/Dashboard/MostLikedCommentsWidget.js
@@ -8,37 +8,34 @@ import BanUserDialog from 'coral-admin/src/components/BanUserDialog';
const lang = new I18n(translations);
-class MostLikedCommentsWidget extends React.Component {
+const MostLikedCommentsWidget = props => {
+ const {
+ comments,
+ moderation,
+ settings,
+ handleBanUser,
+ showBanUserDialog,
+ hideBanUserDialog,
+ acceptComment,
+ rejectComment
+ } = props;
- render () {
- // console.log('render! loading?', this.props.data.loading);
-
- // if (this.props.data.loading) {
- // return ;
- // }
-
- // const {
- // comments,
- // moderation,
- // settings,
- // showBanUserDialog,
- // hideBanUserDialog
- // } = this.props;
-
- // console.log('MostLikedCommentsWidget', comments);
-
- return (
-
-
{lang.t('most_liked_comments')}
- {/* {}}
- rejectComment={() => {}} />*/}
-
- );
- }
-}
+ return (
+
+
{lang.t('most_liked_comments')}
+
+
+
+ );
+};
export default MostLikedCommentsWidget;
diff --git a/client/coral-admin/src/containers/Dashboard/Widget.css b/client/coral-admin/src/containers/Dashboard/Widget.css
index d9cce2043..624b72519 100644
--- a/client/coral-admin/src/containers/Dashboard/Widget.css
+++ b/client/coral-admin/src/containers/Dashboard/Widget.css
@@ -3,7 +3,7 @@
margin: 10px 5px 5px 5px;
box-shadow: 0px 0px 5px 0px rgba(0,0,0,0.2);
padding: 15px;
- width: calc(50% - 10px);
+ flex: 1;
}
.heading {