Eslint fixes

ar-mac · ar-mac · commit f6b51936aef1 · 2017-05-27T15:06:09.000+02:00
diff --git a/client/.eslintrc.yml b/client/.eslintrc.yml
@@ -10,3 +10,7 @@ env:
 globals:
   context: false
   jest: true
+
+rules:
+  jsx-a11y/href-no-hash: 0
+  jsx-a11y/alt-text: 0
diff --git a/client/package.json b/client/package.json
@@ -21,6 +21,7 @@
     "jsonapi-serializer": "^3.5.2",
     "lodash": "^4.17.4",
     "object-path-immutable": "^0.5.1",
+    "prop-types": "^15.5.10",
     "qs": "^6.4.0",
     "react": "^15.4.2",
     "react-addons-css-transition-group": "^15.5.2",
diff --git a/client/src/api/client.js b/client/src/api/client.js
@@ -5,7 +5,6 @@ import {
   get,
   groupBy,
   keys,
-  pick,
   set,
   values,
   zipObject,
diff --git a/client/src/components/App.js b/client/src/components/App.js
@@ -1,8 +1,6 @@
 import React, { Component } from 'react';
-import { Link } from 'react-router';
 import { connect } from 'react-redux';
-import { isEmpty } from 'lodash';
-import { Collapse, Container, Navbar, NavbarToggler, Nav, NavItem, NavLink, NavDropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap';
+import { Container, Navbar, Nav, NavItem, NavLink, NavDropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap';
 
 import { getUser, logout } from '../store/auth';
 
@@ -17,12 +15,12 @@ export class App extends Component {
   };
 
   toggle = () => this.setState({
-    isOpen: !this.state.isOpen
+    isOpen: !this.state.isOpen,
   });
 
   render() {
     const { user } = this.props;
-    const userIsAdmin = user.roles.includes('admin')
+    const userIsAdmin = user.roles.includes('admin');
 
     return (
       <div>
diff --git a/client/src/components/Auth/Login.js b/client/src/components/Auth/Login.js
@@ -1,4 +1,4 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { replace } from 'react-router-redux';
 import { SubmissionError } from 'redux-form';
@@ -8,7 +8,6 @@ import LoginForm from './LoginForm';
 import { login } from '../../store/auth';
 
 export class Login extends Component {
-  // eslint-disable-next-line class-methods-use-this
   componentWillMount() {
     localStorage.clear();
   }
diff --git a/client/src/components/Auth/LoginForm.js b/client/src/components/Auth/LoginForm.js
@@ -1,5 +1,4 @@
-import React, { Component, PropTypes } from 'react';
-import { isEmpty } from 'lodash';
+import React, { Component } from 'react';
 import { Field, reduxForm } from 'redux-form';
 import { Alert, Button, Form } from 'reactstrap';
 
diff --git a/client/src/components/Categories/CategoryForm.js b/client/src/components/Categories/CategoryForm.js
@@ -1,5 +1,4 @@
-import React, { Component, PropTypes } from 'react';
-import { isEmpty } from 'lodash';
+import React, { Component } from 'react';
 import { Field, reduxForm } from 'redux-form';
 import { Button, Form, Col, Row } from 'reactstrap';
 
diff --git a/client/src/components/Categories/CategoryList.js b/client/src/components/Categories/CategoryList.js
@@ -1,5 +1,4 @@
-import React, { Component, PropTypes } from 'react';
-import { find, keyBy } from 'lodash';
+import React, { Component } from 'react';
 
 import { Loading } from '../UI';
 import { withResourceList } from '../../hocs';
diff --git a/client/src/components/Dashboard.js b/client/src/components/Dashboard.js
@@ -1,7 +1,7 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
 import { Link } from 'react-router';
 import { connect } from 'react-redux';
-import { get, find, keyBy } from 'lodash';
+import { get } from 'lodash';
 
 import { fetchList, getList, getMap } from '../store/api';
 
diff --git a/client/src/components/Posts/PostEdit.js b/client/src/components/Posts/PostEdit.js
@@ -1,7 +1,6 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
 import { push } from 'react-router-redux';
 import { connect } from 'react-redux';
-import { get, find, omit } from 'lodash';
 
 import { ErrorAlert, Loading, EditHeader } from '../UI';
 import { withResource } from '../../hocs';
diff --git a/client/src/components/Posts/PostForm.js b/client/src/components/Posts/PostForm.js
@@ -1,5 +1,4 @@
-import React, { Component, PropTypes } from 'react';
-import { isEmpty } from 'lodash';
+import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { Field, FieldArray, formValueSelector, reduxForm } from 'redux-form';
 import { Button, Form, FormFeedback, Col, Row } from 'reactstrap';
diff --git a/client/src/components/Posts/PostList.js b/client/src/components/Posts/PostList.js
@@ -1,12 +1,12 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
 import { Link } from 'react-router';
 import { connect } from 'react-redux';
-import { get, find, keyBy } from 'lodash';
+import { get } from 'lodash';
 import { Button } from 'reactstrap';
 
 import { fetchList, getMap, getMany } from '../../store/api';
 import { withResourceList } from '../../hocs';
-import { ListHeader, ListTable } from '../UI';
+import { ListTable } from '../UI';
 import PostListFilter from './PostListFilter';
 
 const formatDate = date => (new Date(date)).toLocaleString();
diff --git a/client/src/components/Posts/PostListFilter.js b/client/src/components/Posts/PostListFilter.js
@@ -1,5 +1,4 @@
-import React, { Component, PropTypes } from 'react';
-import { isEmpty } from 'lodash';
+import React, { Component } from 'react';
 import { Field, reduxForm } from 'redux-form';
 import { Form, Row, Col } from 'reactstrap';
 
diff --git a/client/src/components/Routes.js b/client/src/components/Routes.js
@@ -1,19 +1,21 @@
-import React, { PureComponent, PropTypes } from 'react';
+import React, { PureComponent } from 'react';
+import PropTypes from 'prop-types';
+
 import { Router, Route, IndexRoute } from 'react-router';
 import { UserAuthWrapper } from 'redux-auth-wrapper';
 
 import { getUser } from '../store/auth';
 import App from './App';
 import Dashboard from './Dashboard';
 import { PostList, PostEdit } from './Posts';
-import { CategoryList, CategoryEdit } from './Categories';
+import { CategoryList } from './Categories';
 import { UserList, UserEdit } from './Users';
 import { Login } from './Auth';
 
 const UserIsAuthenticated = UserAuthWrapper({ authSelector: getUser });
 const UserIsAdmin = UserAuthWrapper({
   authSelector: getUser,
-  predicate: user => user.roles.includes('admin')
+  predicate: user => user.roles.includes('admin'),
 });
 
 export class Routes extends PureComponent {
diff --git a/client/src/components/UI/CardSingle.js b/client/src/components/UI/CardSingle.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React from 'react';
 
 import { Card, CardBlock } from 'reactstrap';
 
diff --git a/client/src/components/UI/EditHeader.js b/client/src/components/UI/EditHeader.js
@@ -1,13 +1,9 @@
-import React, { Component } from 'react';
+import React from 'react';
 import { Badge } from 'reactstrap';
 
-export default (props) => {
-  const { isNew, children, onDelete } = props;
-
-  return (
-    <h2>
-      { children }
-      { !isNew && <Badge color="danger" onClick={onDelete}>X</Badge> }
-    </h2>
-  );
-};
+export default ({ isNew, children, onDelete }) => (
+  <h2>
+    { children }
+    { !isNew && <Badge color="danger" onClick={onDelete}>X</Badge> }
+  </h2>
+);
diff --git a/client/src/components/UI/ListTable.js b/client/src/components/UI/ListTable.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React from 'react';
 import { Table } from 'reactstrap';
 
 import { Loading, Pagination } from './';
diff --git a/client/src/components/UI/Pagination.js b/client/src/components/UI/Pagination.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React from 'react';
 import { createUltimatePagination, ITEM_TYPES } from 'react-ultimate-pagination';
 import { Input, Label } from 'reactstrap';
 
diff --git a/client/src/components/Users/UserEdit.js b/client/src/components/Users/UserEdit.js
@@ -1,4 +1,4 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
 import { push } from 'react-router-redux';
 import { connect } from 'react-redux';
 
@@ -32,7 +32,7 @@ export class UserEdit extends Component {
     return (
       <div>
         <EditHeader {...this.props}>{ isNew ? 'New User' : resource.email }</EditHeader>
-        <UserForm initialValues={resource} roles={roles} onSubmit={onSubmit}></UserForm>
+        <UserForm initialValues={resource} roles={roles} onSubmit={onSubmit}/>
       </div>
     );
   }
diff --git a/client/src/components/Users/UserForm.js b/client/src/components/Users/UserForm.js
@@ -1,5 +1,4 @@
-import React, { Component, PropTypes } from 'react';
-import { isEmpty } from 'lodash';
+import React, { Component } from 'react';
 import { Field, reduxForm } from 'redux-form';
 import { Button, Form } from 'reactstrap';
 
diff --git a/client/src/components/Users/UserList.js b/client/src/components/Users/UserList.js
@@ -1,6 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
 import { Link } from 'react-router';
-import { find, keyBy } from 'lodash';
 
 import { ListTable } from '../UI';
 import { withResourceList } from '../../hocs';
@@ -31,7 +30,7 @@ export class UserList extends Component {
         attribute: 'role',
         header: 'Role',
         rowRender: user => user.roles.join(),
-      }
+      },
     ];
 
     return (
diff --git a/client/src/forms/fields/MultiselectField.js b/client/src/forms/fields/MultiselectField.js
@@ -3,7 +3,7 @@ import { FormGroup, Label, Input, FormFeedback } from 'reactstrap';
 
 class MultiselectField extends Component {
   render() {
-    const { input, type, label, options, meta: { touched, error } } = this.props;
+    const { input, label, options, meta: { touched, error } } = this.props;
     const showError = touched && error;
 
     return (
diff --git a/client/src/forms/fields/SelectField.js b/client/src/forms/fields/SelectField.js
@@ -3,7 +3,7 @@ import { FormGroup, Label, Input, FormFeedback } from 'reactstrap';
 
 class SelectField extends Component {
   render() {
-    const { input, type, label, options, meta: { touched, error } } = this.props;
+    const { input, label, options, meta: { touched, error } } = this.props;
     const showError = touched && error;
 
     return (
diff --git a/client/src/hocs/withResource.js b/client/src/hocs/withResource.js
@@ -1,7 +1,5 @@
-import React, { Component, PropTypes } from 'react';
 import { connect } from 'react-redux';
 import { SubmissionError } from 'redux-form';
-import { get, find, omit } from 'lodash';
 import compose from 'recompose/compose';
 import withHandlers from 'recompose/withHandlers';
 
diff --git a/client/src/hocs/withResourceList.js b/client/src/hocs/withResourceList.js
@@ -1,7 +1,6 @@
-import React, { Component, PropTypes } from 'react';
 import { connect } from 'react-redux';
 import { SubmissionError } from 'redux-form';
-import { get, find, isEmpty, omitBy } from 'lodash';
+import { isEmpty, omitBy } from 'lodash';
 import compose from 'recompose/compose';
 import withHandlers from 'recompose/withHandlers';
 
diff --git a/client/src/store/api/reducer.js b/client/src/store/api/reducer.js
@@ -1,8 +1,6 @@
 import imm from 'object-path-immutable';
 import {
   get,
-  isEmpty,
-  keyBy,
   keys,
   map,
   pick,
diff --git a/client/src/store/configureStore.js b/client/src/store/configureStore.js
@@ -8,7 +8,6 @@ import auth from './auth/reducer';
 const composeEnhancers =
   process.env.NODE_ENV === 'production'
     ? compose
-    // eslint-disable-next-line no-underscore-dangle
     : window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
 
 export default (history) => {
diff --git a/client/yarn.lock b/client/yarn.lock
@@ -4767,6 +4767,13 @@ prop-types@15.5.8, prop-types@^15.0.0, prop-types@^15.5.4, prop-types@^15.5.6, p
   dependencies:
     fbjs "^0.8.9"
 
+prop-types@^15.5.10:
+  version "15.5.10"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.10.tgz#2797dfc3126182e3a95e3dfbb2e893ddd7456154"
+  dependencies:
+    fbjs "^0.8.9"
+    loose-envify "^1.3.1"
+
 proxy-addr@~1.1.3:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.4.tgz#27e545f6960a44a627d9b44467e35c1b6b4ce2f3"
