diff --git a/index.html b/index.html index 0b373a51c..6ecd3a7f2 100644 --- a/index.html +++ b/index.html @@ -46,6 +46,7 @@ content="<%= htmlWebpackPlugin.options.description %>" data-react-helmet="true" /> + - + + (
- - - - - image/svg+xml - - mon-entreprise_logo - - - - - - - - mon-entreprise_logo - - mycompanyinfrance diff --git a/source/sites/mon-entreprise.fr/images/socialMedia.png b/source/sites/mon-entreprise.fr/images/socialMedia.png deleted file mode 100644 index dd140eb8c..000000000 Binary files a/source/sites/mon-entreprise.fr/images/socialMedia.png and /dev/null differ diff --git a/source/sites/mon-entreprise.fr/layout/Footer/Contact.js b/source/sites/mon-entreprise.fr/layout/Footer/Contact.js index 3cbda129f..9a95ba259 100644 --- a/source/sites/mon-entreprise.fr/layout/Footer/Contact.js +++ b/source/sites/mon-entreprise.fr/layout/Footer/Contact.js @@ -1,5 +1,5 @@ +import ContactImage from 'Images/contact.png' import React from 'react' -import ContactImage from '../images/contact.png' const Contact = () => (

diff --git a/source/sites/mon-entreprise.fr/layout/Footer/Integration.js b/source/sites/mon-entreprise.fr/layout/Footer/Integration.js index b32e2ddf9..b607d8c5a 100644 --- a/source/sites/mon-entreprise.fr/layout/Footer/Integration.js +++ b/source/sites/mon-entreprise.fr/layout/Footer/Integration.js @@ -3,6 +3,10 @@ import { ScrollToTop } from 'Components/utils/Scroll' import urssafLogo from 'Images/urssaf.svg' import React, { useState } from 'react' import { Link } from 'react-router-dom' +import apecLogo from './images/apec.png' +import cciLogo from './images/cci.png' +import minTraLogo from './images/min-tra.jpg' +import poleEmploiLogo from './images/pole-emploi.png' import './Integration.css' export default function Integration() { @@ -63,34 +67,28 @@ export default function Integration() {

diff --git a/source/sites/mon-entreprise.fr/layout/Header/Header.js b/source/sites/mon-entreprise.fr/layout/Header/Header.js index 6363023ee..4bfd26461 100644 --- a/source/sites/mon-entreprise.fr/layout/Header/Header.js +++ b/source/sites/mon-entreprise.fr/layout/Header/Header.js @@ -3,15 +3,15 @@ import { React, T } from 'Components' import withSitePaths from 'Components/utils/withSitePaths' import withTracker from 'Components/utils/withTracker' +import companySvg from 'Images/company.svg' +import estimateSvg from 'Images/estimate.svg' +import hiringSvg from 'Images/hiring.svg' import { compose } from 'ramda' import { withTranslation } from 'react-i18next' import { connect } from 'react-redux' import { withRouter } from 'react-router' import { NavLink } from 'react-router-dom' import { régimeSelector } from 'Selectors/companyStatusSelectors' -import companySvg from '../../images/company.svg' -import estimateSvg from '../../images/estimate.svg' -import hiringSvg from '../../images/hiring.svg' import './Header.css' import type { Tracker } from 'Components/utils/withTracker' diff --git a/source/sites/mon-entreprise.fr/layout/Navigation/Navigation.js b/source/sites/mon-entreprise.fr/layout/Navigation/Navigation.js index 89f0d4954..0ae8ed68c 100644 --- a/source/sites/mon-entreprise.fr/layout/Navigation/Navigation.js +++ b/source/sites/mon-entreprise.fr/layout/Navigation/Navigation.js @@ -1,14 +1,14 @@ /* @flow */ import { React, T } from 'Components' import withSitePaths from 'Components/utils/withSitePaths' +import companySvg from 'Images/company.svg' +import estimateSvg from 'Images/estimate.svg' +import hiringSvg from 'Images/hiring.svg' import { compose } from 'ramda' import { withTranslation } from 'react-i18next' import { connect } from 'react-redux' import { withRouter } from 'react-router' import { NavLink } from 'react-router-dom' -import companySvg from '../../images/company.svg' -import estimateSvg from '../../images/estimate.svg' -import hiringSvg from '../../images/hiring.svg' import './Navigation.css' import NavOpener from './NavOpener' import SideBar from './SideBar' diff --git a/source/sites/mon-entreprise.fr/layout/Navigation/SideBar.js b/source/sites/mon-entreprise.fr/layout/Navigation/SideBar.js index 127246da2..9bbb7f1af 100644 --- a/source/sites/mon-entreprise.fr/layout/Navigation/SideBar.js +++ b/source/sites/mon-entreprise.fr/layout/Navigation/SideBar.js @@ -2,11 +2,11 @@ import classnames from 'classnames' import withTracker from 'Components/utils/withTracker' -import backSvg from 'Images/back.svg' -import mobileMenuSvg from 'Images/mobile-menu.svg' import { compose } from 'ramda' import React from 'react' import { withRouter } from 'react-router' +import backSvg from './back.svg' +import mobileMenuSvg from './mobile-menu.svg' import './SideBar.css' import type { Tracker } from 'Components/utils/withTracker' import type { Location } from 'react-router-dom' diff --git a/source/images/back.svg b/source/sites/mon-entreprise.fr/layout/Navigation/back.svg similarity index 100% rename from source/images/back.svg rename to source/sites/mon-entreprise.fr/layout/Navigation/back.svg diff --git a/source/images/mobile-menu.svg b/source/sites/mon-entreprise.fr/layout/Navigation/mobile-menu.svg similarity index 100% rename from source/images/mobile-menu.svg rename to source/sites/mon-entreprise.fr/layout/Navigation/mobile-menu.svg diff --git a/source/webpack.common.js b/source/webpack.common.js index 3d51d2001..b5faa945c 100644 --- a/source/webpack.common.js +++ b/source/webpack.common.js @@ -41,7 +41,8 @@ module.exports = { 'My company in France: A step-by-step guide to start a business in France', description: 'Find the type of company that suits you and follow the steps to register your company. Discover the French social security system by simulating your hiring costs. Discover the procedures to hire in France and learn the basics of French labour law.', - filename: 'infrance.html' + filename: 'infrance.html', + logo: 'https://mon-entreprise.fr/images/logo-mycompany.png' }), new HTMLPlugin({ template: 'index.html', @@ -51,7 +52,8 @@ module.exports = { "Mon-entreprise.fr : L'assistant officiel du créateur d'entreprise", description: 'Du statut juridique à la première embauche, en passant par la simulation des cotisations, vous trouverez ici toutes les ressources pour démarrer votre activité.', - filename: 'mon-entreprise.html' + filename: 'mon-entreprise.html', + logo: 'https://mon-entreprise.fr/images/logo.png' }), new CopyPlugin([ @@ -69,8 +71,8 @@ module.exports = { to: 'sitemap.infrance.en.txt' }, { - from: './source/sites/mon-entreprise.fr/images', - to: 'static-images' + from: './source/images', + to: 'images' }, { from: './source/sites/mon-entreprise.fr/favicon',