From 4e5d002d0431c8e8f933e3c67a4533ef9807325d Mon Sep 17 00:00:00 2001
From: MTeresaMB
Date: Fri, 15 Dec 2023 11:15:23 +0100
Subject: [PATCH 1/2] add labels relevants links and studies section
---
.../cv-x-wing-squadron/html-parts/index.ts | 1 +
.../relevants-links-section/index.ts | 1 +
.../relevants-links-section.ejs | 80 +++++++++++++++++++
.../relevants-links-section.part.ts | 15 ++++
.../labels/studies-english-labels.const.ts | 2 +
.../labels/studies-label.model.ts | 2 +
.../labels/studies-spanish-labels.const.ts | 2 +
.../studies-section/studies-section.ejs | 4 +-
.../src/engine/cv-x-wing-squadron/index.ts | 3 +
9 files changed, 108 insertions(+), 2 deletions(-)
create mode 100644 packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevants-links-section/index.ts
create mode 100644 packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevants-links-section/relevants-links-section.ejs
create mode 100644 packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevants-links-section/relevants-links-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 8d50eaff..212f493b 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
@@ -11,3 +11,4 @@ export * from './hard-skills-section';
export * from './soft-skills-section';
export * from './experience-section';
export * from './studies-section';
+export * from './relevants-links-section';
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevants-links-section/index.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevants-links-section/index.ts
new file mode 100644
index 00000000..12fe55f6
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevants-links-section/index.ts
@@ -0,0 +1 @@
+export * from './relevants-links-section.part';
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevants-links-section/relevants-links-section.ejs b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevants-links-section/relevants-links-section.ejs
new file mode 100644
index 00000000..95dbf285
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevants-links-section/relevants-links-section.ejs
@@ -0,0 +1,80 @@
+<%_ if (profile.relevantLinks && profile.relevantLinks.length !== 0) { -%>
+
\ No newline at end of file
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevants-links-section/relevants-links-section.part.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevants-links-section/relevants-links-section.part.ts
new file mode 100644
index 00000000..3fdcc438
--- /dev/null
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevants-links-section/relevants-links-section.part.ts
@@ -0,0 +1,15 @@
+import { ManfredAwesomicCV } from '@/model';
+import { ProfileSectionVm, mapFromMacCvToProfileSectionVm } from '@lemoncode/manfred-common/profile-section';
+import ejs from 'ejs';
+import relevantLinksTemplate from './relevant-links-section.ejs?raw';
+
+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(relevantLinksTemplate, rootObject);
+};
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-english-labels.const.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-english-labels.const.ts
index e57fc9f9..b6c79a75 100644
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-english-labels.const.ts
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-english-labels.const.ts
@@ -2,4 +2,6 @@ import { StudiesLabels } from './studies-label.model';
export const englishStudiesLabels: StudiesLabels = {
STUDIES_HEADING: 'Studies',
+ TECH_TOOLS_HEADING: 'Technologies and Tools',
+ CURRENT_DATE: 'Now',
};
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-label.model.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-label.model.ts
index 27d0cf19..2337736a 100644
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-label.model.ts
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-label.model.ts
@@ -1,3 +1,5 @@
export interface StudiesLabels {
STUDIES_HEADING: string;
+ TECH_TOOLS_HEADING: string;
+ CURRENT_DATE: string;
}
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-spanish-labels.const.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-spanish-labels.const.ts
index 0c35087e..328dfbb9 100644
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-spanish-labels.const.ts
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/labels/studies-spanish-labels.const.ts
@@ -2,4 +2,6 @@ import { StudiesLabels } from './studies-label.model';
export const spanishStudiesLabels: StudiesLabels = {
STUDIES_HEADING: 'Estudios',
+ TECH_TOOLS_HEADING: 'Tecnologias y Herramientas',
+ CURRENT_DATE: 'Actualidad',
};
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
index fa3f5091..12eb6b83 100644
--- 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
@@ -27,7 +27,7 @@
<%- 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
+ - <%= labels.CURRENT_DATE %>
<%_}-%>
@@ -35,7 +35,7 @@
<%= study.institution.description %>
<%_ if(study.linkedCompetences && study.linkedCompetences.length !== 0) { -%>
-
+
<%_ for(const competence of study.linkedCompetences) { -%>
- <%= competence %>
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 4b30dc9c..a8776a0c 100644
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/index.ts
@@ -13,6 +13,7 @@ import {
generateSoftSkillsSection,
generateExperienceSection,
generateStudiesSection,
+ generateRelevantLinksSection,
} from './html-parts';
export const exportManfredJsonToCVXWingHTML = (manfredJsonContent: ManfredAwesomicCV, settings: Settings): string => {
@@ -29,10 +30,12 @@ export const exportManfredJsonToCVXWingHTML = (manfredJsonContent: ManfredAwesom
const softSkillsSection = generateSoftSkillsSection(manfredJsonContent, settings);
const hardSkillsSection = generateHardSkillsSection(manfredJsonContent, settings);
const languageSection = generateLanguageSection(manfredJsonContent, settings);
+ const relevantLinksSection = generateRelevantLinksSection(manfredJsonContent);
return `
${htmlDocumentStart}
${headerElementStart}
${headerSection}
+ ${relevantLinksSection}
${headerElementEnd}
${mainElementStart}
${aboutMeSection}
From c22f229c3a59d0779a8bb24ea1f86d1f651e27c2 Mon Sep 17 00:00:00 2001
From: MTeresaMB
Date: Fri, 15 Dec 2023 11:21:48 +0100
Subject: [PATCH 2/2] fixed relevant links section ejs
---
.../relevants-links-section/relevants-links-section.part.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevants-links-section/relevants-links-section.part.ts b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevants-links-section/relevants-links-section.part.ts
index 3fdcc438..f217e2d0 100644
--- a/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevants-links-section/relevants-links-section.part.ts
+++ b/packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/relevants-links-section/relevants-links-section.part.ts
@@ -1,7 +1,7 @@
import { ManfredAwesomicCV } from '@/model';
import { ProfileSectionVm, mapFromMacCvToProfileSectionVm } from '@lemoncode/manfred-common/profile-section';
import ejs from 'ejs';
-import relevantLinksTemplate from './relevant-links-section.ejs?raw';
+import relevantLinksTemplate from './relevants-links-section.ejs?raw';
export const generateRelevantLinksSection = (cv: ManfredAwesomicCV): string => {
const profileSectionVm = mapFromMacCvToProfileSectionVm(cv);