commit bec7091e2da4d23b39c083b5f67cf6591f039631
parent ebbce5aed8f3efa9315abaec302cd1060d609a95
Author: Konstantin Tarkus <hello@tarkus.me>
Date: Fri, 19 Jun 2015 00:54:56 +0300
Update ESLint settings
Diffstat:
13 files changed, 66 insertions(+), 42 deletions(-)
diff --git a/.eslintrc b/.eslintrc
@@ -21,6 +21,25 @@
// Code style
"indent": [2, 2],
- "quotes": [2, "single"]
+ "quotes": [2, "single"],
+
+ // React
+ "react/display-name": 0,
+ "react/jsx-boolean-value": 1,
+ "react/jsx-no-undef": 1,
+ "react/jsx-quotes": 1,
+ "react/jsx-sort-prop-types": 0,
+ "react/jsx-sort-props": 0,
+ "react/jsx-uses-react": 1,
+ "react/jsx-uses-vars": 1,
+ "react/no-did-mount-set-state": 1,
+ "react/no-did-update-set-state": 1,
+ "react/no-multi-comp": 1,
+ "react/no-unknown-property": 1,
+ "react/prop-types": 1,
+ "react/react-in-jsx-scope": 1,
+ "react/self-closing-comp": 1,
+ "react/sort-comp": 1,
+ "react/wrap-multilines": 1
}
}
diff --git a/src/components/App/App.js b/src/components/App/App.js
@@ -1,9 +1,9 @@
/*! React Starter Kit | MIT License | http://www.reactstarterkit.com/ */
import React, { PropTypes } from 'react';
-import styles from './App.less'; // eslint-disable-line no-unused-vars
-import withContext from '../../decorators/withContext'; // eslint-disable-line no-unused-vars
-import withStyles from '../../decorators/withStyles'; // eslint-disable-line no-unused-vars
+import styles from './App.less';
+import withContext from '../../decorators/withContext';
+import withStyles from '../../decorators/withStyles';
import AppActions from '../../actions/AppActions';
import AppStore from '../../stores/AppStore';
import Header from '../Header';
diff --git a/src/components/ContactPage/ContactPage.js b/src/components/ContactPage/ContactPage.js
@@ -1,8 +1,8 @@
/*! React Starter Kit | MIT License | http://www.reactstarterkit.com/ */
-import React, { PropTypes } from 'react'; // eslint-disable-line no-unused-vars
-import styles from './ContactPage.less'; // eslint-disable-line no-unused-vars
-import withStyles from '../../decorators/withStyles'; // eslint-disable-line no-unused-vars
+import React, { PropTypes } from 'react';
+import styles from './ContactPage.less';
+import withStyles from '../../decorators/withStyles';
@withStyles(styles)
class ContactPage {
diff --git a/src/components/ContentPage/ContentPage.js b/src/components/ContentPage/ContentPage.js
@@ -1,19 +1,20 @@
/*! React Starter Kit | MIT License | http://www.reactstarterkit.com/ */
-import React, { PropTypes } from 'react'; // eslint-disable-line no-unused-vars
-import styles from './ContentPage.less'; // eslint-disable-line no-unused-vars
-import withStyles from '../../decorators/withStyles'; // eslint-disable-line no-unused-vars
+import React, { PropTypes } from 'react';
+import styles from './ContentPage.less';
+import withStyles from '../../decorators/withStyles';
@withStyles(styles)
class ContentPage {
- static contextTypes = {
- onSetTitle: PropTypes.func.isRequired
- };
-
static propTypes = {
path: PropTypes.string.isRequired,
- content: PropTypes.string.isRequired
+ content: PropTypes.string.isRequired,
+ title: PropTypes.string
+ };
+
+ static contextTypes = {
+ onSetTitle: PropTypes.func.isRequired
};
render() {
diff --git a/src/components/Feedback/Feedback.js b/src/components/Feedback/Feedback.js
@@ -1,8 +1,8 @@
/*! React Starter Kit | MIT License | http://www.reactstarterkit.com/ */
-import React from 'react'; // eslint-disable-line no-unused-vars
-import styles from './Feedback.less'; // eslint-disable-line no-unused-vars
-import withStyles from '../../decorators/withStyles'; // eslint-disable-line no-unused-vars
+import React from 'react';
+import styles from './Feedback.less';
+import withStyles from '../../decorators/withStyles';
@withStyles(styles)
class Feedback {
diff --git a/src/components/Footer/Footer.js b/src/components/Footer/Footer.js
@@ -1,9 +1,9 @@
/*! React Starter Kit | MIT License | http://www.reactstarterkit.com/ */
-import React, { PropTypes } from 'react'; // eslint-disable-line no-unused-vars
-import styles from './Footer.less'; // eslint-disable-line no-unused-vars
-import withViewport from '../../decorators/withViewport'; // eslint-disable-line no-unused-vars
-import withStyles from '../../decorators/withStyles'; // eslint-disable-line no-unused-vars
+import React, { PropTypes } from 'react';
+import styles from './Footer.less';
+import withViewport from '../../decorators/withViewport';
+import withStyles from '../../decorators/withStyles';
import Link from '../../utils/Link';
@withViewport
diff --git a/src/components/Header/Header.js b/src/components/Header/Header.js
@@ -1,8 +1,8 @@
/*! React Starter Kit | MIT License | http://www.reactstarterkit.com/ */
-import React from 'react'; // eslint-disable-line no-unused-vars
-import styles from './Header.less'; // eslint-disable-line no-unused-vars
-import withStyles from '../../decorators/withStyles'; // eslint-disable-line no-unused-vars
+import React from 'react';
+import styles from './Header.less';
+import withStyles from '../../decorators/withStyles';
import Link from '../../utils/Link';
import Navigation from '../Navigation';
diff --git a/src/components/LoginPage/LoginPage.js b/src/components/LoginPage/LoginPage.js
@@ -1,8 +1,8 @@
/*! React Starter Kit | MIT License | http://www.reactstarterkit.com/ */
-import React, { PropTypes } from 'react'; // eslint-disable-line no-unused-vars
-import styles from './LoginPage.less'; // eslint-disable-line no-unused-vars
-import withStyles from '../../decorators/withStyles'; // eslint-disable-line no-unused-vars
+import React, { PropTypes } from 'react';
+import styles from './LoginPage.less';
+import withStyles from '../../decorators/withStyles';
@withStyles(styles)
class LoginPage {
diff --git a/src/components/Navigation/Navigation.js b/src/components/Navigation/Navigation.js
@@ -1,14 +1,18 @@
/*! React Starter Kit | MIT License | http://www.reactstarterkit.com/ */
-import React from 'react'; // eslint-disable-line no-unused-vars
+import React, { PropTypes } from 'react';
import classNames from 'classnames';
-import styles from './Navigation.less'; // eslint-disable-line no-unused-vars
-import withStyles from '../../decorators/withStyles'; // eslint-disable-line no-unused-vars
+import styles from './Navigation.less';
+import withStyles from '../../decorators/withStyles';
import Link from '../../utils/Link';
@withStyles(styles)
class Navigation {
+ static propTypes = {
+ className: PropTypes.string
+ };
+
render() {
return (
<div className={classNames(this.props.className, 'Navigation')} role="navigation">
diff --git a/src/components/NotFoundPage/NotFoundPage.js b/src/components/NotFoundPage/NotFoundPage.js
@@ -1,8 +1,8 @@
/*! React Starter Kit | MIT License | http://www.reactstarterkit.com/ */
-import React, { PropTypes } from 'react'; // eslint-disable-line no-unused-vars
-import withStyles from '../../decorators/withStyles'; // eslint-disable-line no-unused-vars
-import styles from './NotFoundPage.less'; // eslint-disable-line no-unused-vars
+import React, { PropTypes } from 'react';
+import withStyles from '../../decorators/withStyles';
+import styles from './NotFoundPage.less';
@withStyles(styles)
class NotFoundPage {
diff --git a/src/components/RegisterPage/RegisterPage.js b/src/components/RegisterPage/RegisterPage.js
@@ -1,8 +1,8 @@
/*! React Starter Kit | MIT License | http://www.reactstarterkit.com/ */
-import React, { PropTypes } from 'react'; // eslint-disable-line no-unused-vars
-import withStyles from '../../decorators/withStyles'; // eslint-disable-line no-unused-vars
-import styles from './RegisterPage.less'; // eslint-disable-line no-unused-vars
+import React, { PropTypes } from 'react';
+import withStyles from '../../decorators/withStyles';
+import styles from './RegisterPage.less';
@withStyles(styles)
class RegisterPage {
diff --git a/src/components/TextBox/TextBox.js b/src/components/TextBox/TextBox.js
@@ -1,8 +1,8 @@
/*! React Starter Kit | MIT License | http://www.reactstarterkit.com/ */
-import React, { PropTypes } from 'react'; // eslint-disable-line no-unused-vars
-import withStyles from '../../decorators/withStyles'; // eslint-disable-line no-unused-vars
-import styles from './TextBox.less'; // eslint-disable-line no-unused-vars
+import React, { PropTypes } from 'react';
+import withStyles from '../../decorators/withStyles';
+import styles from './TextBox.less';
@withStyles(styles)
class TextBox {
diff --git a/src/server.js b/src/server.js
@@ -35,14 +35,14 @@ server.get('*', async (req, res, next) => {
let notFound = false;
let css = [];
let data = {description: ''};
- let app = <App
+ let app = (<App
path={req.path}
context={{
onInsertCss: value => css.push(value),
onSetTitle: value => data.title = value,
onSetMeta: (key, value) => data[key] = value,
onPageNotFound: () => notFound = true
- }} />;
+ }} />);
await db.getPage(uri);
data.body = React.renderToString(app);
