Skip to content

Commit

Permalink
cleanup for deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
jbkly committed Feb 29, 2016
1 parent bdd2cd4 commit 76c9bbd
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 16 deletions.
Empty file added README.md
Empty file.
2 changes: 1 addition & 1 deletion dist/bundle.min.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
},
"scripts": {
"start": "node server",
"serve": "DEV=true nodemon server --ignore public/ --ignore store/",
"dev": "webpack-dev-server --inline",
"server": "DEV=true nodemon server --ignore public/ --ignore store/",
"go": "npm run serve && npm run dev",
"test": "mocha './tests/**/*.spec.js' --compilers js:babel-core/register",
"testwatch": "clear && mocha './tests/**/*.spec.js' --compilers js:babel-core/register --watch",
"deploy": "NODE_ENV=production webpack -p --config webpack.prod.config.js"
Expand Down
2 changes: 1 addition & 1 deletion public/js/app.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import InventorySystem from './components/InventorySystem';
// minify and deploy

renderDOM(
<InventorySystem url='/api/items' />,
<InventorySystem url='//localhost:3000/api/items' />,
document.getElementById('content')
);

2 changes: 1 addition & 1 deletion server.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ server.register([
function getRouteConfig(description) {
return {
tags: ['api'],
cors: process.env.DEV ? true : false, // only allow cross-origin in dev environment
cors: process.env.DEV ? true : false,
description: description || ''
};
};
Expand Down
34 changes: 22 additions & 12 deletions store/items.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,27 @@
{
"wine": {
"label": "wine",
"type": "drink",
"expiration": 1456711903044
"cheese": {
"label": "cheese",
"type": "dairy",
"expiration": 1456766965540
},
"crackers": {
"label": "crackers",
"type": "snack",
"expiration": 1457921383044
"orange": {
"label": "orange",
"type": "fruit",
"expiration": 1456723885540
},
"beer": {
"label": "beer",
"type": "drink",
"expiration": 1456711843044
"pizza": {
"label": "pizza",
"type": "italian",
"expiration": 1457328565540
},
"ham": {
"label": "ham",
"type": "meat",
"expiration": 1457328565540
},
"eggplant": {
"label": "eggplant",
"type": "vegetable",
"expiration": 1456766965540
}
}

0 comments on commit 76c9bbd

Please sign in to comment.