diff --git a/ui/src/status/components/JSONFeedReader.js b/ui/src/status/components/JSONFeedReader.js index 6087723cb9..90a10e87a5 100644 --- a/ui/src/status/components/JSONFeedReader.js +++ b/ui/src/status/components/JSONFeedReader.js @@ -1,18 +1,28 @@ import React, {PropTypes} from 'react' -import FancyScrollbar from 'shared/components/FancyScrollbar' +import moment from 'moment' const JSONFeedReader = ({data}) => - - {data - ? data.items.map(({date_published, title, content_html}, i) => -
- {`${new Date(date_published)}`}
{title}
-
+ data + ?
+ {data.items.map(({date_published, title, content_html}, i) => +
+
+
+ {`${moment(date_published).format('MMM D')}`} +
+
+ {title} +
+
+
+
+
+
- ) - : null} - + )} +
+ : null const {shape} = PropTypes diff --git a/ui/src/status/components/NewsFeed.js b/ui/src/status/components/NewsFeed.js index 197b1ea8d5..b6f9853807 100644 --- a/ui/src/status/components/NewsFeed.js +++ b/ui/src/status/components/NewsFeed.js @@ -4,6 +4,7 @@ import {bindActionCreators} from 'redux' import {fetchJSONFeedAsync} from 'src/status/actions' +import FancyScrollbar from 'shared/components/FancyScrollbar' import JSONFeedReader from 'src/status/components/JSONFeedReader' class NewsFeed extends Component { @@ -26,7 +27,7 @@ class NewsFeed extends Component { } return ( -
+ {isFetching ? // TODO: Factor this out of here and AutoRefresh
@@ -37,7 +38,7 @@ class NewsFeed extends Component { : null} {isFailed ? Failed to refresh NewsFeed : null} -
+
) }