production changes

jbkly · Feb 29, 2016 · bdd2cd4 · bdd2cd4
1 parent 4d4210d
commit bdd2cd4
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -36,3 +36,5 @@ jspm_packages
 # ===== End Node.gitignore =====
 
 deployment
+Desktop
+.dockerignore
diff --git a/app.yaml b/app.yaml
@@ -0,0 +1,3 @@
+runtime: nodejs
+vm: true
+api_version: 1
diff --git a/dist/bundle.min.js b/dist/bundle.min.js
diff --git a/package.json b/package.json
@@ -3,8 +3,12 @@
   "version": "0.0.1",
   "description": "A simple API layer to model an inventory",
   "main": "server.js",
+  "engines": {
+    "node": "~5.6"
+  },
   "scripts": {
-    "start": "webpack-dev-server --inline",
+    "start": "node server",
+    "dev": "webpack-dev-server --inline",
     "server": "DEV=true nodemon server --ignore public/ --ignore store/",
     "test": "mocha './tests/**/*.spec.js' --compilers js:babel-core/register",
     "testwatch": "clear && mocha './tests/**/*.spec.js' --compilers js:babel-core/register --watch",

diff --git a/public/js/app.jsx b/public/js/app.jsx
@@ -18,7 +18,7 @@ import InventorySystem from './components/InventorySystem';
 // minify and deploy
 
 renderDOM(
-  <InventorySystem url='//localhost:3000/api/items' />,
+  <InventorySystem url='/api/items' />,
   document.getElementById('content')
 );
 
diff --git a/server.js b/server.js
@@ -13,7 +13,6 @@ const INVENTORY = Path.join(__dirname, 'store/items.json');
 const server = new Hapi.Server();
 
 server.connection({
-  host: 'localhost',
   port: process.env.PORT || 3000
 });
 

diff --git a/store/items.json b/store/items.json
@@ -1,14 +1,4 @@
 {
-  "pear": {
-    "label": "pear",
-    "type": "fruit",
-    "expiration": 1456798183044
-  },
-  "quiche": {
-    "label": "quiche",
-    "type": "uhh",
-    "expiration": 1456711793044
-  },
   "wine": {
     "label": "wine",
     "type": "drink",

diff --git a/webpack.prod.config.js b/webpack.prod.config.js
@@ -15,7 +15,7 @@ module.exports = {
   output: {
     path: path.resolve(__dirname, 'dist'),
     publicPath: '/',
-    filename: 'bundle.js'
+    filename: 'bundle.min.js'
   },
   module: {
     loaders: [