0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-13 10:52:46 +00:00

Finally testing, things should be working a bit better now

This commit is contained in:
Scott Tolksdorf
2017-01-01 13:31:33 -08:00
parent 95c09ba7ad
commit 5ba3f98696
8 changed files with 70 additions and 84 deletions

View File

@@ -88,10 +88,9 @@ const BrewData = {
return newBrew.save();
},
update : (newBrew) => {
return Brew.findOneAndUpdate({ editId : newBrew.editId }, {
...newBrew,
updatedAt : Date.now()
}, {new : true, upsert : true}).exec(); //TODO: TEST THIS that this returns a reocrd
return Brew.findOneAndUpdate({ editId : newBrew.editId },
_.merge(newBrew, { updatedAt : Date.now() }),
{new : true, upsert : true}).exec(); //TODO: TEST THIS that this returns a reocrd
},
remove : (editId) => {
return Brew.find({ editId }).remove().exec();

View File

@@ -12,20 +12,22 @@ const docs = {
const vitreumRender = require('vitreum/steps/render');
const templateFn = require('./client/template.js');
const templateFn = require('../client/template.js');
//TODO: Catch errors here?
const renderPage = (req, res, next) => {
return vitreumRender('homebrew', templateFn, {
url : req.originalUrl,
version : require('./package.json').version,
version : require('../package.json').version,
//TODO: add in login path?
user : req.account && req.account.username,
brews : req.brews,
brew : req.brew
})
.then(res.send)
.catch(next)
.then((page) => {
return res.send(page)
})
.catch(next);
};
@@ -66,10 +68,16 @@ router.get('/search', (req, res, next) => {
//Changelog Page
router.get('/changelog', (req, res, next) => {
req.brew = { text : docs.changelog };
req.brew = {
text : docs.changelog,
title : 'Changelog'
};
return next();
}, renderPage);
//New Page
router.get('/new', renderPage);
//Home Page
router.get('/', (req, res, next) => {
req.brew = { text : docs.welcomeBrew };