update source branch and html output in js

deletidev · deletidev · commit aa0567c358ae · 2023-12-15T10:32:40.000+01:00
diff --git a/export-samples/html/cv-monochrome-force.html b/export-samples/html/cv-monochrome-force.html
@@ -1060,9 +1060,9 @@ <h2 class="title">Educación</h2>
           // Mueve los elementos al contenedor
           myLinks && main.appendChild(myLinks);
           aboutMe && main.appendChild(aboutMe);
-          languages && main.appendChild(languages);
           hardSkills && main.appendChild(hardSkills);
           softSkills && main.appendChild(softSkills);
+          languages && main.appendChild(languages);
           experience && main.appendChild(experience);
           education && main.appendChild(education);
         }
diff --git a/packages/manfred-common/src/doc-parts/experience-section/experience-section.helpers.spec.ts b/packages/manfred-common/src/doc-parts/experience-section/experience-section.helpers.spec.ts
@@ -252,19 +252,19 @@ describe('experience-section.helpers specs', () => {
           competences: [
             {
               name: 'name',
-              type: 'type',
+              type: 'technology',
             },
             {
               name: 'name',
-              type: 'type',
+              type: 'technology',
             },
             {
               name: 'name',
-              type: 'type',
+              type: 'technology',
             },
             {
               name: 'name',
-              type: 'name',
+              type: 'technology',
             },
           ],
           organization: {
@@ -365,19 +365,19 @@ describe('experience-section.helpers specs', () => {
           competences: [
             {
               name: 'name',
-              type: 'type',
+              type: 'technology',
             },
             {
               name: 'name',
-              type: 'type',
+              type: 'technology',
             },
             {
               name: 'name',
-              type: 'type',
+              type: 'technology',
             },
             {
               name: 'name',
-              type: 'name',
+              type: 'technology',
             },
           ],
           organization: {
diff --git a/packages/manfred-common/src/doc-parts/experience-section/experience-section.mapper.spec.ts b/packages/manfred-common/src/doc-parts/experience-section/experience-section.mapper.spec.ts
@@ -54,6 +54,7 @@ describe('mapFromMacCvToExperienceSectionVm', () => {
             organization: {
               name: 'name',
               description: 'description',
+              URL: 'https://lemoncode.net',
             },
             type: 'freelance',
             roles: [
@@ -89,6 +90,7 @@ describe('mapFromMacCvToExperienceSectionVm', () => {
       {
         name: 'name',
         description: 'description',
+        url: 'https://lemoncode.net',
         type: 'Autónomo',
         roles: [
           {
diff --git a/packages/manfred-common/src/doc-parts/experience-section/experience-section.mapper.ts b/packages/manfred-common/src/doc-parts/experience-section/experience-section.mapper.ts
@@ -14,6 +14,7 @@ export const mapFromMacCvToExperienceSectionVm = (cv: ManfredAwesomicCV): Experi
 export const mapJobToExperience = (job: JobManfredAwesomicCV): ExperienceVm => ({
   name: job.organization?.name ?? '',
   description: job.organization?.description ?? '',
+  url: job.organization?.URL ?? '',
   type: mapOrganizationType(job.type, types),
   roles: job.roles?.map(role => role),
 });
diff --git a/packages/manfred-common/src/doc-parts/experience-section/experience-section.vm.ts b/packages/manfred-common/src/doc-parts/experience-section/experience-section.vm.ts
@@ -1,8 +1,9 @@
-import { OrganizationType, PublicEntityDetails, Role } from '@/model';
+import { Competence, OrganizationType, PublicEntityDetails, Role } from '@/model';
 
 export interface ExperienceVm {
   name: string;
   description?: string;
+  url?: string;
   type?: string;
   roles: Role[];
 }
@@ -18,4 +19,5 @@ export interface JobManfredAwesomicCV {
   organization: PublicEntityDetails;
   type?: OrganizationType | undefined;
   roles: [Role, ...Role[]];
+  competences?: Competence[];
 }
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
@@ -0,0 +1,36 @@
+<%_ if(experienceCollection && experienceCollection.length !== 0){ -%>
+<section class="section experiencies">
+    <h2 class="title"><%- labels.EXPERIENCE_CAREER_HEADING %></h2>
+    <div class="experiencies__container">
+      <%_ for(const experience of experienceCollection){ -%>
+      <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>
+        <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) { -%>
+        <div class="experience__text">
+          <%_ for(const challenge of experience.roles[0].challenges){ -%>
+          <p><%- challenge.description %></p>
+          <%_}-%>
+        </div>
+        <%_}-%>
+        <%_ if(experience.url && experience.url !== "undefined") { -%>
+        <a href="https://www.getmanfred.com" class="experience__url"><%- experience.url %></a>
+        <%_}-%>
+        <%_ if(experience.roles[0].competences && experience.roles[0].competences.length !== 0) { -%>
+        <div>
+          <h5 class="experience__tools"><%- labels.EXPERIENCE_CAREER_TOOLS %></h5>
+          <ul class="experience__tools-list">
+          <%_ for(const competences of experience.roles[0].competences ){ -%>
+            <li class="chip"><%- competences.name %></li>
+          <%_ } -%>
+          </ul>
+        </div>
+        <%_ } -%>
+      </div>
+      <%_ } -%>
+    </div>
+  </section>
+<%_ }-%>
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/experience-section/experience-section.part.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/experience-section/experience-section.part.ts
@@ -0,0 +1,24 @@
+import ejs from 'ejs';
+import { ExperienceVm, mapFromMacCvToExperienceSectionVm } from '@lemoncode/manfred-common/experience-section';
+import { Settings, Language, ManfredAwesomicCV } from '@/model';
+import { ISO_SPANISH_LANGUAGE } from '@/engine/engine.const';
+import experienceTemplate from './experience-section.ejs?raw';
+import { getLabels } from './labels';
+
+export const generateExperiencesSection = (cv: ManfredAwesomicCV, settings: Settings): string => {
+  const experienceSectionVm = mapFromMacCvToExperienceSectionVm(cv);
+
+  return generateExperienceSectionInner(experienceSectionVm, settings.language);
+};
+
+const generateExperienceSectionInner = (
+  experienceSectionVm: ExperienceVm[],
+  language: Language = ISO_SPANISH_LANGUAGE
+): string => {
+  const rootObject = {
+    experienceCollection: experienceSectionVm,
+    labels: getLabels(language),
+  };
+
+  return ejs.render(experienceTemplate, rootObject);
+};
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/experience-section/index.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/experience-section/index.ts
@@ -0,0 +1 @@
+export * from './experience-section.part';
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
@@ -0,0 +1,6 @@
+import { ExperienceLabels } from './experience-label.model';
+
+export const englishExperienceLabels: ExperienceLabels = {
+  EXPERIENCE_CAREER_HEADING: 'Experience / Career',
+  EXPERIENCE_CAREER_TOOLS: 'Technologies and Tools',
+};
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
@@ -0,0 +1,4 @@
+export interface ExperienceLabels {
+  EXPERIENCE_CAREER_HEADING: string;
+  EXPERIENCE_CAREER_TOOLS: 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
@@ -0,0 +1,6 @@
+import { ExperienceLabels } from './experience-label.model';
+
+export const spanishExperienceLabels: ExperienceLabels = {
+  EXPERIENCE_CAREER_HEADING: 'Experiencia / Carrera',
+  EXPERIENCE_CAREER_TOOLS: 'Tecnologías y Herramientas',
+};
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/experience-section/labels/index.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/experience-section/labels/index.ts
@@ -0,0 +1,15 @@
+import { Language } from '@/model';
+import { ExperienceLabels } from './experience-label.model';
+import { spanishExperienceLabels } from './experience-spanish-labels.const';
+import { englishExperienceLabels } from './experience-english-labels.const';
+
+export const getLabels = (language: Language): ExperienceLabels => {
+  switch (language) {
+    case 'es':
+      return spanishExperienceLabels;
+    case 'en':
+      return englishExperienceLabels;
+    default:
+      throw new Error(`Language not supported: ${language}`);
+  }
+};
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/hard-skills-section/hard-skills-section.ejs b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/hard-skills-section/hard-skills-section.ejs
@@ -0,0 +1,10 @@
+<%_ if (hardSkillsCollection && hardSkillsCollection.length !== 0) { -%>
+    <section class="section hard-skills">
+        <h2 class="title"><%- labels.HARD_SKILLS_HEADING %></h2>
+        <ul class="hard-skills__list">
+            <%_ for (const item of hardSkillsCollection) { -%>
+                <li class="chip chip-primary"><%- item.skill.name %></li>
+            <%_ } -%>
+        </ul>
+      </section>
+  <%_ } -%>
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/hard-skills-section/hard-skills-section.parts.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/hard-skills-section/hard-skills-section.parts.ts
@@ -0,0 +1,22 @@
+import ejs from 'ejs';
+import { HardSkillVM, mapFromCvToHardSkillVm } from '@lemoncode/manfred-common/hard-skill-section';
+import { ISO_SPANISH_LANGUAGE } from '@/engine/engine.const';
+import { Settings, Language, ManfredAwesomicCV } from '@/model';
+import { getLabels } from './labels';
+import hardSkillsSection from './hard-skills-section.ejs?raw';
+
+export const generateHardSkillsSection = (cv: ManfredAwesomicCV, settings: Settings): string => {
+  const hardSkillsSectionVm = mapFromCvToHardSkillVm(cv);
+  return generateHardSkillsSectionInner(hardSkillsSectionVm, settings.language);
+};
+
+const generateHardSkillsSectionInner = (
+  hardSkillsSectionVm: HardSkillVM[],
+  language: Language = ISO_SPANISH_LANGUAGE
+): string => {
+  const rootObject = {
+    hardSkillsCollection: hardSkillsSectionVm,
+    labels: getLabels(language),
+  };
+  return ejs.render(hardSkillsSection, rootObject);
+};
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/hard-skills-section/index.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/hard-skills-section/index.ts
@@ -0,0 +1 @@
+export * from './hard-skills-section.parts';
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/hard-skills-section/labels/hard-skills-english-labels.const.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/hard-skills-section/labels/hard-skills-english-labels.const.ts
@@ -0,0 +1,5 @@
+import { HardSkillsLabels } from './hard-skills-label.model';
+
+export const englishHardSkillsLabels: HardSkillsLabels = {
+  HARD_SKILLS_HEADING: 'Hard Skills',
+};
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/hard-skills-section/labels/hard-skills-label.model.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/hard-skills-section/labels/hard-skills-label.model.ts
@@ -0,0 +1,3 @@
+export interface HardSkillsLabels {
+  HARD_SKILLS_HEADING: string;
+}
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/hard-skills-section/labels/hard-skills-spanish-labels.const.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/hard-skills-section/labels/hard-skills-spanish-labels.const.ts
@@ -0,0 +1,5 @@
+import { HardSkillsLabels } from './hard-skills-label.model';
+
+export const spanishHardSkillsLabels: HardSkillsLabels = {
+  HARD_SKILLS_HEADING: 'Competencias',
+};
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/hard-skills-section/labels/index.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/hard-skills-section/labels/index.ts
@@ -0,0 +1,15 @@
+import { Language } from '@/model';
+import { HardSkillsLabels } from './hard-skills-label.model';
+import { spanishHardSkillsLabels } from './hard-skills-spanish-labels.const';
+import { englishHardSkillsLabels } from './hard-skills-english-labels.const';
+
+export const getLabels = (language: Language): HardSkillsLabels => {
+  switch (language) {
+    case 'es':
+      return spanishHardSkillsLabels;
+    case 'en':
+      return englishHardSkillsLabels;
+    default:
+      throw new Error(`Language not supported: ${language}`);
+  }
+};
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/html-document-end/html-document-end.ejs b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/html-document-end/html-document-end.ejs
@@ -56,9 +56,9 @@
       // Mueve los elementos al contenedor
       myLinks && main.appendChild(myLinks);
       aboutMe && main.appendChild(aboutMe);
-      languages && main.appendChild(languages);
       hardSkills && main.appendChild(hardSkills);
       softSkills && main.appendChild(softSkills);
+      languages && main.appendChild(languages);
       experience && main.appendChild(experience);
       education && main.appendChild(education);
     }
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
@@ -7,5 +7,8 @@ export * from './footer-section';
 export * from './main-element-start';
 export * from './main-element-end';
 export * from './about-me-section';
+export * from './experience-section';
+export * from './soft-skills-section';
 export * from './relevants-links-section';
+export * from './hard-skills-section';
 export * from './language-section';
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/soft-skills-section/index.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/soft-skills-section/index.ts
@@ -0,0 +1 @@
+export * from './soft-skills-section.part';
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/soft-skills-section/labels/index.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/soft-skills-section/labels/index.ts
@@ -0,0 +1,15 @@
+import { Language } from '@/model';
+import { SoftSkillsLabels } from './soft-skills-label.model';
+import { spanishSoftSkillsLabels } from './soft-skills-spanish-labels.const';
+import { englishSoftSkillsLabels } from './soft-skills-english-labels.const';
+
+export const getLabels = (language: Language): SoftSkillsLabels => {
+  switch (language) {
+    case 'es':
+      return spanishSoftSkillsLabels;
+    case 'en':
+      return englishSoftSkillsLabels;
+    default:
+      throw new Error(`Language not supported: ${language}`);
+  }
+};
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/soft-skills-section/labels/soft-skills-english-labels.const.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/soft-skills-section/labels/soft-skills-english-labels.const.ts
@@ -0,0 +1,5 @@
+import { SoftSkillsLabels } from './soft-skills-label.model';
+
+export const englishSoftSkillsLabels: SoftSkillsLabels = {
+  SOFT_SKILLS_HEADING: 'Soft skills',
+};
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/soft-skills-section/labels/soft-skills-label.model.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/soft-skills-section/labels/soft-skills-label.model.ts
@@ -0,0 +1,3 @@
+export interface SoftSkillsLabels {
+  SOFT_SKILLS_HEADING: string;
+}
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/soft-skills-section/labels/soft-skills-spanish-labels.const.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/soft-skills-section/labels/soft-skills-spanish-labels.const.ts
@@ -0,0 +1,5 @@
+import { SoftSkillsLabels } from './soft-skills-label.model';
+
+export const spanishSoftSkillsLabels: SoftSkillsLabels = {
+  SOFT_SKILLS_HEADING: 'Habilidades',
+};
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/soft-skills-section/soft-skills-section.ejs b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/soft-skills-section/soft-skills-section.ejs
@@ -0,0 +1,10 @@
+<%_ if (softSkillsCollection && softSkillsCollection.length !== 0) { -%>
+    <section class="section soft-skills">
+      <h2 class="title"><%- labels.SOFT_SKILLS_HEADING %></h2>
+      <ul class="soft-skills__list">
+        <%_ for (const item of softSkillsCollection) { -%>
+          <li><%- item.skill.name %></li>
+        <%_ } -%>
+      </ul>
+    </section>
+<%_ } -%>
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/soft-skills-section/soft-skills-section.part.ts b/packages/manfred2html/src/engine/cv-monochrome-force/html-parts/soft-skills-section/soft-skills-section.part.ts
@@ -0,0 +1,22 @@
+import ejs from 'ejs';
+import { SoftSkillVM, mapFromCvToSoftSkillVm } from '@lemoncode/manfred-common/soft-skill-section';
+import { ISO_SPANISH_LANGUAGE } from '@/engine/engine.const';
+import { Settings, Language, ManfredAwesomicCV } from '@/model';
+import { getLabels } from './labels';
+import softSkillsSection from './soft-skills-section.ejs?raw';
+
+export const generateSoftSkillsSection = (cv: ManfredAwesomicCV, settings: Settings): string => {
+  const softSkillsSectionVm = mapFromCvToSoftSkillVm(cv);
+  return generateSoftSkillsSectionInner(softSkillsSectionVm, settings.language);
+};
+
+const generateSoftSkillsSectionInner = (
+  softSkillsSectionVm: SoftSkillVM[],
+  language: Language = ISO_SPANISH_LANGUAGE
+): string => {
+  const rootObject = {
+    softSkillsCollection: softSkillsSectionVm,
+    labels: getLabels(language),
+  };
+  return ejs.render(softSkillsSection, rootObject);
+};
diff --git a/packages/manfred2html/src/engine/cv-monochrome-force/index.ts b/packages/manfred2html/src/engine/cv-monochrome-force/index.ts
@@ -10,6 +10,9 @@ import {
   generateMainElementEnd,
   generateAboutMeSection,
   generateRelevantsLinksSection,
+  generateExperiencesSection,
+  generateSoftSkillsSection,
+  generateHardSkillsSection,
   generateLanguageSection,
 } from './html-parts';
 
@@ -27,6 +30,9 @@ export const exportManfredJSonToCVMonochromeForceHTML = (
   const mainElementEnd = generateMainElementEnd();
   const relevantsLinksSection = generateRelevantsLinksSection(manfredJsonContent, settings);
   const aboutMeSection = generateAboutMeSection(manfredJsonContent, settings);
+  const experienceSection = generateExperiencesSection(manfredJsonContent, settings);
+  const softSkillsSection = generateSoftSkillsSection(manfredJsonContent, settings);
+  const hardSkillsSection = generateHardSkillsSection(manfredJsonContent, settings);
   const languageSection = generateLanguageSection(manfredJsonContent, settings);
 
   return `
@@ -37,7 +43,10 @@ export const exportManfredJSonToCVMonochromeForceHTML = (
       ${mainElementStart}
         ${relevantsLinksSection}
         ${aboutMeSection}
+        ${softSkillsSection}
+        ${hardSkillsSection}
         ${languageSection}
+        ${experienceSection}
       ${mainElementEnd}
       ${footerSection}
     ${htmlDocumentEnd}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export * from './experience-section.part';`