Merge branch 'master' of https://github.com/FullstackAcademy/boilermaker

callbacka · Sep 15, 2017 · bc46e73 · bc46e73
2 parents 4e894de + e99b337
commit bc46e73
Show file tree

Hide file tree

Showing 6 changed files with 5,106 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
-# Boilermaker
+# BoilerMade
 
 *Good things come in pairs*
 
-Looking to mix up a backend with express/sequelize and a frontend with react/redux? That's `boilermaker`!
+Looking to mix up a backend with express/sequelize and a frontend with react/redux? That's `BoilerMade`!
 
 Follow along with the workshop to make your own! This canonical version can serve as a reference, or a starting point all on its own.
 

diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "build-client": "webpack",
     "build-client-watch": "webpack -w",
     "deploy": "git checkout -b deploy && webpack -p && git add -f public/bundle.js public/bundle.js.map && git commit --allow-empty -m 'Deploying' && git push --force heroku deploy:master && git checkout master && git branch -D deploy",
-    "start": "node server",
+    "start": "webpack -p && node server",
     "start-dev": "npm run build-client-watch & npm run start-server",
     "start-server": "NODE_ENV='development' nodemon server -e html,js,scss --ignore public",
     "test": "NODE_ENV='test' DATABASE_URL='postgres://localhost:5432/boilermaker-test' mocha ./**/*.spec.js --compilers js:babel-register"
@@ -39,9 +39,7 @@
     "redux-logger": "^2.8.1",
     "redux-thunk": "^2.2.0",
     "sequelize": "^4.3.1",
-    "socket.io": "^2.0.3"
-  },
-  "devDependencies": {
+    "socket.io": "^2.0.3",
     "axios-mock-adapter": "^1.9.0",
     "babel-core": "^6.22.1",
     "babel-loader": "^6.2.10",

diff --git a/public/bundle.js b/public/bundle.js
diff --git a/public/bundle.js.map b/public/bundle.js.map
diff --git a/public/index.html b/public/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset='utf-8'>
     <meta name='viewport' content='width=device-width initial-scale=1.0'>
-    <title>Boilermaker</title>
+    <title>BoilerMade</title>
     <script defer src="/bundle.js"></script>
   </head>
   <body>