Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

new version #337

Merged
merged 84 commits into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
fe4424e
CV X Wing create html document start and end parts
MTeresaMB Nov 29, 2023
aadb5bf
delete prop color on html-document-start and index
MTeresaMB Nov 29, 2023
82d0b24
Merge pull request #289 from MTeresaMB/feature/#256-CV-X-Wing-Create-…
juanpms2 Nov 30, 2023
2cb3a32
cv-x-wing-squadron-create-header-section
MTeresaMB Dec 7, 2023
db01b83
cv-x-wing-create-about-me-section
MTeresaMB Dec 7, 2023
cc4f2b5
modified unit test profile-section-mapper.spec.ts
MTeresaMB Dec 8, 2023
0f5caa6
change profile section mapper spect
MTeresaMB Dec 8, 2023
ac468a9
changed test returns cv with proper data when fields from aboutMe
MTeresaMB Dec 8, 2023
92efb6f
cv-x-wing-squadron-create-languages-section
MTeresaMB Dec 8, 2023
9c1d548
add tag end section language-section.ejs
MTeresaMB Dec 8, 2023
a078cbd
cv-x-wing-squadron-create-hard-skills-section
MTeresaMB Dec 9, 2023
5752a23
add tag section
MTeresaMB Dec 9, 2023
d2f0955
changed mapper.spec.ts
MTeresaMB Dec 11, 2023
a85e316
changed mapper.spec.ts
MTeresaMB Dec 11, 2023
c66d0d6
changed mapper.spec.ts
MTeresaMB Dec 11, 2023
2a8a608
changed mapper.spec.ts
MTeresaMB Dec 11, 2023
1b6e3e5
feature/[manfred2HTML] CV-x-wing-squadron Create soft skills section …
MTeresaMB Dec 11, 2023
809e1f9
feature/ #264-CV-x-wing-squadron Create experience section
MTeresaMB Dec 12, 2023
b0e54d9
feature/#265-CV-X-Wing-Squadron-Create-studies-section
MTeresaMB Dec 14, 2023
bb5c695
delete relevants links
MTeresaMB Dec 14, 2023
2a6e041
changed avatar.link, location and relevant links
MTeresaMB Dec 14, 2023
ad43229
changed files
MTeresaMB Dec 14, 2023
f7e8dc5
Merge pull request #293 from MTeresaMB/feature/#259-CV-X-Wing-Squadro…
juanpms2 Dec 14, 2023
56c981a
add language labels
MTeresaMB Dec 14, 2023
f3aaa02
Merge branch 'epic/cv-x-wing-squadron' into feature/#260-CV-X-Wing-Sq…
MTeresaMB Dec 14, 2023
1926a5a
add labels file ejs, param settings file index.ts
MTeresaMB Dec 14, 2023
1ab06ab
add param settings index.ts
MTeresaMB Dec 14, 2023
071a19a
Merge pull request #294 from MTeresaMB/feature/#260-CV-X-Wing-Squadro…
juanpms2 Dec 14, 2023
d46d89c
add language labels
MTeresaMB Dec 14, 2023
c71af10
add language labels
MTeresaMB Dec 14, 2023
a40ee3c
add language labels
MTeresaMB Dec 14, 2023
5df0d73
add language labels
MTeresaMB Dec 14, 2023
cec3bab
add language labels
MTeresaMB Dec 14, 2023
50465b4
delete relevant links on header section
MTeresaMB Dec 14, 2023
28f409f
add labels ejs file
MTeresaMB Dec 15, 2023
919dc59
Merge branch 'epic/cv-x-wing-squadron' into feature/#261-CV-X-Wing-Sq…
MTeresaMB Dec 15, 2023
4789ec8
add labels language ejs
MTeresaMB Dec 15, 2023
a42c055
Merge pull request #295 from MTeresaMB/feature/#261-CV-X-Wing-Squadro…
juanpms2 Dec 15, 2023
73e8172
Merge branch 'epic/cv-x-wing-squadron' into feature/#262-CV-X-Wing-Sq…
MTeresaMB Dec 15, 2023
d3df6a9
Merge pull request #296 from MTeresaMB/feature/#262-CV-X-Wing-Squadro…
juanpms2 Dec 15, 2023
6852f33
Merge branch 'epic/cv-x-wing-squadron' into feature/#263-CV-X-Wing-Sq…
MTeresaMB Dec 15, 2023
25bdf42
Merge pull request #297 from MTeresaMB/feature/#263-CV-X-Wing-Squadro…
juanpms2 Dec 15, 2023
cabb943
Merge branch 'epic/cv-x-wing-squadron' into feature/#264-CV-X-Wing-Sq…
MTeresaMB Dec 15, 2023
3be916c
Merge pull request #298 from MTeresaMB/feature/#264-CV-X-Wing-Squadro…
juanpms2 Dec 15, 2023
61b78f8
Merge branch 'epic/cv-x-wing-squadron' into feature/#265-CV-X-Wing-Sq…
MTeresaMB Dec 15, 2023
a5a9af7
Merge pull request #304 from MTeresaMB/feature/#265-CV-X-Wing-Squadro…
juanpms2 Dec 15, 2023
4e5d002
add labels relevants links and studies section
MTeresaMB Dec 15, 2023
c22f229
fixed relevant links section ejs
MTeresaMB Dec 15, 2023
d8e6c70
Merge pull request #307 from MTeresaMB/feature/#269-CV-X-Wing-Squadro…
juanpms2 Dec 15, 2023
33dbbc3
add tag close ejs
MTeresaMB Dec 15, 2023
1969dc0
changed string from english to spanish
MTeresaMB Dec 15, 2023
0e41776
add tag closed section
MTeresaMB Dec 15, 2023
d758793
delete tag closed section
MTeresaMB Dec 15, 2023
e505756
disable select color template x-wing-squadron
MTeresaMB Dec 17, 2023
7f3ae6f
Merge pull request #309 from MTeresaMB/feature/#261-CV-X-Wing-Squadro…
juanpms2 Dec 18, 2023
a6b4403
Merge pull request #310 from MTeresaMB/feature/#265-CV-X-Wing-Squadro…
juanpms2 Dec 18, 2023
0ae6332
Merge pull request #311 from MTeresaMB/feature/#259-CV-X-Wing-Squadro…
juanpms2 Dec 18, 2023
111d785
Merge pull request #312 from MTeresaMB/feature/#269-CV-X-Wing-Squadro…
juanpms2 Dec 18, 2023
e1334ed
updated skills labels
juanpms2 Dec 18, 2023
2f61dfe
comment technology image
juanpms2 Dec 18, 2023
0ec9da2
changed name useState & add useEffect
MTeresaMB Dec 18, 2023
79138d3
changed useEffect
MTeresaMB Dec 18, 2023
8660a86
Merge pull request #314 from MTeresaMB/feature/#276-CV-X-Wing-squadro…
juanpms2 Dec 18, 2023
b8f604a
update header styles
MTeresaMB Dec 19, 2023
a127fee
delete files header section
MTeresaMB Dec 19, 2023
831adbd
Merge pull request #318 from MTeresaMB/feature/#317-Update-header-styles
juanpms2 Dec 19, 2023
c20e2ce
added leticia info to about us
juanpms2 Dec 20, 2023
2ec8f25
resolve responsive sizes
MTeresaMB Dec 20, 2023
d0e2bd7
resolve experience links and add labels
MTeresaMB Dec 20, 2023
57b120b
Merge pull request #331 from MTeresaMB/feature/#319-resolve-responsiv…
juanpms2 Dec 21, 2023
2aa10ce
updated styles
juanpms2 Dec 21, 2023
f92a718
Merge pull request #332 from MTeresaMB/feature/#320-resolve-experienc…
juanpms2 Dec 21, 2023
b46dc90
resolve user name cut
MTeresaMB Dec 21, 2023
5c4f669
Merge branch 'epic/cv-x-wing-squadron' into feature/#322-resolve-user…
MTeresaMB Dec 21, 2023
cfab4d6
Merge pull request #334 from MTeresaMB/feature/#322-resolve-user-name…
juanpms2 Dec 21, 2023
d8f1c91
Update html-document-start.ejs
juanpms2 Dec 21, 2023
5c2be83
Update soft-skills-section.part.ts
juanpms2 Dec 21, 2023
7987166
resolve avatar without image & changed userInfo & -html-document-star…
MTeresaMB Dec 22, 2023
9fbcb1e
update styles html-document-start & changed classname gradient__backg…
MTeresaMB Dec 22, 2023
9806933
Merge pull request #335 from MTeresaMB/feature/#321-resolve-avatar-wi…
juanpms2 Dec 22, 2023
882e98f
Merge branch 'feature/develop' into epic/cv-x-wing-squadron
juanpms2 Dec 22, 2023
110f24a
resolved and updated
juanpms2 Dec 22, 2023
f6173fd
updated model
juanpms2 Dec 22, 2023
8a295c1
Merge pull request #333 from Lemoncode/epic/cv-x-wing-squadron
brauliodiez Jan 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 24 additions & 16 deletions apps/react-app/src/pods/about-us/data-json.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@ interface User {

export const userList: User[] = [
{
avatar: './assets/teresa.jpg',
name: 'Teresa Milanés',
avatar: './assets/leticia-de-la-osa.jpg',
name: 'Leticia de la Osa',
job: 'Frontend Developer',
linkedin_url: 'https://www.linkedin.com/in/mteresamb/',
linkedin_url: 'https://www.linkedin.com/in/deletidev/',
description:
'Soy MªTeresa, desarrolladora de aplicaciones web enfocada en el Frontend y diseño UI- UX.Combino habilidades en diseño y comprensión de la experiencia de usuario para crear interfaces atractivas y funcionales',
'¡Hola! Soy Leti, desarrolladora Frontend. Disfruto cada desafío de dar vida a ideas creativas. Trabajo integrando estética, funcionalidad y accesibilidad con código limpio y reutilizable. Asegurando así una experiencia de usuario positiva.',
},
{
avatar: './assets/flavio.png',
name: 'Flavio Forte',
avatar: './assets/teresa.jpg',
name: 'Teresa Milanés',
job: 'Frontend Developer',
linkedin_url: 'https://www.linkedin.com/in/flavio-forte-/',
linkedin_url: 'https://www.linkedin.com/in/mteresamb/',
description:
'Soy un desarrollador Front End, hace dos años arranque mi carrera cursando un Bootcamp de fundamentos, y me especialice cursando el Máster Front End Lemoncode, en la actualidad me encuentro colaborando en proyectos tales como ManfredExport y complementado mis capacidades cursando el Bootcamp Backend Lemoncode.',
'Soy MªTeresa, desarrolladora de aplicaciones web enfocada en el Frontend y diseño UI- UX.Combino habilidades en diseño y comprensión de la experiencia de usuario para crear interfaces atractivas y funcionales',
},
{
avatar: './assets/juan-berrocal.png',
Expand All @@ -31,14 +31,6 @@ export const userList: User[] = [
description:
'Graduado en informática de sistemas, gestioné la empresa familiar, fui freelance y desde hace tiempo trabajo en logística para una multinacional de alimentación. Las nuevas tecnologías brindan hoy unas posibilidades impensables hace unos años y estoy reciclándome para incorporarme a este fascinante mundo.',
},
{
avatar: './assets/adolfo-zambrana.png',
name: 'Adolfo Zambrana',
job: 'Frontend Developer',
linkedin_url: 'https://www.linkedin.com/in/adolfo-zambrana-gilabert-a37776b5/',
description:
'Buenas, me llamo Adolfo Zambrana, soy programador FrontEnd, diseñador gráfico e Ilustrador, y durante estos últimos años he estado trabajando y formándome como programador Front-End especialista en experiencia de usuario.',
},
{
avatar: './assets/abel-de-tena-torres.jpg',
name: 'Abel de Tena',
Expand All @@ -55,4 +47,20 @@ export const userList: User[] = [
description:
'Graduado en Derecho y Ciencias Políticas. Con anterioridad a dedicarme al desarrollo web, ejercí en un despacho la abogacía penal. Cursé el Bootcamp de JavaScript de Lemoncode y su Máster de FrontEnd. Quedé entusiasmado con la combinación de análisis y creatividad, versatilidad y belleza de la programación. Actualmente estoy estudiando DAW y formándome ante cualquier oportunidad que encuentre en este apasionante sector.',
},
{
avatar: './assets/flavio.png',
name: 'Flavio Forte',
job: 'Frontend Developer',
linkedin_url: 'https://www.linkedin.com/in/flavio-forte-/',
description:
'Soy un desarrollador Front End, hace dos años arranque mi carrera cursando un Bootcamp de fundamentos, y me especialice cursando el Máster Front End Lemoncode, en la actualidad me encuentro colaborando en proyectos tales como ManfredExport y complementado mis capacidades cursando el Bootcamp Backend Lemoncode.',
},
{
avatar: './assets/adolfo-zambrana.png',
name: 'Adolfo Zambrana',
job: 'Frontend Developer',
linkedin_url: 'https://www.linkedin.com/in/adolfo-zambrana-gilabert-a37776b5/',
description:
'Buenas, me llamo Adolfo Zambrana, soy programador FrontEnd, diseñador gráfico e Ilustrador, y durante estos últimos años he estado trabajando y formándome como programador Front-End especialista en experiencia de usuario.',
},
];
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ interface Props {
}

const DOWNLOAD_MESSAGE_TIMEOUT = 2500;
const DESIGN_OPTIONS: TemplateCV[] = ['Sith Elegance', 'Galactic CleanTech', 'Monochrome Force'];
const DESIGN_OPTIONS: TemplateCV[] = ['Sith Elegance', 'Galactic CleanTech', 'X-Wing Squadron', 'Monochrome Force'];
const LANGUAGE_OPTIONS: Language[] = ['es', 'en'];

export const ExportConfig: React.FC<Props> = props => {
Expand All @@ -30,6 +30,7 @@ export const ExportConfig: React.FC<Props> = props => {
const [htmlPreview, setHtmlPreview] = React.useState<string>(
onHTMLSettingSelectionChanged(htmlTemplate, exportHTMLSettings)
);
const [hideColorSelected, setHideColorSelected] = React.useState<boolean>(false);

const handleColorChange = (event: React.ChangeEvent<HTMLInputElement>) => {
setExportHTMLSettings({ ...exportHTMLSettings, colorTheme: event.target.value as ColorTheme });
Expand Down Expand Up @@ -64,6 +65,7 @@ export const ExportConfig: React.FC<Props> = props => {
};

React.useEffect(() => {
setHideColorSelected(exportHTMLSettings.template === 'X-Wing Squadron');
setHtmlPreview(onHTMLSettingSelectionChanged(htmlTemplate, exportHTMLSettings));
}, [exportHTMLSettings]);

Expand All @@ -81,9 +83,11 @@ export const ExportConfig: React.FC<Props> = props => {
label={'Idioma cabeceras'}
/> */}
</div>
<div className={classes.selectColorContainer}>
<CustomSelectColor label={'Colores'} onChange={handleColorChange} />
</div>
{!hideColorSelected && (
<div className={classes.selectColorContainer}>
<CustomSelectColor label={'Colores'} onChange={handleColorChange} />
</div>
)}
</div>
<div className={classes.prevContainer}>
<p className={`${classes.title}`}>Previsualización</p>
Expand Down
40 changes: 28 additions & 12 deletions export-samples/html/cv-x-wing-squadron.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
h1 {
display: flex;
flex-direction: column;
width: min-content;
min-width: min-content;
text-transform: capitalize;
font-family: 'Source Serif Pro', sans-serif;
font-size: 75px;
Expand All @@ -86,6 +86,15 @@
-webkit-text-fill-color: transparent;
}

.gradient__background {
display: flex;
flex-grow: 1;
background: var(--manfred-gradient);
background-clip: text;
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
color: transparent;
}
@media (min-width: 728px) {
h1 {
font-size: 82px;
Expand Down Expand Up @@ -129,7 +138,7 @@
}

.technologie__icon--gray-scale {
width: 35px;
max-width: 35px;
filter: grayscale(100%);
}

Expand All @@ -145,9 +154,13 @@

header > img {
align-self: center;
width: 225px;
height: 225px;
border-radius: 225px;
min-width: 225px;
min-height: 225px;
max-width: 350px;
max-height: 350px;
object-fit: cover;
background: var(--manfred-gradient);
}

.header__content {
Expand All @@ -162,6 +175,10 @@
padding: var(--spacing_16) 0px;
}

.header__content__name > * {
padding-left: var(--spacing_8);
}

.job-title {
color: var(--manfred-dark);
font-family: 'Source Serif Pro', sans-serif;
Expand All @@ -175,6 +192,7 @@
display: flex;
align-items: center;
gap: var(--spacing_8);
padding-left: var(--spacing_8);
}

.header__content__address > p {
Expand All @@ -187,9 +205,10 @@
display: flex;
align-items: center;
gap: var(--spacing_32);
padding-left: var(--spacing_8);
}

@media (min-width: 1024px) {
@media (min-width: 728px) {
.header__content__address > p {
font-size: 16px;
}
Expand All @@ -201,12 +220,7 @@
justify-content: flex-start;
align-items: center;
flex-direction: row;
gap: var(--spacing_64);
}

header > img {
width: 350px;
height: 350px;
gap: var(--spacing_48);
}

.header__content {
Expand Down Expand Up @@ -387,7 +401,9 @@
<svg xmlns="http://www.w3.org/2000/svg" width="64" height="10" viewBox="0 0 64 10" fill="none">
<path d="M1.10269e-06 5L64 5" stroke="#3BA0B7" stroke-width="9" />
</svg>
<h1>david</h1>
<div class="gradient__background">
<h1>david</h1>
</div>
<h2 class="surname">bonilla fuertes</h2>
<p class="job-title">Fundador en Manfred / C-Level Executive</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,4 +335,5 @@ describe('Testing profile-section.mapper.ts', () => {
});
});
});

export {};
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ describe('studies-section.helpers specs', () => {
description: 'description2',
institution: {
name: 'name2',
description: 'description2',
location: {
country: 'Italia',
region: 'region2',
Expand All @@ -31,6 +32,7 @@ describe('studies-section.helpers specs', () => {
description: 'description2',
institution: {
name: 'name2',
description: 'description2',
location: {
country: 'Italia',
region: 'region2',
Expand All @@ -47,6 +49,7 @@ describe('studies-section.helpers specs', () => {
description: 'description',
institution: {
name: 'name',
description: 'description',
location: {
country: 'España',
region: 'region',
Expand All @@ -69,6 +72,7 @@ describe('studies-section.helpers specs', () => {
description: 'description',
institution: {
name: 'name',
description: 'description',
location: {
country: 'España',
region: 'region',
Expand All @@ -85,6 +89,7 @@ describe('studies-section.helpers specs', () => {
description: 'description2',
institution: {
name: 'name2',
description: 'description2',
location: {
country: 'Italia',
region: 'region2',
Expand All @@ -101,6 +106,7 @@ describe('studies-section.helpers specs', () => {
description: 'description2',
institution: {
name: 'name2',
description: 'description2',
location: {
country: 'Italia',
region: 'region2',
Expand All @@ -123,6 +129,7 @@ describe('studies-section.helpers specs', () => {
description: 'description',
institution: {
name: 'name',
description: 'description',
location: {
country: 'España',
region: 'region',
Expand All @@ -139,6 +146,7 @@ describe('studies-section.helpers specs', () => {
description: 'description2',
institution: {
name: 'name2',
description: 'description2',
location: {
country: 'Italia',
region: 'region2',
Expand All @@ -161,6 +169,7 @@ describe('studies-section.helpers specs', () => {
description: 'description',
institution: {
name: 'name',
description: 'description',
location: {
country: 'España',
region: 'region',
Expand All @@ -177,6 +186,7 @@ describe('studies-section.helpers specs', () => {
description: 'description2',
institution: {
name: 'name2',
description: 'description2',
location: {
country: 'Italia',
region: 'region2',
Expand All @@ -201,6 +211,7 @@ describe('studies-section.helpers specs', () => {
description: 'description2',
institution: {
name: 'name2',
description: 'description2',
location: {
country: 'Italia',
region: 'region2',
Expand All @@ -223,6 +234,7 @@ describe('studies-section.helpers specs', () => {
description: 'description2',
institution: {
name: 'name2',
description: 'description2',
location: {
country: 'Italia',
region: 'region2',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ describe('studies-section.mapper specs', () => {
description: 'description',
institution: {
name: 'name',
description: 'description',
location: {
country: 'España',
region: 'region',
Expand Down Expand Up @@ -136,6 +137,7 @@ describe('studies-section.mapper specs', () => {
address: 'address',
},
},
linkedCompetences: [],
},
{
studyType: 'certification',
Expand Down Expand Up @@ -173,6 +175,7 @@ describe('studies-section.mapper specs', () => {
description: 'description',
institution: {
name: 'name',
description: 'description',
location: {
country: 'España',
region: 'region',
Expand All @@ -190,6 +193,7 @@ describe('studies-section.mapper specs', () => {
description: 'description2',
institution: {
name: 'name2',
description: 'description2',
location: {
country: 'Italia',
region: 'region2',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ManfredAwesomicCV } from '@/model';
import { Competence, ManfredAwesomicCV } from '@/model';
import { CountryType, Institution, StudiesSectionVm, StudyTypeWithTranslation } from './studies-section.vm';
import { studiesTypes, countryList } from './studies-section.constants';
import { sortedStudiesByStartDate } from './studies-section.helpers';
Expand All @@ -16,13 +16,13 @@ export const mapFromMacCvToStudiesSectionVm = (cv: ManfredAwesomicCV): StudiesSe
const description = study?.description ?? '';
let institution: Institution = {
name: study?.institution?.name ?? '',
description: study?.institution?.description ?? '',
location: {
country: study?.institution?.location?.country ?? '',
region: study?.institution?.location?.region ?? '',
address: study?.institution?.location?.address ?? '',
},
};

const mapStudyType = mapStudiesTypes(studyType, studiesTypes);
const mapCountry = mapCountries(institution.location.country, countryList);
institution = { ...institution, location: { ...institution.location, country: mapCountry } };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export interface StudiesSectionVm {
export interface Institution {
name: string;
location: Location;
description: string;
}

export interface Location {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<%_ if (profile && profile !== 'undefined' ) { -%>
<section class="main__section about-me__section">
<div class="main__section__header">
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="6" viewBox="0 0 32 6" fill="none">
<path d="M5.51343e-07 3L32 3" stroke="#3BA0B7" stroke-width="6" />
</svg>
<h2><%- labels.ABOUT_ME_HEADING %></h2>
</div>
<p><%= profile?.description %></p>
</section>
<%_ } -%>
Loading
Loading