Skip to content

Commit 4a5f69e

Browse files
committed
updates
1 parent e62c803 commit 4a5f69e

File tree

6 files changed

+78
-43
lines changed

6 files changed

+78
-43
lines changed

src/__t/fullTemplate.js

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/display/displayBody.js

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
import { displayFactoryTwo } from 'email-template-object';
22

3+
import {
4+
logoTopComponent,
5+
logoBottomComponent,
6+
} from 'atherdon-newsletter-react-layouts-innercomponents';
7+
38
import EmailTemplateBodyComponent from '../components/bodyComponent';
49
import footerString from '../display/displayFooter';
510

611
// const ERROR_BODY = '`bodyContent` is a required option for `renderTemplate`';
712

8-
import {
9-
logoTopComponent,
10-
logoBottomComponent,
11-
} from 'atherdon-newsletter-react-layouts-innercomponents';
13+
1214

1315
const checkingBodyContent = (bodyContent) => {
1416
if (!bodyContent) {
@@ -38,5 +40,11 @@ const settings = {
3840
};
3941

4042
const BodyFactory = new displayFactoryTwo();
41-
// console.log(BodyFactory.create(settings))
42-
export default BodyFactory.create(settings);
43+
44+
const BodyHTMLString = BodyFactory.create(settings);
45+
46+
export {
47+
BodyFactory,
48+
settings,
49+
BodyHTMLString
50+
}

src/display/displayMain.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ const settings = {
2828
params: addon1,
2929
};
3030

31-
const Factory = new displayFactoryTwo();
31+
const MainFactory = new displayFactoryTwo();
3232

33-
export default Factory.create(settings);
33+
const MainHTMLString = MainFactory.create(settings);
34+
35+
export {
36+
settings,
37+
MainFactory,
38+
MainHTMLString
39+
}

src/methods.js

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,33 @@
11
import HeadString from './display/displayHead';
22

3-
import BodyString from './display/displayBody';
3+
import { BodyHTMLString } from './display/displayBody';
44

55
import FooterString from './display/displayFooter';
66

7-
import MainString from './display/displayMain';
7+
import { MainHTMLString } from './display/displayMain';
88

9-
console.log(MainString);
9+
// console.log(MainHTMLString);
10+
11+
import displayTemplate from './t/displayTemplate';
12+
13+
const printTemplate = (string) => {
14+
displayTemplate(string);
15+
}
1016

1117
const printHead = () => {
1218
return HeadString;
1319
};
1420

1521
const printMain = () => {
16-
return MainString;
22+
return MainHTMLString;
1723
};
1824

1925
const printFooter = () => {
2026
return FooterString;
2127
};
2228

2329
const printBody = () => {
24-
return BodyString;
30+
return BodyHTMLString;
2531
};
2632

27-
export { printMain, printBody, printFooter, printHead };
33+
export { printMain, printBody, printFooter, printHead, printTemplate };

src/t/displayTemplate.js

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
import { displayFactoryTwo } from 'email-template-object';
2+
3+
import {
4+
settings as bodySettings
5+
} from '../display/displayBody';
6+
7+
import {
8+
settings as mainSettings
9+
} from '../display/displayMain';
10+
11+
12+
// title must be passed from the outside
13+
// const title = `The Secrets of High-Performing DevOps teams`;
14+
// const head = displayHead(title);
15+
16+
function displayTemplate(generated_content) {
17+
18+
19+
const BodyFactory = new displayFactoryTwo();
20+
21+
bodySettings.params.content = generated_content;
22+
23+
24+
const BodyHTMLString = BodyFactory.create(bodySettings);
25+
26+
// console.log(BodyHTMLString)
27+
// ------
28+
29+
const MainFactory = new displayFactoryTwo();
30+
31+
mainSettings.params.body = BodyHTMLString;
32+
33+
let MainHTMLString = MainFactory.create(mainSettings);
34+
35+
// console.log(MainHTMLString)
36+
37+
return MainHTMLString;
38+
39+
40+
41+
};
42+
43+
44+
export default displayTemplate;

0 commit comments

Comments
 (0)