highlight and others

This commit is contained in:
2018-05-11 14:39:55 +02:00
parent 02a06b8e37
commit 3d6e3c63ee
89 changed files with 6364 additions and 34 deletions

15
dist/main.js vendored
View File

@ -48,16 +48,16 @@ app.engine('pag', (filePath, options, callback) => {
let contentStr = content.toString();
let pageOptions = getPageOptions(contentStr);
let renderedPhase1 = contentStr
.replace('#bla#', 'blu');
.replace(/#bla#/g, 'blu');
let renderedPhase2 = masterTmpl
.replace('#maincontent#', renderedPhase1)
.replace('#base#', options.base);
.replace(/#maincontent#/g, renderedPhase1)
.replace(/#base#/g, options.base);
for (let key in pageOptions) {
let value = pageOptions[key];
if (key == 'toc' && value == 'compute') {
value = toc;
}
renderedPhase2 = renderedPhase2.replace(`#${key}#`, value);
renderedPhase2 = renderedPhase2.replace(new RegExp(`#${key}#`, 'g'), value);
}
cache[filePath] = renderedPhase2;
return callback(null, renderedPhase2);
@ -74,11 +74,11 @@ app.get('/index', (req, res) => {
logger.info(req.url);
logger.info(req.baseUrl);
logger.info(req.originalUrl);
logger.info(JSON.stringify(req.headers));
res.render('index', { "base": req.headers['x-proxy-original-url'] });
// logger.info(JSON.stringify(req.headers))
res.render('index', { "base": req.headers['x-proxy-original-url'] || "/" });
});
app.get('/posts/:date', (req, res) => {
res.render(`posts/${req.params.date}/article`, { "base": req.headers['x-proxy-original-url'] });
res.render(`posts/${req.params.date}/article`, { "base": req.headers['x-proxy-original-url'] || "/" });
});
app.get('/', (req, res) => {
res.send('Hello world!');
@ -87,6 +87,7 @@ app.get('/reload', (req, res) => {
logger.info('truncating cache');
cache = {};
toc = getToc();
masterTmpl = fs.readFileSync('./docroot/master.tmpl').toString();
res.send('reload triggered');
});
app.use('/files', express.static('files'));