From 58ba8d0ddad5890a4053d0688e671ee458d51767 Mon Sep 17 00:00:00 2001 From: Kamran Ahmed Date: Thu, 30 Aug 2018 21:32:42 +0500 Subject: Add date jump filter --- src/components/filters/date-jump-filter/index.js | 64 ++++++++++++++++++++++ src/components/filters/date-jump-filter/styles.css | 24 ++++++++ src/components/filters/index.js | 11 +++- src/components/top-nav/index.js | 61 +++------------------ src/components/top-nav/styles.css | 2 +- src/containers/feed/index.js | 7 +-- 6 files changed, 111 insertions(+), 58 deletions(-) create mode 100644 src/components/filters/date-jump-filter/index.js create mode 100644 src/components/filters/date-jump-filter/styles.css (limited to 'src') diff --git a/src/components/filters/date-jump-filter/index.js b/src/components/filters/date-jump-filter/index.js new file mode 100644 index 0000000..2d9a63e --- /dev/null +++ b/src/components/filters/date-jump-filter/index.js @@ -0,0 +1,64 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import { Dropdown, DropdownItem, DropdownMenu, DropdownToggle } from 'reactstrap'; + +import './styles.css'; + +class DateJumpFilter extends React.Component { + state = { + dropdownOpen: false + }; + + updateDateJump = (dateJump) => { + if (dateJump === this.props.selectedDateJump) { + return; + } + + this.props.updateDateJump(dateJump); + }; + + toggle = () => { + this.setState(prevState => ({ + dropdownOpen: !prevState.dropdownOpen + })); + }; + + getSelectedDateJump() { + switch (this.props.selectedDateJump) { + case 'day': + return 'Daily'; + case 'month': + return 'Monthly'; + case 'year': + return 'Yearly'; + case 'week': + return 'Weekly'; + default: + return 'Weekly'; + } + } + + render() { + return ( + + + + { this.getSelectedDateJump() } + + + this.updateDateJump('year') }>Yearly + this.updateDateJump('month') }>Monthly + this.updateDateJump('week') }>Weekly + this.updateDateJump('day') }>Daily + + + ); + } +} + +DateJumpFilter.propTypes = { + updateDateJump: PropTypes.func.isRequired, + selectedDateJump: PropTypes.string +}; + +export default DateJumpFilter; diff --git a/src/components/filters/date-jump-filter/styles.css b/src/components/filters/date-jump-filter/styles.css new file mode 100644 index 0000000..34b0987 --- /dev/null +++ b/src/components/filters/date-jump-filter/styles.css @@ -0,0 +1,24 @@ +.date-jump-type, +.date-jump-type:hover, +.date-jump-type:active { + border-radius: 8px; + padding: 10px 20px; + background: white !important; + color: black !important; + border: 1px solid white !important; + cursor: default; +} + +.date-jump-wrap .dropdown-menu { + border: 1px solid #e8e8e8; + box-shadow: 0 3px 12px rgba(27, 31, 35, 0.15); + font-size: 15px; + line-height: 30px; + top: 3px !important; +} + +.date-jump-wrap .dropdown-menu button { + cursor: pointer; + box-shadow: none; + outline: none; +} diff --git a/src/components/filters/index.js b/src/components/filters/index.js index 3515ead..3b746b5 100644 --- a/src/components/filters/index.js +++ b/src/components/filters/index.js @@ -4,6 +4,7 @@ import PropTypes from 'prop-types'; import LanguageFilter from './language-filter'; import ViewFilter from './view-filter'; import './styles.css'; +import DateJumpFilter from './date-jump-filter'; const Filters = (props) => (
@@ -13,6 +14,12 @@ const Filters = (props) => ( updateLanguage={ props.updateLanguage } />
+
+ +
( Filters.propTypes = { updateLanguage: PropTypes.func.isRequired, updateViewType: PropTypes.func.isRequired, + updateDateJump: PropTypes.func.isRequired, selectedLanguage: PropTypes.string, - selectedViewType: PropTypes.string + selectedViewType: PropTypes.string, + selectedDateJump: PropTypes.string }; export default Filters; diff --git a/src/components/top-nav/index.js b/src/components/top-nav/index.js index 0212dab..7163845 100644 --- a/src/components/top-nav/index.js +++ b/src/components/top-nav/index.js @@ -1,19 +1,9 @@ import React from 'react'; -import PropTypes from 'prop-types'; -import classNames from 'classnames'; import './styles.css'; import Logo from '../icons/logo'; class TopNav extends React.Component { - updateDateJump = (dateJump) => { - if (dateJump === this.props.selectedDateJump) { - return; - } - - this.props.updateDateJump(dateJump); - }; - render() { return (
@@ -28,43 +18,15 @@ class TopNav extends React.Component {

Most starred projects on GitHub

-
- - - - +
+ View Source + Use Extension
@@ -72,9 +34,4 @@ class TopNav extends React.Component { } } -TopNav.propTypes = { - updateDateJump: PropTypes.func.isRequired, - selectedDateJump: PropTypes.string -}; - export default TopNav; diff --git a/src/components/top-nav/styles.css b/src/components/top-nav/styles.css index 7217eb2..d3ccd3f 100644 --- a/src/components/top-nav/styles.css +++ b/src/components/top-nav/styles.css @@ -31,7 +31,7 @@ margin-bottom: 0; } -.top-nav .duration-btns .btn { +.top-nav .external-btns .btn { margin-left: 10px; margin-top: 24px; box-shadow: none; diff --git a/src/containers/feed/index.js b/src/containers/feed/index.js index 7ed8808..354bb4c 100644 --- a/src/containers/feed/index.js +++ b/src/containers/feed/index.js @@ -152,10 +152,7 @@ class FeedContainer extends React.Component { render() { return (
- + { this.renderAlerts() } @@ -175,6 +172,8 @@ class FeedContainer extends React.Component { selectedViewType={ this.props.preference.viewType } updateLanguage={ this.props.updateLanguage } updateViewType={ this.props.updateViewType } + updateDateJump={ this.props.updateDateJump } + selectedDateJump={ this.props.preference.dateJump } /> }
-- cgit v1.3