Merge remote-tracking branch 'origin/master'

Author: jonisaa

demo/Client.js

@@ -6,11 +6,24 @@ import {Provider} from 'react-redux';
 import {syncHistoryWithStore} from 'react-router-redux';
 import {browserHistory} from 'react-router'
 import {render} from 'react-dom';
+import moment from 'moment';
+import numbro from 'numbro';
+import reactWidgetsMomentLocalizer from 'react-widgets/lib/localizers/moment';
+import momentLocalizer from 'redux-autoform-utils/lib/localization/momentLocalizer';
+import numbroLocalizer from 'redux-autoform-utils/lib/localization/numbroLocalizer';
+
 import './less/styles.less';
 
 const store = configureStore();
 const history = syncHistoryWithStore(browserHistory, store);
 
+// setting date localizer
+reactWidgetsMomentLocalizer(moment);
+momentLocalizer(moment);
+
+// setting number localizer
+numbroLocalizer(numbro);
+
 render(
     <Provider store={store}>
         <Router history={history} routes={routes}/>

demo/components/LiveSchemaEditor.js

@@ -6,11 +6,6 @@ import psjon from '../../package.json';
 import { AutoForm } from 'redux-autoform';
 import { EditComponentFactory, DetailsComponentFactory } from '../../src/index';
 import { Alert, Badge } from 'react-bootstrap';
-import moment from 'moment';
-import numbro from 'numbro';
-import reactWidgetsMomentLocalizer from 'react-widgets/lib/localizers/moment';
-import momentLocalizer from 'redux-autoform-utils/lib/localization/momentLocalizer';
-import numbroLocalizer from 'redux-autoform-utils/lib/localization/numbroLocalizer';
 import ButtonToolbar from './ButtonToolbar';
 import FormOptions from './FormOptions';
 
@@ -116,18 +111,8 @@ class LiveSchemaEditor extends Component {
         return _.find(presets, p => p.name == preset);
     };
 
-    setLocalizers = () => {
-        // setting date localizer
-        reactWidgetsMomentLocalizer(moment);
-        momentLocalizer(moment);
-
-        // setting number localizer
-        numbroLocalizer(numbro);
-    };
-
     render() {
         let { reduxFormActions, preset, metaForm, formOptions, formOptionsActions } = this.props;
-        this.setLocalizers();
 
         return (
             <div className="live-schema-editor">

package.json

@@ -30,7 +30,7 @@
     "bootstrap": "^3.3.6",
     "isomorphic-fetch": "^2.2.1",
     "react": "^15.1.0",
-    "react-bootstrap": "^0.30.0-rc.1",
+    "react-bootstrap": "^0.30.0",
     "react-dom": "^15.2.1",
     "react-select": "^0.9.1",
     "react-widgets": "^3.4.2",
@@ -53,6 +53,7 @@
     "cross-env": "^2.0.0",
     "css-loader": "^0.23.1",
     "express": "^4.14.0",
+    "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.9.0",
     "fs-extra-promise": "^0.4.0",
     "isparta": "^4.0.0",
@@ -64,13 +65,13 @@
     "npm": "^3.3.4",
     "numbro": "^1.9.1",
     "path": "^0.12.7",
-    "phantomjs": "^2.1.7",
+    "phantomjs-prebuilt": "^2.1.7",
     "raw-loader": "^0.5.1",
     "react-ace": "^3.4.1",
     "react-hot-loader": "^1.3.0",
     "react-router": "^2.0.0",
     "react-router-redux": "^4.0.2",
-    "redux-autoform": "^0.8.0",
+    "redux-autoform": "^0.8.1",
     "redux-devtools": "^3.2.0",
     "redux-devtools-dock-monitor": "^1.1.1",
     "redux-devtools-log-monitor": "^1.0.9",

src/components/fieldComponents/FieldGroup.js

@@ -1,6 +1,5 @@
 import React, { Component, PropTypes } from 'react';
 import FormGroup from '../FormGroup';
-import _ from 'underscore';
 
 class FieldGroup extends Component {
     static propTypes = {
@@ -17,7 +16,7 @@ class FieldGroup extends Component {
 
     getGroupContent = () => {
         let { componentFactory, _extra: { layout, fields }, group: groupName } = this.props;
-        let group = _.find(layout.groups, g => g.name == groupName);
+        let group = layout.groups.find(g => g.name == groupName);
         let groupProps = {
             component: group.component,
             layout: group,

src/components/groupComponents/Group.js

@@ -1,6 +1,5 @@
 import React, { Component, PropTypes } from 'react';
 import { Alert } from 'react-bootstrap';
-import _ from 'underscore';
 
 class Group extends Component {
     static propTypes = {
@@ -17,7 +16,7 @@ class Group extends Component {
         if (layout.fields) {
 
             components = layout.fields.map(field => {
-                let fieldMetadata = _.find(fields, cp => cp.name === field.name);
+                let fieldMetadata = fields.find(cp => cp.name === field.name);
 
                 if (!fieldMetadata) {
                     throw Error(`Could not find field. Field: ${field.name}`);

tools/build-demo.js

@@ -13,7 +13,7 @@ require.extensions['.html'] = function (module, filename) {
 
 const repoRoot = path.resolve(__dirname, '../');
 const demoBuiltRoot = path.join(repoRoot, 'demo-built');
-const demoBuilt = path.join(demoBuiltRoot, 'redux-autoform');
+const demoBuilt = path.join(demoBuiltRoot, 'redux-autoform-bootstrap-ui');
 
 const licenseSrc = path.join(repoRoot, 'LICENSE');
 const licenseDest = path.join(demoBuilt, 'LICENSE');

webpack.config.demo.dev.js

@@ -0,0 +1,4 @@
+/* eslint no-var: 0 */
+require('babel-register');
+var config = require('./webpack/webpack.config.demo.dev.js');
+module.exports = config;

webpack.config.demo.prod.js

@@ -0,0 +1,4 @@
+/* eslint no-var: 0 */
+require('babel-register');
+var config = require('./webpack/webpack.config.demo.prod.js');
+module.exports = config;

webpack/webpack.config.demo.prod.js

@@ -9,8 +9,8 @@ export default {
 
     output: {
         filename: 'bundle.js',
-        path: './demo-built/redux-autoform/assets',
-        publicPath: '/redux-autoform/assets/'
+        path: './demo-built/redux-autoform-bootstrap-ui/assets',
+        publicPath: '/redux-autoform-bootstrap-ui/assets/'
     },
 
     externals: undefined,