summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/components/group-heading/index.js9
-rw-r--r--src/components/repository-grid/index.js61
-rw-r--r--src/containers/feed/index.js17
-rw-r--r--src/redux/github/actions.js2
4 files changed, 56 insertions, 33 deletions
diff --git a/src/components/group-heading/index.js b/src/components/group-heading/index.js
new file mode 100644
index 0000000..af5f743
--- /dev/null
+++ b/src/components/group-heading/index.js
@@ -0,0 +1,9 @@
+import React from 'react';
+
+const GroupHeading = (props) => (
+ <div className="group-heading">
+ <h4>Today <span className="small text-muted">July 12, 2019</span></h4>
+ </div>
+);
+
+export default GroupHeading;
diff --git a/src/components/repository-grid/index.js b/src/components/repository-grid/index.js
index 78c8dfc..a5c8145 100644
--- a/src/components/repository-grid/index.js
+++ b/src/components/repository-grid/index.js
@@ -1,41 +1,52 @@
import React from 'react';
+import PropTypes from 'prop-types';
import GridItem from './grid-item';
import './styles.css';
+import GroupHeading from '../group-heading';
class RepositoryGrid extends React.Component {
- render() {
- return (
- <div className="repositories-grid">
- <div className="row grid-container">
- <GridItem/>
- <GridItem/>
- <GridItem/>
- <GridItem/>
- <GridItem/>
- <GridItem/>
- <GridItem/>
- <GridItem/>
- <GridItem/>
- </div>
+ renderGroup(repositoryGroup, counter) {
+ let groupHeading = '';
+ // for the first repository group, we have the
+ // heading among the filters out of the grid
+ if (counter !== 0) {
+ groupHeading = (
<div className="row row-group">
- <div className="group-heading">
- <div className="col">
- <h4>Yesterday <span className="small text-muted">July 11, 2019</span></h4>
- </div>
- </div>
+ <GroupHeading/>
</div>
+ );
+ }
+
+ const groupKey = `${repositoryGroup.start}_${repositoryGroup.end}_${counter}`;
+ const repositories = repositoryGroup.data.items;
+
+ return (
+ <div key={ groupKey } data-group-key={ groupKey }>
+ { groupHeading }
<div className="row grid-container">
- <GridItem/>
- <GridItem/>
- <GridItem/>
- <GridItem/>
- <GridItem/>
- <GridItem/>
+ { repositories.map(repository => <GridItem key={ repository.id }/>) }
</div>
</div>
);
}
+
+ render() {
+ console.log(this.props.repositories);
+ return (
+ <div className="repositories-grid">
+ {
+ this.props.repositories.map((repositoryGroup, counter) => {
+ return this.renderGroup(repositoryGroup, counter);
+ })
+ }
+ </div>
+ );
+ }
}
+RepositoryGrid.propTypes = {
+ repositories: PropTypes.array.isRequired
+};
+
export default RepositoryGrid;
diff --git a/src/containers/feed/index.js b/src/containers/feed/index.js
index 1303375..ff66563 100644
--- a/src/containers/feed/index.js
+++ b/src/containers/feed/index.js
@@ -10,6 +10,7 @@ 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';
+import GroupHeading from '../../components/group-heading';
class FeedContainer extends React.Component {
componentDidMount() {
@@ -49,11 +50,11 @@ class FeedContainer extends React.Component {
const lastRecords = repositories[repositories.length - 1];
if (lastRecords) {
- dateRange.start = moment(lastRecords.start).subtract(1, dateJump).format('YYYY-MM-DD');
+ dateRange.start = moment(lastRecords.start).subtract(1, dateJump);
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');
+ dateRange.start = moment().add(1, 'day').subtract(1, dateJump);
+ dateRange.end = moment();
}
return dateRange;
@@ -69,9 +70,7 @@ class FeedContainer extends React.Component {
<div className="container mt-4 mb-5 pb-4">
<div className="header-row clearfix">
- <div className="group-heading">
- <h4>Today <span className="small text-muted">July 12, 2019</span></h4>
- </div>
+ <GroupHeading />
<div className="group-filters">
<Filters
selectedLanguage={ this.props.preference.language }
@@ -82,7 +81,11 @@ class FeedContainer extends React.Component {
</div>
</div>
<div className="body-row">
- { this.props.preference.viewType === 'grid' ? <RepositoryGrid/> : <RepositoryList/> }
+ {
+ this.props.preference.viewType === 'grid'
+ ? <RepositoryGrid repositories={ this.props.github.repositories || [] }/>
+ : <RepositoryList repositories={ this.props.github.repositories || [] }/>
+ }
{ this.props.github.processing && <Loader/> }
</div>
diff --git a/src/redux/github/actions.js b/src/redux/github/actions.js
index 032f991..fe054a0 100644
--- a/src/redux/github/actions.js
+++ b/src/redux/github/actions.js
@@ -12,7 +12,7 @@ const API_URL = 'https://api.github.com/search/repositories';
const transformFilters = (filters) => {
const transformedFilters = {};
- const reposDate = `created:${filters.dateRange.start}..${filters.dateRange.end}`;
+ const reposDate = `created:${filters.dateRange.start.format('YYYY-MM-DD')}..${filters.dateRange.end.format('YYYY-MM-DD')}`;
const reposLanguage = filters.language ? `language:${filters.language} ` : '';
if (filters.token) {