diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/containers/feed/index.js | 4 | ||||
| -rw-r--r-- | src/redux/github/actions.js | 6 | ||||
| -rw-r--r-- | src/redux/github/reducer.js | 12 | ||||
| -rw-r--r-- | src/redux/github/transform.js | 48 | ||||
| -rw-r--r-- | src/store.js | 9 |
5 files changed, 73 insertions, 6 deletions
diff --git a/src/containers/feed/index.js b/src/containers/feed/index.js index b16dc7d..1303375 100644 --- a/src/containers/feed/index.js +++ b/src/containers/feed/index.js @@ -1,15 +1,15 @@ import React from 'react'; -import { connect } from 'react-redux'; import moment from 'moment'; +import { connect } from 'react-redux'; import './styles.css'; +import Loader from '../../components/loader'; 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'; -import Loader from '../../components/loader'; class FeedContainer extends React.Component { componentDidMount() { diff --git a/src/redux/github/actions.js b/src/redux/github/actions.js index a22612b..032f991 100644 --- a/src/redux/github/actions.js +++ b/src/redux/github/actions.js @@ -39,7 +39,11 @@ export const fetchTrending = function (filters) { }).then(response => { dispatch({ type: FETCH_TRENDING_SUCCESS, - payload: response.data + payload: { + start: filters.dateRange.start, + end: filters.dateRange.end, + data: response.data + } }); }).catch(error => { dispatch({ diff --git a/src/redux/github/reducer.js b/src/redux/github/reducer.js index 8f6c037..1cb7d71 100644 --- a/src/redux/github/reducer.js +++ b/src/redux/github/reducer.js @@ -1,4 +1,5 @@ import { FETCH_TRENDING_FAILED, FETCH_TRENDING_SUCCESS, PROCESS_FETCH_TRENDING, UPDATE_FILTERS } from './types'; +import { UPDATE_DATE_TYPE } from '../preference/types'; export const initialState = { processing: false, @@ -20,10 +21,19 @@ export default function reducer(state = initialState, action) { processing: true, error: null }; + case UPDATE_DATE_TYPE: + return { + ...state, + ...initialState + }; case FETCH_TRENDING_SUCCESS: return { ...state, - repositories: action.payload, + // Append the fetched repositories to existing list + repositories: [ + ...state.repositories, + action.payload + ], processing: false, error: null }; diff --git a/src/redux/github/transform.js b/src/redux/github/transform.js new file mode 100644 index 0000000..af788a6 --- /dev/null +++ b/src/redux/github/transform.js @@ -0,0 +1,48 @@ +import { createTransform } from 'redux-persist'; +import moment from 'moment'; +import { initialState } from './reducer'; + +const GithubTransform = createTransform( + // transform state on its way to being serialized and persisted. + (inboundState, key) => { + inboundState = inboundState || {}; + + // If given data does not have persistence configuration before + if (!inboundState.__persisted_at) { + inboundState = { + ...inboundState, + __persisted_at: moment() + }; + } + + return inboundState; + }, + // transform state being rehydrated + (outboundState, key) => { + outboundState = outboundState || {}; + + if (outboundState.__persisted_at) { + const startTime = moment(outboundState.__persisted_at); + const endTime = moment(); + + const duration = moment.duration(endTime.diff(startTime)); + const seconds = duration.asSeconds(); + + // If the state is more than one hour old + // reset it to initial state + if (seconds > 3600) { + return { + ...initialState + }; + } + } + + return outboundState; + }, + // define which reducers this transform gets called for. + { + whitelist: ['github'] + } +); + +export default GithubTransform; diff --git a/src/store.js b/src/store.js index e4caede..c8e72b1 100644 --- a/src/store.js +++ b/src/store.js @@ -1,16 +1,21 @@ import autoMergeLevel2 from 'redux-persist/lib/stateReconciler/autoMergeLevel2'; -import { persistReducer, persistStore } from 'redux-persist'; import { composeWithDevTools } from 'redux-devtools-extension'; +import { persistReducer, persistStore } from 'redux-persist'; import { applyMiddleware, createStore } from 'redux'; import storage from 'redux-persist/lib/storage'; -import rootReducer from './redux/reducers'; import thunk from 'redux-thunk'; +import GithubTransform from './redux/github/transform'; +import rootReducer from './redux/reducers'; + const persistedReducers = persistReducer( { key: 'githunt:root', storage: storage, stateReconciler: autoMergeLevel2, + transforms: [ + GithubTransform + ] }, rootReducer, ); |
