diff --git a/client/config/development/webpack.js b/client/config/development/webpack.js index f8aca1f..7540872 100644 --- a/client/config/development/webpack.js +++ b/client/config/development/webpack.js @@ -1,16 +1,13 @@ import webpack from 'webpack'; -const CLIENT = __dirname + '/../..'; -const ROOT = CLIENT + '/..'; - module.exports = { entry: { - app: CLIENT + '/config/development/app', - style: CLIENT + '/config/development/style' + app: __dirname + '/../../config/development/app', + style: __dirname + '/../../config/development/style' }, output: { filename: '[name].js', - path: CLIENT + '/build/' + process.env.NODE_ENV + path: __dirname + '/../../build/development' }, module: { loaders: [ @@ -30,7 +27,7 @@ module.exports = { ] }, sassLoader: { - includePaths: [CLIENT, ROOT + '/node_modules'] + includePaths: [__dirname + '/../..', __dirname + '/../../../node_modules'] }, plugins: [ new webpack.ProvidePlugin({ @@ -48,8 +45,8 @@ module.exports = { }, resolve: { alias: { - api: CLIENT + '/api/' + process.env.NODE_ENV, - config: CLIENT + '/config/' + process.env.NODE_ENV + api: __dirname + '/../../api/development', + config: __dirname + '/../../config/development' } } } diff --git a/client/dashboard/layout/layout.js b/client/dashboard/layout/layout.js index 8c459f9..ea8d8c1 100644 --- a/client/dashboard/layout/layout.js +++ b/client/dashboard/layout/layout.js @@ -23,9 +23,7 @@ var Layout = React.createClass({ componentDidMount: function() { var layout = this; // window.addEventListener('resize', this.handleResize); - console.log('a') House.ensureHouses().then((houses)=>{ - console.log('b') layout.setState({ houses: houses, house: houses[0], diff --git a/client/models/house.js b/client/models/house.js index d8d6eba..e65ccfa 100644 --- a/client/models/house.js +++ b/client/models/house.js @@ -129,7 +129,6 @@ class House { if (pd1.time < pd2.time) return -1; }) .map((data)=>{ return new PowerDatum(data, house); }); - debugger }); }); } diff --git a/npm-debug.log b/npm-debug.log new file mode 100644 index 0000000..f818a33 --- /dev/null +++ b/npm-debug.log @@ -0,0 +1,45 @@ +0 info it worked if it ends with ok +1 verbose cli [ '/usr/local/bin/node', '/usr/local/bin/npm', 'start' ] +2 info using npm@3.5.3 +3 info using node@v5.4.1 +4 verbose run-script [ 'prestart', 'start', 'poststart' ] +5 info lifecycle spike_proto@0.0.0~prestart: spike_proto@0.0.0 +6 silly lifecycle spike_proto@0.0.0~prestart: no script for prestart, continuing +7 info lifecycle spike_proto@0.0.0~start: spike_proto@0.0.0 +8 verbose lifecycle spike_proto@0.0.0~start: unsafe-perm in lifecycle true +9 verbose lifecycle spike_proto@0.0.0~start: PATH: /usr/local/lib/node_modules/npm/bin/node-gyp-bin:/home/eric/Code/spike2/node_modules/.bin:/home/eric/.rvm/gems/ruby-1.9.3-p484@oroeco_dev/bin:/home/eric/.rvm/gems/ruby-1.9.3-p484@global/bin:/home/eric/.rvm/rubies/ruby-1.9.3-p484/bin:/home/eric/.rvm/bin:/home/eric/bin:/usr/local/heroku/bin:/home/eric/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/opt/lampp/bin +10 verbose lifecycle spike_proto@0.0.0~start: CWD: /home/eric/Code/spike2 +11 silly lifecycle spike_proto@0.0.0~start: Args: [ '-c', 'babel-node ./server/app.express.js' ] +12 silly lifecycle spike_proto@0.0.0~start: Returned: code: 1 signal: null +13 info lifecycle spike_proto@0.0.0~start: Failed to exec start script +14 verbose stack Error: spike_proto@0.0.0 start: `babel-node ./server/app.express.js` +14 verbose stack Exit status 1 +14 verbose stack at EventEmitter. (/usr/local/lib/node_modules/npm/lib/utils/lifecycle.js:232:16) +14 verbose stack at emitTwo (events.js:87:13) +14 verbose stack at EventEmitter.emit (events.js:172:7) +14 verbose stack at ChildProcess. (/usr/local/lib/node_modules/npm/lib/utils/spawn.js:24:14) +14 verbose stack at emitTwo (events.js:87:13) +14 verbose stack at ChildProcess.emit (events.js:172:7) +14 verbose stack at maybeClose (internal/child_process.js:821:16) +14 verbose stack at Process.ChildProcess._handle.onexit (internal/child_process.js:211:5) +15 verbose pkgid spike_proto@0.0.0 +16 verbose cwd /home/eric/Code/spike2 +17 error Linux 3.19.0-49-generic +18 error argv "/usr/local/bin/node" "/usr/local/bin/npm" "start" +19 error node v5.4.1 +20 error npm v3.5.3 +21 error code ELIFECYCLE +22 error spike_proto@0.0.0 start: `babel-node ./server/app.express.js` +22 error Exit status 1 +23 error Failed at the spike_proto@0.0.0 start script 'babel-node ./server/app.express.js'. +23 error Make sure you have the latest version of node.js and npm installed. +23 error If you do, this is most likely a problem with the spike_proto package, +23 error not with npm itself. +23 error Tell the author that this fails on your system: +23 error babel-node ./server/app.express.js +23 error You can get information on how to open an issue for this project with: +23 error npm bugs spike_proto +23 error Or if that isn't available, you can get their info via: +23 error npm owner ls spike_proto +23 error There is likely additional logging output above. +24 verbose exit [ 1, true ] diff --git a/server/app.express.js b/server/app.express.js index 582bdde..421fa53 100644 --- a/server/app.express.js +++ b/server/app.express.js @@ -41,9 +41,9 @@ DB.sync().then(()=>{ * Development Server */ -var config = require('./../client/config/webpack'), +var config = require('./../client/config/development/webpack'), dev_server = new WebpackDevServer(webpack(config), { - contentBase: __dirname + '/../client/build/development', + contentBase: './../client/build/development', publicPath: "/assets/", proxy: { '/data*': `http://localhost:${API_PORT}`,