diff --git a/generate-react-cli.json b/generate-react-cli.json new file mode 100644 index 0000000..83d5aa9 --- /dev/null +++ b/generate-react-cli.json @@ -0,0 +1,14 @@ +{ + "usesTypeScript": false, + "usesStyledComponents": true, + "testLibrary": "None", + "component": { + "default": { + "path": "src/components", + "withStyle": true, + "withTest": false, + "withStory": false, + "withLazy": false + } + } +} \ No newline at end of file diff --git a/public/images/logos/ingroupe.webp b/public/images/logos/ingroupe.webp new file mode 100644 index 0000000..8ebd366 Binary files /dev/null and b/public/images/logos/ingroupe.webp differ diff --git a/src/components/ExperienceCard/ExperienceCard.js b/src/components/ExperienceCard/ExperienceCard.js index fb94a3d..85777cb 100644 --- a/src/components/ExperienceCard/ExperienceCard.js +++ b/src/components/ExperienceCard/ExperienceCard.js @@ -2,10 +2,8 @@ import './ExperienceCard.scss'; import React, { Component } from 'react'; +import ExperienceSlimSpanWrapper from '../ExperienceSlimSpan/ExperienceSlimSpan'; -// import { connect } from "react-redux"; -// import { bindActionCreators } from "redux"; -// import * as MenuComponentActions from "../../store/MenuComponent/actions"; export default class ExperienceCard extends Component { // constructor(props) { @@ -35,6 +33,13 @@ export default class ExperienceCard extends Component {
+ {data.missions ? + data.missions.map(function (mission, index) { + return ; + }) : '' + + } {data.commentaire ?
{data.commentaire}
: ''} @@ -43,8 +48,4 @@ export default class ExperienceCard extends Component {
} -} -// export default connect( -// ({ MenuComponent }) => ({ ...MenuComponent }), -// dispatch => bindActionCreators({ ...MenuComponentActions }, dispatch) -// )( MenuComponent ); +} \ No newline at end of file diff --git a/src/components/ExperienceCard/ExperienceCard.scss b/src/components/ExperienceCard/ExperienceCard.scss index 6a23594..b66d3fa 100644 --- a/src/components/ExperienceCard/ExperienceCard.scss +++ b/src/components/ExperienceCard/ExperienceCard.scss @@ -13,3 +13,12 @@ .card-content { margin-top: 1rem; } + +.mission.card-content { + margin-top: 0; +} + +.mission .media { + border-top-style: none; + align-items: self-end; +} diff --git a/src/components/ExperienceSlimSpan/ExperienceSlimSpan.js b/src/components/ExperienceSlimSpan/ExperienceSlimSpan.js new file mode 100644 index 0000000..4284ab9 --- /dev/null +++ b/src/components/ExperienceSlimSpan/ExperienceSlimSpan.js @@ -0,0 +1,23 @@ +import React, { Component } from 'react'; + + +export default class ExperienceSlimSpan extends Component { + render() { + var data = this.props.data; + var imgSrc = data.logo; + return
+
+
+ +
+ Logo Entreprise +
+
+
+
+

{data.occupation} @ {data.entreprise} - {data.duration}

+
+
+
+ } +}; diff --git a/src/messages/fr.json b/src/messages/fr.json index 48155bc..4537e8f 100644 --- a/src/messages/fr.json +++ b/src/messages/fr.json @@ -14,8 +14,31 @@ "duration": "depuis Juin 2023", "entreprise": "Sopra Steria", "location": "Clermont-Ferrand", - "description": "Fullstack Developer @ Michelin [depuis 02/24]
Maintenance Applicative pour Imprimerie Nationale [06/23 - 02/24]", - "tags": ["Java", "Angular", "Spring", "DevOps", "Linux", "Azure", "Scrum"] + "tags": [ + "Java", + "Angular", + "Spring", + "DevOps", + "Linux", + "Azure", + "Scrum" + ], + "missions": [ + { + "entreprise": "Michelin", + "logo": "../../images/logos/michelin.webp", + "url": "https://www.michelin.fr", + "occupation": "Fullstack Developer", + "duration": "depuis 02/24" + }, + { + "entreprise": "IN Groupe", + "logo": "../../images/logos/ingroupe.webp", + "url": "https://ingroupe.com/fr/", + "occupation": "Maintenance Applicative", + "duration": "06/23 - 02/24" + } + ] }, { "occupation": "Coordinateur événementiel",