From c4c245629ac30ac8f6301e97a85a031c6315a6e5 Mon Sep 17 00:00:00 2001
From: jedrichards <jedrichards@gmail.com>
Date: Wed, 7 Jan 2015 19:23:24 +0000
Subject: [PATCH] Refactoring

---
 .gitignore         |  1 +
 Procfile           |  1 -
 README.md          |  9 +++++----
 client-js/dep.js   |  2 +-
 package.json       | 11 ++++++++---
 public/js/index.js |  2 +-
 views/index.hbs    |  5 +++--
 7 files changed, 19 insertions(+), 12 deletions(-)
 delete mode 100644 Procfile

diff --git a/.gitignore b/.gitignore
index fc081ad..5fb774f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 npm-debug.log
 node_modules/
 .env
+public/js/*
diff --git a/Procfile b/Procfile
deleted file mode 100644
index 063b78f..0000000
--- a/Procfile
+++ /dev/null
@@ -1 +0,0 @@
-web: npm start
diff --git a/README.md b/README.md
index 1add129..086d302 100644
--- a/README.md
+++ b/README.md
@@ -9,11 +9,12 @@ My personal portfolio site.
 
 ## Development
 
-To start the server in development mode and start watching local files for changes run:
+The following npm scripts are available:
 
-```
-npm run start-dev
-```
+Name | Description
+--- | ---
+`npm start` | Starts the server in production mode. Dokku runs this script automatically during deployment to start the app.
+`npm run start:dev` | Starts the server in development mode, restarting the server and rebuilding when local files change.
 
 ## Deployment
 
diff --git a/client-js/dep.js b/client-js/dep.js
index 8e39079..6dac3a8 100644
--- a/client-js/dep.js
+++ b/client-js/dep.js
@@ -1 +1 @@
-module.exports = 'Foo!';
+module.exports = 'Foo! Aw yeah boom time!';
diff --git a/package.json b/package.json
index e35b752..3e57878 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,11 @@
   "main": "index.js",
   "scripts": {
     "start": "forever -m --minUptime 5000 --spinSleepTime 5000 index.js",
-    "start-dev": "export $(cat .env|xargs) && nodemon -e js,hbs index.js",
-    "build": "browserify client-js/index.js > public/js/index.js",
+    "start:dev": "parallelshell 'npm run devserver' 'npm run build:js:watch'",
+    "devserver": "export $(cat .env|xargs) && nodemon -e js,hbs index.js",
+    "build:js": "browserify client-js/index.js > public/js/index.js",
+    "build:js:watch": "watch 'npm run build:js' client-js",
+    "build": "npm run build:js",
     "postinstall": "npm run build"
   },
   "dependencies": {
@@ -14,7 +17,9 @@
     "forever": "^0.13.0",
     "handlebars": "^2.0.0",
     "hapi": "^8.0.0",
-    "nodemon": "^1.2.1"
+    "nodemon": "^1.2.1",
+    "parallelshell": "^1.0.3",
+    "watch": "^0.13.0"
   },
   "engines": {
     "node": "0.10.x"
diff --git a/public/js/index.js b/public/js/index.js
index c7e4950..53c7594 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -1,5 +1,5 @@
 (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-module.exports = 'Foo!';
+module.exports = 'Foo! Aw yeah boom time!';
 
 },{}],2:[function(require,module,exports){
 var dep = require('./dep');
diff --git a/views/index.hbs b/views/index.hbs
index 16e8a5e..e461698 100644
--- a/views/index.hbs
+++ b/views/index.hbs
@@ -10,8 +10,9 @@
         <p><span class="u-mHide">I play well with others </span><a class="RollingLink" href="http://www.madebycomrades.com"><span data-hover="www.madebycomrades.com">www.madebycomrades.com</span></a></p>
     </li>
 </ul>
-<p>I have experience with contemporary frontend technologies such as AngularJS, Backbone + Marionette, Browserify and NPM/Gulp/Grunt for project automation. Also experienced with Node.js-based web apps and REST API development.</p>
-<p>I'm comfortable working in teams of all sizes at all stages of the project lifecycle from planning through to delivery. I've worked on Agile teams and have experience writing unit tests and e2e / integration tests.</p>
+<p>I specialise in JavaScript application architecture and testing, project automation, HTML, CSS and creative coding tasks.</p>
+<p>I have experience with contemporary frontend technologies such as AngularJS, Backbone + Marionette, Browserify and Bash/NPM/Gulp/Grunt for project automation. Also experienced with Node.js-based web apps and REST API development.</p>
+<p>I have Agile experience and I'm comfortable working in teams of all sizes at all stages of the project lifecycle from planning through to delivery.</p>
 <div class="u-row">
     <div class="u-col u-col2">
         <h2>Recent Highlights</h2>