Skip to content

Commit 110f24a

Browse files
committed
resolved and updated
1 parent 882e98f commit 110f24a

File tree

9 files changed

+9
-12
lines changed

9 files changed

+9
-12
lines changed

packages/manfred-common/src/doc-parts/experience-section/experience-section.mapper.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ describe('mapFromMacCvToExperienceSectionVm', () => {
7979
],
8080
},
8181
],
82-
URL: '',
8382
},
8483
],
8584
},
@@ -115,7 +114,6 @@ describe('mapFromMacCvToExperienceSectionVm', () => {
115114
],
116115
},
117116
],
118-
URL: '',
119117
},
120118
];
121119
expect(result).toEqual(expectResult);

packages/manfred-common/src/doc-parts/experience-section/experience-section.mapper.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ export const mapJobToExperience = (job: JobManfredAwesomicCV): ExperienceVm => (
1717
url: job.organization?.URL ?? '',
1818
type: mapOrganizationType(job.type, types),
1919
roles: job.roles?.map(role => role),
20-
URL: job.organization?.URL ?? '',
2120
});
2221

2322
export const mapOrganizationType = (type: string = '', types: Type[]): string => {

packages/manfred-common/src/doc-parts/experience-section/experience-section.vm.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ export interface ExperienceVm {
66
url?: string;
77
type?: string;
88
roles: Role[];
9-
URL: string;
109
}
1110

1211
export interface Type {

packages/manfred-common/src/doc-parts/studies-section/studies-section.mapper.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ describe('studies-section.mapper specs', () => {
137137
address: 'address',
138138
},
139139
},
140-
linkedCompetences: [{ name: 'Competence 1' }, { name: 'Competence 2' }],
140+
linkedCompetences: [],
141141
},
142142
{
143143
studyType: 'certification',
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
<%_ if (profile.avatar) { -%>
2-
<img src="<%= profile?.avatar%>" alt="photo cv"/>
1+
<%_ if (profile.avatarUrl) { -%>
2+
<img src="<%= profile?.avatarUrl%>" />
33
<%_ } -%>

packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/experience-section/experience-section.ejs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
</ul>
4141
<%_ } -%>
4242
</div>
43-
<%_ if(experience.URL) { -%>
44-
<a href="<%= experience.URL %>" target="_blank"><%= experience.name %></a>
43+
<%_ if(experience.url) { -%>
44+
<a href="<%= experience.url %>" target="_blank"><%= experience.name %></a>
4545
<%_ } -%>
4646
<%_ if (experience.roles[0].competences && experience.roles[0].competence !== 0) { -%>
4747
<h3 class="tech__tools__heading"><%= labels.TECH_TOOLS_HEADING %></h3>

packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/html-document-start/html-document-start.ejs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@
262262
justify-content: flex-end;
263263
align-items: flex-start;
264264
gap: var(--spacing_16);
265+
width: 100%;
265266
padding-bottom: var(--spacing_32);
266267
border-bottom: 1px solid rgba(94, 202, 191, 0.3);
267268
}

packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/studies-section/studies-section.ejs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<h3 class="tech__tools__heading"><%= labels.TECH_TOOLS_HEADING %></h3>
3939
<ul class="ul__technologies">
4040
<%_ for(const competence of study.linkedCompetences) { -%>
41-
<li class="li__technologies"><%= competence %></li>
41+
<li class="li__technologies"><%= competence.name %></li>
4242
<%_}-%>
4343
</ul>
4444
<%_}-%>

packages/manfred2html/src/engine/cv-x-wing-squadron/html-parts/userInfo-section/userInfo-section.ejs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<h2 class="surname"><%= profile?.surnames %></h2>
1010
<p class="job-title"><%= profile?.title %></p>
1111
</div>
12-
<%_ if (profile.regionLocation) { -%>
12+
<%_ if (profile.city || profile.country) { -%>
1313
<div class="header__content__address">
1414
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="24" viewBox="0 0 18 24" fill="none">
1515
<g clip-path="url(#clip0_1762_1661)">
@@ -24,7 +24,7 @@
2424
</clipPath>
2525
</defs>
2626
</svg>
27-
<p><%= profile?.regionLocation %>, <%= profile?.countryLocation %></p>
27+
<p><%= profile.city ?? '' %> <%= profile?.country ? ', ' + profile?.country : '' %></p>
2828
</div>
2929
<%_}-%>
3030
<%_}-%>

0 commit comments

Comments
 (0)