eslint adjustments

This commit is contained in:
Cássio Zen 2016-10-10 16:35:42 -03:00
parent ff0949e417
commit 494ea636a3
2 changed files with 22 additions and 16 deletions

View File

@ -39,7 +39,6 @@
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"@kadira/storybook": "^1.36.0", "@kadira/storybook": "^1.36.0",
"autoprefixer": "^6.3.3",
"babel-core": "^6.5.1", "babel-core": "^6.5.1",
"babel-loader": "^6.2.2", "babel-loader": "^6.2.2",
"babel-plugin-lodash": "^3.2.0", "babel-plugin-lodash": "^3.2.0",
@ -55,13 +54,10 @@
"expect": "^1.20.2", "expect": "^1.20.2",
"exports-loader": "^0.6.3", "exports-loader": "^0.6.3",
"file-loader": "^0.8.5", "file-loader": "^0.8.5",
"immutable": "^3.7.6",
"imports-loader": "^0.6.5", "imports-loader": "^0.6.5",
"jest-cli": "^15.1.1", "jest-cli": "^15.1.1",
"js-yaml": "^3.5.3",
"lint-staged": "^3.0.2", "lint-staged": "^3.0.2",
"node-sass": "^3.10.0", "node-sass": "^3.10.0",
"normalizr": "^2.0.0",
"npm-check": "^5.2.3", "npm-check": "^5.2.3",
"postcss-cssnext": "^2.7.0", "postcss-cssnext": "^2.7.0",
"postcss-import": "^8.1.2", "postcss-import": "^8.1.2",
@ -69,12 +65,6 @@
"pre-commit": "^1.1.3", "pre-commit": "^1.1.3",
"react-hot-loader": "^3.0.0-beta.2", "react-hot-loader": "^3.0.0-beta.2",
"react-lazy-load": "^3.0.3", "react-lazy-load": "^3.0.3",
"react-pure-render": "^1.0.2",
"react-redux": "^4.4.0",
"react-router": "^2.5.1",
"react-router-redux": "^4.0.5",
"redux": "^3.3.1",
"redux-thunk": "^1.0.3",
"sass-loader": "^4.0.2", "sass-loader": "^4.0.2",
"style-loader": "^0.13.0", "style-loader": "^0.13.0",
"stylefmt": "^4.3.1", "stylefmt": "^4.3.1",
@ -91,17 +81,21 @@
"whatwg-fetch": "^1.0.0" "whatwg-fetch": "^1.0.0"
}, },
"dependencies": { "dependencies": {
"autoprefixer": "^6.3.3",
"bricks.js": "^1.7.0", "bricks.js": "^1.7.0",
"dateformat": "^1.0.12", "dateformat": "^1.0.12",
"fuzzy": "^0.1.1", "fuzzy": "^0.1.1",
"immutable": "^3.7.6",
"immutability-helper": "^2.0.0", "immutability-helper": "^2.0.0",
"js-base64": "^2.1.9", "js-base64": "^2.1.9",
"js-yaml": "^3.5.3",
"json-loader": "^0.5.4", "json-loader": "^0.5.4",
"localforage": "^1.4.2", "localforage": "^1.4.2",
"lodash": "^4.13.1", "lodash": "^4.13.1",
"markup-it": "git+https://github.com/cassiozen/markup-it.git", "markup-it": "git+https://github.com/cassiozen/markup-it.git",
"material-design-icons": "^3.0.1", "material-design-icons": "^3.0.1",
"moment": "^2.11.2", "moment": "^2.11.2",
"normalizr": "^2.0.0",
"normalize.css": "^4.2.0", "normalize.css": "^4.2.0",
"pluralize": "^3.0.0", "pluralize": "^3.0.0",
"prismjs": "^1.5.1", "prismjs": "^1.5.1",
@ -115,6 +109,12 @@
"react-simple-dnd": "^0.1.2", "react-simple-dnd": "^0.1.2",
"react-toolbox": "^1.2.1", "react-toolbox": "^1.2.1",
"react-waypoint": "^3.1.3", "react-waypoint": "^3.1.3",
"react-pure-render": "^1.0.2",
"react-redux": "^4.4.0",
"react-router": "^2.5.1",
"react-router-redux": "^4.0.5",
"redux": "^3.3.1",
"redux-thunk": "^1.0.3",
"selection-position": "^1.0.0", "selection-position": "^1.0.0",
"semaphore": "^1.0.5", "semaphore": "^1.0.5",
"slate": "^0.13.6" "slate": "^0.13.6"

View File

@ -14,6 +14,7 @@ class DashboardPage extends React.Component {
collection: ImmutablePropTypes.map.isRequired, collection: ImmutablePropTypes.map.isRequired,
collections: ImmutablePropTypes.orderedMap.isRequired, collections: ImmutablePropTypes.orderedMap.isRequired,
dispatch: PropTypes.func.isRequired, dispatch: PropTypes.func.isRequired,
page: PropTypes.number,
entries: ImmutablePropTypes.list, entries: ImmutablePropTypes.list,
}; };
@ -41,15 +42,20 @@ class DashboardPage extends React.Component {
if (collections == null) { if (collections == null) {
return <h1>No collections defined in your config.yml</h1>; return <h1>No collections defined in your config.yml</h1>;
} }
return <div className={styles.root}> return (<div className={styles.root}>
{entries ? {entries ?
<EntryListing collections={collection} entries={entries} page={page} onPaginate={this.handleLoadMore}> <EntryListing
Listing {collection.get('name')} collections={collection}
entries={entries}
page={page}
onPaginate={this.handleLoadMore}
>
{collection.get('name')}
</EntryListing> </EntryListing>
: :
<Loader active>{['Loading Entries', 'Caching Entries', 'This might take several minutes']}</Loader> <Loader active>{['Loading Entries', 'Caching Entries', 'This might take several minutes']}</Loader>
} }
</div>; </div>);
} }
} }
@ -57,7 +63,7 @@ class DashboardPage extends React.Component {
* Instead of checking the publish mode everywhere to dispatch & render the additional editorial workflow stuff, * Instead of checking the publish mode everywhere to dispatch & render the additional editorial workflow stuff,
* We delegate it to a Higher Order Component * We delegate it to a Higher Order Component
*/ */
DashboardPage = CollectionPageHOC(DashboardPage); DashboardPage = CollectionPageHOC(DashboardPage); // eslint-disable-line
function mapStateToProps(state, ownProps) { function mapStateToProps(state, ownProps) {