Merge branch 'epic/cv-jedi-minimalism' of https://github.com/Lemoncode/manfred-export-app into epic/cv-jedi-minimalism

Author: AbelDeTena

apps/react-app/src/pods/template-export/components/customSelectColor/customSelectColor.component.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { cx } from '@emotion/css';
-import { ColorTheme, HexColor } from '@lemoncode/manfred2html';
+import { ColorTheme, HexCommonColor } from '@lemoncode/manfred2html';
 import { InputRadioButton } from './components';
 import * as classes from './customSelectColor.styles';
 
@@ -38,11 +38,11 @@ export const CustomSelectColor: React.FC<Props> = ({ label, onChange }) => {
         />
       </div>
       <fieldset className={classes.colorFieldset}>
-        {Object.keys(HexColor).map(colorKey => (
+        {Object.keys(HexCommonColor).map(colorKey => (
           <InputRadioButton
             key={colorKey}
             value={colorKey as ColorTheme}
-            hexColor={HexColor[colorKey as keyof typeof HexColor]}
+            hexColor={HexCommonColor[colorKey as keyof typeof HexCommonColor]}
             onChange={onChange}
           />
         ))}

packages/manfred2html/src/engine/cv-jedi-minimalism/html-parts/html-document-start/html-document-start.part.ts

@@ -1,6 +1,5 @@
 import ejs from 'ejs';
-import { HexColorJedi } from '@/model';
+import { HexColor } from '@/model';
 import htmlDocumentStartTemplate from './html-document-start.ejs?raw';
 
-export const generateHtmlDocumentStart = (color: HexColorJedi): string =>
-  ejs.render(htmlDocumentStartTemplate, { color });
+export const generateHtmlDocumentStart = (color: HexColor): string => ejs.render(htmlDocumentStartTemplate, { color });

packages/manfred2html/src/engine/cv-monochrome-force/html-parts/html-document-start/html-document-start.helper.ts

@@ -1,4 +1,4 @@
-import { HexColor } from '@/model';
+import { HexColor, HexCommonColor } from '@/model';
 
 interface ColorPalette {
   fifty: string;
@@ -15,7 +15,7 @@ interface ColorPalette {
 
 export const createColorPalette = (color: HexColor): ColorPalette => {
   switch (color) {
-    case HexColor.default:
+    case HexCommonColor.default:
       return {
         fifty: '#eaf3f3',
         hundred: '#bcd9db',
@@ -28,7 +28,7 @@ export const createColorPalette = (color: HexColor): ColorPalette => {
         eightHundred: '#164a4c',
         nineHundred: '#11383a',
       };
-    case HexColor.red:
+    case HexCommonColor.red:
       return {
         fifty: '#ffe8eb',
         hundred: '#feb8c2',
@@ -41,7 +41,7 @@ export const createColorPalette = (color: HexColor): ColorPalette => {
         eightHundred: '#8b0f1f',
         nineHundred: '#6a0b18',
       };
-    case HexColor.green:
+    case HexCommonColor.green:
       return {
         fifty: '#e9f9ef',
         hundred: '#baeccd',
@@ -54,7 +54,7 @@ export const createColorPalette = (color: HexColor): ColorPalette => {
         eightHundred: '#126b33',
         nineHundred: '#0d5127',
       };
-    case HexColor.orange:
+    case HexCommonColor.orange:
       return {
         fifty: '#fcefeb',
         hundred: '#f6cdc0',
@@ -67,7 +67,7 @@ export const createColorPalette = (color: HexColor): ColorPalette => {
         eightHundred: '#7c341d',
         nineHundred: '#5f2816',
       };
-    case HexColor.yellow:
+    case HexCommonColor.yellow:
       return {
         fifty: '#fefae8',
         hundred: '#fcf0b9',
@@ -80,7 +80,7 @@ export const createColorPalette = (color: HexColor): ColorPalette => {
         eightHundred: '#86720f',
         nineHundred: '#66570c',
       };
-    case HexColor.dark:
+    case HexCommonColor.dark:
       return {
         fifty: '#e9eaeb',
         hundred: '#b9bfc1',

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

@@ -1,49 +1,49 @@
 import markdownit from 'markdown-it';
-import { ColorTheme, ExportHTMLSettings, Settings, HexColor, HexColorJedi } from '@/model';
+import { ColorTheme, ExportHTMLSettings, Settings, HexCommonColor, HexJediMinimalismColor } from '@/model';
 
-export const mapColorThemeToHex = (colorTheme: ColorTheme): HexColor => {
+export const mapCommonColorThemeToHex = (colorTheme: ColorTheme): HexCommonColor => {
   switch (colorTheme) {
     case 'default':
-      return HexColor.default;
+      return HexCommonColor.default;
     case 'red':
-      return HexColor.red;
+      return HexCommonColor.red;
     case 'green':
-      return HexColor.green;
+      return HexCommonColor.green;
     case 'orange':
-      return HexColor.orange;
+      return HexCommonColor.orange;
     case 'yellow':
-      return HexColor.yellow;
+      return HexCommonColor.yellow;
     case 'dark':
-      return HexColor.dark;
+      return HexCommonColor.dark;
     default:
-      return HexColor.default;
+      return HexCommonColor.default;
   }
 };
 
-export const mapJediColorThemeToHex = (colorTheme: ColorTheme): HexColorJedi => {
+export const mapJediColorThemeToHex = (colorTheme: ColorTheme): HexJediMinimalismColor => {
   switch (colorTheme) {
     case 'default':
-      return HexColorJedi.default;
+      return HexJediMinimalismColor.default;
     case 'red':
-      return HexColorJedi.red;
+      return HexJediMinimalismColor.red;
     case 'green':
-      return HexColorJedi.green;
+      return HexJediMinimalismColor.green;
     case 'orange':
-      return HexColorJedi.orange;
+      return HexJediMinimalismColor.orange;
     case 'yellow':
-      return HexColorJedi.yellow;
+      return HexJediMinimalismColor.yellow;
     case 'dark':
-      return HexColorJedi.dark;
+      return HexJediMinimalismColor.dark;
     default:
-      return HexColorJedi.default;
+      return HexJediMinimalismColor.default;
   }
 };
 
 export const mapExportHTMLSettingsToSettings = (exportHTMLSettings: ExportHTMLSettings): Settings => ({
   colorTheme:
-    exportHTMLSettings.template !== 'Jedi minimalism'
-      ? mapColorThemeToHex(exportHTMLSettings.colorTheme)
-      : mapJediColorThemeToHex(exportHTMLSettings.colorTheme),
+    exportHTMLSettings.template === 'Jedi minimalism'
+      ? mapJediColorThemeToHex(exportHTMLSettings.colorTheme)
+      : mapCommonColorThemeToHex(exportHTMLSettings.colorTheme),
   template: exportHTMLSettings.template || 'default',
   language: exportHTMLSettings.language || 'es',
 });

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

@@ -10,7 +10,7 @@ export type TemplateCV =
 
 export type Language = 'es' | 'en';
 
-export enum HexColor {
+export enum HexCommonColor {
   default = '#247A7E',
   red = '#E61934',
   green = '#1DB155',
@@ -19,7 +19,7 @@ export enum HexColor {
   dark = '#1B2B33',
 }
 
-export enum HexColorJedi {
+export enum HexJediMinimalismColor {
   default = '#11383A',
   red = '#6A0B18',
   green = '#0D5127',
@@ -28,14 +28,16 @@ export enum HexColorJedi {
   dark = '#0D1418',
 }
 
+export type HexColor = HexCommonColor | HexJediMinimalismColor;
+
 export interface ExportHTMLSettings {
   colorTheme: ColorTheme;
   template: TemplateCV;
   language: Language;
 }
 
 export interface Settings {
-  colorTheme: HexColor | HexColorJedi;
+  colorTheme: HexColor;
   template: TemplateCV;
   language: Language;
 }