hapi all the things

.jshintrc

@@ -1,16 +1,25 @@
 {
-  "browser": true,
-  "esnext": true,
-  "globals": {},
-  "node": true,
-  "globalstrict": true,
-  "quotmark": true,
-  "smarttabs": true,
-  "trailing": true,
-  "undef": true,
-  "unused": true,
-  "maxerr": 50,
-  "laxcomma": true,
-  "curly": true,
-  "strict": false
+  "node"          : true,
+  "quotmark"      : true,
+  "strict"        : false,
+  "smarttabs"     : true,
+  "trailing"      : true,
+  "undef"         : true,
+  "unused"        : false,
+  "maxerr"        : 50,
+  "laxcomma"      : true,
+  "curly"         : true,
+  "eqeqeq"        : true,
+  "freeze"        : true,
+  "indent"        : 2,
+  "maxdepth"      : 3,
+  "maxlen"        : 80,
+  "globals"       : {
+                      "angular":true,
+                      "moment":true,
+                      "console": true,
+                      "define": true,
+                      "require": true,
+                      "personalpageControllers": true
+  }
 }

Makefile

@@ -1,6 +1,10 @@
-all: dist/livebots.js
+all: dist/livebots.css dist/livebots.js
 
-dist/livebots.js: lib/js/**/*.js
+dist/livebots.css: clientApp/css/*.scss
+	node_modules/.bin/node-sass clientApp/css/livebots.scss public/css/livebots.css
+
+dist/livebots.js: clientApp/js/**/*.js
 	node_modules/.bin/browserify -t brfs --debug -e clientApp/js/livebots.js -o public/js/livebots.js
+
 clean:
-	rm -f public/js/livebots.js
+	rm -f public/css/livebots.css public/js/livebots.js

bin/watch.js

@@ -11,8 +11,8 @@ var pending = false;
 
 var watch = [
   'clientApp/js/**/*.js',
-  'public/css/*.css',
-  'public/partials/*.html',
+  'clientApp/css/**/*.scss',
+  'serverApp/public/partials/*.html',
 ];
 
 gaze(watch, watcher);
@@ -39,8 +39,12 @@ function run() {
 
 function exited(code, signal) {
   executing = false;
-  if (! code) console.log('terminated'.green);
-  else console.error('finished with exit code %d'.red, code);
+  if (! code) {
+    console.log('terminated'.green);
+  }
+  else {
+    console.error('finished with exit code %d'.red, code);
+  }
   if (pending) {
     run();
   }

clientApp/js/livebots.js

@@ -1,7 +1,7 @@
 url_prefix = process.env.NODE_ENV === 'production' ? 'http://api.livebots.cc/' : 'http://localhost:3000/';
 
-require('./app.js');
-require('./controllers');
-require('./directives.js');
-require('./filters.js');
-require('./services.js');
+require('./angularApp/app.js');
+require('./angularApp/controllers');
+require('./angularApp/directives');
+require('./angularApp/filters');
+require('./angularApp/services');

package.json

@@ -4,10 +4,10 @@
   "description": "livebots.cc app",
   "main": "index.js",
   "scripts": {
-    "start": "node index.js",
-    "mon": "node_modules/.bin/nodemon index.js",
+    "start": "node serverApp/start.js",
+    "mon": "node_modules/.bin/nodemon serverApp/start.js",
     "dist": "node_modules/.bin/browserify -t brfs --debug -e clientApp/js/livebots.js -o public/js/livebots.js",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "node_modules/.bin/tap serverApp/tests/*.test.js"
   },
   "repository": {
     "type": "git",
@@ -25,16 +25,20 @@
   },
   "dependencies": {
     "handlebars": "~1.1.2",
-    "hapi": "~1.20.0",
     "bunyan": "~0.22.1",
     "request": "~2.30.0",
     "querystring": "~0.2.0",
-    "browserify": "~3.14.1",
-    "brfs": "0.0.8",
-    "colors": "~0.6.2",
-    "gaze": "~0.4.3"
+    "hapi": "~2.0.0-preview",
+    "async": "~0.2.9",
+    "mongoose": "~3.8.4"
   },
   "devDependencies": {
-    "nodemon": "~0.7.10"
+    "nodemon": "~0.7.10",
+    "colors": "~0.6.2",
+    "gaze": "~0.4.3",
+    "brfs": "0.0.8",
+    "browserify": "~3.20.0",
+    "node-sass": "~0.8.1",
+    "tap": "~0.4.8"
   }
 }