Simplify containers declarations

slyg · Jan 28, 2016 · 8faaf9c · 8faaf9c
1 parent 34fe31f
commit 8faaf9c
Show file tree

Hide file tree

Showing 6 changed files with 213 additions and 224 deletions.
diff --git a/app/scripts/shop/containers/CartContainer.js b/app/scripts/shop/containers/CartContainer.js
@@ -4,11 +4,7 @@ import { connect }            from 'react-redux';
 import Cart                   from '../components/Cart';
 import { removeBookFromCart } from '../actionCreators';
 
-const CartContainer = React.createClass({
-  render: function(){
-    return <Cart {...this.props} />;
-  }
-});
+const CartContainer = (props) => <Cart {...props} />;
 
 const mapStateToProps = ({cart}) => ({...cart});
 

diff --git a/app/scripts/shop/containers/PayBoxContainer.js b/app/scripts/shop/containers/PayBoxContainer.js
@@ -2,11 +2,7 @@ import React                  from 'react';
 import { connect }            from 'react-redux';
 import PayBox                 from '../components/PayBox';
 
-const PayBoxContainer = React.createClass({
-  render: function(){
-    return <PayBox {...this.props} />;
-  }
-});
+const PayBoxContainer = (props) => <PayBox {...props} />;
 
 const mapStateToProps = ({discount}) => ({...discount});
 

diff --git a/app/scripts/shop/containers/RootContainer.js b/app/scripts/shop/containers/RootContainer.js
@@ -5,35 +5,31 @@ import BookListContainer  from '../containers/BookListContainer';
 import CartContainer      from '../containers/CartContainer';
 import PayBoxContainer    from '../containers/PayBoxContainer';
 
-const RootContainer = React.createClass({
+const RootContainer = (props) => {
 
-  render: function(){
+  const { hasCart } = props;
 
-    const { hasCart } = this.props;
-
-    return (
-      <div className={hasCart ? 'grid-2-1' : 'grid-4-1'}>
-        <div className='book-list'>
-          <BookListContainer />
-        </div>
-        <div className='cart-box'>
-          {hasCart ? (
-            <div>
-              <div className='cart pbm'>
-                <CartContainer />
-              </div>
-              <div className='offer pbm'>
-                <PayBoxContainer />
-              </div>
+  return (
+    <div className={hasCart ? 'grid-2-1' : 'grid-4-1'}>
+      <div className='book-list'>
+        <BookListContainer />
+      </div>
+      <div className='cart-box'>
+        {hasCart ? (
+          <div>
+            <div className='cart pbm'>
+              <CartContainer />
+            </div>
+            <div className='offer pbm'>
+              <PayBoxContainer />
             </div>
-          ) : null}
-        </div>
+          </div>
+        ) : null}
       </div>
-    );
+    </div>
+  );
 
-  }
-
-});
+};
 
 const mapStateToProps = ({cart}) => ({
   hasCart: (cart.totalPrice > 0)

diff --git a/public/shop.bundle.css b/public/shop.bundle.css