From 8619dd6c967bbeb955e9fefe416dc7913a85adcf Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 12 Feb 2020 15:55:40 +0200 Subject: [PATCH] Show tweets in the twitter report --- assets/js/dashboard/date.js | 5 +++++ .../dashboard/stats/modals/referrer-drilldown.js | 15 +++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/assets/js/dashboard/date.js b/assets/js/dashboard/date.js index eb63ff674..5def1013f 100644 --- a/assets/js/dashboard/date.js +++ b/assets/js/dashboard/date.js @@ -36,6 +36,11 @@ export function formatDay(date) { return `${date.getDate()} ${formatMonth(date)}`; } +export function formatFullDate(date) { + const shortDate = formatMonth(date).substring(0, 3) + return `${shortDate} ${date.getDate()}, ${date.getFullYear()}`; +} + export function parseUTCDate(dateString) { var date = new Date(dateString); return new Date(date.getTime() + date.getTimezoneOffset() * 60000); diff --git a/assets/js/dashboard/stats/modals/referrer-drilldown.js b/assets/js/dashboard/stats/modals/referrer-drilldown.js index 13ad912ef..442298b50 100644 --- a/assets/js/dashboard/stats/modals/referrer-drilldown.js +++ b/assets/js/dashboard/stats/modals/referrer-drilldown.js @@ -5,6 +5,7 @@ import Modal from './modal' import * as api from '../../api' import numberFormatter from '../../number-formatter' import {parseQuery, toHuman} from '../../query' +import {formatFullDate} from '../../date' class ReferrerDrilldownModal extends React.Component { constructor(props) { @@ -56,23 +57,25 @@ class ReferrerDrilldownModal extends React.Component {
- -
{tweet.author_name}
-
@{tweet.author_handle}
+ +
+
{tweet.author_name}
+
@{tweet.author_handle}
+
- {tweet.created} + {formatFullDate(new Date(tweet.created))}
) } renderReferrer(referrer) { - if (false && referrer.tweets) { + if (referrer.tweets) { return ( @@ -80,7 +83,7 @@ class ReferrerDrilldownModal extends React.Component { appears in {referrer.tweets.length} tweets -
+
{ referrer.tweets.map(this.renderTweet) }