Merge pull request #308 from deletidev/feature/#275-CV-monochrome-force-Create-studies-section

juanpms2 · web-flow · commit 761090d11a3c · 2023-12-18T08:33:51.000+01:00
Closed #275
diff --git a/packages/manfred-common/src/doc-parts/studies-section/studies-section.mapper.spec.ts b/packages/manfred-common/src/doc-parts/studies-section/studies-section.mapper.spec.ts
@@ -1,4 +1,4 @@
-import { ManfredAwesomicCV } from '@/model';
+import { Competence, ManfredAwesomicCV } from '@/model';
 import { mapCountries, mapFromMacCvToStudiesSectionVm, mapStudiesTypes } from './studies-section.mapper';
 import { CountryType, StudiesSectionVm, StudyTypeWithTranslation } from './studies-section.vm';
 
@@ -72,6 +72,7 @@ describe('studies-section.mapper specs', () => {
                   address: 'address',
                 },
               },
+              linkedCompetences: [{ name: 'CSS', type: 'technology' }],
             },
           ],
         },
@@ -97,6 +98,7 @@ describe('studies-section.mapper specs', () => {
               address: 'address',
             },
           },
+          linkedCompetences: [{ name: 'CSS', type: 'technology' }],
         },
       ];
 
@@ -151,6 +153,7 @@ describe('studies-section.mapper specs', () => {
                   address: 'address2',
                 },
               },
+              linkedCompetences: [{ name: 'CSS', type: 'technology' }],
             },
           ],
         },
@@ -176,6 +179,7 @@ describe('studies-section.mapper specs', () => {
               address: 'address',
             },
           },
+          linkedCompetences: [],
         },
         {
           studyType: 'Certificación',
@@ -192,6 +196,7 @@ describe('studies-section.mapper specs', () => {
               address: 'address2',
             },
           },
+          linkedCompetences: [{ name: 'CSS', type: 'technology' }],
         },
       ];
 
diff --git a/packages/manfred-common/src/doc-parts/studies-section/studies-section.mapper.ts b/packages/manfred-common/src/doc-parts/studies-section/studies-section.mapper.ts
@@ -26,6 +26,7 @@ export const mapFromMacCvToStudiesSectionVm = (cv: ManfredAwesomicCV): StudiesSe
       const mapStudyType = mapStudiesTypes(studyType, studiesTypes);
       const mapCountry = mapCountries(institution.location.country, countryList);
       institution = { ...institution, location: { ...institution.location, country: mapCountry } };
+      const linkedCompetences = study?.linkedCompetences ?? [];
 
       return {
         name,
@@ -35,6 +36,7 @@ export const mapFromMacCvToStudiesSectionVm = (cv: ManfredAwesomicCV): StudiesSe
         finishDate,
         description,
         institution,
+        linkedCompetences,
       };
     }) ?? [];
 
diff --git a/packages/manfred-common/src/doc-parts/studies-section/studies-section.vm.ts b/packages/manfred-common/src/doc-parts/studies-section/studies-section.vm.ts
@@ -8,6 +8,7 @@ export interface StudiesSectionVm {
   finishDate: string;
   description: string;
   institution: Institution;
+  linkedCompetences?: Competence[];
 }
 
 export interface Institution {
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/experience-section/experience-section.ejs b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/experience-section/experience-section.ejs
@@ -6,7 +6,7 @@
       <div class="experience">
         <p class="experience__date"><%- new Date(experience.roles[0].startDate).toLocaleDateString(undefined, { year:"numeric", month:"short"})%> <%_ if(experience.roles[0].finishDate && experience.roles[0].finishDate.toLowerCase() !=='actualidad') { -%>
               <%- "- "+new Date(experience.roles[0].finishDate).toLocaleDateString(undefined, { year:"numeric", month:"short"}) -%>
-              <%_ } else { -%> - Actualidad<%_}-%></p>
+              <%_ } else { -%> - <%- labels.CURRENT_DATE %> <%_ } -%>
         <h3 class="experience__position"><%- experience.roles[0].name %></h3>
         <h4 class="experience__company"><%- experience.name %></h4>
         <%_ if(experience.roles[0].challenges && experience.roles[0].challenges.length !== 0) { -%>
@@ -16,8 +16,8 @@
           <%_}-%>
         </div>
         <%_}-%>
