{this.props.title}
-{this.props.nomEntreprise} - {this.props.lieuEntreprise} - ({this.props.date})
+{this.props.nomEntreprise} - {this.props.lieuEntreprise} - {this.props.date}
} } diff --git a/src/components/ExperienceCard/ExperienceCard.scss b/src/components/ExperienceCard/ExperienceCard.scss index 48eef73..47063b6 100644 --- a/src/components/ExperienceCard/ExperienceCard.scss +++ b/src/components/ExperienceCard/ExperienceCard.scss @@ -1,4 +1,4 @@ - -.component-experienceCard-component{ - +.comment{ + font-style: italic; + margin-top: -25px; } \ No newline at end of file diff --git a/src/components/MainCard/MainCard.js b/src/components/MainCard/MainCard.js index 42a575e..23bce91 100644 --- a/src/components/MainCard/MainCard.js +++ b/src/components/MainCard/MainCard.js @@ -1,22 +1,21 @@ import React, {Component} from '../../../node_modules/react'; +import { injectIntl } from 'react-intl' + import ExperienceCard from '../ExperienceCard/index'; import ButtonIcon from '../ButtonIcon/index'; import './MainCard.scss' import photoProfil from '../../images/profile_opt.png'; -import michelinLogo from '../../images/logos/michelin.png'; -import iutClermontLogo from '../../images/logos/www.iut-clermont.png'; -import harvestLogo from '../../images/logos/harvest.fr.png'; - // import { connect } from "react-redux"; // import { bindActionCreators } from "redux"; // import * as mainCardActions from "../../store/mainCard/actions"; -export default class MainCard extends Component { +class MainCard extends Component { // constructor(props) { // super(props); // this.state = {}; // } render() { + const experienceCardMessage = this.props.intl.messages.experienceCard; return
@@ -63,46 +62,45 @@ export default class MainCard extends Component {
- Experience
-
-
- Education
-
- ;
+ })}
+ Education
+ {experienceCardMessage.education.map(function(experience, index){
+ return ;
+ })}
+
+