Merge pull request #1 from bryanchriswhite/master

devops tweaks

Author: dylanlott

.eslintrc

@@ -1,28 +1,3 @@
-# {
-#   "parser": "babel-eslint",
-#   "plugins": [
-#   ],
-#   "env": {
-#     "browser": true,
-#     "node": true,
-#     "es6": true,
-#   },
-#   "globals": {
-#     "__DEV__": true,
-#     "__SERVER__": true
-#   },
-#   "ecmaFeatures": {
-#   },
-#   "rules": {
-#     // Strict mode
-#     "strict": [2, "never"],
-#
-#     // Code style
-#     "indent": [2, 2],
-#     "quotes": [2, "single"],
-#   }
-# }
-
 {
   "extends": "eslint-config-airbnb",
   "env": {
@@ -47,12 +22,12 @@
     "no-multi-spaces": 0
   },
   "plugins": [
-    "react", "import"
+    "import"
   ],
   "settings": {
     "import/parser": "babel-eslint",
     "import/resolve": {
-      moduleDirectory: ["node_modules", "src"]
+      "moduleDirectory": ["node_modules", "src"]
     }
   },
   "globals": {

.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 build/
 src/config/
+.idea/

package.json

@@ -35,8 +35,13 @@
     "babel-preset-stage-0": "^6.5.0",
     "del": "^2.2.1",
     "eslint": "^3.2.2",
+    "eslint-config-airbnb": "^10.0.0",
+    "eslint-plugin-import": "^1.12.0",
+    "eslint-plugin-jsx-a11y": "^2.0.1",
+    "eslint-plugin-react": "^6.0.0",
     "gaze": "^1.1.0",
     "json-loader": "^0.5.4",
+    "lodash.merge": "^4.5.1",
     "mkdirp": "^0.5.1",
     "ncp": "^2.0.0",
     "path": "^0.12.7",

src/server.js

@@ -1,9 +1,9 @@
-import { Schema } from './schema';
 import graphqlHTTP from 'express-graphql';
 import express from 'express';
 import 'babel-polyfill';
 import path from 'path';
 import mongoose from 'mongoose';
+import { Schema } from './schema';
 
 
 const config = require('./config/main.json');
@@ -22,5 +22,5 @@ server.use('/graphql', graphqlHTTP(request => ({
 })));
 
 server.listen(server.get('port'), () => {
-  console.log('The server is running at http://localhost:' + server.get('port'));
+  console.log('The server is running at http://localhost: %s', server.get('port'));
 });