0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-29 11:12:39 +00:00

Merge branch 'master' into pr/1981

This commit is contained in:
Trevor Buckner
2022-01-29 21:34:38 -05:00
13 changed files with 500 additions and 173 deletions

View File

@@ -261,7 +261,8 @@ app.use((req, res)=>{
account : req.account,
enable_v3 : config.get('enable_v3')
};
templateFn('homebrew', title = req.brew ? req.brew.title : '', props)
const title = req.brew ? req.brew.title : '';
templateFn('homebrew', title, props)
.then((page)=>{ res.send(page); })
.catch((err)=>{
console.log(err);

View File

@@ -7,7 +7,7 @@ const config = require('./config.js');
//let oAuth2Client;
GoogleActions = {
const GoogleActions = {
authCheck : (account, res)=>{
if(!account || !account.googleId){ // If not signed into Google