diff --git a/content b/content index c275503..d8542c7 160000 --- a/content +++ b/content @@ -1 +1 @@ -Subproject commit c275503cf287258cec923b45e41ef748ee7fce21 +Subproject commit d8542c7560fb0c2e02d19b4920036ecc646c2744 diff --git a/src/utils/baseContext.js b/src/utils/baseContext.js index 02367e5..29e4993 100644 --- a/src/utils/baseContext.js +++ b/src/utils/baseContext.js @@ -48,6 +48,7 @@ layout: "layout no-print", sidebar: "sidebar no-print", container: "container no-print", + content: "markdown-content", }, styles: {}, }; @@ -97,23 +98,32 @@ return context; } - - renderWithBaseContext(template, overrides = {}) { - const context = Object.assign({}, this.baseContext, overrides); - this.res.render(template, context); + mergeOverrides(overrides = {}, cssOverrides = {}) { + return { + ...this.baseContext, + ...overrides, + css: { + ...this.baseContext?.css, + ...overrides?.css, + ...cssOverrides, + }, + }; + } + renderWithBaseContext(template, overrides = {}, cssOverrides = {}) { + this.res.render(template, this.mergeOverrides(overrides, cssOverrides)); } - renderWithCallback(template, cb, overrides = {}) { - let context = Object.assign({}, this.baseContext, overrides); - this.res.logger.info(cb); // Retained mission critical log + renderWithCallback(template, cb, overrides = {}, cssOverrides = {}) { + let context = this.mergeOverrides(overrides, cssOverrides); + this.res.logger.info(cb); context = cb(context); this.res.render(template, context); } - renderGenericMessage(overrides = {}) { + renderGenericMessage(overrides = {}, cssOverrides = {}) { this.res.render( "pages/generic-message", - Object.assign({}, this.baseContext, overrides), + this.mergeOverrides(overrides, cssOverrides), ); } } diff --git a/src/utils/htmlRoutes.js b/src/utils/htmlRoutes.js index bdbb50c..6a35102 100644 --- a/src/utils/htmlRoutes.js +++ b/src/utils/htmlRoutes.js @@ -42,6 +42,7 @@ return res.renderWithBaseContext( this.cache.get(routePath).template, this.cache.get(routePath).context, + this.cache.get(routePath).cssOverrides, ); } // Fetch the actual HTML file name from the YAML config @@ -66,6 +67,11 @@ extraScripts: extraScripts || [], meta: pageConfig.meta || {}, }; + const cssOverrides = { + classes: { + content: "content", + }, + }; /* console.log("Assets Router Path", assetsRouterPath); console.log("Assets URI", assetsUri); @@ -76,9 +82,9 @@ // 4. Update Cache if (this.shouldCache) { - this.cache.set(routePath, { template, context }); + this.cache.set(routePath, { template, context, cssOverrides }); } - res.renderWithBaseContext(template, context); + res.renderWithBaseContext(template, context, cssOverrides); } catch (err) { err.statusCode = 500; next(err); diff --git a/src/views/pages/page.handlebars b/src/views/pages/page.handlebars index 41490cf..414d6dd 100644 --- a/src/views/pages/page.handlebars +++ b/src/views/pages/page.handlebars @@ -21,6 +21,6 @@ {{/if}} -
+
{{{content}}}