Fix merge conflict.

millette · Jun 29, 2016 · 144b198 · 144b198
2 parents de45fe8 + b427259
commit 144b198
Show file tree

Hide file tree

Showing 45 changed files with 311 additions and 1,744 deletions.
diff --git a/.bowerrc b/.bowerrc
diff --git a/.editorconfig b/.editorconfig
diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,5 @@
 node_modules/
-public/components
-.sass-cache
 npm-debug.log
-cdb.js
-db/sessions-development
-db/users-development
 .nyc_output
-builder
-public/css/style.css
-wrk.js
 old-stuff
 
diff --git a/.travis.yml b/.travis.yml
diff --git a/Dockerfile b/Dockerfile
diff --git a/Dockerfile-orig b/Dockerfile-orig
diff --git a/app.js b/app.js
diff --git a/bin/www b/bin/www
diff --git a/bower.json b/bower.json
diff --git a/db/.gitkeep b/db/.gitkeep
diff --git a/public/img/favicon.ico → favicon.ico b/public/img/favicon.ico → favicon.ico
diff --git a/gulpfile.js b/gulpfile.js
diff --git a/lib/passport.js b/lib/passport.js
diff --git a/lib/utils.js b/lib/utils.js
diff --git a/manifest.json b/manifest.json
@@ -0,0 +1,57 @@
+{
+  "server": {
+    "app": {
+      "siteTitle": "Committed Streaker"
+    },
+    "load": { "sampleInterval": 1000 }
+  },
+  "connections": [{ "port": 3060 }],
+  "registrations": [
+    { "plugin": "hapi-context-credentials" },
+    { "plugin": "hapi-auth-couchdb-cookie" },
+    { "plugin": "hapi-context-app" },
+    { "plugin": "./plugins/login" },
+    { "plugin": "inert" },
+    { "plugin": "vision" },
+    { "plugin": "lout" },
+    {
+      "plugin": {
+        "register": "visionary",
+        "options": {
+          "engines": { "ejs": "ejs" },
+          "path": "views",
+          "isCached": false
+        }
+      }
+    },
+    {
+      "plugin": {
+        "register": "hapi-favicon",
+        "options": {
+          "path": "./favicon.ico"
+        }
+      }
+    },
+    {
+      "plugin": {
+        "register": "good",
+        "options": {
+          "reporters": {
+            "console": [
+              {
+                "module": "good-squeeze",
+                "name": "Squeeze",
+                "args": [{
+                  "response": "*",
+                  "log": "*"
+                }]
+              },
+              { "module": "good-console" },
+              "stdout"
+            ]
+          }
+        }
+      }
+    }
+  ]
+}