Skip to content

Commit 1c36347

Browse files
committed
refactor jedi minimalism cv
1 parent 94a256a commit 1c36347

File tree

4 files changed

+10
-39
lines changed

4 files changed

+10
-39
lines changed
Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,6 @@
11
import ejs from 'ejs';
2-
import { HexColor, HexColorJedi } from '@/model';
2+
import { HexColorJedi } from '@/model';
33
import htmlDocumentStartTemplate from './html-document-start.ejs?raw';
44

5-
export const generateHtmlDocumentStart = (color: HexColor): string => {
6-
const jediColor = () => {
7-
switch (color) {
8-
case HexColor.default:
9-
return '#11383A';
10-
case HexColor.red:
11-
return '#6A0B18';
12-
case HexColor.green:
13-
return '#0D5127';
14-
case HexColor.orange:
15-
return '#5F2816';
16-
case HexColor.yellow:
17-
return '#66570C';
18-
case HexColor.dark:
19-
return '#0D1418';
20-
default:
21-
return '#11383A';
22-
}
23-
};
24-
25-
return ejs.render(htmlDocumentStartTemplate, { color: jediColor() });
26-
};
5+
export const generateHtmlDocumentStart = (color: HexColorJedi): string =>
6+
ejs.render(htmlDocumentStartTemplate, { color });

packages/manfred2html/src/engine/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { ManfredAwesomicCV, ExportHTMLSettings } from '@/model';
2-
import { mapExportHTMLSettingsToSettings, mapExportHTMLJediSettingsToSettings } from '@/mappers';
2+
import { mapExportHTMLSettingsToSettings } from '@/mappers';
33
import { exportManfredJSonToCVSithEleganceHTML } from './cv-sith-elegance';
44
import { exportManfredJSonToCVGalacticCleanTechHTML } from './cv-galactic-cleantech';
55
import { exportManfredJsonToCVXWingHTML } from './cv-x-wing-squadron';
6-
76
import { exportManfredJSonToCVMonochromeForceHTML } from './cv-monochrome-force';
87
import { exportManfredJSonToCVJediMinimalismHTML } from './cv-jedi-minimalism';
98

packages/manfred2html/src/mappers/exportHTMLSettings.mappers.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import markdownit from 'markdown-it';
2-
import { ColorTheme, ExportHTMLSettings, Settings, HexColor, HexColorJedi, JediSettings } from '@/model';
2+
import { ColorTheme, ExportHTMLSettings, Settings, HexColor, HexColorJedi } from '@/model';
33

44
export const mapColorThemeToHex = (colorTheme: ColorTheme): HexColor => {
55
switch (colorTheme) {
@@ -40,7 +40,10 @@ export const mapJediColorThemeToHex = (colorTheme: ColorTheme): HexColorJedi =>
4040
};
4141

4242
export const mapExportHTMLSettingsToSettings = (exportHTMLSettings: ExportHTMLSettings): Settings => ({
43-
colorTheme: mapColorThemeToHex(exportHTMLSettings.colorTheme),
43+
colorTheme:
44+
exportHTMLSettings.template !== 'Jedi minimalism'
45+
? mapColorThemeToHex(exportHTMLSettings.colorTheme)
46+
: mapJediColorThemeToHex(exportHTMLSettings.colorTheme),
4447
template: exportHTMLSettings.template || 'default',
4548
language: exportHTMLSettings.language || 'es',
4649
});
@@ -57,8 +60,3 @@ export const mapMarkdownToHTML = (md: string): string => {
5760

5861
return mdParser.render(md);
5962
};
60-
export const mapExportHTMLJediSettingsToSettings = (exportHTMLSettings: ExportHTMLSettings): JediSettings => ({
61-
colorTheme: mapJediColorThemeToHex(exportHTMLSettings.colorTheme),
62-
template: exportHTMLSettings.template || 'default',
63-
language: exportHTMLSettings.language || 'es',
64-
});

packages/manfred2html/src/model/export-html-settings.model.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,7 @@ export interface ExportHTMLSettings {
3535
}
3636

3737
export interface Settings {
38-
colorTheme: HexColor;
39-
template: TemplateCV;
40-
language: Language;
41-
}
42-
43-
export interface JediSettings {
44-
colorTheme: HexColorJedi;
38+
colorTheme: HexColor | HexColorJedi;
4539
template: TemplateCV;
4640
language: Language;
4741
}

0 commit comments

Comments
 (0)