added bootstrap and moved some stuff around

nazimamin · Jan 17, 2015 · dc311a1 · dc311a1
1 parent e56f26a
commit dc311a1
Show file tree

Hide file tree

Showing 46 changed files with 9,680 additions and 106 deletions.
diff --git a/PennAppsIOTPillBox/package.json b/PennAppsIOTPillBox/package.json
diff --git a/PennAppsIOTPillBox/views/index.html b/PennAppsIOTPillBox/views/index.html
diff --git a/PennAppsIOTPillBox/views/layout.jade b/PennAppsIOTPillBox/views/layout.jade
diff --git a/PennAppsIOTPillBox/views/login.html b/PennAppsIOTPillBox/views/login.html
diff --git a/PennAppsIOTPillBox/views/login.jade b/PennAppsIOTPillBox/views/login.jade
diff --git a/PennAppsIOTPillBox/views/register.html b/PennAppsIOTPillBox/views/register.html
diff --git a/PennAppsIOTPillBox/views/register.jade b/PennAppsIOTPillBox/views/register.jade
diff --git a/PennAppsIOTPillBox/app.js → app.js b/PennAppsIOTPillBox/app.js → app.js
diff --git a/PennAppsIOTPillBox/bin/www → bin/www b/PennAppsIOTPillBox/bin/www → bin/www
diff --git a/node_modules/express/node_modules/content-disposition/package.json b/node_modules/express/node_modules/content-disposition/package.json
diff --git a/node_modules/express/node_modules/merge-descriptors/package.json b/node_modules/express/node_modules/merge-descriptors/package.json
diff --git a/node_modules/express/node_modules/path-to-regexp/package.json b/node_modules/express/node_modules/path-to-regexp/package.json
diff --git a/node_modules/express/node_modules/proxy-addr/node_modules/forwarded/package.json b/node_modules/express/node_modules/proxy-addr/node_modules/forwarded/package.json
diff --git a/node_modules/express/node_modules/proxy-addr/node_modules/ipaddr.js/package.json b/node_modules/express/node_modules/proxy-addr/node_modules/ipaddr.js/package.json
diff --git a/node_modules/express/node_modules/proxy-addr/package.json b/node_modules/express/node_modules/proxy-addr/package.json
diff --git a/node_modules/express/package.json b/node_modules/express/package.json
diff --git a/node_modules/jade/node_modules/character-parser/package.json b/node_modules/jade/node_modules/character-parser/package.json
diff --git a/node_modules/jade/node_modules/commander/package.json b/node_modules/jade/node_modules/commander/package.json
diff --git a/...de/node_modules/constantinople/node_modules/acorn-globals/node_modules/acorn/package.json b/...de/node_modules/constantinople/node_modules/acorn-globals/node_modules/acorn/package.json
diff --git a/node_modules/jade/node_modules/constantinople/node_modules/acorn-globals/package.json b/node_modules/jade/node_modules/constantinople/node_modules/acorn-globals/package.json
diff --git a/node_modules/jade/node_modules/constantinople/package.json b/node_modules/jade/node_modules/constantinople/package.json
diff --git a/...modules/jade/node_modules/with/node_modules/acorn-globals/node_modules/acorn/package.json b/...modules/jade/node_modules/with/node_modules/acorn-globals/node_modules/acorn/package.json
diff --git a/node_modules/jade/node_modules/with/node_modules/acorn-globals/package.json b/node_modules/jade/node_modules/with/node_modules/acorn-globals/package.json
diff --git a/node_modules/jade/node_modules/with/node_modules/acorn/package.json b/node_modules/jade/node_modules/with/node_modules/acorn/package.json
diff --git a/node_modules/jade/node_modules/with/package.json b/node_modules/jade/node_modules/with/package.json
diff --git a/node_modules/jade/package.json b/node_modules/jade/package.json
diff --git a/package.json b/package.json
@@ -1,22 +1,17 @@
 {
   "name": "PennAppsIOTPillBox",
-  "version": "1.0.0",
-  "description": "Giggidy.",
-  "main": "index.js",
+  "version": "0.0.0",
+  "private": true,
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "start": "node ./bin/www"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/NazimAmin/PennAppsIOTPillBox.git"
-  },
-  "author": "",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/NazimAmin/PennAppsIOTPillBox/issues"
-  },
-  "homepage": "https://github.com/NazimAmin/PennAppsIOTPillBox",
   "dependencies": {
-    "express": "^4.11.0"
+    "body-parser": "~1.10.1",
+    "cookie-parser": "~1.3.3",
+    "debug": "~2.1.1",
+    "express": "~4.11.0",
+    "jade": "~1.9.0",
+    "morgan": "~1.5.1",
+    "serve-favicon": "~2.2.0"
   }
-}
+}