mirror of
https://github.com/wassname/talk.git
synced 2026-08-15 12:55:10 +08:00
"works"
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
.Dashboard {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.heading {
|
||||
|
||||
@@ -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 (
|
||||
<div className={styles.Dashboard}>
|
||||
{assetsByFlag && <FlagWidget assets={assetsByFlag} />}
|
||||
{/*<MostLikedCommentsWidget
|
||||
<FlagWidget assets={assetsByFlag} />
|
||||
<MostLikedCommentsWidget
|
||||
comments={mostLikedComments}
|
||||
moderation={moderation}
|
||||
settings={settings}
|
||||
acceptComment={this.props.acceptComment}
|
||||
rejectComment={this.props.rejectComment}
|
||||
handleBanUser={this.props.banUser}
|
||||
showBanUserDialog={this.props.showBanUserDialog}
|
||||
hideBanUserDialog={this.props.hideBanUserDialog} />*/}
|
||||
{assetsByLike && <LikeWidget assets={assetsByLike} />}
|
||||
hideBanUserDialog={this.props.hideBanUserDialog} />
|
||||
<LikeWidget assets={assetsByLike} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
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 {
|
||||
|
||||
@@ -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 <Spinner />;
|
||||
// }
|
||||
|
||||
// const {
|
||||
// comments,
|
||||
// moderation,
|
||||
// settings,
|
||||
// showBanUserDialog,
|
||||
// hideBanUserDialog
|
||||
// } = this.props;
|
||||
|
||||
// console.log('MostLikedCommentsWidget', comments);
|
||||
|
||||
return (
|
||||
<div className={styles.widget}>
|
||||
<h2 className={styles.heading}>{lang.t('most_liked_comments')}</h2>
|
||||
{/*<ModerationQueue
|
||||
comments={comments}
|
||||
suspectWords={settings.wordlist.suspect}
|
||||
showBanUserDialog={showBanUserDialog}
|
||||
acceptComment={() => {}}
|
||||
rejectComment={() => {}} />*/}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
return (
|
||||
<div className={styles.widget}>
|
||||
<h2 className={styles.heading}>{lang.t('most_liked_comments')}</h2>
|
||||
<ModerationQueue
|
||||
comments={comments}
|
||||
suspectWords={settings.wordlist.suspect}
|
||||
showBanUserDialog={showBanUserDialog}
|
||||
acceptComment={acceptComment}
|
||||
rejectComment={rejectComment} />
|
||||
<BanUserDialog
|
||||
open={moderation.banDialog}
|
||||
user={moderation.user}
|
||||
handleClose={hideBanUserDialog}
|
||||
handleBanUser={handleBanUser} />
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default MostLikedCommentsWidget;
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user