diff --git a/web/resources/public/index.html b/web/resources/public/index.html new file mode 100644 index 0000000..7052fc9 --- /dev/null +++ b/web/resources/public/index.html @@ -0,0 +1,187 @@ + +
+ + + + + + + + + + + + + + + + + + + + diff --git a/web/spec/appSpec.js b/web/spec/appSpec.js index 40cf628..585af8a 100644 --- a/web/spec/appSpec.js +++ b/web/spec/appSpec.js @@ -20,9 +20,9 @@ describe('app', function () { Promise.resolve({rows: [{name: 'World'}]})) agent - .get('/') + .get('/status.json') .expect(200) - .expect('Hello World!') + .expect({message: 'Hello World!'}) .catch(fail) .then(done) }) diff --git a/web/src/main.js b/web/src/main.js index 61d52ba..c4163cd 100644 --- a/web/src/main.js +++ b/web/src/main.js @@ -14,16 +14,20 @@ var tmpdir = '/tmp' var upload = multer({dest: tmpdir, fileFilter: jpegOnly}) var photoMaxAge = '1year' +var wwwRoot = path.join(__dirname, '..', 'resources', 'public') + exports.build = function (storage) { var router = express.Router() - router.get('/', function (req, res) { + + router.get('/status.json', function (req, res) { db.query('SELECT $1::text as name', ['World']) .then((result) => { - res.send('Hello ' + result.rows[0].name + '!') - }) - .catch((error) => { - res.send(error.message) + res.setHeader('Content-Type', 'application/json') + res.send(JSON.stringify({ + message: 'Hello ' + result.rows[0].name + '!' + })) }) + .catch(internalErrorHandler(res)) }) router.post('/inbox', upload.single('photoFile'), function (req, res) { @@ -114,6 +118,8 @@ exports.build = function (storage) { .catch(internalErrorHandler(res)) }) + router.use('/', express.static(wwwRoot)) + return router }