diff --git a/source/components/AnimatedTargetValue.js b/source/components/AnimatedTargetValue.js index ded3ae151..544d805a4 100644 --- a/source/components/AnimatedTargetValue.js +++ b/source/components/AnimatedTargetValue.js @@ -1,5 +1,5 @@ import React, { Component } from 'react' -import withLanguage from './withLanguage' +import withLanguage from 'Components/utils/withLanguage' import './AnimatedTargetValue.css' import ReactCSSTransitionGroup from 'react-addons-css-transition-group' diff --git a/source/components/pages/Home.css b/source/components/pages/Home.css deleted file mode 100644 index f98ed9ff6..000000000 --- a/source/components/pages/Home.css +++ /dev/null @@ -1,15 +0,0 @@ -#logos { - display: flex; - justify-content: center; - align-items: center; -} -#logos a { - margin: 0 0.6em; - display: inline-block; -} -#logos #marianne img { - width: calc(1vw + 4em); -} -#logos #urssaf img { - width: calc(1vw + 6em); -} diff --git a/source/components/pages/Home.js b/source/components/pages/Home.js deleted file mode 100644 index dced4d8fa..000000000 --- a/source/components/pages/Home.js +++ /dev/null @@ -1,33 +0,0 @@ -import React from 'react' -import './Pages.css' -import './Home.css' -import Simu from '../Simu' -import PreviousSimulationBanner from '../PreviousSimulationBanner' - -const Home = () => ( -
- - - -
-) - -export default Home diff --git a/source/sites/mycompanyinfrance.fr/marianne.svg b/source/images/marianne.svg similarity index 99% rename from source/sites/mycompanyinfrance.fr/marianne.svg rename to source/images/marianne.svg index 1c5351718..be9dc53c3 100644 --- a/source/sites/mycompanyinfrance.fr/marianne.svg +++ b/source/images/marianne.svg @@ -1,7 +1,6 @@ - - + diff --git a/source/sites/embauche.gouv.fr/pages/Home.css b/source/sites/embauche.gouv.fr/pages/Home.css index fef4b2e1b..41fddd621 100644 --- a/source/sites/embauche.gouv.fr/pages/Home.css +++ b/source/sites/embauche.gouv.fr/pages/Home.css @@ -11,6 +11,9 @@ margin: 0 0.6em; display: inline-block; } +#logos a::after { + display: none; +} #logos #marianne img { width: calc(1vw + 4em); } diff --git a/source/sites/mycompanyinfrance.fr/Landing.js b/source/sites/mycompanyinfrance.fr/Landing.js index 8b2343ccd..10f4c0ea4 100644 --- a/source/sites/mycompanyinfrance.fr/Landing.js +++ b/source/sites/mycompanyinfrance.fr/Landing.js @@ -7,8 +7,8 @@ import { Link } from 'react-router-dom' import { config } from 'react-spring' import * as Animate from 'Ui/animate' import './Landing.css' -import marianneSvg from './marianne.svg' -import urssafSvg from './urssaf.svg' +import marianneSvg from 'Images/marianne.svg' +import urssafSvg from 'Images/urssaf.svg' const Landing = ({ colours: { colour } }) => ( <> diff --git a/source/sites/mycompanyinfrance.fr/urssaf.svg b/source/sites/mycompanyinfrance.fr/urssaf.svg deleted file mode 100644 index 36882ca4a..000000000 --- a/source/sites/mycompanyinfrance.fr/urssaf.svg +++ /dev/null @@ -1,2 +0,0 @@ - -image/svg+xml \ No newline at end of file diff --git a/source/webpack.common.js b/source/webpack.common.js index b9e7ce48b..269323f8f 100644 --- a/source/webpack.common.js +++ b/source/webpack.common.js @@ -12,18 +12,20 @@ module.exports = { Components: path.resolve('source/components/'), Selectors: path.resolve('source/selectors/'), Reducers: path.resolve('source/reducers/'), - Types: path.resolve('source/types/') + Types: path.resolve('source/types/'), + Images: path.resolve('source/images/') } }, entry: { infrance: ['./source/sites/mycompanyinfrance.fr/entry.js'], embauche: ['./source/sites/embauche.gouv.fr/entry.js'], - // To not introduce breaking into the iframe integration, we serve simulateur.js from a 'dist' subdirectory - 'dist/simulateur': ['./source/sites/embauche.gouv.fr/iframe-script.js'], + // To not introduce breaking into the iframe integration, we serve simulateur.js from a 'dist' subdirectory + 'dist/simulateur': ['./source/sites/embauche.gouv.fr/iframe-script.js'] }, output: { path: path.resolve('./dist/'), - filename: ({ chunk }) => chunk.name === 'dist/simulateur' ? '[name].js' : '[name].[hash].js' + filename: ({ chunk }) => + chunk.name === 'dist/simulateur' ? '[name].js' : '[name].[hash].js' }, module: { rules: [ @@ -83,16 +85,22 @@ module.exports = { template: 'index.html', chunks: ['infrance'], title: 'My company in france 🇫🇷', - description: "The easy guide to help you start your business in france. From registering your company to hiring your first employee.", + description: + 'The easy guide to help you start your business in france. From registering your company to hiring your first employee.', filename: 'infrance.html' }), new HTMLPlugin({ template: 'index.html', chunks: ['embauche'], - title: 'Simulateur d\'embauche 🤝', - description: "Simulation du prix d'une embauche en France et calcul du salaire net à partir du brut : CDD, statut cadre, cotisations sociales, retraite...", - filename: 'embauche.html', + title: "Simulateur d'embauche 🤝", + description: + "Simulation du prix d'une embauche en France et calcul du salaire net à partir du brut : CDD, statut cadre, cotisations sociales, retraite...", + filename: 'embauche.html' }), - new CopyPlugin(['./manifest.webmanifest', './source/sites/embauche.gouv.fr/images/logo', './robots.txt']) + new CopyPlugin([ + './manifest.webmanifest', + './source/sites/embauche.gouv.fr/images/logo', + './robots.txt' + ]) ] }