From 05fec20b3d8fda352c8ab73c869cac3cbe7f82ce Mon Sep 17 00:00:00 2001 From: acialini Date: Mon, 13 May 2024 14:34:08 +0200 Subject: [PATCH] removed wrongly commited changes to branch --- node/.bashrc | 3 --- node/package.json | 8 ------ node/pdf-generate/handlers.js | 28 +++++---------------- node/pdf-generate/react/test.js | 44 --------------------------------- 4 files changed, 6 insertions(+), 77 deletions(-) delete mode 100644 node/.bashrc delete mode 100644 node/pdf-generate/react/test.js diff --git a/node/.bashrc b/node/.bashrc deleted file mode 100644 index 18151f1..0000000 --- a/node/.bashrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "presets": ["@babel/preset-env", "@babel/preset-react"] -} \ No newline at end of file diff --git a/node/package.json b/node/package.json index d22af0d..9571589 100644 --- a/node/package.json +++ b/node/package.json @@ -10,11 +10,9 @@ "test:coverage": "jest --coverage" }, "dependencies": { - "@babel/register": "^7.23.7", "adm-zip": "^0.5.10", "applicationinsights": "^1.7.4", "axios": "^1.5.0", - "babel-node": "^0.0.1-security", "bitgener": "^1.2.12", "chromium": "^3.0.3", "express": "^4.18.2", @@ -24,15 +22,9 @@ "nodemon": "^3.0.1", "puppeteer": "^22.0.0", "qrcode-svg": "^1.1.0", - "react": "^18.3.1", - "react-dom": "^18.3.1", "uuid": "^9.0.1" }, "devDependencies": { - "@babel/cli": "^7.24.5", - "@babel/core": "^7.24.5", - "@babel/preset-env": "^7.24.5", - "@babel/preset-react": "^7.24.1", "@types/jest": "^24.0.15", "@types/semver": "^7.3.10", "jest": "^29.6.4" diff --git a/node/pdf-generate/handlers.js b/node/pdf-generate/handlers.js index 237231c..71c8c15 100644 --- a/node/pdf-generate/handlers.js +++ b/node/pdf-generate/handlers.js @@ -12,12 +12,6 @@ let handlebars = require("handlebars"); const packageJson = require("../package.json"); var AdmZip = require("adm-zip"); const fse = require('fs-extra'); -const { renderToString } = require('react-dom/server'); -const React = require("react"); -require('@babel/register')({ - presets: ['@babel/preset-env', '@babel/preset-react'], -}) - const info = async function (req, res, next) { @@ -92,22 +86,12 @@ const generatePdf = async function (req, res, next) { try { const jsonData = JSON.parse(data); - if (renderMode === 'handlebar') { - let templateFile = readFileSync(path.join(workingDir, "template.html")).toString(); - let template = handlebars.compile(templateFile); - jsonData.tempPath = workingDir; - let html = template(jsonData); - fs.writeFileSync(path.join(workingDir, "compiledTemplate.html"), html); - - } else { - const h = React.createElement; - //let template = require(path.join(workingDir, "template.js")); - let template = require("./react/test.js"); - let html = renderToString(h(template, { - data: jsonData - })); - fs.writeFileSync(path.join(workingDir, "compiledTemplate.html"), html); - } + let templateFile = readFileSync(path.join(workingDir, "template.html")).toString(); + let template = handlebars.compile(templateFile); + jsonData.tempPath = workingDir; + let html = template(jsonData); + fs.writeFileSync(path.join(workingDir, "compiledTemplate.html"), html); + } catch (err) { console.log(err) res.status(500); diff --git a/node/pdf-generate/react/test.js b/node/pdf-generate/react/test.js deleted file mode 100644 index c6bcb66..0000000 --- a/node/pdf-generate/react/test.js +++ /dev/null @@ -1,44 +0,0 @@ -const React = require("react"); - -const css = { - __html: ` - -`, -} - -module.exports = ({ size = 256, color = 'inherit', ...props }) => ( - - - - - - - UI - - - - - -) \ No newline at end of file