diff --git a/public/images/logos/soprasteria.co.uk.webp b/public/images/logos/soprasteria.co.uk.webp new file mode 100644 index 0000000..e5fd6a7 Binary files /dev/null and b/public/images/logos/soprasteria.co.uk.webp differ diff --git a/src/App.test.js b/src/App.test.js index c0c0c76..ec6a0f9 100644 --- a/src/App.test.js +++ b/src/App.test.js @@ -1,8 +1,18 @@ -import { render, screen } from '@testing-library/react'; -import App from './App'; +import React from 'react'; +import { IntlProvider } from 'react-intl'; -test('renders Anthony Yvon Dumas', () => { - render(); - const linkElement = screen.getByText(/Anthony Yvon Dumas/i); - expect(linkElement).toBeInTheDocument(); +import { render, screen } from '@testing-library/react'; + +import MenuComponent from './App'; +import { getTexts } from './services/message.service'; + + +test('renders Anthony Yvon Dumas', async () => { + render( + + ); + expect(await screen.findByText("Anthony Yvon Dumas")).toBeInTheDocument(); }); + diff --git a/src/components/ButtonIcon/ButtonIcon.js b/src/components/ButtonIcon/ButtonIcon.js index 7b550e1..2236fc6 100644 --- a/src/components/ButtonIcon/ButtonIcon.js +++ b/src/components/ButtonIcon/ButtonIcon.js @@ -11,7 +11,7 @@ export default class ButtonIcon extends Component { render() { return diff --git a/src/components/ContactButton/ContactButton.js b/src/components/ContactButton/ContactButton.js index 1bfabf9..3130065 100644 --- a/src/components/ContactButton/ContactButton.js +++ b/src/components/ContactButton/ContactButton.js @@ -13,10 +13,10 @@ export default class ContactButton extends Component { // } render() { const data = this.props.data; - return
- + - + {data.title} diff --git a/src/components/ContactCard/ContactCard.js b/src/components/ContactCard/ContactCard.js index 993bb02..48d621f 100644 --- a/src/components/ContactCard/ContactCard.js +++ b/src/components/ContactCard/ContactCard.js @@ -1,39 +1,40 @@ -import React, {Component} from 'react'; +import './ContactCard.scss'; + +import React, { Component } from 'react'; import { injectIntl } from 'react-intl'; -import './ContactCard.scss' - import ContactButton from '../ContactButton/index'; + // import { connect } from "react-redux"; // import { bindActionCreators } from "redux"; // import * as contactCardActions from "../../store/contactCard/actions"; class ContactCard extends Component { - // constructor(props) { - // super(props); - // this.state = {}; - // } - render() { - const contactCardMessage = this.props.intl.messages.contactCard; - return
-
-
-

- {contactCardMessage.title} -

-

- {contactCardMessage.subtitle} -

-
- {contactCardMessage.ways.map(function(button, index){ - return ; - })} -
+ // constructor(props) { + // super(props); + // this.state = {}; + // } + render() { + const contactCardMessage = this.props.intl.messages.contactCard; + return
+
+
+

+ {contactCardMessage.title} +

+

+ {contactCardMessage.subtitle} +

+
+ {contactCardMessage.ways.map(function (button, index) { + return ; + })}
+
-
; - } +
; } +} - export default injectIntl(ContactCard) \ No newline at end of file +export default injectIntl(ContactCard) \ No newline at end of file diff --git a/src/components/ExperienceCard/ExperienceCard.js b/src/components/ExperienceCard/ExperienceCard.js index e7737d6..6f2dd6f 100644 --- a/src/components/ExperienceCard/ExperienceCard.js +++ b/src/components/ExperienceCard/ExperienceCard.js @@ -1,5 +1,7 @@ +import './ExperienceCard.scss'; + import React, { Component } from 'react'; -import './ExperienceCard.scss' + // import { connect } from "react-redux"; // import { bindActionCreators } from "redux"; @@ -13,29 +15,29 @@ export default class ExperienceCard extends Component { render() { var data = this.props.data; var imgSrc = data.logo; - return
-
-
+ return
+
+ -
-

{data.occupation}

-

{data.entreprise} - {data.location} - {data.duration}

-
+
+

{data.occupation}

+

{data.entreprise} - {data.location} - {data.duration}

+
{data.tags.map(function (name, index) { - return {name}; + return {name}; })}
-
+
{data.description}
- {data.commentaire ?
+ {data.commentaire ?
{data.commentaire}
: ''} diff --git a/src/components/FooterCard/FooterCard.js b/src/components/FooterCard/FooterCard.js index a5603a0..4970305 100644 --- a/src/components/FooterCard/FooterCard.js +++ b/src/components/FooterCard/FooterCard.js @@ -1,8 +1,8 @@ import './FooterCard.scss'; +import React, { Component } from 'react'; import { injectIntl } from 'react-intl'; -import React, { Component } from 'react'; import bulmaLogo from '../../images/made-with-bulma.webp'; @@ -16,17 +16,17 @@ class FooterCard extends Component { // } render() { const footerMessage = this.props.intl.messages.footer; - return