Merge branch 'add_redirects' of github.com:sclements/scratch-www into s3

# Conflicts:
#	.eslintrc
#	server/handler.js

.eslintrc

@@ -20,8 +20,9 @@
         "formatMessage": true
     },
     "ecmaFeatures": {
-        "jsx": true,
+        "arrowFunctions": true,
-        "blockBindings": true
+        "blockBindings": true,
+        "jsx": true
     },
     "plugins": [
         "react"

server/handler.js

@@ -2,8 +2,12 @@
  * Constructor
  */
 function Handler (route) {
-    var url = '/' + route.view + '.html';
+    // Handle redirects
+    if (route.redirect) {
+        return (req, res) => { res.redirect(route.redirect); };
+    }
 
+    var url = '/' + route.view + '.html';
     return function (req, res, next) {
         req.url = url;
         next();

server/index.js

@@ -16,10 +16,9 @@ app.disable('x-powered-by');
 app.use(log());
 
 // Bind routes
-for (var routeId in routes) {
+routes.forEach(route => {
-    var route = routes[routeId];
     app.get(route.pattern, handler(route));
-}
+});
 
 app.use(webpackDevMiddleware(compiler));
 

src/routes.json

@@ -43,5 +43,9 @@
         "pattern": "^/wedo$",
         "view": "wedo2",
         "title": "LEGO WeDo 2.0"
+    },
+    {
+        "pattern": "/info/donate/",
+        "redirect": "https://secure.donationpay.org/scratchfoundation/"
     }
 ]

webpack.config.js

@@ -11,7 +11,9 @@ var entry = {
     init: './src/init.js'
 };
 routes.forEach(function (route) {
-    entry[route.view] = './src/views/' + route.view + '/' + route.view + '.jsx';
+    if (!route.redirect) {
+        entry[route.view] = './src/views/' + route.view + '/' + route.view + '.jsx';
+    }
 });
 
 // Config