ff-stream-web

commit 1fbb96213120cca390fdc383157abb4b7e8be69a
parent 6372b3dcf55f1d3e9528a4fbdc6ac7e968c4cd76
Author: Konstantin Tarkus <hello@tarkus.me>
Date:   Wed,  1 Apr 2015 12:56:40 +0300

Fix the code style in React components using ES6 classes

Diffstat:
M
src/components/App/App.js
 | 
15
++++++++-------
M
src/components/ContentPage/ContentPage.js
 | 
9
++++++---
M
src/components/HomePage/HomePage.js
 | 
9
++++++---
M
src/components/Navbar/Navbar.js
 | 
6
++++--
M
src/components/NotFoundPage/NotFoundPage.js
 | 
6
++++--
M
src/components/TextBox/TextBox.js
 | 
9
+++++----

6 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/src/components/App/App.js b/src/components/App/App.js
@@ -9,8 +9,7 @@
 'use strict';
 
 import './App.less';
-
-import React from 'react';
+import React, { Component, PropTypes } from 'react';
 import invariant from 'react/lib/invariant';
 import AppActions from '../../actions/AppActions';
 import AppStore from '../../stores/AppStore';
@@ -18,7 +17,7 @@ import Navbar from '../Navbar';
 import ContentPage from '../ContentPage';
 import NotFoundPage from '../NotFoundPage';
 
-export default class App extends React.Component {
+class App extends Component {
 
   componentDidMount() {
     window.addEventListener('popstate', this.handlePopState);
@@ -133,8 +132,10 @@ export default class App extends React.Component {
 }
 
 App.propTypes = {
-  path: React.PropTypes.string.isRequired,
-  onSetTitle: React.PropTypes.func.isRequired,
-  onSetMeta: React.PropTypes.func.isRequired,
-  onPageNotFound: React.PropTypes.func.isRequired
+  path: PropTypes.string.isRequired,
+  onSetTitle: PropTypes.func.isRequired,
+  onSetMeta: PropTypes.func.isRequired,
+  onPageNotFound: PropTypes.func.isRequired
 };
+
+export default App;
diff --git a/src/components/ContentPage/ContentPage.js b/src/components/ContentPage/ContentPage.js
@@ -8,9 +8,10 @@
 
 'use strict';
 
-import React from 'react';
+import './ContentPage.less';
+import React, { Component, PropTypes } from 'react';
 
-export default class ContentPage extends React.Component {
+class ContentPage extends Component {
 
   render() {
     var { className, body, other } = this.props;
@@ -24,5 +25,7 @@ export default class ContentPage extends React.Component {
 }
 
 ContentPage.propTypes = {
-  body: React.PropTypes.string.isRequired
+  body: PropTypes.string.isRequired
 };
+
+export default ContentPage;
diff --git a/src/components/HomePage/HomePage.js b/src/components/HomePage/HomePage.js
@@ -8,9 +8,10 @@
 
 'use strict';
 
-import React from 'react';
+import './HomePage.less';
+import React, { Component, PropTypes } from 'react';
 
-export default class HomePage extends React.Component {
+class HomePage extends Component {
 
   render() {
     return (
@@ -22,5 +23,7 @@ export default class HomePage extends React.Component {
 }
 
 HomePage.propTypes = {
-  body: React.PropTypes.string.isRequired
+  body: PropTypes.string.isRequired
 };
+
+export default HomePage;
diff --git a/src/components/Navbar/Navbar.js b/src/components/Navbar/Navbar.js
@@ -8,9 +8,9 @@
 
 'use strict';
 
-import React from 'react';
+import React, { Component } from 'react';
 
-export default class Navbar extends React.Component {
+class Navbar extends Component {
 
   render() {
     return (
@@ -26,3 +26,5 @@ export default class Navbar extends React.Component {
   }
 
 }
+
+export default Navbar;
diff --git a/src/components/NotFoundPage/NotFoundPage.js b/src/components/NotFoundPage/NotFoundPage.js
@@ -10,9 +10,9 @@
 
 //require('./NotFoundPage.less');
 
-import React from 'react';
+import React, { Component } from 'react';
 
-export default class NotFoundPage extends React.Component {
+class NotFoundPage extends Component {
 
   render() {
     return (
@@ -24,3 +24,5 @@ export default class NotFoundPage extends React.Component {
   }
 
 }
+
+export default NotFoundPage;
diff --git a/src/components/TextBox/TextBox.js b/src/components/TextBox/TextBox.js
@@ -9,10 +9,9 @@
 'use strict';
 
 import './TextBox.less';
+import React, { Component, PropTypes } from 'react';
 
-import React from 'react';
-
-export default class TextBox extends React.Component {
+class TextBox extends Component {
 
   render() {
     return (
@@ -27,9 +26,11 @@ export default class TextBox extends React.Component {
 }
 
 TextBox.propTypes = {
-  maxLines: React.PropTypes.number
+  maxLines: PropTypes.number
 };
 
 TextBox.defaultProps = {
   maxLines: 1
 };
+
+export default TextBox;