+
+ )
+ }
+
+}
+
+
+export default connect(null, { addComment })(CommentAddForm)
diff --git a/src/components/comment.js b/src/components/comment/index.js
similarity index 71%
rename from src/components/comment.js
rename to src/components/comment/index.js
index dba04b4..8735d60 100644
--- a/src/components/comment.js
+++ b/src/components/comment/index.js
@@ -1,7 +1,7 @@
import React from 'react'
import PropTypes from 'prop-types'
import { connect } from 'react-redux'
-import { createCommentSelector } from '../selectors'
+import { createCommentSelector } from '../../selectors'
function Comment({comment}) {
return (
@@ -13,17 +13,17 @@ function Comment({comment}) {
Comment.propTypes = {
comment: PropTypes.shape({
- text: PropTypes.string.isRequired,
- user: PropTypes.string
+ id: "",
+ text: PropTypes.string.isRequired,
+ user: PropTypes.string
}).isRequired
}
const createMapStateToProps = () => {
const commentSelector = createCommentSelector()
-
return (state, ownProps) => ({
comment: commentSelector(state, ownProps)
})
}
-export default connect(createMapStateToProps)(Comment)
\ No newline at end of file
+export default connect(createMapStateToProps)(Comment)
diff --git a/src/components/counter.js b/src/components/counter.js
index b49ee19..345c5f2 100644
--- a/src/components/counter.js
+++ b/src/components/counter.js
@@ -29,4 +29,4 @@ const mapStateToProps = state => ({
count: state.counter
})
-export default connect(mapStateToProps)(Counter)
\ No newline at end of file
+export default connect(mapStateToProps)(Counter)
diff --git a/src/components/filters/date-range.js b/src/components/filters/date-range.js
index 83f64da..327f5f7 100644
--- a/src/components/filters/date-range.js
+++ b/src/components/filters/date-range.js
@@ -25,9 +25,8 @@ class DateRange extends Component {
);
}
-
}
export default connect(state => ({
range: state.filters.dateRange
-}), { changeDateRange })(DateRange)
\ No newline at end of file
+}), { changeDateRange })(DateRange)
diff --git a/src/components/filters/index.js b/src/components/filters/index.js
index 99cc284..041fc9e 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 './date-range'
import SelectFilter from './select'
+import {connect} from 'react-redux'
class Filters extends Component {
static propTypes = {
@@ -16,4 +17,6 @@ class Filters extends Component {
}
}
-export default Filters
\ No newline at end of file
+export default connect(state => ({
+ articles: state.articles
+}))(Filters)
diff --git a/src/components/filters/select.js b/src/components/filters/select.js
index 9f57049..609e6cb 100644
--- a/src/components/filters/select.js
+++ b/src/components/filters/select.js
@@ -9,14 +9,14 @@ import 'react-select/dist/react-select.css'
class SelectFilter extends Component {
static propTypes = {
- articles: PropTypes.array.isRequired
+ articles: PropTypes.object.isRequired
};
handleChange = selected => this.props.changeSelection(selected.map(option => option.value))
render() {
const { articles, selected } = this.props
- const options = articles.map(article => ({
+ const options = Object.values(articles).map(article => ({
label: article.title,
value: article.id
}))
@@ -33,4 +33,4 @@ class SelectFilter extends Component {
export default connect(state => ({
selected: state.filters.selected,
articles: articleListSelector(state)
-}), { changeSelection })(SelectFilter)
\ No newline at end of file
+}), { changeSelection })(SelectFilter)
diff --git a/src/components/user-form.js b/src/components/user-form.js
index 359570c..ded71cc 100644
--- a/src/components/user-form.js
+++ b/src/components/user-form.js
@@ -28,4 +28,4 @@ class UserForm extends Component {
}
}
-export default UserForm
\ No newline at end of file
+export default UserForm
diff --git a/src/constants/index.js b/src/constants/index.js
index f34f842..6266326 100644
--- a/src/constants/index.js
+++ b/src/constants/index.js
@@ -11,4 +11,4 @@ export const ADD_COMMENT = 'ADD_COMMENT'
export const START = '_START'
export const SUCCESS = '_SUCCESS'
-export const FAIL = '_FAIL'
\ No newline at end of file
+export const FAIL = '_FAIL'
diff --git a/src/daypicker.js b/src/daypicker.js
new file mode 100644
index 0000000..22c9140
--- /dev/null
+++ b/src/daypicker.js
@@ -0,0 +1,77 @@
+import React from 'react';
+import Helmet from 'react-helmet';
+import DayPicker, { DateUtils } from 'react-day-picker';
+import 'react-day-picker/lib/style.css';
+
+export default class DayPickerInstance extends React.Component {
+ static defaultProps = {
+ numberOfMonths: 2,
+ };
+ constructor(props) {
+ super(props);
+ this.handleDayClick = this.handleDayClick.bind(this);
+ this.handleResetClick = this.handleResetClick.bind(this);
+ this.state = this.getInitialState();
+ }
+ getInitialState() {
+ return {
+ from: undefined,
+ to: undefined,
+ };
+ }
+ handleDayClick(day) {
+ const range = DateUtils.addDayToRange(day, this.state);
+ this.setState(range);
+ }
+ handleResetClick() {
+ this.setState(this.getInitialState());
+ }
+ render() {
+ const { from, to } = this.state;
+ const modifiers = { start: from, end: to };
+ return (
+ Добавить комментарий:
+ + + +
+
+
+
+
+ );
+ }
+}
diff --git a/src/decorators/accordion.js b/src/decorators/accordion.js
index 8926175..9ffc6a5 100644
--- a/src/decorators/accordion.js
+++ b/src/decorators/accordion.js
@@ -11,4 +11,4 @@ export default (OriginalComponent) => class DecoratedComponent extends React.Com
render() {
return + {!from && !to && 'Please select the first day.'} + {from && !to && 'Please select the last day.'} + {from && + to && + `Selected from ${from.toLocaleDateString()} to + ${to.toLocaleDateString()}`}{' '} + {from && + to && ( + + )} +
+