Merge branch 'master' into fix/constants

Author: EricSimons

src/components/ArticleList.js

@@ -30,6 +30,7 @@ const ArticleList = props => {
       }
 
       <ListPagination
+        pager={props.pager}
         articlesCount={props.articlesCount}
         currentPage={props.currentPage} />
     </div>

src/components/Home/MainView.js

@@ -8,7 +8,7 @@ const YourFeedTab = props => {
   if (props.token) {
     const clickHandler = ev => {
       ev.preventDefault();
-      props.onTabClick('feed', agent.Articles.feed());
+      props.onTabClick('feed', agent.Articles.feed, agent.Articles.feed());
     }
 
     return (
@@ -27,7 +27,7 @@ const YourFeedTab = props => {
 const GlobalFeedTab = props => {
   const clickHandler = ev => {
     ev.preventDefault();
-    props.onTabClick('all', agent.Articles.all());
+    props.onTabClick('all', agent.Articles.all, agent.Articles.all());
   };
   return (
     <li className="nav-item">
@@ -62,7 +62,7 @@ const mapStateToProps = state => ({
 });
 
 const mapDispatchToProps = dispatch => ({
-  onTabClick: (tab, payload) => dispatch({ type: CHANGE_TAB, tab, payload })
+  onTabClick: (tab, pager, payload) => dispatch({ type: 'CHANGE_TAB', tab, pager, payload })
 });
 
 const MainView = props => {
@@ -84,6 +84,7 @@ const MainView = props => {
       </div>
 
       <ArticleList
+        pager={props.pager}
         articles={props.articles}
         loading={props.loading}
         articlesCount={props.articlesCount}

src/components/Home/Tags.js

@@ -10,7 +10,7 @@ const Tags = props => {
           tags.map(tag => {
             const handleClick = ev => {
               ev.preventDefault();
-              props.onClickTag(tag, agent.Articles.byTag(tag));
+              props.onClickTag(tag, page => agent.Articles.byTag(tag, page), agent.Articles.byTag(tag));
             };
 
             return (

src/components/Home/index.js

@@ -19,10 +19,10 @@ const mapStateToProps = state => ({
 });
 
 const mapDispatchToProps = dispatch => ({
-  onClickTag: (tag, payload) =>
-    dispatch({ type: APPLY_TAG_FILTER, tag, payload }),
-  onLoad: (tab, payload) =>
-    dispatch({ type: HOME_PAGE_LOADED, tab, payload }),
+  onClickTag: (tag, pager, payload) =>
+    dispatch({ type: 'APPLY_TAG_FILTER', tag, pager, payload }),
+  onLoad: (tab, pager, payload) =>
+    dispatch({ type: 'HOME_PAGE_LOADED', tab, pager, payload }),
   onUnload: () =>
     dispatch({  type: HOME_PAGE_UNLOADED })
 });
@@ -31,10 +31,10 @@ class Home extends React.Component {
   componentWillMount() {
     const tab = this.props.token ? 'feed' : 'all';
     const articlesPromise = this.props.token ?
-      agent.Articles.feed() :
-      agent.Articles.all();
+      agent.Articles.feed :
+      agent.Articles.all;
 
-    this.props.onLoad(tab, Promise.all([agent.Tags.getAll(), articlesPromise]));
+    this.props.onLoad(tab, articlesPromise, Promise.all([agent.Tags.getAll(), articlesPromise()]));
   }
 
   componentWillUnmount() {

src/components/ListPagination.js

@@ -18,7 +18,13 @@ const ListPagination = props => {
     range.push(i);
   }
 
-  const setPage = page => props.onSetPage(page, agent.Articles.all(page));
+  const setPage = page => {
+    if(props.pager) {
+      props.onSetPage(page, props.pager(page));
+    }else {
+      props.onSetPage(page, agent.Articles.all(page))
+    }
+  };
 
   return (
     <nav>

src/components/Profile.js

@@ -154,6 +154,7 @@ class Profile extends React.Component {
               </div>
 
               <ArticleList
+                pager={this.props.pager}
                 articles={this.props.articles}
                 articlesCount={this.props.articlesCount}
                 state={this.props.currentPage} />

src/components/ProfileFavorites.js

@@ -11,15 +11,15 @@ import {
 } from '../constants/actionTypes';
 
 const mapDispatchToProps = dispatch => ({
-  onLoad: (payload) =>
-    dispatch({ type: PROFILE_FAVORITES_PAGE_LOADED, payload }),
+  onLoad: (pager, payload) =>
+    dispatch({ type: 'PROFILE_FAVORITES_PAGE_LOADED', pager, payload }),
   onUnload: () =>
     dispatch({ type: PROFILE_FAVORITES_PAGE_UNLOADED })
 });
 
 class ProfileFavorites extends Profile {
   componentWillMount() {
-    this.props.onLoad(Promise.all([
+    this.props.onLoad(page => agent.Articles.favoritedBy(this.props.params.username, page), Promise.all([
       agent.Profile.get(this.props.params.username),
       agent.Articles.favoritedBy(this.props.params.username)
     ]));

src/reducers/articleList.js

@@ -39,6 +39,7 @@ export default (state = {}, action) => {
     case APPLY_TAG_FILTER:
       return {
         ...state,
+        pager: action.pager,
         articles: action.payload.articles,
         articlesCount: action.payload.articlesCount,
         tab: null,
@@ -48,6 +49,7 @@ export default (state = {}, action) => {
     case HOME_PAGE_LOADED:
       return {
         ...state,
+        pager: action.pager,
         tags: action.payload[0].tags,
         articles: action.payload[1].articles,
         articlesCount: action.payload[1].articlesCount,
@@ -59,6 +61,7 @@ export default (state = {}, action) => {
     case CHANGE_TAB:
       return {
         ...state,
+        pager: action.pager,
         articles: action.payload.articles,
         articlesCount: action.payload.articlesCount,
         tab: action.tab,
@@ -69,6 +72,7 @@ export default (state = {}, action) => {
     case PROFILE_FAVORITES_PAGE_LOADED:
       return {
         ...state,
+        pager: action.pager,
         articles: action.payload[1].articles,
         articlesCount: action.payload[1].articlesCount,
         currentPage: 0

src/store.js

@@ -12,6 +12,6 @@ const getMiddleware = () => {
   }
 }
 
-const store = createStore(reducer, getMiddleware());
+const store = createStore(reducer, getMiddleware(), window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__())
 
 export default store;