diff --git a/mon-entreprise/source/components/ui/Fonts.css b/mon-entreprise/source/components/ui/Fonts.css index 2befd09d6..1e94f39f7 100644 --- a/mon-entreprise/source/components/ui/Fonts.css +++ b/mon-entreprise/source/components/ui/Fonts.css @@ -4,9 +4,9 @@ font-style: normal; font-weight: 400; src: local('Roboto'), local('Roboto-Regular'), - url('./fonts/roboto-v20-latin-regular.woff2') format('woff2'), + url('/fonts/roboto-v20-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('./fonts/roboto-v20-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + url('/fonts/roboto-v20-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } /* roboto-italic - latin */ @@ -15,9 +15,9 @@ font-style: italic; font-weight: 400; src: local('Roboto Italic'), local('Roboto-Italic'), - url('./fonts/roboto-v20-latin-italic.woff2') format('woff2'), + url('/fonts/roboto-v20-latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('./fonts/roboto-v20-latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + url('/fonts/roboto-v20-latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } /* roboto-500 - latin */ @@ -26,9 +26,9 @@ font-style: normal; font-weight: bold; src: local('Roboto Medium'), local('Roboto-Medium'), - url('./fonts/roboto-v20-latin-500.woff2') format('woff2'), + url('/fonts/roboto-v20-latin-500.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('./fonts/roboto-v20-latin-500.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + url('/fonts/roboto-v20-latin-500.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } /* montserrat-600 - latin */ @@ -37,7 +37,7 @@ font-style: normal; font-weight: 600; src: local('Montserrat SemiBold'), local('Montserrat-SemiBold'), - url('./fonts/montserrat-v15-latin-600.woff2') format('woff2'), + url('/fonts/montserrat-v15-latin-600.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('./fonts/montserrat-v15-latin-600.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + url('/fonts/montserrat-v15-latin-600.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } diff --git a/mon-entreprise/source/images/favicon/android-chrome-192x192.png b/mon-entreprise/source/static/favicon/android-chrome-192x192.png similarity index 100% rename from mon-entreprise/source/images/favicon/android-chrome-192x192.png rename to mon-entreprise/source/static/favicon/android-chrome-192x192.png diff --git a/mon-entreprise/source/images/favicon/android-chrome-512x512.png b/mon-entreprise/source/static/favicon/android-chrome-512x512.png similarity index 100% rename from mon-entreprise/source/images/favicon/android-chrome-512x512.png rename to mon-entreprise/source/static/favicon/android-chrome-512x512.png diff --git a/mon-entreprise/source/images/favicon/apple-touch-icon.png b/mon-entreprise/source/static/favicon/apple-touch-icon.png similarity index 100% rename from mon-entreprise/source/images/favicon/apple-touch-icon.png rename to mon-entreprise/source/static/favicon/apple-touch-icon.png diff --git a/mon-entreprise/source/images/favicon/browserconfig.xml b/mon-entreprise/source/static/favicon/browserconfig.xml similarity index 100% rename from mon-entreprise/source/images/favicon/browserconfig.xml rename to mon-entreprise/source/static/favicon/browserconfig.xml diff --git a/mon-entreprise/source/images/favicon/favicon-16x16.png b/mon-entreprise/source/static/favicon/favicon-16x16.png similarity index 100% rename from mon-entreprise/source/images/favicon/favicon-16x16.png rename to mon-entreprise/source/static/favicon/favicon-16x16.png diff --git a/mon-entreprise/source/images/favicon/favicon-32x32.png b/mon-entreprise/source/static/favicon/favicon-32x32.png similarity index 100% rename from mon-entreprise/source/images/favicon/favicon-32x32.png rename to mon-entreprise/source/static/favicon/favicon-32x32.png diff --git a/mon-entreprise/source/images/favicon/favicon.ico b/mon-entreprise/source/static/favicon/favicon.ico similarity index 100% rename from mon-entreprise/source/images/favicon/favicon.ico rename to mon-entreprise/source/static/favicon/favicon.ico diff --git a/mon-entreprise/source/images/favicon/mstile-150x150.png b/mon-entreprise/source/static/favicon/mstile-150x150.png similarity index 100% rename from mon-entreprise/source/images/favicon/mstile-150x150.png rename to mon-entreprise/source/static/favicon/mstile-150x150.png diff --git a/mon-entreprise/source/images/favicon/safari-pinned-tab.svg b/mon-entreprise/source/static/favicon/safari-pinned-tab.svg similarity index 100% rename from mon-entreprise/source/images/favicon/safari-pinned-tab.svg rename to mon-entreprise/source/static/favicon/safari-pinned-tab.svg diff --git a/mon-entreprise/source/components/ui/fonts/montserrat-v15-latin-600.woff b/mon-entreprise/source/static/fonts/montserrat-v15-latin-600.woff similarity index 100% rename from mon-entreprise/source/components/ui/fonts/montserrat-v15-latin-600.woff rename to mon-entreprise/source/static/fonts/montserrat-v15-latin-600.woff diff --git a/mon-entreprise/source/components/ui/fonts/montserrat-v15-latin-600.woff2 b/mon-entreprise/source/static/fonts/montserrat-v15-latin-600.woff2 similarity index 100% rename from mon-entreprise/source/components/ui/fonts/montserrat-v15-latin-600.woff2 rename to mon-entreprise/source/static/fonts/montserrat-v15-latin-600.woff2 diff --git a/mon-entreprise/source/components/ui/fonts/roboto-v20-latin-500.woff b/mon-entreprise/source/static/fonts/roboto-v20-latin-500.woff similarity index 100% rename from mon-entreprise/source/components/ui/fonts/roboto-v20-latin-500.woff rename to mon-entreprise/source/static/fonts/roboto-v20-latin-500.woff diff --git a/mon-entreprise/source/components/ui/fonts/roboto-v20-latin-500.woff2 b/mon-entreprise/source/static/fonts/roboto-v20-latin-500.woff2 similarity index 100% rename from mon-entreprise/source/components/ui/fonts/roboto-v20-latin-500.woff2 rename to mon-entreprise/source/static/fonts/roboto-v20-latin-500.woff2 diff --git a/mon-entreprise/source/components/ui/fonts/roboto-v20-latin-italic.woff b/mon-entreprise/source/static/fonts/roboto-v20-latin-italic.woff similarity index 100% rename from mon-entreprise/source/components/ui/fonts/roboto-v20-latin-italic.woff rename to mon-entreprise/source/static/fonts/roboto-v20-latin-italic.woff diff --git a/mon-entreprise/source/components/ui/fonts/roboto-v20-latin-italic.woff2 b/mon-entreprise/source/static/fonts/roboto-v20-latin-italic.woff2 similarity index 100% rename from mon-entreprise/source/components/ui/fonts/roboto-v20-latin-italic.woff2 rename to mon-entreprise/source/static/fonts/roboto-v20-latin-italic.woff2 diff --git a/mon-entreprise/source/components/ui/fonts/roboto-v20-latin-regular.woff b/mon-entreprise/source/static/fonts/roboto-v20-latin-regular.woff similarity index 100% rename from mon-entreprise/source/components/ui/fonts/roboto-v20-latin-regular.woff rename to mon-entreprise/source/static/fonts/roboto-v20-latin-regular.woff diff --git a/mon-entreprise/source/components/ui/fonts/roboto-v20-latin-regular.woff2 b/mon-entreprise/source/static/fonts/roboto-v20-latin-regular.woff2 similarity index 100% rename from mon-entreprise/source/components/ui/fonts/roboto-v20-latin-regular.woff2 rename to mon-entreprise/source/static/fonts/roboto-v20-latin-regular.woff2 diff --git a/mon-entreprise/source/images/Urssaf.svg b/mon-entreprise/source/static/images/Urssaf.svg similarity index 100% rename from mon-entreprise/source/images/Urssaf.svg rename to mon-entreprise/source/static/images/Urssaf.svg diff --git a/mon-entreprise/source/images/assurance-maladie.svg b/mon-entreprise/source/static/images/assurance-maladie.svg similarity index 100% rename from mon-entreprise/source/images/assurance-maladie.svg rename to mon-entreprise/source/static/images/assurance-maladie.svg diff --git a/mon-entreprise/source/images/banner-share.png b/mon-entreprise/source/static/images/banner-share.png similarity index 100% rename from mon-entreprise/source/images/banner-share.png rename to mon-entreprise/source/static/images/banner-share.png diff --git a/mon-entreprise/source/images/banner-share.svg b/mon-entreprise/source/static/images/banner-share.svg similarity index 100% rename from mon-entreprise/source/images/banner-share.svg rename to mon-entreprise/source/static/images/banner-share.svg diff --git a/mon-entreprise/source/images/company.svg b/mon-entreprise/source/static/images/company.svg similarity index 100% rename from mon-entreprise/source/images/company.svg rename to mon-entreprise/source/static/images/company.svg diff --git a/mon-entreprise/source/images/destinataires/Urssaf.png b/mon-entreprise/source/static/images/destinataires/Urssaf.png similarity index 100% rename from mon-entreprise/source/images/destinataires/Urssaf.png rename to mon-entreprise/source/static/images/destinataires/Urssaf.png diff --git a/mon-entreprise/source/images/destinataires/Urssaf.svg b/mon-entreprise/source/static/images/destinataires/Urssaf.svg similarity index 100% rename from mon-entreprise/source/images/destinataires/Urssaf.svg rename to mon-entreprise/source/static/images/destinataires/Urssaf.svg diff --git a/mon-entreprise/source/images/destinataires/agff.png b/mon-entreprise/source/static/images/destinataires/agff.png similarity index 100% rename from mon-entreprise/source/images/destinataires/agff.png rename to mon-entreprise/source/static/images/destinataires/agff.png diff --git a/mon-entreprise/source/images/destinataires/agirc.png b/mon-entreprise/source/static/images/destinataires/agirc.png similarity index 100% rename from mon-entreprise/source/images/destinataires/agirc.png rename to mon-entreprise/source/static/images/destinataires/agirc.png diff --git a/mon-entreprise/source/images/destinataires/cnav.png b/mon-entreprise/source/static/images/destinataires/cnav.png similarity index 100% rename from mon-entreprise/source/images/destinataires/cnav.png rename to mon-entreprise/source/static/images/destinataires/cnav.png diff --git a/mon-entreprise/source/images/destinataires/destinataires.yaml b/mon-entreprise/source/static/images/destinataires/destinataires.yaml similarity index 100% rename from mon-entreprise/source/images/destinataires/destinataires.yaml rename to mon-entreprise/source/static/images/destinataires/destinataires.yaml diff --git a/mon-entreprise/source/images/destinataires/salarié.png b/mon-entreprise/source/static/images/destinataires/salarié.png similarity index 100% rename from mon-entreprise/source/images/destinataires/salarié.png rename to mon-entreprise/source/static/images/destinataires/salarié.png diff --git a/mon-entreprise/source/images/estimate.svg b/mon-entreprise/source/static/images/estimate.svg similarity index 100% rename from mon-entreprise/source/images/estimate.svg rename to mon-entreprise/source/static/images/estimate.svg diff --git a/mon-entreprise/source/images/hiring.svg b/mon-entreprise/source/static/images/hiring.svg similarity index 100% rename from mon-entreprise/source/images/hiring.svg rename to mon-entreprise/source/static/images/hiring.svg diff --git a/mon-entreprise/source/images/logo-mycompany-share.png b/mon-entreprise/source/static/images/logo-mycompany-share.png similarity index 100% rename from mon-entreprise/source/images/logo-mycompany-share.png rename to mon-entreprise/source/static/images/logo-mycompany-share.png diff --git a/mon-entreprise/source/images/logo-mycompany.svg b/mon-entreprise/source/static/images/logo-mycompany.svg similarity index 100% rename from mon-entreprise/source/images/logo-mycompany.svg rename to mon-entreprise/source/static/images/logo-mycompany.svg diff --git a/mon-entreprise/source/images/logo-share.png b/mon-entreprise/source/static/images/logo-share.png similarity index 100% rename from mon-entreprise/source/images/logo-share.png rename to mon-entreprise/source/static/images/logo-share.png diff --git a/mon-entreprise/source/images/logo-share.svg b/mon-entreprise/source/static/images/logo-share.svg similarity index 100% rename from mon-entreprise/source/images/logo-share.svg rename to mon-entreprise/source/static/images/logo-share.svg diff --git a/mon-entreprise/source/images/logo.svg b/mon-entreprise/source/static/images/logo.svg similarity index 100% rename from mon-entreprise/source/images/logo.svg rename to mon-entreprise/source/static/images/logo.svg diff --git a/mon-entreprise/source/images/logos-cnavpl/carcdsf.jpg b/mon-entreprise/source/static/images/logos-cnavpl/carcdsf.jpg similarity index 100% rename from mon-entreprise/source/images/logos-cnavpl/carcdsf.jpg rename to mon-entreprise/source/static/images/logos-cnavpl/carcdsf.jpg diff --git a/mon-entreprise/source/images/logos-cnavpl/carmf.png b/mon-entreprise/source/static/images/logos-cnavpl/carmf.png similarity index 100% rename from mon-entreprise/source/images/logos-cnavpl/carmf.png rename to mon-entreprise/source/static/images/logos-cnavpl/carmf.png diff --git a/mon-entreprise/source/images/logos-cnavpl/carpimko.png b/mon-entreprise/source/static/images/logos-cnavpl/carpimko.png similarity index 100% rename from mon-entreprise/source/images/logos-cnavpl/carpimko.png rename to mon-entreprise/source/static/images/logos-cnavpl/carpimko.png diff --git a/mon-entreprise/source/images/logos-cnavpl/cavec.jpg b/mon-entreprise/source/static/images/logos-cnavpl/cavec.jpg similarity index 100% rename from mon-entreprise/source/images/logos-cnavpl/cavec.jpg rename to mon-entreprise/source/static/images/logos-cnavpl/cavec.jpg diff --git a/mon-entreprise/source/images/logos-cnavpl/cipav.png b/mon-entreprise/source/static/images/logos-cnavpl/cipav.png similarity index 100% rename from mon-entreprise/source/images/logos-cnavpl/cipav.png rename to mon-entreprise/source/static/images/logos-cnavpl/cipav.png diff --git a/mon-entreprise/source/images/logos-cnavpl/cnbf.png b/mon-entreprise/source/static/images/logos-cnavpl/cnbf.png similarity index 100% rename from mon-entreprise/source/images/logos-cnavpl/cnbf.png rename to mon-entreprise/source/static/images/logos-cnavpl/cnbf.png diff --git a/mon-entreprise/source/images/logos-cnavpl/index.tsx b/mon-entreprise/source/static/images/logos-cnavpl/index.tsx similarity index 100% rename from mon-entreprise/source/images/logos-cnavpl/index.tsx rename to mon-entreprise/source/static/images/logos-cnavpl/index.tsx diff --git a/mon-entreprise/source/images/map-directions.png b/mon-entreprise/source/static/images/map-directions.png similarity index 100% rename from mon-entreprise/source/images/map-directions.png rename to mon-entreprise/source/static/images/map-directions.png diff --git a/mon-entreprise/source/images/marianne.svg b/mon-entreprise/source/static/images/marianne.svg similarity index 100% rename from mon-entreprise/source/images/marianne.svg rename to mon-entreprise/source/static/images/marianne.svg diff --git a/mon-entreprise/source/images/mycompany-logo-partage.png b/mon-entreprise/source/static/images/mycompany-logo-partage.png similarity index 100% rename from mon-entreprise/source/images/mycompany-logo-partage.png rename to mon-entreprise/source/static/images/mycompany-logo-partage.png diff --git a/mon-entreprise/source/images/publicodes.png b/mon-entreprise/source/static/images/publicodes.png similarity index 100% rename from mon-entreprise/source/images/publicodes.png rename to mon-entreprise/source/static/images/publicodes.png diff --git a/mon-entreprise/source/images/revenus.svg b/mon-entreprise/source/static/images/revenus.svg similarity index 100% rename from mon-entreprise/source/images/revenus.svg rename to mon-entreprise/source/static/images/revenus.svg diff --git a/mon-entreprise/source/images/références/Urssaf.svg b/mon-entreprise/source/static/images/références/Urssaf.svg similarity index 100% rename from mon-entreprise/source/images/références/Urssaf.svg rename to mon-entreprise/source/static/images/références/Urssaf.svg diff --git a/mon-entreprise/source/images/références/agirc-arrco.png b/mon-entreprise/source/static/images/références/agirc-arrco.png similarity index 100% rename from mon-entreprise/source/images/références/agirc-arrco.png rename to mon-entreprise/source/static/images/références/agirc-arrco.png diff --git a/mon-entreprise/source/images/références/ameli.png b/mon-entreprise/source/static/images/références/ameli.png similarity index 100% rename from mon-entreprise/source/images/références/ameli.png rename to mon-entreprise/source/static/images/références/ameli.png diff --git a/mon-entreprise/source/images/références/bpi-création.png b/mon-entreprise/source/static/images/références/bpi-création.png similarity index 100% rename from mon-entreprise/source/images/références/bpi-création.png rename to mon-entreprise/source/static/images/références/bpi-création.png diff --git a/mon-entreprise/source/images/références/ladocumentationfrançaise.png b/mon-entreprise/source/static/images/références/ladocumentationfrançaise.png similarity index 100% rename from mon-entreprise/source/images/références/ladocumentationfrançaise.png rename to mon-entreprise/source/static/images/références/ladocumentationfrançaise.png diff --git a/mon-entreprise/source/images/références/marianne.png b/mon-entreprise/source/static/images/références/marianne.png similarity index 100% rename from mon-entreprise/source/images/références/marianne.png rename to mon-entreprise/source/static/images/références/marianne.png diff --git a/mon-entreprise/source/images/références/pole-emploi.png b/mon-entreprise/source/static/images/références/pole-emploi.png similarity index 100% rename from mon-entreprise/source/images/références/pole-emploi.png rename to mon-entreprise/source/static/images/références/pole-emploi.png diff --git a/mon-entreprise/source/images/références/senat.png b/mon-entreprise/source/static/images/références/senat.png similarity index 100% rename from mon-entreprise/source/images/références/senat.png rename to mon-entreprise/source/static/images/références/senat.png diff --git a/mon-entreprise/manifest.webmanifest b/mon-entreprise/source/static/manifest.webmanifest similarity index 100% rename from mon-entreprise/manifest.webmanifest rename to mon-entreprise/source/static/manifest.webmanifest diff --git a/mon-entreprise/source/robots.txt b/mon-entreprise/source/static/robots.infrance.txt similarity index 100% rename from mon-entreprise/source/robots.txt rename to mon-entreprise/source/static/robots.infrance.txt diff --git a/mon-entreprise/source/sitemap.en.txt b/mon-entreprise/source/static/sitemap.en.txt similarity index 100% rename from mon-entreprise/source/sitemap.en.txt rename to mon-entreprise/source/static/sitemap.en.txt diff --git a/mon-entreprise/source/sitemap.fr.txt b/mon-entreprise/source/static/sitemap.fr.txt similarity index 100% rename from mon-entreprise/source/sitemap.fr.txt rename to mon-entreprise/source/static/sitemap.fr.txt diff --git a/mon-entreprise/tsconfig.json b/mon-entreprise/tsconfig.json index 2405812d9..1c60dc007 100644 --- a/mon-entreprise/tsconfig.json +++ b/mon-entreprise/tsconfig.json @@ -6,7 +6,7 @@ "Actions/*": ["actions/*"], "Components": ["components"], "Components/*": ["components/*"], - "Images/*": ["images/*"], + "Images/*": ["static/images/*"], "Reducers/*": ["reducers/*"], "Selectors/*": ["selectors/*"], "Types/*": ["types/*"] diff --git a/mon-entreprise/webpack.common.js b/mon-entreprise/webpack.common.js index a8188f9ba..ed4d551fe 100644 --- a/mon-entreprise/webpack.common.js +++ b/mon-entreprise/webpack.common.js @@ -110,7 +110,7 @@ module.exports.default = { Selectors: path.resolve('source/selectors/'), Reducers: path.resolve('source/reducers/'), Types: path.resolve('source/types/'), - Images: path.resolve('source/images/'), + Images: path.resolve('source/static/images/'), }, extensions: ['.js', '.ts', '.tsx'], }, @@ -135,31 +135,11 @@ module.exports.default = { GITHUB_SHA: '', }), new CopyPlugin([ - './manifest.webmanifest', - { - from: './source/robots.txt', - to: 'robots.infrance.txt', - }, - { - from: './source/sitemap.fr.txt', - to: 'sitemap.infrance.fr.txt', - }, - { - from: './source/sitemap.en.txt', - to: 'sitemap.infrance.en.txt', - }, - { - from: './source/images', - to: 'images', - }, + './source/static', { from: './source/data', to: 'data', }, - { - from: './source/images/favicon', - to: 'favicon', - }, ]), ], }