From 4c519d1d8b37669933a2fa4815ac069d54fce0e0 Mon Sep 17 00:00:00 2001
From: omiceron <omiceron@gmail.com>
Date: Sun, 28 Jan 2018 23:41:36 +0500
Subject: [PATCH 01/14] HT4.1 - Store completed

---
 src/AC/index.js                     | 16 +++++++++++++-
 src/components/App.js               |  1 +
 src/components/Article/index.js     |  2 +-
 src/components/Filters/DateRange.js | 33 ++++++++++++++++++++++++++---
 src/components/Filters/Select.js    | 17 ++++++++++-----
 src/components/Filters/index.js     | 11 ++++++++--
 src/constants/index.js              |  5 +++--
 src/reducer/articles.js             |  1 +
 src/reducer/filters.js              | 23 ++++++++++++++++++++
 src/reducer/index.js                |  8 ++++---
 src/store/index.js                  |  2 +-
 11 files changed, 101 insertions(+), 18 deletions(-)
 create mode 100644 src/reducer/filters.js

diff --git a/src/AC/index.js b/src/AC/index.js
index 6b623b4..5e8b16f 100644
--- a/src/AC/index.js
+++ b/src/AC/index.js
@@ -1,4 +1,4 @@
-import {INCREMENT, DELETE_ARTICLE} from '../constants'
+import {INCREMENT, DELETE_ARTICLE, FILTER_DATERANGE, FILTER_SELECT} from '../constants'
 
 export function increment() {
     return {
@@ -11,4 +11,18 @@ export function deleteArticle(id) {
         type: DELETE_ARTICLE,
         payload: { id }
     }
+}
+
+export function filterDateRange({from, to}) {
+    return {
+        type: FILTER_DATERANGE,
+        payload: { from, to }
+    }
+}
+
+export function filterSelect(selected) {
+    return {
+        type: FILTER_SELECT,
+        payload: { selected }
+    }
 }
\ No newline at end of file
diff --git a/src/components/App.js b/src/components/App.js
index 7fc1ed4..6842c60 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -4,6 +4,7 @@ import UserForm from './UserForm'
 import Filters from './Filters'
 import Counter from './Counter'
 
+
 class App extends Component {
     render() {
         return (
diff --git a/src/components/Article/index.js b/src/components/Article/index.js
index c5a5791..08010ef 100644
--- a/src/components/Article/index.js
+++ b/src/components/Article/index.js
@@ -63,7 +63,7 @@ class Article extends PureComponent {
     }
 
     handleDelete = () => {
-        const {deleteArticle,article} = this.props
+        const {deleteArticle, article} = this.props
         deleteArticle(article.id)
     }
 
diff --git a/src/components/Filters/DateRange.js b/src/components/Filters/DateRange.js
index 7f1fdb9..8823b99 100644
--- a/src/components/Filters/DateRange.js
+++ b/src/components/Filters/DateRange.js
@@ -1,18 +1,36 @@
 import React, { Component } from 'react'
 import DayPicker, { DateUtils } from 'react-day-picker'
+import {connect} from 'react-redux'
+import {filterDateRange} from '../../AC'
+import Article from '../Article'
 
 import 'react-day-picker/lib/style.css'
 
 class DateRange extends Component {
+/*
     state = {
         from: null,
         to: null
     }
+*/
 
-    handleDayClick = (day) => this.setState(DateUtils.addDayToRange(day, this.state))
+//    handleDayClick = (day) => this.setState(DateUtils.addDayToRange(day, this.state))
+
+    handleDayClick = (day) => {
+
+        console.log('handleclick', this.props)
+        const {filterDateRange} = this.props
+        filterDateRange(DateUtils.addDayToRange(day, this.props))
+    }
+
+/*    handleDayClick = () => {
+        const {filterDateRange, range} = this.props
+        filterDateRange(range)
+    }*/
 
     render() {
-        const { from, to } = this.state
+//        const { from, to } = this.state
+        const { from, to } = this.props
         const selectedRange = from && to && `${from.toDateString()} - ${to.toDateString()}`
         return (
             <div className="date-range">
@@ -26,5 +44,14 @@ class DateRange extends Component {
     }
 
 }
+/*
+
+const mapStateToProps = (storeState) => ({
+    range: storeState.filters
+})
+
+export default connect(mapStateToProps)(DateRange)
+*/
+
 
-export default DateRange
\ No newline at end of file
+export default connect(null, { filterDateRange })(DateRange)
diff --git a/src/components/Filters/Select.js b/src/components/Filters/Select.js
index 018dd1d..20fbdc0 100644
--- a/src/components/Filters/Select.js
+++ b/src/components/Filters/Select.js
@@ -1,6 +1,8 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import Select from 'react-select'
+import {connect} from 'react-redux'
+import {filterSelect} from '../../AC'
 
 import 'react-select/dist/react-select.css'
 
@@ -9,11 +11,16 @@ class SelectFilter extends Component {
         articles: PropTypes.array.isRequired
     };
 
-    state = {
+/*    state = {
         selected: null
-    }
+    }*/
+
+    //handleChange = selected => (console.log(selected), this.setState({ selected }))
 
-    handleChange = selected => this.setState({ selected })
+    handleChange = () => {
+        const {selectArticles, selected} = this.props
+        selectArticles(selected)
+    }
 
     render() {
         const { articles } = this.props
@@ -24,11 +31,11 @@ class SelectFilter extends Component {
 
         return <Select
             options={options}
-            value={this.state.selected}
+            value={this.props.selected}
             onChange={this.handleChange}
             multi
         />
     }
 }
 
-export default SelectFilter
\ No newline at end of file
+export default connect(null, { filterSelect })(SelectFilter)
\ No newline at end of file
diff --git a/src/components/Filters/index.js b/src/components/Filters/index.js
index 4ac1415..f735535 100644
--- a/src/components/Filters/index.js
+++ b/src/components/Filters/index.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react'
 import DateRange from './DateRange'
 import SelectFilter from './Select'
+import {connect} from 'react-redux'
 
 class Filters extends Component {
     static propTypes = {
@@ -10,10 +11,16 @@ class Filters extends Component {
         return (
             <div>
                 <SelectFilter articles = {this.props.articles}/>
-                <DateRange />
+                <DateRange {...this.props.filters}/>
             </div>
         )
     }
 }
 
-export default Filters
\ No newline at end of file
+export default connect(storeState => ({
+    articles: storeState.articles,
+    filters: storeState.filters
+}))(Filters)
+
+/*
+export default Filters*/
diff --git a/src/constants/index.js b/src/constants/index.js
index f1c8ad4..c7c8c0d 100644
--- a/src/constants/index.js
+++ b/src/constants/index.js
@@ -1,3 +1,4 @@
 export const INCREMENT = 'INCREMENT'
-
-export const DELETE_ARTICLE = 'DELETE_ARTICLE'
\ No newline at end of file
+export const DELETE_ARTICLE = 'DELETE_ARTICLE'
+export const FILTER_DATERANGE = 'FILTER_DATERANGE'
+export const FILTER_SELECT = 'FILTER_SELECT'
\ No newline at end of file
diff --git a/src/reducer/articles.js b/src/reducer/articles.js
index 023a7b9..72a6693 100644
--- a/src/reducer/articles.js
+++ b/src/reducer/articles.js
@@ -9,5 +9,6 @@ export default (articlesState = defaultArticles, action) => {
             return articlesState.filter(article => article.id !== payload.id)
     }
 
+
     return articlesState
 }
\ No newline at end of file
diff --git a/src/reducer/filters.js b/src/reducer/filters.js
new file mode 100644
index 0000000..c50e7fb
--- /dev/null
+++ b/src/reducer/filters.js
@@ -0,0 +1,23 @@
+import {FILTER_DATERANGE, FILTER_SELECT} from '../constants'
+
+export default (state = {from: null, to: null, selected: null}, action) => {
+    console.log(JSON.stringify(action.payload))
+
+    const {type, payload} = action
+
+    switch (type) {
+        case FILTER_DATERANGE:
+            return {
+                ...payload,
+                selected: state.selected
+            };
+
+        case FILTER_SELECT:
+            return {
+                ...state,
+                selected: payload.selected
+            }
+    }
+
+    return state
+}
\ No newline at end of file
diff --git a/src/reducer/index.js b/src/reducer/index.js
index 96c1a98..8ed14d3 100644
--- a/src/reducer/index.js
+++ b/src/reducer/index.js
@@ -1,8 +1,10 @@
 import {combineReducers} from 'redux'
-import counterReducer from './counter'
+import counter from './counter'
 import articles from './articles'
+import filters from './filters'
 
 export default combineReducers({
-    counter: counterReducer,
-    articles
+    counter,
+    articles,
+    filters
 })
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
index 1b60099..a74d59f 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,7 +1,7 @@
 import {createStore} from 'redux'
 import rootReducer from '../reducer'
 
-const store = createStore(rootReducer)
+const store = createStore(rootReducer, window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__())
 
 //dev only, no need in prod
 window.store = store

From 2dfe954664f89d9ffac0ff6a65fc29c2066c0a7b Mon Sep 17 00:00:00 2001
From: omiceron <omiceron@gmail.com>
Date: Mon, 29 Jan 2018 00:23:05 +0500
Subject: [PATCH 02/14] HT4.1 - Select fixed, some code refactored

---
 src/AC/index.js                     |  6 +++---
 src/components/Filters/DateRange.js |  6 +++++-
 src/components/Filters/Select.js    | 18 +++++++++++++-----
 src/components/Filters/index.js     | 11 ++++++-----
 src/constants/index.js              |  2 +-
 src/reducer/filters.js              |  6 +++---
 6 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/src/AC/index.js b/src/AC/index.js
index 5e8b16f..7eb217b 100644
--- a/src/AC/index.js
+++ b/src/AC/index.js
@@ -1,4 +1,4 @@
-import {INCREMENT, DELETE_ARTICLE, FILTER_DATERANGE, FILTER_SELECT} from '../constants'
+import {INCREMENT, DELETE_ARTICLE, FILTER_DATERANGE, FILTER_SELECTED} from '../constants'
 
 export function increment() {
     return {
@@ -20,9 +20,9 @@ export function filterDateRange({from, to}) {
     }
 }
 
-export function filterSelect(selected) {
+export function filterSelected(selected) {
     return {
-        type: FILTER_SELECT,
+        type: FILTER_SELECTED,
         payload: { selected }
     }
 }
\ No newline at end of file
diff --git a/src/components/Filters/DateRange.js b/src/components/Filters/DateRange.js
index 8823b99..004e0be 100644
--- a/src/components/Filters/DateRange.js
+++ b/src/components/Filters/DateRange.js
@@ -18,9 +18,12 @@ class DateRange extends Component {
 
     handleDayClick = (day) => {
 
-        console.log('handleclick', this.props)
+
+
         const {filterDateRange} = this.props
         filterDateRange(DateUtils.addDayToRange(day, this.props))
+
+
     }
 
 /*    handleDayClick = () => {
@@ -29,6 +32,7 @@ class DateRange extends Component {
     }*/
 
     render() {
+        console.log('DateRange --- \n', this.props)
 //        const { from, to } = this.state
         const { from, to } = this.props
         const selectedRange = from && to && `${from.toDateString()} - ${to.toDateString()}`
diff --git a/src/components/Filters/Select.js b/src/components/Filters/Select.js
index 20fbdc0..a91eb5b 100644
--- a/src/components/Filters/Select.js
+++ b/src/components/Filters/Select.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import Select from 'react-select'
 import {connect} from 'react-redux'
-import {filterSelect} from '../../AC'
+import {filterSelected} from '../../AC'
 
 import 'react-select/dist/react-select.css'
 
@@ -17,12 +17,17 @@ class SelectFilter extends Component {
 
     //handleChange = selected => (console.log(selected), this.setState({ selected }))
 
-    handleChange = () => {
-        const {selectArticles, selected} = this.props
-        selectArticles(selected)
+    handleChange = (selected) => {
+
+        const {filterSelected} = this.props
+        filterSelected(selected)
+
+
+
     }
 
     render() {
+        console.log('Select --- \n', this.props)
         const { articles } = this.props
         const options = articles.map(article => ({
             label: article.title,
@@ -38,4 +43,7 @@ class SelectFilter extends Component {
     }
 }
 
-export default connect(null, { filterSelect })(SelectFilter)
\ No newline at end of file
+export default connect(storeState => ({
+    articles: storeState.articles,
+    selected: storeState.filters.selected
+}), { filterSelected })(SelectFilter)
\ No newline at end of file
diff --git a/src/components/Filters/index.js b/src/components/Filters/index.js
index f735535..1ef6964 100644
--- a/src/components/Filters/index.js
+++ b/src/components/Filters/index.js
@@ -8,19 +8,20 @@ class Filters extends Component {
     };
 
     render() {
+        const { from, to } = this.props.filters
         return (
             <div>
                 <SelectFilter articles = {this.props.articles}/>
-                <DateRange {...this.props.filters}/>
+                <DateRange from = {from}
+                           to = {to}/>
+
             </div>
         )
     }
 }
 
-export default connect(storeState => ({
-    articles: storeState.articles,
-    filters: storeState.filters
-}))(Filters)
+
+export default connect( storeState => ({...storeState}) )(Filters)
 
 /*
 export default Filters*/
diff --git a/src/constants/index.js b/src/constants/index.js
index c7c8c0d..737401a 100644
--- a/src/constants/index.js
+++ b/src/constants/index.js
@@ -1,4 +1,4 @@
 export const INCREMENT = 'INCREMENT'
 export const DELETE_ARTICLE = 'DELETE_ARTICLE'
 export const FILTER_DATERANGE = 'FILTER_DATERANGE'
-export const FILTER_SELECT = 'FILTER_SELECT'
\ No newline at end of file
+export const FILTER_SELECTED = 'FILTER_SELECTED'
\ No newline at end of file
diff --git a/src/reducer/filters.js b/src/reducer/filters.js
index c50e7fb..e7c22ea 100644
--- a/src/reducer/filters.js
+++ b/src/reducer/filters.js
@@ -1,7 +1,7 @@
-import {FILTER_DATERANGE, FILTER_SELECT} from '../constants'
+import {FILTER_DATERANGE, FILTER_SELECTED} from '../constants'
 
 export default (state = {from: null, to: null, selected: null}, action) => {
-    console.log(JSON.stringify(action.payload))
+//    console.log(JSON.stringify(action.payload))
 
     const {type, payload} = action
 
@@ -12,7 +12,7 @@ export default (state = {from: null, to: null, selected: null}, action) => {
                 selected: state.selected
             };
 
-        case FILTER_SELECT:
+        case FILTER_SELECTED:
             return {
                 ...state,
                 selected: payload.selected

From 2a7eec857a2f605cee500c20efa3380766088a56 Mon Sep 17 00:00:00 2001
From: omiceron <omiceron@gmail.com>
Date: Mon, 29 Jan 2018 12:00:15 +0500
Subject: [PATCH 03/14] HT4.2 - ArticleList completed

---
 src/components/ArticleList.js    | 17 ++++++++++++--
 src/components/Filters/Select.js |  2 +-
 src/components/Filters/index.js  |  1 +
 src/fixtures.js                  |  2 +-
 src/reducer/articles.js          |  6 ++---
 src/reducer/filters.js           |  8 ++++---
 src/reducer/index.js             | 39 +++++++++++++++++++++++++++++++-
 7 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/src/components/ArticleList.js b/src/components/ArticleList.js
index 99e28c7..1c9067f 100644
--- a/src/components/ArticleList.js
+++ b/src/components/ArticleList.js
@@ -6,7 +6,7 @@ import Accordion from './common/Accordion'
 
 class ArticleList extends Accordion {
     render() {
-        const {articles} = this.props
+        const articles = filterArticles(this.props)
         if (!articles.length) return <h3>No Articles</h3>
         const articleElements = articles.map((article) => <li key={article.id}>
             <Article article={article}
@@ -22,6 +22,18 @@ class ArticleList extends Accordion {
     }
 }
 
+function filterArticles({articles, filters}) {
+
+    const {from, to, selected} = filters;
+
+    return articles.filter( ({date, id}) => {
+        const byDate = from && to ? new Date(date) >= from && new Date(date) <= to : true;
+        const bySelect = selected.length ? selected.map( ({ value }) => value ).includes(id) : true
+
+        return byDate && bySelect
+    } )
+}
+
 
 ArticleList.defaultProps = {
     articles: []
@@ -32,5 +44,6 @@ ArticleList.propTypes = {
 }
 
 export default connect(state => ({
-    articles: state.articles
+    articles: state.articles,
+    filters: state.filters
 }))(ArticleList)
\ No newline at end of file
diff --git a/src/components/Filters/Select.js b/src/components/Filters/Select.js
index a91eb5b..09db8a4 100644
--- a/src/components/Filters/Select.js
+++ b/src/components/Filters/Select.js
@@ -44,6 +44,6 @@ class SelectFilter extends Component {
 }
 
 export default connect(storeState => ({
-    articles: storeState.articles,
+//    articles: storeState.articles,
     selected: storeState.filters.selected
 }), { filterSelected })(SelectFilter)
\ No newline at end of file
diff --git a/src/components/Filters/index.js b/src/components/Filters/index.js
index 1ef6964..eaa85bf 100644
--- a/src/components/Filters/index.js
+++ b/src/components/Filters/index.js
@@ -9,6 +9,7 @@ class Filters extends Component {
 
     render() {
         const { from, to } = this.props.filters
+
         return (
             <div>
                 <SelectFilter articles = {this.props.articles}/>
diff --git a/src/fixtures.js b/src/fixtures.js
index 86c7272..0e336a1 100644
--- a/src/fixtures.js
+++ b/src/fixtures.js
@@ -1,7 +1,7 @@
 export default [
     {
         "id": "56c782f18990ecf954f6e027",
-        "date": "2016-06-09T15:03:23.000Z",
+        "date": "2018-06-09T15:03:23.000Z",
         "title": "Commodo qui incididunt",
         "text": "Commodo qui incididunt ex ut ea nulla et eu aliquip duis. Aute deserunt excepteur ullamco fugiat sunt aliquip exercitation do sint incididunt. Amet consectetur sint irure reprehenderit fugiat amet mollit. In commodo mollit ullamco cillum pariatur eiusmod cillum aute mollit. Culpa non sint eiusmod ad dolor velit dolore voluptate do adipisicing. Cupidatat sint est magna officia qui magna eu elit qui excepteur fugiat duis ex labore.\n\nAliquip veniam ad reprehenderit mollit exercitation id enim ut exercitation. Esse irure ipsum minim laborum reprehenderit irure ut. Tempor excepteur nisi nulla nostrud amet id cillum. Sint velit sint officia aliqua sint quis deserunt.\n\nAliquip dolor cillum deserunt enim nulla dolor amet irure cupidatat commodo laboris id aliqua. Labore aliqua adipisicing Lorem id adipisicing. Ad cupidatat et do anim ex commodo elit magna ad consequat. Nostrud sit eu laborum ut consequat fugiat aute culpa. Lorem tempor quis sunt ad consequat excepteur est. Enim voluptate cillum Lorem ex fugiat ea qui. Irure aute magna dolore eiusmod minim non ad anim dolore sint et.",
         "comments": [
diff --git a/src/reducer/articles.js b/src/reducer/articles.js
index 72a6693..38a0fcb 100644
--- a/src/reducer/articles.js
+++ b/src/reducer/articles.js
@@ -1,4 +1,4 @@
-import {DELETE_ARTICLE} from '../constants'
+import {DELETE_ARTICLE, FILTER_DATERANGE, FILTER_SELECTED} from '../constants'
 import defaultArticles from '../fixtures'
 
 export default (articlesState = defaultArticles, action) => {
@@ -6,9 +6,9 @@ export default (articlesState = defaultArticles, action) => {
 
     switch (type) {
         case DELETE_ARTICLE:
-            return articlesState.filter(article => article.id !== payload.id)
-    }
+            return articlesState.filter(article => article.id !== payload.id);
 
+    }
 
     return articlesState
 }
\ No newline at end of file
diff --git a/src/reducer/filters.js b/src/reducer/filters.js
index e7c22ea..10d53a5 100644
--- a/src/reducer/filters.js
+++ b/src/reducer/filters.js
@@ -1,21 +1,23 @@
 import {FILTER_DATERANGE, FILTER_SELECTED} from '../constants'
+import defaultArticles from '../fixtures'
 
-export default (state = {from: null, to: null, selected: null}, action) => {
+export default (state = {from: null, to: null, selected: []}, action) => {
 //    console.log(JSON.stringify(action.payload))
 
     const {type, payload} = action
 
+
     switch (type) {
         case FILTER_DATERANGE:
             return {
                 ...payload,
-                selected: state.selected
+                selected: state.selected,
             };
 
         case FILTER_SELECTED:
             return {
                 ...state,
-                selected: payload.selected
+                selected: payload.selected,
             }
     }
 
diff --git a/src/reducer/index.js b/src/reducer/index.js
index 8ed14d3..f5e5aae 100644
--- a/src/reducer/index.js
+++ b/src/reducer/index.js
@@ -7,4 +7,41 @@ export default combineReducers({
     counter,
     articles,
     filters
-})
\ No newline at end of file
+
+})
+
+/*
+
+const combinedReducer = combineReducers({
+    counter,
+    articles,
+    filters,
+    filteredArticles: () => []
+})
+
+function filterReducer(state, action) {
+    const { type } = action
+
+    function filter(state) {
+        const {articles} = state
+        const {from, to, selected} = state.filters
+        return articles.filter(article => {
+            let fromFiltered = from != null ? new Date(article.date) >= from : true
+            let toFiltered = to != null ? new Date(article.date) <= to : true
+            let selectFiltered = selected && selected.length > 0 ? selected.some(({value}) => article.id == value) : true
+            return fromFiltered && toFiltered && selectFiltered
+        })
+    }
+
+    return {...state, filteredArticles: filter(state)}
+}
+
+function rootReducer(state, action) {
+    const intermediateState = combinedReducer(state, action)
+    const finalState = filterReducer(intermediateState, action)
+    return finalState
+}
+
+export default rootReducer
+
+*/

From ef3ea5180eced2446d0331de87008fa8335c5e8a Mon Sep 17 00:00:00 2001
From: omiceron <omiceron@gmail.com>
Date: Mon, 29 Jan 2018 12:02:48 +0500
Subject: [PATCH 04/14] HT4.2 - ArticleList completed

---
 src/reducer/index.js | 38 +-------------------------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/src/reducer/index.js b/src/reducer/index.js
index f5e5aae..a7be8cb 100644
--- a/src/reducer/index.js
+++ b/src/reducer/index.js
@@ -8,40 +8,4 @@ export default combineReducers({
     articles,
     filters
 
-})
-
-/*
-
-const combinedReducer = combineReducers({
-    counter,
-    articles,
-    filters,
-    filteredArticles: () => []
-})
-
-function filterReducer(state, action) {
-    const { type } = action
-
-    function filter(state) {
-        const {articles} = state
-        const {from, to, selected} = state.filters
-        return articles.filter(article => {
-            let fromFiltered = from != null ? new Date(article.date) >= from : true
-            let toFiltered = to != null ? new Date(article.date) <= to : true
-            let selectFiltered = selected && selected.length > 0 ? selected.some(({value}) => article.id == value) : true
-            return fromFiltered && toFiltered && selectFiltered
-        })
-    }
-
-    return {...state, filteredArticles: filter(state)}
-}
-
-function rootReducer(state, action) {
-    const intermediateState = combinedReducer(state, action)
-    const finalState = filterReducer(intermediateState, action)
-    return finalState
-}
-
-export default rootReducer
-
-*/
+})
\ No newline at end of file

From 1ac413fc33f920ba15a328882b8d6f93666f3083 Mon Sep 17 00:00:00 2001
From: omiceron <omiceron@gmail.com>
Date: Mon, 29 Jan 2018 12:22:18 +0500
Subject: [PATCH 05/14] HT4.2 - ArticleList completed

---
 src/components/ArticleList.js    | 17 +++++++++++++++--
 src/components/Filters/Select.js |  4 +++-
 src/fixtures.js                  |  2 +-
 src/reducer/filters.js           |  2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/components/ArticleList.js b/src/components/ArticleList.js
index 99e28c7..1c9067f 100644
--- a/src/components/ArticleList.js
+++ b/src/components/ArticleList.js
@@ -6,7 +6,7 @@ import Accordion from './common/Accordion'
 
 class ArticleList extends Accordion {
     render() {
-        const {articles} = this.props
+        const articles = filterArticles(this.props)
         if (!articles.length) return <h3>No Articles</h3>
         const articleElements = articles.map((article) => <li key={article.id}>
             <Article article={article}
@@ -22,6 +22,18 @@ class ArticleList extends Accordion {
     }
 }
 
+function filterArticles({articles, filters}) {
+
+    const {from, to, selected} = filters;
+
+    return articles.filter( ({date, id}) => {
+        const byDate = from && to ? new Date(date) >= from && new Date(date) <= to : true;
+        const bySelect = selected.length ? selected.map( ({ value }) => value ).includes(id) : true
+
+        return byDate && bySelect
+    } )
+}
+
 
 ArticleList.defaultProps = {
     articles: []
@@ -32,5 +44,6 @@ ArticleList.propTypes = {
 }
 
 export default connect(state => ({
-    articles: state.articles
+    articles: state.articles,
+    filters: state.filters
 }))(ArticleList)
\ No newline at end of file
diff --git a/src/components/Filters/Select.js b/src/components/Filters/Select.js
index 20fbdc0..47a1e13 100644
--- a/src/components/Filters/Select.js
+++ b/src/components/Filters/Select.js
@@ -38,4 +38,6 @@ class SelectFilter extends Component {
     }
 }
 
-export default connect(null, { filterSelect })(SelectFilter)
\ No newline at end of file
+export default connect(storeState => ({
+    selected: storeState.filters.selected
+}), { filterSelect })(SelectFilter)
\ No newline at end of file
diff --git a/src/fixtures.js b/src/fixtures.js
index 86c7272..0e336a1 100644
--- a/src/fixtures.js
+++ b/src/fixtures.js
@@ -1,7 +1,7 @@
 export default [
     {
         "id": "56c782f18990ecf954f6e027",
-        "date": "2016-06-09T15:03:23.000Z",
+        "date": "2018-06-09T15:03:23.000Z",
         "title": "Commodo qui incididunt",
         "text": "Commodo qui incididunt ex ut ea nulla et eu aliquip duis. Aute deserunt excepteur ullamco fugiat sunt aliquip exercitation do sint incididunt. Amet consectetur sint irure reprehenderit fugiat amet mollit. In commodo mollit ullamco cillum pariatur eiusmod cillum aute mollit. Culpa non sint eiusmod ad dolor velit dolore voluptate do adipisicing. Cupidatat sint est magna officia qui magna eu elit qui excepteur fugiat duis ex labore.\n\nAliquip veniam ad reprehenderit mollit exercitation id enim ut exercitation. Esse irure ipsum minim laborum reprehenderit irure ut. Tempor excepteur nisi nulla nostrud amet id cillum. Sint velit sint officia aliqua sint quis deserunt.\n\nAliquip dolor cillum deserunt enim nulla dolor amet irure cupidatat commodo laboris id aliqua. Labore aliqua adipisicing Lorem id adipisicing. Ad cupidatat et do anim ex commodo elit magna ad consequat. Nostrud sit eu laborum ut consequat fugiat aute culpa. Lorem tempor quis sunt ad consequat excepteur est. Enim voluptate cillum Lorem ex fugiat ea qui. Irure aute magna dolore eiusmod minim non ad anim dolore sint et.",
         "comments": [
diff --git a/src/reducer/filters.js b/src/reducer/filters.js
index c50e7fb..10cfce6 100644
--- a/src/reducer/filters.js
+++ b/src/reducer/filters.js
@@ -1,6 +1,6 @@
 import {FILTER_DATERANGE, FILTER_SELECT} from '../constants'
 
-export default (state = {from: null, to: null, selected: null}, action) => {
+export default (state = {from: null, to: null, selected: []}, action) => {
     console.log(JSON.stringify(action.payload))
 
     const {type, payload} = action

From 056c1a960ed3cc2272da0e41aca8edd6b62fb19c Mon Sep 17 00:00:00 2001
From: omiceron <omiceron@gmail.com>
Date: Mon, 29 Jan 2018 12:24:04 +0500
Subject: [PATCH 06/14] HT4.2 - ArticleList completed

---
 src/components/ArticleList.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/ArticleList.js b/src/components/ArticleList.js
index 1c9067f..19521f8 100644
--- a/src/components/ArticleList.js
+++ b/src/components/ArticleList.js
@@ -32,6 +32,7 @@ function filterArticles({articles, filters}) {
 
         return byDate && bySelect
     } )
+
 }
 
 

From 73b985ca6b13fe211fd2e8f0dfb48f0bba22f431 Mon Sep 17 00:00:00 2001
From: omiceron <omiceron@gmail.com>
Date: Mon, 29 Jan 2018 12:46:42 +0500
Subject: [PATCH 07/14] HT4.2 - ArticleList completed

---
 src/components/ArticleList.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/ArticleList.js b/src/components/ArticleList.js
index 1c9067f..8381ff8 100644
--- a/src/components/ArticleList.js
+++ b/src/components/ArticleList.js
@@ -31,6 +31,7 @@ function filterArticles({articles, filters}) {
         const bySelect = selected.length ? selected.map( ({ value }) => value ).includes(id) : true
 
         return byDate && bySelect
+
     } )
 }
 

From af453089ef755fbb65c9ccc4f1b55def27c848b9 Mon Sep 17 00:00:00 2001
From: omiceron <omiceron@gmail.com>
Date: Mon, 29 Jan 2018 12:54:10 +0500
Subject: [PATCH 08/14] HT4.2 - ArticleList completed

---
 src/components/Filters/Select.js | 8 ++++----
 src/reducer/articles.js          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/Filters/Select.js b/src/components/Filters/Select.js
index 47a1e13..da09220 100644
--- a/src/components/Filters/Select.js
+++ b/src/components/Filters/Select.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 import Select from 'react-select'
 import {connect} from 'react-redux'
-import {filterSelect} from '../../AC'
+import {filterSelected} from '../../AC'
 
 import 'react-select/dist/react-select.css'
 
@@ -18,8 +18,8 @@ class SelectFilter extends Component {
     //handleChange = selected => (console.log(selected), this.setState({ selected }))
 
     handleChange = () => {
-        const {selectArticles, selected} = this.props
-        selectArticles(selected)
+        const {filterSelected, selected} = this.props
+        filterSelected(selected)
     }
 
     render() {
@@ -40,4 +40,4 @@ class SelectFilter extends Component {
 
 export default connect(storeState => ({
     selected: storeState.filters.selected
-}), { filterSelect })(SelectFilter)
\ No newline at end of file
+}), { filterSelected })(SelectFilter)
\ No newline at end of file
diff --git a/src/reducer/articles.js b/src/reducer/articles.js
index 38a0fcb..d36868d 100644
--- a/src/reducer/articles.js
+++ b/src/reducer/articles.js
@@ -1,4 +1,4 @@
-import {DELETE_ARTICLE, FILTER_DATERANGE, FILTER_SELECTED} from '../constants'
+import {DELETE_ARTICLE} from '../constants'
 import defaultArticles from '../fixtures'
 
 export default (articlesState = defaultArticles, action) => {

From 35321419f52d6b2144cb8e292322b621d0e55009 Mon Sep 17 00:00:00 2001
From: omiceron <omiceron@gmail.com>
Date: Mon, 29 Jan 2018 13:18:11 +0500
Subject: [PATCH 09/14] HT4.2 - ArticleList completed

---
 src/components/ArticleList.js       |  4 +--
 src/components/Filters/DateRange.js | 18 --------------
 src/reducer/index.js                | 38 +----------------------------
 3 files changed, 3 insertions(+), 57 deletions(-)

diff --git a/src/components/ArticleList.js b/src/components/ArticleList.js
index 1c9067f..2abd20e 100644
--- a/src/components/ArticleList.js
+++ b/src/components/ArticleList.js
@@ -27,8 +27,8 @@ function filterArticles({articles, filters}) {
     const {from, to, selected} = filters;
 
     return articles.filter( ({date, id}) => {
-        const byDate = from && to ? new Date(date) >= from && new Date(date) <= to : true;
-        const bySelect = selected.length ? selected.map( ({ value }) => value ).includes(id) : true
+        const byDate = !from && !to || new Date(date) >= from && new Date(date) < to;
+        const bySelect = !selected.length || selected.map( ({ value }) => value ).includes(id)
 
         return byDate && bySelect
     } )
diff --git a/src/components/Filters/DateRange.js b/src/components/Filters/DateRange.js
index 004e0be..18ca5d6 100644
--- a/src/components/Filters/DateRange.js
+++ b/src/components/Filters/DateRange.js
@@ -14,23 +14,13 @@ class DateRange extends Component {
     }
 */
 
-//    handleDayClick = (day) => this.setState(DateUtils.addDayToRange(day, this.state))
-
     handleDayClick = (day) => {
 
-
-
         const {filterDateRange} = this.props
         filterDateRange(DateUtils.addDayToRange(day, this.props))
 
-
     }
 
-/*    handleDayClick = () => {
-        const {filterDateRange, range} = this.props
-        filterDateRange(range)
-    }*/
-
     render() {
         console.log('DateRange --- \n', this.props)
 //        const { from, to } = this.state
@@ -48,14 +38,6 @@ class DateRange extends Component {
     }
 
 }
-/*
-
-const mapStateToProps = (storeState) => ({
-    range: storeState.filters
-})
-
-export default connect(mapStateToProps)(DateRange)
-*/
 
 
 export default connect(null, { filterDateRange })(DateRange)
diff --git a/src/reducer/index.js b/src/reducer/index.js
index f5e5aae..a7be8cb 100644
--- a/src/reducer/index.js
+++ b/src/reducer/index.js
@@ -8,40 +8,4 @@ export default combineReducers({
     articles,
     filters
 
-})
-
-/*
-
-const combinedReducer = combineReducers({
-    counter,
-    articles,
-    filters,
-    filteredArticles: () => []
-})
-
-function filterReducer(state, action) {
-    const { type } = action
-
-    function filter(state) {
-        const {articles} = state
-        const {from, to, selected} = state.filters
-        return articles.filter(article => {
-            let fromFiltered = from != null ? new Date(article.date) >= from : true
-            let toFiltered = to != null ? new Date(article.date) <= to : true
-            let selectFiltered = selected && selected.length > 0 ? selected.some(({value}) => article.id == value) : true
-            return fromFiltered && toFiltered && selectFiltered
-        })
-    }
-
-    return {...state, filteredArticles: filter(state)}
-}
-
-function rootReducer(state, action) {
-    const intermediateState = combinedReducer(state, action)
-    const finalState = filterReducer(intermediateState, action)
-    return finalState
-}
-
-export default rootReducer
-
-*/
+})
\ No newline at end of file

From b40de1a123e181bf24a0f16871565a542e8baa2a Mon Sep 17 00:00:00 2001
From: omiceron <omiceron@gmail.com>
Date: Mon, 29 Jan 2018 13:19:03 +0500
Subject: [PATCH 10/14] HT4.2 - ArticleList completed

---
 src/components/Filters/Select.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/Filters/Select.js b/src/components/Filters/Select.js
index da09220..48a0734 100644
--- a/src/components/Filters/Select.js
+++ b/src/components/Filters/Select.js
@@ -17,12 +17,16 @@ class SelectFilter extends Component {
 
     //handleChange = selected => (console.log(selected), this.setState({ selected }))
 
-    handleChange = () => {
-        const {filterSelected, selected} = this.props
+    handleChange = (selected) => {
+
+        const {filterSelected} = this.props
         filterSelected(selected)
+
+
     }
 
     render() {
+        console.log('Select --- \n', this.props)
         const { articles } = this.props
         const options = articles.map(article => ({
             label: article.title,
@@ -39,5 +43,6 @@ class SelectFilter extends Component {
 }
 
 export default connect(storeState => ({
+//    articles: storeState.articles,
     selected: storeState.filters.selected
 }), { filterSelected })(SelectFilter)
\ No newline at end of file

From 77612b6ea63c7cc9db12d0f37f851f648b8d64f9 Mon Sep 17 00:00:00 2001
From: omiceron <omiceron@gmail.com>
Date: Mon, 29 Jan 2018 13:21:43 +0500
Subject: [PATCH 11/14] HT4.2 - ArticleList completed

---
 src/components/Filters/Select.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Filters/Select.js b/src/components/Filters/Select.js
index 09db8a4..48a0734 100644
--- a/src/components/Filters/Select.js
+++ b/src/components/Filters/Select.js
@@ -23,7 +23,6 @@ class SelectFilter extends Component {
         filterSelected(selected)
 
 
-
     }
 
     render() {

From db4986fc04267439d0f9ee10787bc9682f6df5da Mon Sep 17 00:00:00 2001
From: omiceron <omiceron@gmail.com>
Date: Mon, 29 Jan 2018 13:23:38 +0500
Subject: [PATCH 12/14] HT4.2

---
 src/components/Filters/Select.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Filters/Select.js b/src/components/Filters/Select.js
index 48a0734..81a4e81 100644
--- a/src/components/Filters/Select.js
+++ b/src/components/Filters/Select.js
@@ -22,7 +22,6 @@ class SelectFilter extends Component {
         const {filterSelected} = this.props
         filterSelected(selected)
 
-
     }
 
     render() {

From a10196297e338ef1e43553f4b8b4b9537ee3bcd0 Mon Sep 17 00:00:00 2001
From: omiceron <omiceron@gmail.com>
Date: Mon, 29 Jan 2018 13:24:58 +0500
Subject: [PATCH 13/14] HT4.2

---
 src/components/ArticleList.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/ArticleList.js b/src/components/ArticleList.js
index a86e90d..b7c3ac3 100644
--- a/src/components/ArticleList.js
+++ b/src/components/ArticleList.js
@@ -27,13 +27,11 @@ function filterArticles({articles, filters}) {
     const {from, to, selected} = filters;
 
     return articles.filter( ({date, id}) => {
-        const byDate = !from && !to || new Date(date) >= from && new Date(date) < to;
+        const byDate = !from && !to || new Date(date) >= from && new Date(date) <= to;
         const bySelect = !selected.length || selected.map( ({ value }) => value ).includes(id)
 
         return byDate && bySelect
-
     } )
-
 }
 
 

From cfdabc30bc12a7364e3a3fc8d684b42c11adb30f Mon Sep 17 00:00:00 2001
From: omiceron <omiceron@gmail.com>
Date: Mon, 29 Jan 2018 13:28:56 +0500
Subject: [PATCH 14/14] HT4.2 - Final

---
 src/reducer/filters.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/reducer/filters.js b/src/reducer/filters.js
index 10cfce6..f0b0d7e 100644
--- a/src/reducer/filters.js
+++ b/src/reducer/filters.js
@@ -1,4 +1,4 @@
-import {FILTER_DATERANGE, FILTER_SELECT} from '../constants'
+import {FILTER_DATERANGE, FILTER_SELECTED} from '../constants'
 
 export default (state = {from: null, to: null, selected: []}, action) => {
     console.log(JSON.stringify(action.payload))
@@ -12,7 +12,7 @@ export default (state = {from: null, to: null, selected: []}, action) => {
                 selected: state.selected
             };
 
-        case FILTER_SELECT:
+        case FILTER_SELECTED:
             return {
                 ...state,
                 selected: payload.selected