progress towards the electron port

lots of path changes, working on app initialization
jweismann · Feb 15, 2017 · a6a482d · a6a482d
1 parent e33ce7a
commit a6a482d
Show file tree

Hide file tree

Showing 33 changed files with 826 additions and 993 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,3 +1,27 @@
 {
-  stage: 0
-}
+  "presets": [
+    ["env", { "targets": { "node": 6 }, "useBuiltIns": true }],
+    "stage-0",
+    "react"
+  ],
+  "plugins": ["add-module-exports"],
+  "env": {
+    "production": {
+      "presets": ["react-optimize"],
+      "plugins": ["babel-plugin-dev-expression"]
+    },
+    "development": {
+      "plugins": [
+        "transform-class-properties",
+        "transform-es2015-classes",
+        "tcomb"
+      ],
+      "presets": ["react-hmre"]
+    },
+    "test": {
+      "plugins": [
+        ["webpack-loaders", { "config": "webpack.config.test.js", "verbose": false }]
+      ]
+    }
+  }
+}
diff --git a/app/actions/async.js b/app/actions/async.js
@@ -31,7 +31,7 @@ import * as metrics from '../constants/metrics';
 
 import * as syncActions from './sync';
 import * as actionUtils from './utils';
-import personUtils from '../../core/personUtils';
+import personUtils from '../../lib/core/personUtils';
 
 let services = {};
 let versionInfo = {};

diff --git a/app/actions/sync.js b/app/actions/sync.js
@@ -28,7 +28,7 @@ import { addInfoToError, getAppInitErrorMessage, getLoginErrorMessage, getLogout
 import errorText from '../constants/errors';
 
 import * as actionUtils from './utils';
-import personUtils from '../../core/personUtils';
+import personUtils from '../../lib/core/personUtils';
 
 export function addTargetDevice(userId, deviceKey) {
   return {

diff --git a/app/app.html b/app/app.html
@@ -16,11 +16,11 @@
     </script>
   </head>
   <body>
-    <div id="root"></div>
+    <div id="app"></div>
     <script>
       {
         const script = document.createElement('script');
-        const port = process.env.PORT || 3000;
+        const port = process.env.PORT || 3005;
         script.src = (process.env.HOT)
           ? 'http://localhost:' + port + '/dist/bundle.js'
           : './dist/bundle.js';

diff --git a/app/components/ClinicUserBlock.js b/app/components/ClinicUserBlock.js
@@ -18,7 +18,7 @@
 var _ = require('lodash');
 var React = require('react');
 var sundial = require('sundial');
-var personUtils = require('../core/personUtils');
+var personUtils = require('../../lib/core/personUtils');
 var cx = require('classnames');
 
 var styles = require('../../styles/components/ClinicUserBlock.module.less');

diff --git a/app/components/ClinicUserEdit.js b/app/components/ClinicUserEdit.js
@@ -18,10 +18,10 @@
 var React = require('react');
 var _ = require('lodash');
 var sundial = require('sundial');
-var personUtils = require('../core/personUtils');
+var personUtils = require('../../lib/core/personUtils');
 import { reduxForm } from 'redux-form';
 
-var config = require('../config');
+var config = require('../../lib/config');
 
 var styles = require('../../styles/components/ClinicUserEdit.module.less');
 

diff --git a/app/components/ClinicUserSelect.js b/app/components/ClinicUserSelect.js
@@ -20,8 +20,8 @@ var React = require('react');
 var Select = require('react-select');
 var sundial = require('sundial');
 var cx = require('classnames');
-var personUtils = require('../core/personUtils');
-var metrics = require('../redux/constants/metrics');
+var personUtils = require('../../lib/core/personUtils');
+var metrics = require('../constants/metrics');
 
 var styles = require('../../styles/components/ClinicUserSelect.module.less');
 

diff --git a/app/components/DeviceSelection.js b/app/components/DeviceSelection.js
@@ -19,7 +19,7 @@ var _ = require('lodash');
 var React = require('react');
 var cx = require('classnames');
 
-import { urls } from '../redux/constants/otherConstants';
+import { urls } from '../constants/otherConstants';
 
 import styles from '../../styles/components/DeviceSelection.module.less';
 

diff --git a/app/components/LoggedInAs.js b/app/components/LoggedInAs.js
@@ -16,7 +16,6 @@
  */
 var _ = require('lodash');
 var React = require('react');
-var getIn = require('../core/getIn');
 
 var styles = require('../../styles/components/LoggedInAs.module.less');
 
@@ -121,7 +120,7 @@ var LoggedInAs = React.createClass({
   },
 
   getName: function() {
-    return getIn(this.props.user, ['profile', 'fullName']);
+    return _.get(this.props.user, ['profile', 'fullName']);
   },
 
   noopHandler: function(e) {

diff --git a/app/components/Login.js b/app/components/Login.js
@@ -17,7 +17,7 @@
 
 var React = require('react');
 
-var config = require('../config');
+var config = require('../../lib/config');
 
 var styles = require('../../styles/components/Login.module.less');
 

diff --git a/app/components/NoUploadTargets.js b/app/components/NoUploadTargets.js
@@ -18,7 +18,7 @@
 import _ from 'lodash';
 import React, { Component, PropTypes } from 'react';
 
-import { urls } from '../redux/constants/otherConstants';
+import { urls } from '../constants/otherConstants';
 
 import styles from '../../styles/components/NoUploadTargets.module.less';
 

diff --git a/app/components/UserDropdown.js b/app/components/UserDropdown.js
@@ -18,9 +18,9 @@
 var _ = require('lodash');
 var React = require('react');
 var Select = require('react-select');
-var personUtils = require('../core/personUtils');
+var personUtils = require('../../lib/core/personUtils');
 
-var pages = require('../redux/constants/otherConstants').pages;
+var pages = require('../constants/otherConstants').pages;
 
 var styles = require('../../styles/components/UserDropdown.module.less');
 

diff --git a/app/components/VersionCheckError.js b/app/components/VersionCheckError.js
@@ -18,8 +18,8 @@
 import cx from 'classnames';
 import React, { Component, PropTypes } from 'react';
 
-import * as errorUtils from '../redux/utils/errors';
-import errorText from '../redux/constants/errors';
+import * as errorUtils from '../utils/errors';
+import errorText from '../constants/errors';
 
 import styles from '../../styles/components/VersionCheck.module.less';
 

diff --git a/app/containers/App.boilerplate.js b/app/containers/App.boilerplate.js
@@ -0,0 +1,15 @@
+import React, { Component } from 'react';
+
+export default class App extends Component {
+  props: {
+    children: HTMLElement
+  };
+
+  render() {
+    return (
+      <div>
+        {this.props.children}
+      </div>
+    );
+  }
+}