Merge branch 'master' into twitter

handlers/twitter.js

@@ -1,5 +1,6 @@
 const Twitter = require('twitter')
 
+console.log(process.env);
 const client = new Twitter({
   consumer_key: process.env.TWITTER_CONSUMER_KEY,
   consumer_secret: process.env.TWITTER_CONSUMER_SECRET,
@@ -27,4 +28,4 @@ module.exports = (req, res) => {
     .then(extractImageUrl)
     .then(respondSuccess.bind(null, res))
     .catch(respondFail.bind(null, res))
-}
+}

package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "dev": "node server.js",
     "build": "next build",
-    "start": "next start"
+    "start": "NODE_ENV=production node server.js"
   },
   "dependencies": {
     "axios": "^0.16.2",
@@ -17,8 +17,8 @@
     "form-data": "^2.2.0",
     "highlight.js": "^9.12.0",
     "morgan": "^1.8.2",
-    "next": "^2.4.3",
+    "next": "^3.2.2",
-    "react": "^15.5.4",
+    "react": "^15.6.1",
     "react-click-outside": "^2.3.1",
     "react-codemirror": "0.2.6",
     "react-color": "^2.12.1",
@@ -29,5 +29,13 @@
     "react-spinner": "^0.2.7",
     "react-syntax-highlight": "^0.0.6",
     "twitter": "^1.7.1"
+  },
+  "now": {
+    "env": {
+      "TWITTER_CONSUMER_KEY": "@twitter-consumer-key",
+      "TWITTER_CONSUMER_SECRET":"@twitter-consumer-secret",
+      "TWITTER_ACCESS_TOKEN_KEY": "@twitter-access-token-key",
+      "TWITTER_ACCESS_TOKEN_SECRET": "@twitter-access-token-secret"
+    }
   }
 }

server.js

@@ -3,14 +3,14 @@ const morgan = require('morgan')
 const bodyParser = require('body-parser')
 const next = require('next')
 
+const port = parseInt(process.env.PORT, 10) || 3000
 const dev = process.env.NODE_ENV !== 'production'
 const app = next({ dev })
 const handle = app.getRequestHandler()
 
 function wrap (handler) {
   return (req, res) => handler(req, res).catch((err) => {
-    console.log('error handler triggereedddd')
+    console.log('ERR:', err)
-    console.log(err)
   })
 }
 
@@ -24,7 +24,7 @@ app.prepare()
     app.render(req, res, '/about'))
 
   // if root, render webpage from next
-  server.get('*', (req, res) =>
+  server.get('/*', (req, res) =>
     app.render(req, res, '/', req.query))
 
   // otherwise, try and get gist
@@ -34,8 +34,8 @@ app.prepare()
   server.post('/upload', bodyParser.json(), wrap(require('./handlers/upload')))
   server.post('/twitter', bodyParser.json({ limit: '5mb' }), require('./handlers/twitter'))
 
-  server.listen(3000, (err) => {
+  server.listen(port, (err) => {
     if (err) throw err
-    console.log('> Ready on http://localhost:3000')
+    console.log(`> Ready on http://localhost:${port}`)
   })
 })