diff options
| author | Kamran Ahmed <kamranahmed.se@gmail.com> | 2018-08-25 11:27:49 +0500 |
|---|---|---|
| committer | Kamran Ahmed <kamranahmed.se@gmail.com> | 2018-08-25 11:27:49 +0500 |
| commit | 4ec4e100d9be8df3e2ec62b83bc208bf8b1be842 (patch) | |
| tree | a86d51877bec573d9ae31ba0ce0a8fb103b23549 /src | |
| parent | Author image responsiveness (diff) | |
| download | githunt-4ec4e100d9be8df3e2ec62b83bc208bf8b1be842.tar.gz | |
Make language and view filters work
Diffstat (limited to '')
| -rw-r--r-- | src/components/filters/index.js | 18 | ||||
| -rw-r--r-- | src/components/filters/language-filter/index.js | 14 | ||||
| -rw-r--r-- | src/components/filters/view-filter/index.js | 18 | ||||
| -rw-r--r-- | src/containers/feed/index.js | 25 | ||||
| -rw-r--r-- | src/redux/preference/actions.js | 11 | ||||
| -rw-r--r-- | src/redux/preference/reducer.js | 12 | ||||
| -rw-r--r-- | src/redux/preference/types.js | 1 | ||||
| -rw-r--r-- | src/store.js | 19 |
8 files changed, 85 insertions, 33 deletions
diff --git a/src/components/filters/index.js b/src/components/filters/index.js index 521e486..3515ead 100644 --- a/src/components/filters/index.js +++ b/src/components/filters/index.js @@ -1,4 +1,5 @@ import React from 'react'; +import PropTypes from 'prop-types'; import LanguageFilter from './language-filter'; import ViewFilter from './view-filter'; @@ -7,12 +8,25 @@ import './styles.css'; const Filters = (props) => ( <div className="filters-wrap"> <div className="filter-item"> - <LanguageFilter/> + <LanguageFilter + selectedLanguage={ props.selectedLanguage } + updateLanguage={ props.updateLanguage } + /> </div> <div className="filter-item"> - <ViewFilter/> + <ViewFilter + selectedViewType={ props.selectedViewType } + updateViewType={ props.updateViewType } + /> </div> </div> ); +Filters.propTypes = { + updateLanguage: PropTypes.func.isRequired, + updateViewType: PropTypes.func.isRequired, + selectedLanguage: PropTypes.string, + selectedViewType: PropTypes.string +}; + export default Filters; diff --git a/src/components/filters/language-filter/index.js b/src/components/filters/language-filter/index.js index 67a4522..00a468a 100644 --- a/src/components/filters/language-filter/index.js +++ b/src/components/filters/language-filter/index.js @@ -1,17 +1,15 @@ import React from 'react'; import ReactDOM from 'react-dom'; - +import PropTypes from 'prop-types'; import classNames from 'classnames'; import './styles.css'; import languages from './languages'; class LanguageFilter extends React.Component { - filterInputRef = React.createRef(); state = { - selected: '', filterText: '', selectedIndex: 0, showDropdown: false @@ -118,10 +116,11 @@ class LanguageFilter extends React.Component { } this.setState({ - selected: selectedLanguage.title, filterText: '', showDropdown: false }); + + this.props.updateLanguage(selectedLanguage.value); }; hideDropdown = () => { @@ -174,7 +173,7 @@ class LanguageFilter extends React.Component { <div className='language-filter-wrap'> <a href="javascript:void(0)" onClick={ this.toggleDropdown } className="btn btn-light language-filter shadowed"> <i className="fa fa-filter mr-2"></i> - { this.state.selected || 'All Languages' } + { this.props.selectedLanguage || 'All Languages' } </a> { this.state.showDropdown && this.getLanguageDropdown() } </div> @@ -182,4 +181,9 @@ class LanguageFilter extends React.Component { } } +LanguageFilter.propTypes = { + updateLanguage: PropTypes.func.isRequired, + selectedLanguage: PropTypes.string +}; + export default LanguageFilter; diff --git a/src/components/filters/view-filter/index.js b/src/components/filters/view-filter/index.js index 33fc14f..1d21266 100644 --- a/src/components/filters/view-filter/index.js +++ b/src/components/filters/view-filter/index.js @@ -1,28 +1,25 @@ import React from 'react'; import classNames from 'classnames'; +import PropTypes from 'prop-types'; import './styles.css'; class ViewFilter extends React.Component { - state = { - selected: 'grid' - }; + state = {}; changeSelected = (viewType) => { - this.setState({ - selected: viewType - }); + this.props.updateViewType(viewType); }; render() { return ( <div className="view-type-wrap"> <div className="view-type btn shadowed cursor-default"> - <a onClick={ () => this.changeSelected('grid') } href="javascript:void(0)" className={ classNames({ active: this.state.selected === 'grid' }) }> + <a onClick={ () => this.changeSelected('grid') } href="javascript:void(0)" className={ classNames({ active: this.props.selectedViewType === 'grid' }) }> <i className="fa fa-table mr-2"></i> Grid </a> - <a onClick={ () => this.changeSelected('list') } href="javascript:void(0)" className={ classNames({ active: this.state.selected === 'list' }) }> + <a onClick={ () => this.changeSelected('list') } href="javascript:void(0)" className={ classNames({ active: this.props.selectedViewType === 'list' }) }> <i className="fa fa-list mr-2"></i> List </a> @@ -32,4 +29,9 @@ class ViewFilter extends React.Component { } } +ViewFilter.propTypes = { + updateViewType: PropTypes.func.isRequired, + selectedViewType: PropTypes.string, +}; + export default ViewFilter; diff --git a/src/containers/feed/index.js b/src/containers/feed/index.js index 50951e2..12441ee 100644 --- a/src/containers/feed/index.js +++ b/src/containers/feed/index.js @@ -1,10 +1,11 @@ import React from 'react'; +import { connect } from 'react-redux'; import './styles.css'; import TopNav from '../../components/top-nav'; import Filters from '../../components/filters'; -import GridItem from '../../components/repository-grid/grid-item'; import RepositoryGrid from '../../components/repository-grid'; +import { updateLanguage, updateViewType } from '../../redux/preference/actions'; import RepositoryList from '../../components/repository-list'; class FeedContainer extends React.Component { @@ -19,11 +20,16 @@ class FeedContainer extends React.Component { <h4>Today <span className="small text-muted">July 12, 2019</span></h4> </div> <div className="group-filters"> - <Filters/> + <Filters + selectedLanguage={ this.props.preference.language } + selectedViewType={ this.props.preference.viewType } + updateLanguage={ this.props.updateLanguage } + updateViewType={ this.props.updateViewType } + /> </div> </div> <div className="body-row"> - <RepositoryList/> + { this.props.preference.viewType === 'grid' ? <RepositoryGrid/> : <RepositoryList/> } </div> </div> </div> @@ -31,4 +37,15 @@ class FeedContainer extends React.Component { } } -export default FeedContainer; +const mapStateToProps = store => { + return { + preference: store.preference, + }; +}; + +const mapDispatchToProps = { + updateLanguage, + updateViewType +}; + +export default connect(mapStateToProps, mapDispatchToProps)(FeedContainer); diff --git a/src/redux/preference/actions.js b/src/redux/preference/actions.js index 1045b6b..3183b81 100644 --- a/src/redux/preference/actions.js +++ b/src/redux/preference/actions.js @@ -1,4 +1,4 @@ -import { UPDATE_OPTIONS, UPDATE_VIEW_TYPE } from './types'; +import { UPDATE_LANGUAGE, UPDATE_OPTIONS, UPDATE_VIEW_TYPE } from './types'; export const updateOptions = function (setting) { return dispatch => { @@ -17,3 +17,12 @@ export const updateViewType = function (viewType = 'grid') { }); }; }; + +export const updateLanguage = function (language) { + return dispatch => { + dispatch({ + type: UPDATE_LANGUAGE, + payload: language + }); + }; +}; diff --git a/src/redux/preference/reducer.js b/src/redux/preference/reducer.js index a72c8b2..8c1819f 100644 --- a/src/redux/preference/reducer.js +++ b/src/redux/preference/reducer.js @@ -1,7 +1,8 @@ -import { RESET_OPTIONS, UPDATE_OPTIONS, UPDATE_VIEW_TYPE } from './types'; +import { RESET_OPTIONS, UPDATE_LANGUAGE, UPDATE_OPTIONS, UPDATE_VIEW_TYPE } from './types'; const initialState = { - view: 'grid', + viewType: 'grid', + language: '', options: { token: '', }, @@ -22,7 +23,12 @@ export default function reducer(state = initialState, action) { case UPDATE_VIEW_TYPE: return { ...state, - view: action.payload + viewType: action.payload + }; + case UPDATE_LANGUAGE: + return { + ...state, + language: action.payload }; default: return state; diff --git a/src/redux/preference/types.js b/src/redux/preference/types.js index 84e1f8b..9874e13 100644 --- a/src/redux/preference/types.js +++ b/src/redux/preference/types.js @@ -1,3 +1,4 @@ export const UPDATE_OPTIONS = 'UPDATE_OPTIONS'; export const RESET_OPTIONS = 'RESET_OPTIONS'; export const UPDATE_VIEW_TYPE = 'UPDATE_VIEW_TYPE'; +export const UPDATE_LANGUAGE = 'UPDATE_LANGUAGE'; diff --git a/src/store.js b/src/store.js index 0b56933..e4caede 100644 --- a/src/store.js +++ b/src/store.js @@ -1,9 +1,10 @@ -import { applyMiddleware, compose, createStore } from 'redux'; +import autoMergeLevel2 from 'redux-persist/lib/stateReconciler/autoMergeLevel2'; import { persistReducer, persistStore } from 'redux-persist'; -import thunk from 'redux-thunk'; +import { composeWithDevTools } from 'redux-devtools-extension'; +import { applyMiddleware, createStore } from 'redux'; import storage from 'redux-persist/lib/storage'; -import autoMergeLevel2 from 'redux-persist/lib/stateReconciler/autoMergeLevel2'; import rootReducer from './redux/reducers'; +import thunk from 'redux-thunk'; const persistedReducers = persistReducer( { @@ -14,12 +15,10 @@ const persistedReducers = persistReducer( rootReducer, ); -export const store = createStore( - persistedReducers, - compose( - applyMiddleware(thunk), - window.devToolsExtension ? window.devToolsExtension() : f => f - ) -); +export const store = createStore(persistedReducers, composeWithDevTools( + applyMiddleware( + thunk, + ), +)); export const persist = persistStore(store); |
