highlight and others

src/main.ts

@@ -61,18 +61,18 @@ app.engine('pag', (filePath: string, options: any, callback: any) => {
             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
@@ -92,12 +92,12 @@ 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) => {
@@ -108,6 +108,7 @@ app.get('/reload', (req, res) => {
     logger.info('truncating cache')
     cache = {}
     toc = getToc()
+    masterTmpl = fs.readFileSync('./docroot/master.tmpl').toString()
     res.send('reload triggered')
 })