diff options
| author | Kamran Ahmed <kamranahmed.se@gmail.com> | 2018-08-25 22:28:46 +0500 |
|---|---|---|
| committer | Kamran Ahmed <kamranahmed.se@gmail.com> | 2018-08-25 22:28:46 +0500 |
| commit | 3cb44125e3aaa8927b6216d5c311746f9a14a44e (patch) | |
| tree | 60e81f3df3ed4d85435edef8d307abac4bff1e0b /src | |
| parent | Change colors (diff) | |
| download | githunt-3cb44125e3aaa8927b6216d5c311746f9a14a44e.tar.gz | |
Filter preparation for trending repositories
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/top-nav/index.js | 28 | ||||
| -rw-r--r-- | src/containers/feed/index.js | 58 | ||||
| -rw-r--r-- | src/redux/github/reducer.js | 11 | ||||
| -rw-r--r-- | src/redux/preference/actions.js | 4 | ||||
| -rw-r--r-- | src/redux/preference/reducer.js | 4 |
5 files changed, 80 insertions, 25 deletions
diff --git a/src/components/top-nav/index.js b/src/components/top-nav/index.js index 387244b..ff87fc2 100644 --- a/src/components/top-nav/index.js +++ b/src/components/top-nav/index.js @@ -16,41 +16,41 @@ const TopNav = (props) => ( </a> <div className="float-right duration-btns"> <a href="javascript:void(0)" - onClick={ () => props.updateDateType('year') } + onClick={ () => props.updateDateJump('year') } className={ classNames('btn', { - 'btn-primary': props.selectedDateType === 'year', - 'btn-light': props.selectedDateType !== 'year', + 'btn-primary': props.selectedDateJump === 'year', + 'btn-light': props.selectedDateJump !== 'year', }) }> Yearly </a> <a href="javascript:void(0)" - onClick={ () => props.updateDateType('month') } + onClick={ () => props.updateDateJump('month') } className={ classNames('btn', { - 'btn-primary': props.selectedDateType === 'month', - 'btn-light': props.selectedDateType !== 'month', + 'btn-primary': props.selectedDateJump === 'month', + 'btn-light': props.selectedDateJump !== 'month', }) }> Monthly </a> <a href="javascript:void(0)" - onClick={ () => props.updateDateType('week') } + onClick={ () => props.updateDateJump('week') } className={ classNames('btn', { - 'btn-primary': props.selectedDateType === 'week', - 'btn-light': props.selectedDateType !== 'week', + 'btn-primary': props.selectedDateJump === 'week', + 'btn-light': props.selectedDateJump !== 'week', }) }> Weekly </a> <a href="javascript:void(0)" - onClick={ () => props.updateDateType('day') } + onClick={ () => props.updateDateJump('day') } className={ classNames('btn', { - 'btn-primary': props.selectedDateType === 'day', - 'btn-light': props.selectedDateType !== 'day', + 'btn-primary': props.selectedDateJump === 'day', + 'btn-light': props.selectedDateJump !== 'day', }) }> Daily @@ -61,8 +61,8 @@ const TopNav = (props) => ( ); TopNav.propTypes = { - updateDateType: PropTypes.func.isRequired, - selectedDateType: PropTypes.string + updateDateJump: PropTypes.func.isRequired, + selectedDateJump: PropTypes.string }; export default TopNav; diff --git a/src/containers/feed/index.js b/src/containers/feed/index.js index 224d5b8..0cc7597 100644 --- a/src/containers/feed/index.js +++ b/src/containers/feed/index.js @@ -1,20 +1,69 @@ import React from 'react'; import { connect } from 'react-redux'; +import moment from 'moment'; import './styles.css'; import TopNav from '../../components/top-nav'; import Filters from '../../components/filters'; import RepositoryGrid from '../../components/repository-grid'; import RepositoryList from '../../components/repository-list'; -import { updateDateType, updateLanguage, updateViewType } from '../../redux/preference/actions'; +import { updateDateJump, updateLanguage, updateViewType } from '../../redux/preference/actions'; class FeedContainer extends React.Component { + componentDidMount() { + const existingRepositories = this.props.github.repositories || []; + // If there are no loaded repositories before, fetch them + if (existingRepositories.length === 0) { + this.fetchNextRepositories(); + } + } + + fetchNextRepositories() { + console.log(this.getFilters()); + } + + getFilters() { + const filters = {}; + + filters.daterange = this.getNextDateRange(); + filters.sort = 'stars'; + filters.order = 'desc'; + + if (this.props.preference.language) { + filters.language = this.props.preference.language; + } + + if (this.props.preference.options.token) { + filters.token = this.props.preference.options.token; + } + + return filters; + } + + getNextDateRange() { + const repositories = this.props.github.repositories || []; + const dateJump = this.props.preference.dateJump; + + const dateRange = {}; + const lastRecords = repositories[repositories.length - 1]; + + if (lastRecords) { + dateRange.start = moment(lastRecords.start).subtract(1, dateJump).format('YYYY-MM-DD'); + dateRange.end = lastRecords.start; + } else { + dateRange.start = moment().add(1, 'day').subtract(1, dateJump).format('YYYY-MM-DD'); + dateRange.end = moment().format('YYYY-MM-DD'); + } + + return dateRange; + } + render() { return ( <div className="page-wrap"> <TopNav - updateDateType={ this.props.updateDateType } - selectedDateType={ this.props.preference.dateType } + updateDateJump={ this.props.updateDateJump } + selectedDateJump={ this.props.preference.dateJump } /> <div className="container mt-4 mb-5 pb-4"> @@ -43,13 +92,14 @@ class FeedContainer extends React.Component { const mapStateToProps = store => { return { preference: store.preference, + github: store.github }; }; const mapDispatchToProps = { updateLanguage, updateViewType, - updateDateType + updateDateJump }; export default connect(mapStateToProps, mapDispatchToProps)(FeedContainer); diff --git a/src/redux/github/reducer.js b/src/redux/github/reducer.js index 66a11b5..8f6c037 100644 --- a/src/redux/github/reducer.js +++ b/src/redux/github/reducer.js @@ -2,9 +2,14 @@ import { FETCH_TRENDING_FAILED, FETCH_TRENDING_SUCCESS, PROCESS_FETCH_TRENDING, export const initialState = { processing: false, - error: null, + // Array of objects with the below format + // [ + // { start: '', end: '', data: [] }, + // { start: '', end: '', data: [] } + // ] + repositories: [], filters: {}, - data: [], + error: null, }; export default function reducer(state = initialState, action) { @@ -18,7 +23,7 @@ export default function reducer(state = initialState, action) { case FETCH_TRENDING_SUCCESS: return { ...state, - data: action.payload, + repositories: action.payload, processing: false, error: null }; diff --git a/src/redux/preference/actions.js b/src/redux/preference/actions.js index 8f115c0..57ab13a 100644 --- a/src/redux/preference/actions.js +++ b/src/redux/preference/actions.js @@ -27,11 +27,11 @@ export const updateLanguage = function (language) { }; }; -export const updateDateType = function (dateType) { +export const updateDateJump = function (dateJump) { return dispatch => { dispatch({ type: UPDATE_DATE_TYPE, - payload: dateType + payload: dateJump }); }; }; diff --git a/src/redux/preference/reducer.js b/src/redux/preference/reducer.js index dfdec5c..e634104 100644 --- a/src/redux/preference/reducer.js +++ b/src/redux/preference/reducer.js @@ -2,7 +2,7 @@ import { RESET_OPTIONS, UPDATE_DATE_TYPE, UPDATE_LANGUAGE, UPDATE_OPTIONS, UPDAT const initialState = { viewType: 'grid', - dateType: 'weekly', + dateJump: 'week', language: '', options: { token: '', @@ -24,7 +24,7 @@ export default function reducer(state = initialState, action) { case UPDATE_DATE_TYPE: return { ...state, - dateType: action.payload + dateJump: action.payload }; case UPDATE_VIEW_TYPE: return { |
