Skip to content

Commit

Permalink
run together
Browse files Browse the repository at this point in the history
  • Loading branch information
jscott1989 committed Jun 15, 2016
1 parent e2ecb6d commit 28f64a9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
9 changes: 6 additions & 3 deletions src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
"doc": "docs"
},
"scripts": {
"test": "./run-tests"
"test": "./run-tests",
"run-development-server": "source ve/bin/activate; ./manage.py runserver 0.0.0.0:8000",
"run-webpack": "webpack --watch",
"run-redis": "redis-server /usr/local/etc/redis.conf",
"run-celery": "source ve/bin/activate; celery -A happeninghq worker -l info"
},
"repository": {
"type": "git",
Expand All @@ -26,7 +30,6 @@
"bourbon-neat": "^1.7.4",
"datatables": "^1.10.11",
"document-register-element": "^0.5.4",
"epiceditor": "^0.2.0",
"font-awesome": "^4.6.1",
"hologram-github-theme": "^0.1.4",
"jquery": "^2.2.3",
Expand All @@ -35,7 +38,6 @@
"knockout": "^3.4.0",
"lodash": "^4.13.1",
"markdown": "^0.5.0",
"neat": "^1.2.2",
"node-uuid": "^1.4.7",
"quill": "^0.20.1",
"react": "^15.0.2",
Expand Down Expand Up @@ -63,6 +65,7 @@
"file-loader": "^0.8.5",
"imports-loader": "^0.6.5",
"node-sass": "^3.7.0",
"npm-run-all": "^2.1.2",
"react-dom": "^15.1.0",
"sass-loader": "^3.2.0",
"style-loader": "^0.13.1",
Expand Down
3 changes: 1 addition & 2 deletions src/run-server
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@ if [ ! -d "ve" ]; then
exit
fi

source ve/bin/activate
python manage.py runserver $@
node_modules/npm-run-all/bin/npm-run-all/index.js --parallel run-webpack run-development-server

0 comments on commit 28f64a9

Please sign in to comment.