summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/containers/feed/index.js11
-rw-r--r--src/redux/github/actions.js19
2 files changed, 24 insertions, 6 deletions
diff --git a/src/containers/feed/index.js b/src/containers/feed/index.js
index 0cc7597..862ce35 100644
--- a/src/containers/feed/index.js
+++ b/src/containers/feed/index.js
@@ -5,6 +5,7 @@ import moment from 'moment';
import './styles.css';
import TopNav from '../../components/top-nav';
import Filters from '../../components/filters';
+import { fetchTrending } from '../../redux/github/actions';
import RepositoryGrid from '../../components/repository-grid';
import RepositoryList from '../../components/repository-list';
import { updateDateJump, updateLanguage, updateViewType } from '../../redux/preference/actions';
@@ -19,15 +20,14 @@ class FeedContainer extends React.Component {
}
fetchNextRepositories() {
- console.log(this.getFilters());
+ const filters = this.getFilters();
+ this.props.fetchTrending(filters);
}
getFilters() {
const filters = {};
- filters.daterange = this.getNextDateRange();
- filters.sort = 'stars';
- filters.order = 'desc';
+ filters.dateRange = this.getNextDateRange();
if (this.props.preference.language) {
filters.language = this.props.preference.language;
@@ -99,7 +99,8 @@ const mapStateToProps = store => {
const mapDispatchToProps = {
updateLanguage,
updateViewType,
- updateDateJump
+ updateDateJump,
+ fetchTrending
};
export default connect(mapStateToProps, mapDispatchToProps)(FeedContainer);
diff --git a/src/redux/github/actions.js b/src/redux/github/actions.js
index 7f843c4..a22612b 100644
--- a/src/redux/github/actions.js
+++ b/src/redux/github/actions.js
@@ -9,6 +9,23 @@ import {
const API_URL = 'https://api.github.com/search/repositories';
+const transformFilters = (filters) => {
+ const transformedFilters = {};
+
+ const reposDate = `created:${filters.dateRange.start}..${filters.dateRange.end}`;
+ const reposLanguage = filters.language ? `language:${filters.language} ` : '';
+
+ if (filters.token) {
+ transformedFilters.access_token = filters.token;
+ }
+
+ transformedFilters.q = reposLanguage + reposDate;
+ transformedFilters.sort = 'stars';
+ transformedFilters.order = 'desc';
+
+ return transformedFilters;
+};
+
/**
* @param {object} filters
* @returns {Function}
@@ -18,7 +35,7 @@ export const fetchTrending = function (filters) {
dispatch({ type: PROCESS_FETCH_TRENDING });
axios.get(API_URL, {
- params: filters
+ params: transformFilters(filters)
}).then(response => {
dispatch({
type: FETCH_TRENDING_SUCCESS,