upd

src/html/methods.js

@@ -0,0 +1,22 @@
+// @TODO both layouts things can be moved out from importing it here.
+const {
+    // TODO: finish and fix this thing. it was done by Serge quickly,
+    // and ruined a lot of our logic
+    fullTemplate, 
+
+    fullTemplateOLD
+  } = require('atherdon-newsletter-js-layouts');
+
+
+
+const MESSAGE_HTML_CONTENT_ONLY = 'The content has been parsed successfully';
+const MESSAGE_HTML_FULL_TEMPLATE = 'The full-template has been parsed successfully';
+const MESSAGE_HTML_FULL_TEMPLATE2 = 'The full-template has been parsed successfully2';
+
+module.exports = {
+
+    MESSAGE_HTML_CONTENT_ONLY,
+    MESSAGE_HTML_FULL_TEMPLATE,
+    MESSAGE_HTML_FULL_TEMPLATE2
+
+}

src/parser.js

@@ -17,14 +17,17 @@ const {
   printMessage
 } = require('markup-generator');
 
+const { writeReactComponent } = require('./react/methods');
+
 const {
-  writeReactComponent,
+
   generateTemplateName,
 
   FULL_SOURCE,
   CONTENT_SOURCE, 
 } = require('./utils');
 
+
 const {
   MESSAGE_HTML_CONTENT_ONLY,
   MESSAGE_HTML_FULL_TEMPLATE,
@@ -34,6 +37,7 @@ const {
   MESSAGE_REACT_CONTENT
 } = require('./command-line-methods');
 
+
 const {
   parse, 
   parseFullTHing,
@@ -67,6 +71,8 @@ switch (process.env.PARSE) {
     break;
 }
 
+
+
 function generateFullTemplate2() {
   const { content, warnings, previewText } = parseFullTHing({ source: FULL_SOURCE });
 
@@ -91,6 +97,9 @@ function generateFullTemplate2() {
   printMessage(message, 'green2');
 }
 
+
+
+
 function generateFullTemplate() {
   // same as from top
 
@@ -104,6 +113,9 @@ function generateFullTemplate() {
   printMessage(message, 'green2');
 }
 
+
+
+
 function generateReactContent() {
   const { content, warnings } = parseMDReact(CONTENT_SOURCE);
   // console.log("parsedContent", { content, warnings, previewText });
@@ -119,6 +131,8 @@ function generateReactContent() {
   printMessage(message, 'green2');
 }
 
+
+
 function generateReactFullTemplate() {
   const { content, warnings, previewText } = parseMDReactFullThing({ source: FULL_SOURCE });
 
@@ -135,6 +149,8 @@ function generateReactFullTemplate() {
   printMessage(message, 'green2');
 }
 
+
+
 // this method is depricated.
 // we will remove export of it at some point.
 function generateContentOnly() {
@@ -152,6 +168,8 @@ function generateContentOnly() {
   printMessage(message, 'green2');
 }
 
+
+
 module.exports = {
   generateContentOnly,
   generateFullTemplate,

src/react/methods.js

@@ -1,4 +1,5 @@
 const { write } = require('markup-generator');
+const reactLayouts = require('atherdon-newsletter-react');
 
 const reactComponent = `
 import React from "react";
@@ -23,3 +24,26 @@ function writeReactComponent(fileName, content, dir = 'generated', message) {
   const result = reactComponentReplace(content);
   write(fileName, result, dir, message);
 }
+
+
+// const {
+//     parse, 
+//     parseFullTHing,
+//   } = require('./html/parseHTML');
+
+
+const MESSAGE_REACT_FULL_TEMPLATE = 'The FullTemplate has been parsed successfully';
+const MESSAGE_REACT_CONTENT = 'The Content has been parsed successfully';
+
+// module.exports = {
+
+//   MESSAGE_REACT_FULL_TEMPLATE,
+//   MESSAGE_REACT_CONTENT,
+// };
+
+
+module.exports = {
+    reactComponent,
+    reactComponentReplace,
+    writeReactComponent
+};

src/utils.js

@@ -1,36 +1,5 @@
-const fs = require('fs');
-const { write } = require('markup-generator');
-
-
-const reactComponent = `
-import React from "react";
-
-const Content = () => {
-  return (
-    <>
-      {content}
-    </>
-  );
-};
-
-export default Content;
-`;
-
-function reactComponentReplace(content){
-  return reactComponent.replace(/{content}/g, content);
-}
-
-function writeReactComponent(fileName, content, dir = 'generated', message) {
-
-  const result = reactComponentReplace(content);
-  write(fileName, result, dir, message);
-}
-
-
-
 const generateTemplateName = (suffix, ext = 'html') => `${suffix}-${Date.now()}.${ext}`;
 
-
 // @TODO add path, in order to make it work PERFECTLY
 const FULL_SOURCE = 'source/source.md';
 
@@ -39,8 +8,6 @@ const CONTENT_SOURCE = 'source/source.md';
 
 module.exports = {
 
-  writeReactComponent,
-
   FULL_SOURCE,
   CONTENT_SOURCE,
   generateTemplateName,