f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-24 16:22:44 +00:00
Code Wiki Activity

Merge branch 'master' into SwappableThemes-ReorganizeFolderStructure

Browse Source
This commit is contained in:
Trevor Buckner
2022-08-27 18:24:35 -04:00
parent fc20d73520 215b64f5a6
commit eb9d76655e
20 changed files with 23327 additions and 22584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
server/app.js
View File

@@ -68,12 +68,12 @@ app.use((req, res, next)=>{
app.use(homebrewApi);
app.use(require('./admin.api.js'));
const HomebrewModel = require('./homebrew.model.js').model;
const welcomeText = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
const welcomeTextV3 = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg_v3.md', 'utf8');
const migrateText = require('fs').readFileSync('client/homebrew/pages/homePage/migrate.md', 'utf8');
const changelogText = require('fs').readFileSync('changelog.md', 'utf8');
const faqText = require('fs').readFileSync('faq.md', 'utf8');
const HomebrewModel = require('./homebrew.model.js').model;
const welcomeText = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg.md', 'utf8');
const welcomeTextLegacy = require('fs').readFileSync('client/homebrew/pages/homePage/welcome_msg_legacy.md', 'utf8');
const migrateText = require('fs').readFileSync('client/homebrew/pages/homePage/migrate.md', 'utf8');
const changelogText = require('fs').readFileSync('changelog.md', 'utf8');
const faqText = require('fs').readFileSync('faq.md', 'utf8');
String.prototype.replaceAll = function(s, r){return this.split(s).join(r);};
@@ -85,16 +85,18 @@ app.get('/robots.txt', (req, res)=>{
//Home page
app.get('/', (req, res, next)=>{
req.brew = {
text : welcomeText
text : welcomeText,
renderer : 'V3'
};
splitTextStyleAndMetadata(req.brew);
return next();
});
//Home page v3
app.get('/v3_preview', (req, res, next)=>{
app.get('/legacy', (req, res, next)=>{
req.brew = {
text : welcomeTextV3,
renderer : 'V3'
text : welcomeTextLegacy,
renderer : 'legacy'
};
splitTextStyleAndMetadata(req.brew);
return next();
@@ -177,7 +179,8 @@ app.get('/user/:username', async (req, res, next)=>{
'editId',
'createdAt',
'updatedAt',
'lastViewed'
'lastViewed',
'tags'
];
let brews = await HomebrewModel.getByUser(req.params.username, ownAccount, fields)

1
server/googleActions.js
View File

@@ -124,7 +124,6 @@ const GoogleActions = {
title : file.properties.title,
description : file.description,
views : parseInt(file.properties.views),
tags : '',
published : file.properties.published ? file.properties.published == 'true' : false,
systems : [],
thumbnail : file.properties.thumbnail

3
server/homebrew.api.js
View File

@@ -56,6 +56,9 @@ const getBrew = (accessType)=>{
throw 'Brew not found in Homebrewery database or Google Drive';
}
if(typeof stub.tags === 'string') {
stub.tags = [];
}
req.brew = stub;
next();

2
server/homebrew.model.js
View File

@@ -13,7 +13,7 @@ const HomebrewSchema = mongoose.Schema({
pageCount : { type: Number, default: 1 },
description : { type: String, default: '' },
tags : { type: String, default: '' },
tags : [String],
systems : [String],
renderer : { type: String, default: '' },
authors : [String],