diff --git a/server.ts b/server.ts index 7087769..7d16511 100644 --- a/server.ts +++ b/server.ts @@ -26,7 +26,7 @@ var bodyParser = require('body-parser') var jsonParser = bodyParser.json() -function buildCss(portal: string, suffix = null, variables: {} = null) { +function buildCss(portal: string, suffix = null, variables: {} = null, customCss = "") { let lessFile = 'community.less' if (portal === 'connect') { lessFile = 'connect.less' @@ -48,7 +48,7 @@ function buildCss(portal: string, suffix = null, variables: {} = null) { rewriteUrls: 'all', modifyVars: modifyVars }; - less.render(input, options, function (error, result) { + less.render(customCss + input , options, function (error, result) { if (error) { console.log(error); } else { @@ -80,7 +80,7 @@ function buildAll(res: Response = null) { if (response.data && Array.isArray(response.data) && response.data.length > 0) { response.data.forEach((layout: Layout) => { let variables = Layout.getVariables(CustomizationOptions.checkForObsoleteVersion(layout.layoutOptions, layout.portalPid)); - buildCss(layout.portalPid, layout.date ? layout.date : null, variables); + buildCss(layout.portalPid, layout.date ? layout.date : null, variables, layout.layoutOptions.identity.customCss); }); if (res) { res.status(200).send({ @@ -191,7 +191,7 @@ export function app() { server.post('/build-css/:id/:suffix', jsonParser,(req, res) => { let variables = Layout.getVariables(CustomizationOptions.checkForObsoleteVersion(req.body, req.params.id)); - buildCss(req.params.id , req.params.suffix, variables); + buildCss(req.params.id , req.params.suffix, variables, req.body.layoutOptions.identity.customCss); res.status(200).send({ code: 200, message: 'CSS build for ' + req.params.id + ' layout was successful' @@ -200,7 +200,7 @@ export function app() { server.post('/build-css/preview/:id/:suffix', jsonParser, (req, res) => { let variables = Layout.getVariables(CustomizationOptions.checkForObsoleteVersion(req.body, req.params.id)); - buildCss(req.params.id, req.params.suffix, variables); + buildCss(req.params.id, req.params.suffix, variables, req.body.identity.customCss); res.status(200).send({code: 200, message: 'CSS build for ' + req.params.id + ' layout was successful'}); }); server.get('/health-check', async (_req, res, _next) => {