This commit is contained in:
2018-05-11 12:24:52 +02:00
parent 425d6d230d
commit 8e489a70b1
6 changed files with 13 additions and 53 deletions

7
dist/main.js vendored
View File

@ -11,7 +11,7 @@ function getPageOptions(contentStr) {
let lines = contentStr.split("\n");
let firstLine = lines[0];
// logger.info(`firstLine: ${firstLine}`)
let pageOptionsStr = firstLine.replace(/^\s*<!-- (\{.+\}) -->.*$/, "\$1");
let pageOptionsStr = firstLine.replace(/^\s*<!-- (\{.+\}) -->[\s\S]*$/, "\$1");
// logger.info(`pageOptionsStr: ${pageOptionsStr}`)
pageOptions = JSON.parse(pageOptionsStr);
// logger.info(JSON.stringify(pageOptions))
@ -70,6 +70,9 @@ app.engine('pag', (filePath, options, callback) => {
app.set('views', './docroot');
app.set('view engine', 'pag');
app.get('/index', (req, res) => {
logger.info(req.url);
logger.info(req.baseUrl);
logger.info(req.originalUrl);
res.render('index', {});
});
app.get('/posts/:date', (req, res) => {
@ -85,7 +88,7 @@ app.get('/reload', (req, res) => {
res.send('reload triggered');
});
app.use('/files', express.static('files'));
masterTmpl = fs.readFileSync(config.dict.masterTmpl).toString();
masterTmpl = fs.readFileSync('./docroot/master.tmpl').toString();
toc = getToc();
app.listen(config.dict.httpPort, () => {
logger.info("Homepage is listening");