restore WelcomeModal. tests pass. webpack 2.2.1

vhmartinezm · Feb 27, 2017 · 2c1e62a · 2c1e62a
1 parent 27b30a7
commit 2c1e62a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 31 deletions.
diff --git a/app/src/containers/LandingContainer/index.js b/app/src/containers/LandingContainer/index.js
@@ -15,7 +15,7 @@ import { reduxForm } from 'redux-form';
 import {
   LoadingIndicator,
   Divider,
-  // WelcomeModal,
+  WelcomeModal,
   Contributor,
 } from 'components';
 import * as LandingActionCreators from './actions';
@@ -43,21 +43,21 @@ class LandingContainer extends Component {
     const {
       isLoading,
       actions,
-      // isShowingModal,
+      isShowingModal,
       contributors,
       name,
-      // fields: {
-        // nameInput,
-      // },
+      fields: {
+        nameInput,
+      },
     } = this.props;
     return (
       <Box className={styles.container} colorIndex="light-2">
-        {/* <WelcomeModal */}
-        {/* onSubmit={this.handleSubmit} */}
-        {/* nameInput={nameInput} */}
-        {/* onClose={actions.closeModal} */}
-        {/* isVisible={true} */}
-        {/* /> */}
+        <WelcomeModal
+          onSubmit={this.handleSubmit}
+          nameInput={nameInput}
+          onClose={actions.closeModal}
+          isVisible={isShowingModal}
+        />
         <Maybe predicate={isLoading}>
           <Section
             align="center"

diff --git a/devServer.js b/devServer.js
@@ -11,10 +11,7 @@ const serverUrl = process.env.BASE_URL || 'http://localhost:1337';
 const PORT = serverUrl.match(/\d+/g)[0];
 const IP = serverUrl.match(/\w+/g)[1];
 
-new WebpackDevServer(
-  webpack(
-    config
-  ), {
+new WebpackDevServer(webpack(config), {
   publicPath: config.output.publicPath,
   hot: true,
   historyApiFallback: true,

diff --git a/package.json b/package.json
@@ -140,15 +140,15 @@
     "react-dom": "^15.0.1",
     "react-hot-loader": "^3.0.0-beta.6",
     "react-intl": "^2.1.3",
-    "react-redux": "^5.0.3",
+    "react-redux": "^4.4.5",
     "react-router": "^3.0.2",
     "react-router-redux": "^4.0.4",
     "redux": "^3.5.2",
-    "redux-auth-wrapper": "^1.0.0",
-    "redux-form": "^6.5.0",
+    "redux-auth-wrapper": "^0.8.0",
+    "redux-form": "^5.2.5",
     "redux-logger": "^2.6.1",
     "redux-mock-store": "^1.1.4",
-    "redux-thunk": "^2.2.0",
+    "redux-thunk": "^1.0.0",
     "reselect": "^2.5.4",
     "serialize-javascript": "^1.3.0",
     "sinon": "2.0.0-pre",

diff --git a/webpack.config.js b/webpack.config.js
@@ -108,7 +108,7 @@ module.exports = {
     }),
     new ExtractTextPlugin('[name].[contenthash].css'),
     new webpack.HotModuleReplacementPlugin(),
-    // new NpmInstallPlugin(),
+    // new NpmInstallPlugin(), Cannot read property 'plugin' of null
     new HtmlwebpackPlugin({
       title: 'Scalable React Boilerplate',
       template: 'config/templates/_index.dev.html',

diff --git a/webpack.config.prod.js b/webpack.config.prod.js
@@ -119,17 +119,6 @@ module.exports = {
       }
     ]
   },
-  // sassLoader: {
-  //   includePaths: [
-  //     './node_modules',
-  //   ]
-  // },
-  // postcss: function () {
-  //   return {
-  //     defaults: [precss, autoprefixer],
-  //     cleaner:  [autoprefixer({ browsers: [] })]
-  //   };
-  // },
   resolve: {
     extensions: ['.js', '.jsx', '.json', '.scss', '.css'],
     alias: {