From a6a482d91683868d98bfa5dca3dd59016552e4aa Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Tue, 7 Feb 2017 17:43:54 -0500 Subject: [PATCH] progress towards the electron port lots of path changes, working on app initialization --- .babelrc | 28 +- app/actions/async.js | 2 +- app/actions/sync.js | 2 +- app/app.html | 4 +- app/components/ClinicUserBlock.js | 2 +- app/components/ClinicUserEdit.js | 4 +- app/components/ClinicUserSelect.js | 4 +- app/components/DeviceSelection.js | 2 +- app/components/LoggedInAs.js | 3 +- app/components/Login.js | 2 +- app/components/NoUploadTargets.js | 2 +- app/components/UserDropdown.js | 4 +- app/components/VersionCheckError.js | 4 +- app/containers/App.boilerplate.js | 15 + app/containers/App.js | 491 +++++++++++++++++++- app/containers/App0.js | 494 --------------------- app/containers/Root.dev.js | 9 +- app/containers/Root.js | 6 +- app/containers/Root.prod.js | 4 +- app/index.js | 8 +- app/reducers/users.js | 2 +- app/routes.js | 1 - app/store/configureStore.development.js | 29 +- app/store/configureStore.production.js | 19 +- lib/config.js | 5 +- lib/core/api.js | 2 +- lib/core/device.js | 1 - lib/core/getIn.js | 48 -- lib/core/storage.js | 2 +- lib/drivers/dexcomDriver.js | 2 +- server.js | 2 +- webpack.config.development.js | 51 ++- yarn.lock | 565 +++++++----------------- 33 files changed, 826 insertions(+), 993 deletions(-) create mode 100755 app/containers/App.boilerplate.js mode change 100755 => 100644 app/containers/App.js delete mode 100644 app/containers/App0.js delete mode 100644 lib/core/getIn.js diff --git a/.babelrc b/.babelrc index 7347f66f20..4e8db7d68b 100644 --- a/.babelrc +++ b/.babelrc @@ -1,3 +1,27 @@ { - stage: 0 -} \ No newline at end of file + "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 index a6e594d759..e75d4b4146 100644 --- 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 index 85aa012a30..6e10c529bd 100644 --- 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 index 42185ac8a8..3b01934c30 100755 --- a/app/app.html +++ b/app/app.html @@ -16,11 +16,11 @@ -
+