From d9406bda561c226c7923b03919678cfa9e5c7581 Mon Sep 17 00:00:00 2001 From: MTeresaMB Date: Thu, 14 Dec 2023 13:32:48 +0100 Subject: [PATCH 1/5] feature/#269-CV-X-Wing-Squadron-Create-relevant-links-section --- .../cv-x-wing-squadron/html-parts/index.ts | 2 + .../relevant-links-section/index.ts | 1 + .../relevant-links-section.ejs | 80 +++++++++++++++++++ .../relevant-links-section.part.ts | 17 ++++ .../html-parts/studies-section/index.ts | 1 + .../studies-section/studies-section.ejs | 48 +++++++++++ .../studies-section/studies-section.part.ts | 14 ++++ .../src/engine/cv-x-wing-squadron/index.ts | 5 ++ 8 files changed, 168 insertions(+) create mode 100644 packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/index.ts create mode 100644 packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevant-links-section.ejs create mode 100644 packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevant-links-section.part.ts create mode 100644 packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/index.ts create mode 100644 packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/studies-section.ejs create mode 100644 packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/studies-section.part.ts diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/index.ts index c3ce5db8..2b443f24 100644 --- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/index.ts +++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/index.ts @@ -10,3 +10,5 @@ export * from './language-section'; export * from './hard-skills-section'; export * from './soft-skills-section'; export * from './experience-section'; +export * from './studies-section'; +export * from './relevant-links-section'; diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/index.ts new file mode 100644 index 00000000..b254c02f --- /dev/null +++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/index.ts @@ -0,0 +1 @@ +export * from './relevant-links-section.part'; diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevant-links-section.ejs b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevant-links-section.ejs new file mode 100644 index 00000000..ad15a120 --- /dev/null +++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevant-links-section.ejs @@ -0,0 +1,80 @@ +<%_ if (profile.relevantLinks && profile.relevantLinks.length !== 0) { -%> +
+ <%_ for (const link of profile?.relevantLinks) { -%> + <%_ if (link.type === 'linkedin') { -%> +
+ target="_blank"> + + + + + + + + + + + +
+ <%_ } -%> + <%_ if (link.type === 'github') { -%> +
+ target="_blank"> + + + + + + + + + + + +
+ <%_ } %> + <%_ if (link.type === 'twitter') { -%> +
+ target="_blank"> + + + + +
+ <%_ } %> + <%_ if (link.type === 'web') { -%> +
+ target="_blank"> + + + + +
+ <%_ } %> + <%_ if (link.type === 'otros') { -%> +
+ target="_blank"> + + + + +
+ <%_ } %> + <%_ } %> + <%_ } %> +
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevant-links-section.part.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevant-links-section.part.ts new file mode 100644 index 00000000..0c506bcd --- /dev/null +++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevant-links-section.part.ts @@ -0,0 +1,17 @@ +import ejs from 'ejs'; +import relevantLinksSection from './relevant-links-section.ejs?raw'; +import { ManfredAwesomicCV } from '@/model'; +import { ProfileSectionVm, mapFromMacCvToProfileSectionVm } from '@lemoncode/manfred-common/profile-section'; +export const generateRelevantLinksSection = (cv: ManfredAwesomicCV): string => { + const profileSectionVm = mapFromMacCvToProfileSectionVm(cv); + + return generateRelevantLinksSectionInner(profileSectionVm); +}; + +const generateRelevantLinksSectionInner = (profileSectionVm: ProfileSectionVm): string => { + const rootObject = { + profile: profileSectionVm, + }; + + return ejs.render(relevantLinksSection, rootObject); +}; diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/index.ts new file mode 100644 index 00000000..bd83d5eb --- /dev/null +++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/index.ts @@ -0,0 +1 @@ +export * from './studies-section.part'; diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/studies-section.ejs b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/studies-section.ejs new file mode 100644 index 00000000..e933efc5 --- /dev/null +++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/studies-section.ejs @@ -0,0 +1,48 @@ +<%_ if(studiesCollection && studiesCollection.length !== 0) { -%> +
+
+ + + +

Educación

+
+ <%_ for (const study of studiesCollection) { -%> +
+

<%= study.name %>

+ <%_ if (study.institution) { -%> +

<%- study.institution.name %>

+ <%_ } -%> +
+ + + +

+ <%- 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 { -%> + - Actualidad + <%_}-%> +

+
+
+

<%= study.institution.description %>

+
+ <%_ if(study.linkedCompetences && study.linkedCompetences.length !== 0) { -%> +

Tecnologías y Herramientas

+
    + <%_ for(const competence of study.linkedCompetences) { -%> +
  • <%= competence %>
    • + <%_}-%> +
+ <%_}-%> +
+ <%_}-%> +
+<%_}-%> diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/studies-section.part.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/studies-section.part.ts new file mode 100644 index 00000000..8a60bbfb --- /dev/null +++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/studies-section.part.ts @@ -0,0 +1,14 @@ +import ejs from 'ejs'; +import studiesTemplate from './studies-section.ejs?raw'; +import { StudiesSectionVm, mapFromMacCvToStudiesSectionVm } from '@lemoncode/manfred-common/studies-section'; +import { ManfredAwesomicCV } from '@/model'; + +export const generateStudiesSection = (cv: ManfredAwesomicCV): string => { + const studiesSectionVm = mapFromMacCvToStudiesSectionVm(cv); + return generateStudiesSectionInner(studiesSectionVm); +}; + +const generateStudiesSectionInner = (studiesSectionVm: StudiesSectionVm[]): string => { + const rootObject = { studiesCollection: studiesSectionVm }; + return ejs.render(studiesTemplate, rootObject); +}; diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts index ecd6bc29..d18b5fec 100644 --- a/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts +++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts @@ -12,6 +12,8 @@ import { generateHardSkillsSection, generateSoftSkillsSection, generateExperienceSection, + generateStudiesSection, + generateRelevantLinksSection, } from './html-parts'; export const exportManfredJsonToCVXWingHTML = (manfredJsonContent: ManfredAwesomicCV): string => { @@ -27,6 +29,8 @@ export const exportManfredJsonToCVXWingHTML = (manfredJsonContent: ManfredAwesom const hardSkillsSection = generateHardSkillsSection(manfredJsonContent); const softSkillsSection = generateSoftSkillsSection(manfredJsonContent); const experienceSection = generateExperienceSection(manfredJsonContent); + const studiesSection = generateStudiesSection(manfredJsonContent); + const relevantLinksSection = generateRelevantLinksSection(manfredJsonContent); return ` ${htmlDocumentStart} ${headerElementStart} @@ -38,6 +42,7 @@ export const exportManfredJsonToCVXWingHTML = (manfredJsonContent: ManfredAwesom ${hardSkillsSection} ${softSkillsSection} ${experienceSection} + ${studiesSection} ${mainElementEnd} ${htmlDocumentEnd} `; From 6743e28978b2868f967ac68df2648a282d7cb565 Mon Sep 17 00:00:00 2001 From: MTeresaMB Date: Thu, 14 Dec 2023 13:36:35 +0100 Subject: [PATCH 2/5] delete section relevant links --- .../header-section/header-section.ejs | 80 ------------------- 1 file changed, 80 deletions(-) diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section/header-section.ejs b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section/header-section.ejs index 35a0caaf..0bafcea0 100644 --- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section/header-section.ejs +++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/header-section/header-section.ejs @@ -29,86 +29,6 @@

<%= profile?.regionLocation %>, <%= profile?.countryLocation %>

<%_ } -%> - <%_ if (profile.relevantLinks && profile.relevantLinks.length !== 0) { -%> -
- <%_ for (const link of profile?.relevantLinks) { -%> - <%_ if (link.type === 'linkedin') { -%> -
- target="_blank"> - - - - - - - - - - - -
- <%_ } -%> - <%_ if (link.type === 'github') { -%> -
- target="_blank"> - - - - - - - - - - - -
- <%_ } %> - <%_ if (link.type === 'twitter') { -%> -
- target="_blank"> - - - - -
- <%_ } %> - <%_ if (link.type === 'web') { -%> -
- target="_blank"> - - - - -
- <%_ } %> - <%_ if (link.type === 'otros') { -%> -
- target="_blank"> - - - - -
- <%_ } %> - <%_ } %> - <%_ } %> -
<%_ } -%> From 8c1658f8ff1598a4d92c4dbc6c5618c84bc549f9 Mon Sep 17 00:00:00 2001 From: MTeresaMB Date: Thu, 14 Dec 2023 21:14:23 +0100 Subject: [PATCH 3/5] add language labels --- .../relevant-links-section/index.ts | 2 +- .../relevant-links-section/labels/index.ts | 15 ++++++++++++ .../relevants-links-english-labels.const.ts | 5 ++++ .../labels/relevants-links-label.model.ts | 3 +++ .../relevants-links-spanish-labels.const.ts | 5 ++++ .../relevant-links-section.part.ts | 17 ------------- ...ection.ejs => relevants-links-section.ejs} | 0 .../relevants-links-section.part.ts | 24 +++++++++++++++++++ .../src/engine/cv-x-wing-squadron/index.ts | 7 +++--- packages/manfred2html/src/engine/index.ts | 2 +- 10 files changed, 58 insertions(+), 22 deletions(-) create mode 100644 packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/index.ts create mode 100644 packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-english-labels.const.ts create mode 100644 packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-label.model.ts create mode 100644 packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-spanish-labels.const.ts delete mode 100644 packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevant-links-section.part.ts rename packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/{relevant-links-section.ejs => relevants-links-section.ejs} (100%) create mode 100644 packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevants-links-section.part.ts diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/index.ts index b254c02f..12fe55f6 100644 --- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/index.ts +++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/index.ts @@ -1 +1 @@ -export * from './relevant-links-section.part'; +export * from './relevants-links-section.part'; diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/index.ts new file mode 100644 index 00000000..41c9f130 --- /dev/null +++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/index.ts @@ -0,0 +1,15 @@ +import { Language } from '@/model'; +import { RelevantsLinksLabels } from './relevants-links-label.model'; +import { spanishRelevantsLinksLabels } from './relevants-links-spanish-labels.const'; +import { englishRelevantsLinksLabels } from './relevants-links-english-labels.const'; + +export const getLabels = (language: Language): RelevantsLinksLabels => { + switch (language) { + case 'es': + return spanishRelevantsLinksLabels; + case 'en': + return englishRelevantsLinksLabels; + default: + throw new Error(`Language not supported: ${language}`); + } +}; diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-english-labels.const.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-english-labels.const.ts new file mode 100644 index 00000000..47316820 --- /dev/null +++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-english-labels.const.ts @@ -0,0 +1,5 @@ +import { RelevantsLinksLabels } from './relevants-links-label.model'; + +export const englishRelevantsLinksLabels: RelevantsLinksLabels = { + RELEVANTS_LINKS_HEADING: 'My Links', +}; diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-label.model.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-label.model.ts new file mode 100644 index 00000000..7569f913 --- /dev/null +++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-label.model.ts @@ -0,0 +1,3 @@ +export interface RelevantsLinksLabels { + RELEVANTS_LINKS_HEADING: string; +} diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-spanish-labels.const.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-spanish-labels.const.ts new file mode 100644 index 00000000..7fd7feb8 --- /dev/null +++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-spanish-labels.const.ts @@ -0,0 +1,5 @@ +import { RelevantsLinksLabels } from './relevants-links-label.model'; + +export const spanishRelevantsLinksLabels: RelevantsLinksLabels = { + RELEVANTS_LINKS_HEADING: 'Mis enlaces', +}; diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevant-links-section.part.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevant-links-section.part.ts deleted file mode 100644 index 0c506bcd..00000000 --- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevant-links-section.part.ts +++ /dev/null @@ -1,17 +0,0 @@ -import ejs from 'ejs'; -import relevantLinksSection from './relevant-links-section.ejs?raw'; -import { ManfredAwesomicCV } from '@/model'; -import { ProfileSectionVm, mapFromMacCvToProfileSectionVm } from '@lemoncode/manfred-common/profile-section'; -export const generateRelevantLinksSection = (cv: ManfredAwesomicCV): string => { - const profileSectionVm = mapFromMacCvToProfileSectionVm(cv); - - return generateRelevantLinksSectionInner(profileSectionVm); -}; - -const generateRelevantLinksSectionInner = (profileSectionVm: ProfileSectionVm): string => { - const rootObject = { - profile: profileSectionVm, - }; - - return ejs.render(relevantLinksSection, rootObject); -}; diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevant-links-section.ejs b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevants-links-section.ejs similarity index 100% rename from packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevant-links-section.ejs rename to packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevants-links-section.ejs diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevants-links-section.part.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevants-links-section.part.ts new file mode 100644 index 00000000..479f28f4 --- /dev/null +++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevants-links-section.part.ts @@ -0,0 +1,24 @@ +import { ManfredAwesomicCV, Settings, Language } from '@/model'; +import { ProfileSectionVm, mapFromMacCvToProfileSectionVm } from '@lemoncode/manfred-common/profile-section'; +import { ISO_SPANISH_LANGUAGE } from '@/engine/engine.const'; +import { getLabels } from './labels'; +import ejs from 'ejs'; +import relevantLinksTemplate from './relevant-links-section.ejs?raw'; + +export const generateRelevantLinksSection = (cv: ManfredAwesomicCV, settings: Settings): string => { + const profileSectionVm = mapFromMacCvToProfileSectionVm(cv); + + return generateRelevantLinksSectionInner(profileSectionVm, settings.language); +}; + +const generateRelevantLinksSectionInner = ( + profileSectionVm: ProfileSectionVm, + language: Language = ISO_SPANISH_LANGUAGE +): string => { + const rootObject = { + profile: profileSectionVm, + labels: getLabels(language), + }; + + return ejs.render(relevantLinksTemplate, rootObject); +}; diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts index d18b5fec..e3cbbd88 100644 --- a/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts +++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts @@ -1,4 +1,4 @@ -import { ManfredAwesomicCV } from '@/model'; +import { ManfredAwesomicCV, Settings } from '@/model'; import { generateHtmlDocumentStart, generateHtmlDocumentEnd, @@ -16,7 +16,7 @@ import { generateRelevantLinksSection, } from './html-parts'; -export const exportManfredJsonToCVXWingHTML = (manfredJsonContent: ManfredAwesomicCV): string => { +export const exportManfredJsonToCVXWingHTML = (manfredJsonContent: ManfredAwesomicCV, settings: Settings): string => { const htmlDocumentStart = generateHtmlDocumentStart(); const htmlDocumentEnd = generateHtmlDocumentEnd(); const headerElementStart = generateHeaderElementStart(); @@ -30,11 +30,12 @@ export const exportManfredJsonToCVXWingHTML = (manfredJsonContent: ManfredAwesom const softSkillsSection = generateSoftSkillsSection(manfredJsonContent); const experienceSection = generateExperienceSection(manfredJsonContent); const studiesSection = generateStudiesSection(manfredJsonContent); - const relevantLinksSection = generateRelevantLinksSection(manfredJsonContent); + const relevantLinksSection = generateRelevantLinksSection(manfredJsonContent, settings); return ` ${htmlDocumentStart} ${headerElementStart} ${headerSection} + ${relevantLinksSection} ${headerElementEnd} ${mainElementStart} ${aboutMeSection} diff --git a/packages/manfred2html/src/engine/index.ts b/packages/manfred2html/src/engine/index.ts index 1db8b55c..8e4d0965 100644 --- a/packages/manfred2html/src/engine/index.ts +++ b/packages/manfred2html/src/engine/index.ts @@ -16,7 +16,7 @@ export const exportHTMLTemplate = ( case 'Galactic CleanTech': return exportManfredJSonToCVGalacticCleanTechHTML(manfredJsonContent, settings); case 'X-Wing Squadron': - return exportManfredJsonToCVXWingHTML(manfredJsonContent); + return exportManfredJsonToCVXWingHTML(manfredJsonContent, settings); default: throw new Error('Template not found'); } From 567e8eaed33eefefb0c6e33cf10aaf2c25409cc7 Mon Sep 17 00:00:00 2001 From: MTeresaMB Date: Thu, 14 Dec 2023 21:29:31 +0100 Subject: [PATCH 4/5] delete language labels --- .../relevant-links-section/labels/index.ts | 15 --------------- .../relevants-links-english-labels.const.ts | 5 ----- .../labels/relevants-links-label.model.ts | 3 --- .../relevants-links-spanish-labels.const.ts | 5 ----- 4 files changed, 28 deletions(-) delete mode 100644 packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/index.ts delete mode 100644 packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-english-labels.const.ts delete mode 100644 packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-label.model.ts delete mode 100644 packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-spanish-labels.const.ts diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/index.ts deleted file mode 100644 index 41c9f130..00000000 --- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/index.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Language } from '@/model'; -import { RelevantsLinksLabels } from './relevants-links-label.model'; -import { spanishRelevantsLinksLabels } from './relevants-links-spanish-labels.const'; -import { englishRelevantsLinksLabels } from './relevants-links-english-labels.const'; - -export const getLabels = (language: Language): RelevantsLinksLabels => { - switch (language) { - case 'es': - return spanishRelevantsLinksLabels; - case 'en': - return englishRelevantsLinksLabels; - default: - throw new Error(`Language not supported: ${language}`); - } -}; diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-english-labels.const.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-english-labels.const.ts deleted file mode 100644 index 47316820..00000000 --- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-english-labels.const.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { RelevantsLinksLabels } from './relevants-links-label.model'; - -export const englishRelevantsLinksLabels: RelevantsLinksLabels = { - RELEVANTS_LINKS_HEADING: 'My Links', -}; diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-label.model.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-label.model.ts deleted file mode 100644 index 7569f913..00000000 --- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-label.model.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface RelevantsLinksLabels { - RELEVANTS_LINKS_HEADING: string; -} diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-spanish-labels.const.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-spanish-labels.const.ts deleted file mode 100644 index 7fd7feb8..00000000 --- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/labels/relevants-links-spanish-labels.const.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { RelevantsLinksLabels } from './relevants-links-label.model'; - -export const spanishRelevantsLinksLabels: RelevantsLinksLabels = { - RELEVANTS_LINKS_HEADING: 'Mis enlaces', -}; From 57f22a728a56ddd5cecf7efc0fcb9ea1bd46d284 Mon Sep 17 00:00:00 2001 From: MTeresaMB Date: Thu, 14 Dec 2023 21:36:38 +0100 Subject: [PATCH 5/5] changed index and relevant links part --- .../relevants-links-section.part.ts | 14 ++++---------- .../src/engine/cv-x-wing-squadron/index.ts | 6 +++--- packages/manfred2html/src/engine/index.ts | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevants-links-section.part.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevants-links-section.part.ts index 479f28f4..d62d80d0 100644 --- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevants-links-section.part.ts +++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevant-links-section/relevants-links-section.part.ts @@ -1,23 +1,17 @@ -import { ManfredAwesomicCV, Settings, Language } from '@/model'; +import { ManfredAwesomicCV } from '@/model'; import { ProfileSectionVm, mapFromMacCvToProfileSectionVm } from '@lemoncode/manfred-common/profile-section'; -import { ISO_SPANISH_LANGUAGE } from '@/engine/engine.const'; -import { getLabels } from './labels'; import ejs from 'ejs'; import relevantLinksTemplate from './relevant-links-section.ejs?raw'; -export const generateRelevantLinksSection = (cv: ManfredAwesomicCV, settings: Settings): string => { +export const generateRelevantLinksSection = (cv: ManfredAwesomicCV): string => { const profileSectionVm = mapFromMacCvToProfileSectionVm(cv); - return generateRelevantLinksSectionInner(profileSectionVm, settings.language); + return generateRelevantLinksSectionInner(profileSectionVm); }; -const generateRelevantLinksSectionInner = ( - profileSectionVm: ProfileSectionVm, - language: Language = ISO_SPANISH_LANGUAGE -): string => { +const generateRelevantLinksSectionInner = (profileSectionVm: ProfileSectionVm): string => { const rootObject = { profile: profileSectionVm, - labels: getLabels(language), }; return ejs.render(relevantLinksTemplate, rootObject); diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts index e3cbbd88..c0afb53d 100644 --- a/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts +++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts @@ -1,4 +1,4 @@ -import { ManfredAwesomicCV, Settings } from '@/model'; +import { ManfredAwesomicCV } from '@/model'; import { generateHtmlDocumentStart, generateHtmlDocumentEnd, @@ -16,7 +16,7 @@ import { generateRelevantLinksSection, } from './html-parts'; -export const exportManfredJsonToCVXWingHTML = (manfredJsonContent: ManfredAwesomicCV, settings: Settings): string => { +export const exportManfredJsonToCVXWingHTML = (manfredJsonContent: ManfredAwesomicCV): string => { const htmlDocumentStart = generateHtmlDocumentStart(); const htmlDocumentEnd = generateHtmlDocumentEnd(); const headerElementStart = generateHeaderElementStart(); @@ -30,7 +30,7 @@ export const exportManfredJsonToCVXWingHTML = (manfredJsonContent: ManfredAwesom const softSkillsSection = generateSoftSkillsSection(manfredJsonContent); const experienceSection = generateExperienceSection(manfredJsonContent); const studiesSection = generateStudiesSection(manfredJsonContent); - const relevantLinksSection = generateRelevantLinksSection(manfredJsonContent, settings); + const relevantLinksSection = generateRelevantLinksSection(manfredJsonContent); return ` ${htmlDocumentStart} ${headerElementStart} diff --git a/packages/manfred2html/src/engine/index.ts b/packages/manfred2html/src/engine/index.ts index 8e4d0965..1db8b55c 100644 --- a/packages/manfred2html/src/engine/index.ts +++ b/packages/manfred2html/src/engine/index.ts @@ -16,7 +16,7 @@ export const exportHTMLTemplate = ( case 'Galactic CleanTech': return exportManfredJSonToCVGalacticCleanTechHTML(manfredJsonContent, settings); case 'X-Wing Squadron': - return exportManfredJsonToCVXWingHTML(manfredJsonContent, settings); + return exportManfredJsonToCVXWingHTML(manfredJsonContent); default: throw new Error('Template not found'); }