ff-stream-web

git clone git://archive.git.mtrnord.blog/MTRNord/ff-stream-web.git
Log | Files | Refs | README | LICENSE

commit 24e5e3be146ab5bc4098c94bab2683e3fcf2b206
parent 24472d62776ebdfd76bdb7113244037aa39f2b04
Author: Konstantin Tarkus <hello@tarkus.me>
Date:   Mon,  1 Jun 2015 11:37:25 +0300

Use express.Router for API routes

Diffstat:
Msrc/api/query.js | 37+++++++++++++++++++------------------
Msrc/server.js | 2+-
2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/api/query.js b/src/api/query.js @@ -1,28 +1,29 @@ /*! React Starter Kit | MIT License | http://www.reactstarterkit.com/ */ +import express from 'express'; import db from '../core/Database'; -function query(server) { - server.get('/api/query', async (req, res, next) => { - try { - let path = req.query.path; +const router = express.Router(); - if (!path) { - res.status(400).send({error: `The 'path' query parameter cannot be empty.`}); - } +router.get('/', async (req, res, next) => { + try { + let path = req.query.path; - let page = await db.getPage(path); + if (!path) { + res.status(400).send({error: `The 'path' query parameter cannot be empty.`}); + } + + let page = await db.getPage(path); - if (page) { - res.status(200).send(page); - } else { - res.status(404).send({error: `The page '${path}' is not found.`}); - } - } catch (err) { - next(err); + if (page) { + res.status(200).send(page); + } else { + res.status(404).send({error: `The page '${path}' is not found.`}); } - }); -} + } catch (err) { + next(err); + } +}); -export default query; +export default router; diff --git a/src/server.js b/src/server.js @@ -21,7 +21,7 @@ server.use(express.static(path.join(__dirname))); // // Register API middleware // ----------------------------------------------------------------------------- -require('./api/query')(server); +server.use('/api/query', require('./api/query')); // // Register server-side rendering middleware