From 33381c6dc40a05e6da3289b78f8b641078c9d95b Mon Sep 17 00:00:00 2001 From: Kamran Ahmed Date: Mon, 27 Aug 2018 22:45:25 +0500 Subject: Add dynamic group headings --- src/components/group-heading/index.js | 59 +++++++++++++++++++++-- src/components/group-heading/styles.css | 3 ++ src/components/repository-grid/grid-item/index.js | 2 +- src/containers/feed/index.js | 6 ++- src/redux/github/actions.js | 4 +- 5 files changed, 65 insertions(+), 9 deletions(-) create mode 100644 src/components/group-heading/styles.css (limited to 'src') diff --git a/src/components/group-heading/index.js b/src/components/group-heading/index.js index af5f743..762d36d 100644 --- a/src/components/group-heading/index.js +++ b/src/components/group-heading/index.js @@ -1,9 +1,58 @@ import React from 'react'; +import moment from 'moment'; +import PropTypes from 'prop-types'; -const GroupHeading = (props) => ( -
-

Today July 12, 2019

-
-); +import './styles.css'; + +class GroupHeading extends React.Component { + getTitle() { + const startMoment = moment(this.props.start); + const currentMoment = moment(); + const yesterdayMoment = moment().subtract(1, 'day'); + + // For "day" jumps show the day name + if (this.props.dateJump === 'day') { + if (startMoment.isSame(currentMoment, 'day')) { + return 'Today'; + } else if (startMoment.isSame(yesterdayMoment, 'day')) { + return 'Yesterday'; + } + + return startMoment.format('dddd'); + } + + return startMoment.fromNow(); + } + + getSubtitle() { + const startMoment = moment(this.props.start); + const endMoment = moment(this.props.end); + + if (startMoment.isSame(endMoment, 'day')) { + return startMoment.format('MMMM D, YYYY'); + } + + return startMoment.format('MMMM D, YYYY') + ' – ' + endMoment.format('MMMM D, YYYY'); + } + + render() { + return ( +
+

+ { this.getTitle() } + + { this.getSubtitle() } + +

+
+ ); + } +} + +GroupHeading.propTypes = { + start: PropTypes.string, + end: PropTypes.string, + dateJump: PropTypes.oneOf(['week', 'month', 'year', 'day']) +}; export default GroupHeading; diff --git a/src/components/group-heading/styles.css b/src/components/group-heading/styles.css new file mode 100644 index 0000000..3be9d76 --- /dev/null +++ b/src/components/group-heading/styles.css @@ -0,0 +1,3 @@ +.group-heading h4:first-letter { + text-transform: uppercase; +} diff --git a/src/components/repository-grid/grid-item/index.js b/src/components/repository-grid/grid-item/index.js index 18583c1..b77ebac 100644 --- a/src/components/repository-grid/grid-item/index.js +++ b/src/components/repository-grid/grid-item/index.js @@ -30,7 +30,7 @@ class GridItem extends React.Component {

- Built by · { this.props.repository.owner.login } · { moment(this.props.repository.created_at).format('MMMM D YYYY') } + Built by · { this.props.repository.owner.login } · { moment(this.props.repository.created_at).format('MMMM D, YYYY') }

diff --git a/src/containers/feed/index.js b/src/containers/feed/index.js index 682ae5d..6121ec5 100644 --- a/src/containers/feed/index.js +++ b/src/containers/feed/index.js @@ -85,7 +85,11 @@ class FeedContainer extends React.Component { { this.props.github.repositories && this.props.github.repositories[0] && - + }
{ diff --git a/src/redux/github/actions.js b/src/redux/github/actions.js index fe054a0..c61fd50 100644 --- a/src/redux/github/actions.js +++ b/src/redux/github/actions.js @@ -40,8 +40,8 @@ export const fetchTrending = function (filters) { dispatch({ type: FETCH_TRENDING_SUCCESS, payload: { - start: filters.dateRange.start, - end: filters.dateRange.end, + start: filters.dateRange.start.format(), + end: filters.dateRange.end.format(), data: response.data } }); -- cgit v1.3