Aaltronav/dougal-software
1
0
Fork 0
mirror of https://gitlab.com/wgp/dougal/software.git synced 2025-12-06 12:47:08 +00:00
Code Issues Packages Projects Releases Activity

Add Markdown support to template renderer

Browse Source
This commit is contained in:
D. Berge
2021-05-12 00:26:18 +02:00
parent 3f9a40724d
commit 26c05b9e3c
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/www/server/lib/render.js
View File

@@ -1,5 +1,6 @@
const Path = require('path'); const Path = require('path');
const nunjucks = require('nunjucks'); const nunjucks = require('nunjucks');
const marked = require('marked');
function njkFind (ary, key, value) { function njkFind (ary, key, value) {
if (!ary.find) { if (!ary.find) {
@@ -21,6 +22,9 @@ async function render (data, template) {
const nenv = nunjucks.configure(Path.dirname(template), {autoescape: false, lstripBlocks: false, trimBlocks: false}); const nenv = nunjucks.configure(Path.dirname(template), {autoescape: false, lstripBlocks: false, trimBlocks: false});
nenv.addFilter('find', njkFind); nenv.addFilter('find', njkFind);
nenv.addFilter('padStart', njkPadStart); nenv.addFilter('padStart', njkPadStart);
nenv.addFilter('markdown', function(str) {
return marked(String(str));
});
const view = nenv.render(Path.basename(template), data); const view = nenv.render(Path.basename(template), data);

5
lib/www/server/package-lock.json generated
View File

@@ -14,6 +14,7 @@
"express": "^4.17.1", "express": "^4.17.1",
"express-jwt": "^6.0.0", "express-jwt": "^6.0.0",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^8.5.1",
"marked": "^0.7.0",
"netmask": "^1.0.6", "netmask": "^1.0.6",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",
"nunjucks": "^3.2.3", "nunjucks": "^3.2.3",
@@ -1756,7 +1757,6 @@
"version": "0.7.0", "version": "0.7.0",
"resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz", "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
"integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==", "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==",
"dev": true,
"bin": { "bin": {
"marked": "bin/marked" "marked": "bin/marked"
}, },
@@ -4884,8 +4884,7 @@
"marked": { "marked": {
"version": "0.7.0", "version": "0.7.0",
"resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz", "resolved": "https://registry.npmjs.org/marked/-/marked-0.7.0.tgz",
"integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==", "integrity": "sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg=="
"dev": true
}, },
"md5.js": { "md5.js": {
"version": "1.3.5", "version": "1.3.5",

1
lib/www/server/package.json
View File

@@ -14,6 +14,7 @@
"express": "^4.17.1", "express": "^4.17.1",
"express-jwt": "^6.0.0", "express-jwt": "^6.0.0",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^8.5.1",
"marked": "^0.7.0",
"netmask": "^1.0.6", "netmask": "^1.0.6",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",
"nunjucks": "^3.2.3", "nunjucks": "^3.2.3",