-        <%_ if(experience.url && experience.url !== "undefined") { -%>
-        <a href="https://www.getmanfred.com" class="experience__url"><%- experience.url %></a>
+        <%_ if(experience.url) { -%>
+        <a href=<%= experience.url %> class="experience__url" target="_blank"><%- experience.url %></a>
         <%_}-%>
         <%_ if(experience.roles[0].competences && experience.roles[0].competences.length !== 0) { -%>
         <div>
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/experience-section/labels/experience-english-labels.const.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/experience-section/labels/experience-english-labels.const.ts
@@ -3,4 +3,5 @@ import { ExperienceLabels } from './experience-label.model';
 export const englishExperienceLabels: ExperienceLabels = {
   EXPERIENCE_CAREER_HEADING: 'Experience / Career',
   EXPERIENCE_CAREER_TOOLS: 'Technologies and Tools',
+  CURRENT_DATE: 'Now',
 };
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/experience-section/labels/experience-label.model.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/experience-section/labels/experience-label.model.ts
@@ -1,4 +1,5 @@
 export interface ExperienceLabels {
   EXPERIENCE_CAREER_HEADING: string;
   EXPERIENCE_CAREER_TOOLS: string;
+  CURRENT_DATE: string;
 }
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/experience-section/labels/experience-spanish-labels.const.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/experience-section/labels/experience-spanish-labels.const.ts
@@ -3,4 +3,5 @@ import { ExperienceLabels } from './experience-label.model';
 export const spanishExperienceLabels: ExperienceLabels = {
   EXPERIENCE_CAREER_HEADING: 'Experiencia / Carrera',
   EXPERIENCE_CAREER_TOOLS: 'Tecnologías y Herramientas',
+  CURRENT_DATE: 'Actualidad',
 };
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/html-document-start/html-document-start.ejs b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/html-document-start/html-document-start.ejs
@@ -25,16 +25,16 @@
         --space-64: calc(var(--space-base) * 16);
 
         /* colors */
-        --primary-50: #eaf3f3;
-        --primary-100: #bcd9db;
-        --primary-200: #9cc7ca;
-        --primary-300: #6faeb1;
-        --primary-400: #539ea2;
-        --primary-500: <%= color -%>;
-        --primary-600: #247a7e;
-        --primary-700: #247a7e;
-        --primary-800: #164a4c;
-        --primary-900: #11383a;
+        --primary-50: <%= colorPalette.fifty-%>;
+        --primary-100: <%= colorPalette.hundred -%>;
+        --primary-200: <%= colorPalette.twoHundred -%>;
+        --primary-300: <%= colorPalette.threeHundred -%>;
+        --primary-400: <%= colorPalette.fourHundred -%>;
+        --primary-500: <%= colorPalette.fiveHundred -%>;
+        --primary-600: <%= colorPalette.sixHundred -%>;
+        --primary-700: <%= colorPalette.sevenHundred -%>;
+        --primary-800: <%= colorPalette.eightHundred -%>;
+        --primary-900: <%= colorPalette.nineHundred -%>;
 
         /* text */
         --light-light-50: #fefefe;
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/html-document-start/html-document-start.helper.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/html-document-start/html-document-start.helper.ts
@@ -0,0 +1,110 @@
+import { HexColor } from '@/model';
+
+interface ColorPalette {
+  fifty: string;
+  hundred: string;
+  twoHundred: string;
+  threeHundred: string;
+  fourHundred: string;
+  fiveHundred: string;
+  sixHundred: string;
+  sevenHundred: string;
+  eightHundred: string;
+  nineHundred: string;
+}
+
+export const createColorPalette = (color: HexColor): ColorPalette => {
+  switch (color) {
+    case HexColor.default:
+      return {
+        fifty: '#eaf3f3',
+        hundred: '#bcd9db',
+        twoHundred: '#9cc7ca',
+        threeHundred: '#6faeb1',
+        fourHundred: '#539ea2',
+        fiveHundred: '#28868b',
+        sixHundred: '#247a7e',
+        sevenHundred: '#1c5f63',
+        eightHundred: '#164a4c',
+        nineHundred: '#11383a',
+      };
+    case HexColor.red:
+      return {
+        fifty: '#ffe8eb',
+        hundred: '#feb8c2',
+        twoHundred: '#fe96a4',
+        threeHundred: '#fe667a',
+        fourHundred: '#fd4961',
+        fiveHundred: '#fd1b39',
+        sixHundred: '#e61934',
+        sevenHundred: '#b41328',
+        eightHundred: '#8b0f1f',
+        nineHundred: '#6a0b18',
+      };
+    case HexColor.green:
+      return {
+        fifty: '#e9f9ef',
+        hundred: '#baeccd',
+        twoHundred: '#98e3b4',
+        threeHundred: '#6ad692',
+        fourHundred: '#4dce7d',
+        fiveHundred: '#20c25d',
+        sixHundred: '#1db155',
+        sevenHundred: '#178a42',
+        eightHundred: '#126b33',
+        nineHundred: '#0d5127',
+      };
+    case HexColor.orange:
+      return {
+        fifty: '#fcefeb',
+        hundred: '#f6cdc0',
+        twoHundred: '#f1b5a2',
+        threeHundred: '#eb9477',
+        fourHundred: '#e77f5d',
+        fiveHundred: '#e15f34',
+        sixHundred: '#cd562f',
+        sevenHundred: '#a04325',
+        eightHundred: '#7c341d',
+        nineHundred: '#5f2816',
+      };
+    case HexColor.yellow:
+      return {
+        fifty: '#fefae8',
+        hundred: '#fcf0b9',
+        twoHundred: '#fae997',
+        threeHundred: '#f8df67',
+        fourHundred: '#f6d949',
+        fiveHundred: '#f4cf1c',
+        sixHundred: '#debc19',
+        sevenHundred: '#ad9314',
+        eightHundred: '#86720f',
+        nineHundred: '#66570c',
+      };
+    case HexColor.dark:
+      return {
+        fifty: '#e9eaeb',
+        hundred: '#b9bfc1',
+        twoHundred: '#989fa3',
+        threeHundred: '#68747a',
+        fourHundred: '#4b5960',
+        fiveHundred: '#1e2f38',
+        sixHundred: '#1b2b33',
+        sevenHundred: '#152128',
+        eightHundred: '#111a1f',
+        nineHundred: '#0d1418',
+      };
+    default:
+      return {
+        fifty: '#eaf3f3',
+        hundred: '#bcd9db',
+        twoHundred: '#9cc7ca',
+        threeHundred: '#6faeb1',
+        fourHundred: '#539ea2',
+        fiveHundred: '#28868b',
+        sixHundred: '#247a7e',
+        sevenHundred: '#1c5f63',
+        eightHundred: '#164a4c',
+        nineHundred: '#11383a',
+      };
+  }
+};
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/html-document-start/html-document-start.part.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/html-document-start/html-document-start.part.ts
@@ -3,10 +3,12 @@ import { HexColor } from '@/model';
 import { ManfredAwesomicCV } from '@lemoncode/manfred-common/model';
 import htmlDocumentStartTemplate from './html-document-start.ejs?raw';
 import { mapFromMacCvToProfileSectionVm } from '@lemoncode/manfred-common/profile-section';
+import { createColorPalette } from './html-document-start.helper';
 
 export const generateHtmlDocumentStart = (cv: ManfredAwesomicCV, color: HexColor): string => {
   const profileSectionVm = mapFromMacCvToProfileSectionVm(cv);
   const avatarUrl = profileSectionVm.avatarUrl;
+  const colorPalette = createColorPalette(color);
 
-  return ejs.render(htmlDocumentStartTemplate, { color, avatarUrl });
+  return ejs.render(htmlDocumentStartTemplate, { colorPalette, avatarUrl });
 };
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/index.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/index.ts
@@ -12,3 +12,4 @@ export * from './soft-skills-section';
 export * from './relevants-links-section';
 export * from './hard-skills-section';
 export * from './language-section';
+export * from './studies-section';
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/studies-section/index.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/studies-section/index.ts
@@ -0,0 +1 @@
+export * from './studies-section.part';
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/studies-section/labels/index.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/studies-section/labels/index.ts
@@ -0,0 +1,15 @@
+import { Language } from '@/model';
+import { StudiesLabels } from './studies-label.model';
+import { spanishStudiesLabels } from './studies-spanish-labels.const';
+import { englishStudiesLabels } from './studies-english-labels.const';
+
+export const getLabels = (language: Language): StudiesLabels => {
+  switch (language) {
+    case 'es':
+      return spanishStudiesLabels;
+    case 'en':
+      return englishStudiesLabels;
+    default:
+      throw new Error(`Language not supported: ${language}`);
+  }
+};
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/studies-section/labels/studies-english-labels.const.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/studies-section/labels/studies-english-labels.const.ts
@@ -0,0 +1,6 @@
+import { StudiesLabels } from './studies-label.model';
+
+export const englishStudiesLabels: StudiesLabels = {
+  STUDIES_HEADING: 'Studies',
+  CURRENT_DATE: 'Now',
+};
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/studies-section/labels/studies-label.model.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/studies-section/labels/studies-label.model.ts
@@ -0,0 +1,4 @@
+export interface StudiesLabels {
+  STUDIES_HEADING: string;
+  CURRENT_DATE: string;
+}
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/studies-section/labels/studies-spanish-labels.const.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/studies-section/labels/studies-spanish-labels.const.ts
@@ -0,0 +1,6 @@
+import { StudiesLabels } from './studies-label.model';
+
+export const spanishStudiesLabels: StudiesLabels = {
+  STUDIES_HEADING: 'Estudios',
+  CURRENT_DATE: 'Actualidad',
+};
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/studies-section/studies-section.ejs b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/studies-section/studies-section.ejs
@@ -0,0 +1,37 @@
+<%_ if (studiesCollection && studiesCollection.length !== 0) { -%>
+  <section class="section educations">
+    <h2 class="title"><%- labels.STUDIES_HEADING %></h2>
+    <%_ for (const study of studiesCollection) { -%>
+        <div class="education">
+          <div class="decoration">
+            <div class="decoration__circle"></div>
+            <hr class="decoration__line" />
+          </div>
+          <div class="education__group">
+            <p class="education__date"><%- new Date(study.startDate).toLocaleDateString(undefined, { year:"numeric", month:"short"})%> <%_ if(study.finishDate && study.finishDate.toLowerCase() !=='actualidad') { -%>
+              <%- "- "+new Date(study.finishDate).toLocaleDateString(undefined, { year:"numeric", month:"short"}) -%>
+            <%_ } else { -%> - <%- labels.CURRENT_DATE %> <%_ } -%>
+            </p>
+            <p class="education__title"><%- study.name %></p>
+            <p class="education__entity"><%- study.institution.name %></p>
+            <%_ if (study.description) { -%>
+              <p class="education__text">
+                <%- study.description %>
+              </p>
+              <%_ } -%>
+            <%_ if (study.linkedCompetences && study.linkedCompetences.length !== 0) { -%>
+            <p class="education__technologies">
+            <% study.linkedCompetences.forEach(function(competence, index) { %>
+              <% if (index === study.linkedCompetences.length - 1) { %>
+                <%- competence.name %>
+              <% } else { %>
+                <%- competence.name %> <span> | </span>
+              <% }; %>
+            <% }); %>
+            </p>
+            <%_ } -%>
+          </div>
+        </div>
+      <%_ } -%>
+    </section>
+    <%_ } -%>
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/studies-section/studies-section.part.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/studies-section/studies-section.part.ts
@@ -0,0 +1,24 @@
+import ejs from 'ejs';
+import { StudiesSectionVm, mapFromMacCvToStudiesSectionVm } from '@lemoncode/manfred-common/studies-section';
+import { ISO_SPANISH_LANGUAGE } from '@/engine/engine.const';
+import { ManfredAwesomicCV, Settings, Language } from '@/model';
+import { getLabels } from './labels';
+import studiesTemplate from './studies-section.ejs?raw';
+
+export const generateStudiesSection = (cv: ManfredAwesomicCV, settings: Settings): string => {
+  const studiesSectionVm = mapFromMacCvToStudiesSectionVm(cv);
+
+  return generateStudiesSectionInner(studiesSectionVm, settings.language);
+};
+
+const generateStudiesSectionInner = (
+  studiesSectionVm: StudiesSectionVm[],
+  language: Language = ISO_SPANISH_LANGUAGE
+): string => {
+  const rootObject = {
+    studiesCollection: studiesSectionVm,
+    labels: getLabels(language),
+  };
+
+  return ejs.render(studiesTemplate, rootObject);
+};
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/index.ts b/packages/manfred2html/src/engine/cv-monochrome-force/index.ts
@@ -14,6 +14,7 @@ import {
   generateSoftSkillsSection,
   generateHardSkillsSection,
   generateLanguageSection,
+  generateStudiesSection,
 } from './html-parts';
 
 export const exportManfredJSonToCVMonochromeForceHTML = (
@@ -34,7 +35,7 @@ export const exportManfredJSonToCVMonochromeForceHTML = (
   const softSkillsSection = generateSoftSkillsSection(manfredJsonContent, settings);
   const hardSkillsSection = generateHardSkillsSection(manfredJsonContent, settings);
   const languageSection = generateLanguageSection(manfredJsonContent, settings);
-
+  const studiesSection = generateStudiesSection(manfredJsonContent, settings);
   return `
     ${htmlDocumentStart}
       ${headerElementStart}
@@ -47,6 +48,7 @@ export const exportManfredJSonToCVMonochromeForceHTML = (
         ${hardSkillsSection}
         ${languageSection}
         ${experienceSection}
+        ${studiesSection}
       ${mainElementEnd}
       ${footerSection}
     ${htmlDocumentEnd}

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ export interface StudiesSectionVm {`
`8`	`8`	`finishDate: string;`
`9`	`9`	`description: string;`
`10`	`10`	`institution: Institution;`
	`11`	`+ linkedCompetences?: Competence[];`
`11`	`12`	`}`
`12`	`13`
`13`	`14`	`export interface Institution {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`export interface ExperienceLabels {`
`2`	`2`	`EXPERIENCE_CAREER_HEADING: string;`
`3`	`3`	`EXPERIENCE_CAREER_TOOLS: string;`
	`4`	`+ CURRENT_DATE: string;`
`4`	`5`	`}`