Merge pull request #20 from AxaGuilDEv/fix/refactor-code

fix: reuse utility function
AxaFrance · Feb 21, 2023 · 62d1ebb · 62d1ebb
2 parents c107f1b + a4193f6
commit 62d1ebb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/src/reporters/generatorReports.js b/src/reporters/generatorReports.js
@@ -1,6 +1,5 @@
 const fs = require("fs");
 const path = require("path");
-const folderTemplate = "templates";
 const folderTranslate = "translate";
 const minify = require("html-minifier").minify;
 
@@ -115,13 +114,6 @@ const populateTemplate = async (options, results, htmlPerPageResult) => {
     gasesNumberOfVisits: results.gasesNumberOfVisits,
   });
 
-  const myCss = {
-    style: fs.readFileSync(
-      path.join(__dirname, folderTemplate, "./style.css"),
-      "utf8"
-    ),
-  };
-
   return ejs.render(template, {
     [globalNoteTag]: statusGreen(results.globalNote, options),
     [globalPerformanceTag]: performanceBlockTemplate,
@@ -131,7 +123,7 @@ const populateTemplate = async (options, results, htmlPerPageResult) => {
     [htmlPerPageBlock]: htmlPerPageResult,
     GlobalGreenItMetrics: GlobalGreenItMetricsTemplate,
     Translations: options.translations,
-    myCss: myCss,
+    style: readTemplate("./style.css"),
     lang: options.lang
   });
 };

diff --git a/src/reporters/readTemplate.js b/src/reporters/readTemplate.js
@@ -3,7 +3,7 @@ const fs = require("fs");
 const path = require("path");
 const readTemplate = (templateFile) => {
   const templatePath = path.join(__dirname, folderTemplate, templateFile);
-  return fs.readFileSync(templatePath).toString();
+  return fs.readFileSync(templatePath, "utf-8").toString();
 };
 module.exports = {
   readTemplate,

diff --git a/src/reporters/templates/template.html b/src/reporters/templates/template.html
@@ -11,7 +11,7 @@
 
 <body>
   <style>
-    <%- myCss.style %>
+    <%- style %>
   </style>
   <article class="lh-root lh-vars lh-screenshot-overlay--enabled">
     <div class="lh-header-container">