From 51968374dd5a83530d8580fe2d150baec4eb9816 Mon Sep 17 00:00:00 2001 From: Jonathan Cremin Date: Sat, 22 Aug 2015 00:27:55 +0100 Subject: [PATCH] Update deps, redesign 404 --- package.json | 33 ++++++++++----------- web/public/404.html | 34 +++++++++------------- web/public/config.js | 59 +++++++++++++++++--------------------- web/public/src/app.js | 4 ++- web/public/styles/app.scss | 42 +++++++++++++++++++++++++-- 5 files changed, 100 insertions(+), 72 deletions(-) diff --git a/package.json b/package.json index fa10402..39f5ddc 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "private": true, "engines": { "iojs": "^2.5.0", - "npm": "^3.2.0" + "npm": "^3.3.0" }, "scripts": { "build": "npm run build-js && npm run build-sass", @@ -17,8 +17,9 @@ "jspm": "jspm install", "start": "npm run build && babel-node app.js", "test": "mongo hostr test/fixtures/mongo-user.js test/fixtures/mongo-file.js && mocha -r babel/register test/api test/web", - "watch": "nodemon -x \"babel-node\" app.js", - "watch-js": "babel -D -w -m system -d web/public/build web/public/src", + "watch": "parallelshell \"npm run watch-js\" \"npm run watch-server\" \"npm run watch-sass\"", + "watch-js": "babel -Dw -m system -d web/public/build web/public/src", + "watch-server": "nodemon -x \"babel-node\" app.js", "watch-sass": "node-sass -w -r -o web/public/styles/ web/public/styles/" }, "dependencies": { @@ -28,18 +29,17 @@ "co": "~4.6.0", "co-busboy": "~1.3.0", "co-redis": "~1.2.1", - "co-views": "~1.0.0", + "co-views": "~2.0.0", "debug": "~2.2.0", "ejs": "~2.3.2", "gm": "~1.18.1", - "heapdump": "^0.3.7", - "http-errors": "^1.3.1", - "jspm": "~0.16.0-beta.3", + "http-errors": "~1.3.1", + "jspm": "~0.16.0", "kcors": "~1.0.1", "koa": "~0.21.0", "koa-bodyparser": "~2.0.1", "koa-compress": "~1.0.8", - "koa-csrf": "^2.3.0", + "koa-csrf": "~2.3.0", "koa-favicon": "~1.2.0", "koa-file-server": "~2.3.1", "koa-generic-session": "~1.9.0", @@ -47,7 +47,7 @@ "koa-mount": "~1.3.0", "koa-redis": "~1.0.0", "koa-route": "~2.4.2", - "koa-statsd": "0.0.2", + "koa-statsd": "~0.0.2", "koa-views": "~3.1.0", "koa-websocket": "~1.0.0", "mandrill-api": "~1.0.45", @@ -60,19 +60,20 @@ "passwords": "~1.3.0", "pretty-error": "~1.2.0", "raven": "~0.8.1", - "redis": "0.12.1", + "redis": "~0.12.1", "redis-url": "~1.2.1", "s3-upload-stream": "~1.0.7", - "statsy": "^0.2.0", - "stripe": "~3.7.0", + "statsy": "~0.2.0", + "stripe": "~3.7.1", "swig": "~1.4.2", "virustotal.js": "~0.3.1" }, "devDependencies": { - "eslint": "~1.1.0", + "eslint": "~1.2.0", "istanbul": "~0.3.18", "mocha": "~2.2.5", "nodemon": "~1.4.1", + "parallelshell": "~2.0.0", "supertest": "~1.0.1", "tmp": "~0.0.27" }, @@ -93,9 +94,9 @@ "zeroclipboard": "npm:zeroclipboard@~2.2.0" }, "devDependencies": { - "babel": "npm:babel-core@^5.8.5", - "babel-runtime": "npm:babel-runtime@^5.8.5", - "core-js": "npm:core-js@~1.0.0" + "babel": "npm:babel-core@^5.8.22", + "babel-runtime": "npm:babel-runtime@^5.8.20", + "core-js": "npm:core-js@^1.1.0" } } } diff --git a/web/public/404.html b/web/public/404.html index 4f892f3..5a2135d 100644 --- a/web/public/404.html +++ b/web/public/404.html @@ -1,5 +1,5 @@ - + @@ -10,31 +10,23 @@ - -
-
-
-
- -
-
-
-
-

404

-

We can't find the file you're looking for :(

- -

The owner may have removed it or it may never have existed in the first place.

- - Try our homepage instead :) -
+
+
+

404

+

Sorry, it looks like the file you asked for is gone.

+ Take Me Home
-
+