From 4c45dd183db2968303f54f93a728a4f2b24e52b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Rialland?= Date: Thu, 23 Feb 2023 16:19:45 +0100 Subject: [PATCH] Move images into assets directory --- site/source/Provider.tsx | 2 +- site/source/{ => assets}/images/Urssaf.svg | 0 .../{ => assets}/images/assurance-maladie.svg | 0 site/source/{ => assets}/images/banner-share.png | Bin site/source/{ => assets}/images/banner-share.svg | 0 site/source/{ => assets}/images/company.svg | 0 .../{ => assets}/images/destinataires/Urssaf.png | Bin .../{ => assets}/images/destinataires/Urssaf.svg | 0 .../{ => assets}/images/destinataires/agirc.png | Bin .../{ => assets}/images/destinataires/cnav.png | Bin .../images/destinataires/destinataires.yaml | 0 .../{ => assets}/images/destinataires/salarié.png | Bin .../images/donner-votre-avis-services-publics.svg | 0 site/source/{ => assets}/images/estimate.svg | 0 site/source/{ => assets}/images/hiring.svg | 0 site/source/{ => assets}/images/logo-backup.svg | 0 site/source/{ => assets}/images/logo-dgfip.svg | 0 .../{ => assets}/images/logo-monentreprise.svg | 0 .../images/logo-monentreprise_white.svg | 0 site/source/{ => assets}/images/logo-mycompany.svg | 0 .../{ => assets}/images/logo-mycompany_white.svg | 0 site/source/{ => assets}/images/logo.svg | 0 .../images/logos-caisses-retraite/carcdsf.jpg | Bin .../images/logos-caisses-retraite/carmf.png | Bin .../images/logos-caisses-retraite/carpimko.png | Bin .../images/logos-caisses-retraite/cavec.jpg | Bin .../images/logos-caisses-retraite/cavp.svg | 0 .../images/logos-caisses-retraite/cipav.png | Bin .../images/logos-caisses-retraite/cnbf.png | Bin .../images/logos-caisses-retraite/ircec.jpg | Bin site/source/{ => assets}/images/marianne.svg | 0 .../{ => assets}/images/mycompany-logo-partage.png | Bin site/source/{ => assets}/images/publicodes.png | Bin site/source/{ => assets}/images/revenus.svg | 0 site/source/{ => assets}/images/road-sign.svg | 0 site/source/components/JeDonneMonAvis.tsx | 2 +- site/source/components/Logo.tsx | 8 ++++---- site/source/components/Route404.tsx | 2 +- site/source/components/SchemeComparaison.tsx | 2 +- site/source/components/layout/Footer/Contact.tsx | 2 +- .../InstitutionsPartenaires.tsx | 9 +++++---- .../components/simulationExplanation/logos.ts | 8 ++++++++ site/source/images/logos-caisses-retraite/index.tsx | 8 -------- .../pages/gerer/demande-mobilité/PDFDocument.tsx | 2 +- site/source/pages/integration/Iframe.tsx | 2 +- site/vite.config.ts | 2 +- 46 files changed, 25 insertions(+), 24 deletions(-) rename site/source/{ => assets}/images/Urssaf.svg (100%) rename site/source/{ => assets}/images/assurance-maladie.svg (100%) rename site/source/{ => assets}/images/banner-share.png (100%) rename site/source/{ => assets}/images/banner-share.svg (100%) rename site/source/{ => assets}/images/company.svg (100%) rename site/source/{ => assets}/images/destinataires/Urssaf.png (100%) rename site/source/{ => assets}/images/destinataires/Urssaf.svg (100%) rename site/source/{ => assets}/images/destinataires/agirc.png (100%) rename site/source/{ => assets}/images/destinataires/cnav.png (100%) rename site/source/{ => assets}/images/destinataires/destinataires.yaml (100%) rename site/source/{ => assets}/images/destinataires/salarié.png (100%) rename site/source/{ => assets}/images/donner-votre-avis-services-publics.svg (100%) rename site/source/{ => assets}/images/estimate.svg (100%) rename site/source/{ => assets}/images/hiring.svg (100%) rename site/source/{ => assets}/images/logo-backup.svg (100%) rename site/source/{ => assets}/images/logo-dgfip.svg (100%) rename site/source/{ => assets}/images/logo-monentreprise.svg (100%) rename site/source/{ => assets}/images/logo-monentreprise_white.svg (100%) rename site/source/{ => assets}/images/logo-mycompany.svg (100%) rename site/source/{ => assets}/images/logo-mycompany_white.svg (100%) rename site/source/{ => assets}/images/logo.svg (100%) rename site/source/{ => assets}/images/logos-caisses-retraite/carcdsf.jpg (100%) rename site/source/{ => assets}/images/logos-caisses-retraite/carmf.png (100%) rename site/source/{ => assets}/images/logos-caisses-retraite/carpimko.png (100%) rename site/source/{ => assets}/images/logos-caisses-retraite/cavec.jpg (100%) rename site/source/{ => assets}/images/logos-caisses-retraite/cavp.svg (100%) rename site/source/{ => assets}/images/logos-caisses-retraite/cipav.png (100%) rename site/source/{ => assets}/images/logos-caisses-retraite/cnbf.png (100%) rename site/source/{ => assets}/images/logos-caisses-retraite/ircec.jpg (100%) rename site/source/{ => assets}/images/marianne.svg (100%) rename site/source/{ => assets}/images/mycompany-logo-partage.png (100%) rename site/source/{ => assets}/images/publicodes.png (100%) rename site/source/{ => assets}/images/revenus.svg (100%) rename site/source/{ => assets}/images/road-sign.svg (100%) create mode 100644 site/source/components/simulationExplanation/logos.ts delete mode 100644 site/source/images/logos-caisses-retraite/index.tsx diff --git a/site/source/Provider.tsx b/site/source/Provider.tsx index cc686c8b2..1c20b47a9 100644 --- a/site/source/Provider.tsx +++ b/site/source/Provider.tsx @@ -7,6 +7,7 @@ import { I18nextProvider, useTranslation } from 'react-i18next' import { Provider as ReduxProvider } from 'react-redux' import { BrowserRouter } from 'react-router-dom' +import logo from '@/assets/images/logo-monentreprise.svg' import { DisableAnimationOnPrintProvider } from '@/components/utils/DisableAnimationContext' import { ThemeColorsProvider } from '@/components/utils/colors' import { GlobalStyle } from '@/design-system/global-style' @@ -16,7 +17,6 @@ import { H1, H4 } from '@/design-system/typography/heading' import { Link } from '@/design-system/typography/link' import { Body, Intro } from '@/design-system/typography/paragraphs' import { useIframeResizer } from '@/hooks/useIframeResizer' -import logo from '@/images/logo-monentreprise.svg' import { ServiceWorker } from './ServiceWorker' import { TrackingContext } from './components/ATInternetTracking' diff --git a/site/source/images/Urssaf.svg b/site/source/assets/images/Urssaf.svg similarity index 100% rename from site/source/images/Urssaf.svg rename to site/source/assets/images/Urssaf.svg diff --git a/site/source/images/assurance-maladie.svg b/site/source/assets/images/assurance-maladie.svg similarity index 100% rename from site/source/images/assurance-maladie.svg rename to site/source/assets/images/assurance-maladie.svg diff --git a/site/source/images/banner-share.png b/site/source/assets/images/banner-share.png similarity index 100% rename from site/source/images/banner-share.png rename to site/source/assets/images/banner-share.png diff --git a/site/source/images/banner-share.svg b/site/source/assets/images/banner-share.svg similarity index 100% rename from site/source/images/banner-share.svg rename to site/source/assets/images/banner-share.svg diff --git a/site/source/images/company.svg b/site/source/assets/images/company.svg similarity index 100% rename from site/source/images/company.svg rename to site/source/assets/images/company.svg diff --git a/site/source/images/destinataires/Urssaf.png b/site/source/assets/images/destinataires/Urssaf.png similarity index 100% rename from site/source/images/destinataires/Urssaf.png rename to site/source/assets/images/destinataires/Urssaf.png diff --git a/site/source/images/destinataires/Urssaf.svg b/site/source/assets/images/destinataires/Urssaf.svg similarity index 100% rename from site/source/images/destinataires/Urssaf.svg rename to site/source/assets/images/destinataires/Urssaf.svg diff --git a/site/source/images/destinataires/agirc.png b/site/source/assets/images/destinataires/agirc.png similarity index 100% rename from site/source/images/destinataires/agirc.png rename to site/source/assets/images/destinataires/agirc.png diff --git a/site/source/images/destinataires/cnav.png b/site/source/assets/images/destinataires/cnav.png similarity index 100% rename from site/source/images/destinataires/cnav.png rename to site/source/assets/images/destinataires/cnav.png diff --git a/site/source/images/destinataires/destinataires.yaml b/site/source/assets/images/destinataires/destinataires.yaml similarity index 100% rename from site/source/images/destinataires/destinataires.yaml rename to site/source/assets/images/destinataires/destinataires.yaml diff --git a/site/source/images/destinataires/salarié.png b/site/source/assets/images/destinataires/salarié.png similarity index 100% rename from site/source/images/destinataires/salarié.png rename to site/source/assets/images/destinataires/salarié.png diff --git a/site/source/images/donner-votre-avis-services-publics.svg b/site/source/assets/images/donner-votre-avis-services-publics.svg similarity index 100% rename from site/source/images/donner-votre-avis-services-publics.svg rename to site/source/assets/images/donner-votre-avis-services-publics.svg diff --git a/site/source/images/estimate.svg b/site/source/assets/images/estimate.svg similarity index 100% rename from site/source/images/estimate.svg rename to site/source/assets/images/estimate.svg diff --git a/site/source/images/hiring.svg b/site/source/assets/images/hiring.svg similarity index 100% rename from site/source/images/hiring.svg rename to site/source/assets/images/hiring.svg diff --git a/site/source/images/logo-backup.svg b/site/source/assets/images/logo-backup.svg similarity index 100% rename from site/source/images/logo-backup.svg rename to site/source/assets/images/logo-backup.svg diff --git a/site/source/images/logo-dgfip.svg b/site/source/assets/images/logo-dgfip.svg similarity index 100% rename from site/source/images/logo-dgfip.svg rename to site/source/assets/images/logo-dgfip.svg diff --git a/site/source/images/logo-monentreprise.svg b/site/source/assets/images/logo-monentreprise.svg similarity index 100% rename from site/source/images/logo-monentreprise.svg rename to site/source/assets/images/logo-monentreprise.svg diff --git a/site/source/images/logo-monentreprise_white.svg b/site/source/assets/images/logo-monentreprise_white.svg similarity index 100% rename from site/source/images/logo-monentreprise_white.svg rename to site/source/assets/images/logo-monentreprise_white.svg diff --git a/site/source/images/logo-mycompany.svg b/site/source/assets/images/logo-mycompany.svg similarity index 100% rename from site/source/images/logo-mycompany.svg rename to site/source/assets/images/logo-mycompany.svg diff --git a/site/source/images/logo-mycompany_white.svg b/site/source/assets/images/logo-mycompany_white.svg similarity index 100% rename from site/source/images/logo-mycompany_white.svg rename to site/source/assets/images/logo-mycompany_white.svg diff --git a/site/source/images/logo.svg b/site/source/assets/images/logo.svg similarity index 100% rename from site/source/images/logo.svg rename to site/source/assets/images/logo.svg diff --git a/site/source/images/logos-caisses-retraite/carcdsf.jpg b/site/source/assets/images/logos-caisses-retraite/carcdsf.jpg similarity index 100% rename from site/source/images/logos-caisses-retraite/carcdsf.jpg rename to site/source/assets/images/logos-caisses-retraite/carcdsf.jpg diff --git a/site/source/images/logos-caisses-retraite/carmf.png b/site/source/assets/images/logos-caisses-retraite/carmf.png similarity index 100% rename from site/source/images/logos-caisses-retraite/carmf.png rename to site/source/assets/images/logos-caisses-retraite/carmf.png diff --git a/site/source/images/logos-caisses-retraite/carpimko.png b/site/source/assets/images/logos-caisses-retraite/carpimko.png similarity index 100% rename from site/source/images/logos-caisses-retraite/carpimko.png rename to site/source/assets/images/logos-caisses-retraite/carpimko.png diff --git a/site/source/images/logos-caisses-retraite/cavec.jpg b/site/source/assets/images/logos-caisses-retraite/cavec.jpg similarity index 100% rename from site/source/images/logos-caisses-retraite/cavec.jpg rename to site/source/assets/images/logos-caisses-retraite/cavec.jpg diff --git a/site/source/images/logos-caisses-retraite/cavp.svg b/site/source/assets/images/logos-caisses-retraite/cavp.svg similarity index 100% rename from site/source/images/logos-caisses-retraite/cavp.svg rename to site/source/assets/images/logos-caisses-retraite/cavp.svg diff --git a/site/source/images/logos-caisses-retraite/cipav.png b/site/source/assets/images/logos-caisses-retraite/cipav.png similarity index 100% rename from site/source/images/logos-caisses-retraite/cipav.png rename to site/source/assets/images/logos-caisses-retraite/cipav.png diff --git a/site/source/images/logos-caisses-retraite/cnbf.png b/site/source/assets/images/logos-caisses-retraite/cnbf.png similarity index 100% rename from site/source/images/logos-caisses-retraite/cnbf.png rename to site/source/assets/images/logos-caisses-retraite/cnbf.png diff --git a/site/source/images/logos-caisses-retraite/ircec.jpg b/site/source/assets/images/logos-caisses-retraite/ircec.jpg similarity index 100% rename from site/source/images/logos-caisses-retraite/ircec.jpg rename to site/source/assets/images/logos-caisses-retraite/ircec.jpg diff --git a/site/source/images/marianne.svg b/site/source/assets/images/marianne.svg similarity index 100% rename from site/source/images/marianne.svg rename to site/source/assets/images/marianne.svg diff --git a/site/source/images/mycompany-logo-partage.png b/site/source/assets/images/mycompany-logo-partage.png similarity index 100% rename from site/source/images/mycompany-logo-partage.png rename to site/source/assets/images/mycompany-logo-partage.png diff --git a/site/source/images/publicodes.png b/site/source/assets/images/publicodes.png similarity index 100% rename from site/source/images/publicodes.png rename to site/source/assets/images/publicodes.png diff --git a/site/source/images/revenus.svg b/site/source/assets/images/revenus.svg similarity index 100% rename from site/source/images/revenus.svg rename to site/source/assets/images/revenus.svg diff --git a/site/source/images/road-sign.svg b/site/source/assets/images/road-sign.svg similarity index 100% rename from site/source/images/road-sign.svg rename to site/source/assets/images/road-sign.svg diff --git a/site/source/components/JeDonneMonAvis.tsx b/site/source/components/JeDonneMonAvis.tsx index 92fe67001..bc01d0fad 100644 --- a/site/source/components/JeDonneMonAvis.tsx +++ b/site/source/components/JeDonneMonAvis.tsx @@ -1,7 +1,7 @@ import { useTranslation } from 'react-i18next' +import donnerVotreAvisSvg from '@/assets/images/donner-votre-avis-services-publics.svg' import { Link } from '@/design-system/typography/link' -import donnerVotreAvisSvg from '@/images/donner-votre-avis-services-publics.svg' export const JeDonneMonAvis = ({ light }: { light?: boolean }) => { const { t } = useTranslation() diff --git a/site/source/components/Logo.tsx b/site/source/components/Logo.tsx index 81f0a2c20..06de8af1b 100644 --- a/site/source/components/Logo.tsx +++ b/site/source/components/Logo.tsx @@ -1,11 +1,11 @@ import { useTranslation } from 'react-i18next' import styled from 'styled-components' +import logoSvgFR from '@/assets/images/logo-monentreprise.svg' +import logoSvgFRDark from '@/assets/images/logo-monentreprise_white.svg' +import logoSvgEN from '@/assets/images/logo-mycompany.svg' +import logoSvgENDark from '@/assets/images/logo-mycompany_white.svg' import { useDarkMode } from '@/hooks/useDarkMode' -import logoSvgFR from '@/images/logo-monentreprise.svg' -import logoSvgFRDark from '@/images/logo-monentreprise_white.svg' -import logoSvgEN from '@/images/logo-mycompany.svg' -import logoSvgENDark from '@/images/logo-mycompany_white.svg' /* Figma source: https://www.figma.com/file/YJUpRNO12lcPUDsEYEXzT9/logo-monentreprisee-urssaf-edition */ diff --git a/site/source/components/Route404.tsx b/site/source/components/Route404.tsx index a46c59853..7077e60fd 100644 --- a/site/source/components/Route404.tsx +++ b/site/source/components/Route404.tsx @@ -1,9 +1,9 @@ import { Trans } from 'react-i18next' +import image from '@/assets/images/road-sign.svg' import PageHeader from '@/components/PageHeader' import { Button } from '@/design-system/buttons' import { Container } from '@/design-system/layout' -import image from '@/images/road-sign.svg' export default function Route404() { return ( diff --git a/site/source/components/SchemeComparaison.tsx b/site/source/components/SchemeComparaison.tsx index 70be2091c..704439dab 100644 --- a/site/source/components/SchemeComparaison.tsx +++ b/site/source/components/SchemeComparaison.tsx @@ -7,6 +7,7 @@ import { isAutoentrepreneur, useDispatchAndGoToNextQuestion, } from '@/actions/companyStatusActions' +import revenusSVG from '@/assets/images/revenus.svg' import { Message } from '@/design-system' import AnswerGroup from '@/design-system/answer-group' import { Button } from '@/design-system/buttons' @@ -14,7 +15,6 @@ import { Emoji } from '@/design-system/emoji' import { Grid, Spacing } from '@/design-system/layout' import { H2, H3 } from '@/design-system/typography/heading' import { Intro } from '@/design-system/typography/paragraphs' -import revenusSVG from '@/images/revenus.svg' import { useSitePaths } from '@/sitePaths' type SchemeComparaisonProps = { diff --git a/site/source/components/layout/Footer/Contact.tsx b/site/source/components/layout/Footer/Contact.tsx index ad41c6e33..415092fc8 100644 --- a/site/source/components/layout/Footer/Contact.tsx +++ b/site/source/components/layout/Footer/Contact.tsx @@ -1,4 +1,4 @@ -import ContactImage from '@/images/contact.png' +import ContactImage from '@/assets/images/contact.png' const Contact = () => (
diff --git a/site/source/components/simulationExplanation/InstitutionsPartenaires.tsx b/site/source/components/simulationExplanation/InstitutionsPartenaires.tsx index f02507894..95c66d721 100644 --- a/site/source/components/simulationExplanation/InstitutionsPartenaires.tsx +++ b/site/source/components/simulationExplanation/InstitutionsPartenaires.tsx @@ -3,6 +3,9 @@ import { Trans } from 'react-i18next' import { useSelector } from 'react-redux' import styled from 'styled-components' +import urssafSrc from '@/assets/images/Urssaf.svg' +import assuranceMaladieSrc from '@/assets/images/assurance-maladie.svg' +import dgfipSrc from '@/assets/images/logo-dgfip.svg' import Value, { Condition, WhenApplicable, @@ -16,12 +19,10 @@ import { Emoji } from '@/design-system/emoji' import { Grid } from '@/design-system/layout' import { H2, H3 } from '@/design-system/typography/heading' import { Body, SmallBody } from '@/design-system/typography/paragraphs' -import urssafSrc from '@/images/Urssaf.svg' -import assuranceMaladieSrc from '@/images/assurance-maladie.svg' -import dgfipSrc from '@/images/logo-dgfip.svg' -import * as logosSrc from '@/images/logos-caisses-retraite' import { targetUnitSelector } from '@/selectors/simulationSelectors' +import * as logosSrc from './logos' + export default function InstitutionsPartenaires() { const unit = useSelector(targetUnitSelector) diff --git a/site/source/components/simulationExplanation/logos.ts b/site/source/components/simulationExplanation/logos.ts new file mode 100644 index 000000000..68d136fc3 --- /dev/null +++ b/site/source/components/simulationExplanation/logos.ts @@ -0,0 +1,8 @@ +export { default as CIPAV } from '@/assets/images/logos-caisses-retraite/cipav.png' +export { default as CARPIMKO } from '@/assets/images/logos-caisses-retraite/carpimko.png' +export { default as CARMF } from '@/assets/images/logos-caisses-retraite/carmf.png' +export { default as CARCDSF } from '@/assets/images/logos-caisses-retraite/carcdsf.jpg' +export { default as CNBF } from '@/assets/images/logos-caisses-retraite/cnbf.png' +export { default as CAVEC } from '@/assets/images/logos-caisses-retraite/cavec.jpg' +export { default as IRCEC } from '@/assets/images/logos-caisses-retraite/ircec.jpg' +export { default as CAVP } from '@/assets/images/logos-caisses-retraite/cavp.svg' diff --git a/site/source/images/logos-caisses-retraite/index.tsx b/site/source/images/logos-caisses-retraite/index.tsx deleted file mode 100644 index 2aed7e636..000000000 --- a/site/source/images/logos-caisses-retraite/index.tsx +++ /dev/null @@ -1,8 +0,0 @@ -export { default as CIPAV } from './cipav.png' -export { default as CARPIMKO } from './carpimko.png' -export { default as CARMF } from './carmf.png' -export { default as CARCDSF } from './carcdsf.jpg' -export { default as CNBF } from './cnbf.png' -export { default as CAVEC } from './cavec.jpg' -export { default as IRCEC } from './ircec.jpg' -export { default as CAVP } from './cavp.svg' diff --git a/site/source/pages/gerer/demande-mobilité/PDFDocument.tsx b/site/source/pages/gerer/demande-mobilité/PDFDocument.tsx index 4a4250ddc..cc2eacd2a 100644 --- a/site/source/pages/gerer/demande-mobilité/PDFDocument.tsx +++ b/site/source/pages/gerer/demande-mobilité/PDFDocument.tsx @@ -1,7 +1,7 @@ import PDFElement from '@react-pdf/renderer' import { RuleNode } from 'publicodes' -import urssafPng from '@/images/destinataires/Urssaf.png' +import urssafPng from '@/assets/images/destinataires/Urssaf.png' import FieldsPDF, { styles as fieldStyles } from './FieldsPDF' import montserratUrl from './Montserrat-SemiBold.ttf' diff --git a/site/source/pages/integration/Iframe.tsx b/site/source/pages/integration/Iframe.tsx index 87b0ce594..3dbd332c1 100644 --- a/site/source/pages/integration/Iframe.tsx +++ b/site/source/pages/integration/Iframe.tsx @@ -5,6 +5,7 @@ import { Trans, useTranslation } from 'react-i18next' import { useHref, useSearchParams } from 'react-router-dom' import styled from 'styled-components' +import urssafLogo from '@/assets/images/Urssaf.svg' import { TrackPage } from '@/components/ATInternetTracking' import { PopoverWithTrigger, TextField } from '@/design-system' import { Article } from '@/design-system/card' @@ -15,7 +16,6 @@ import { H1, H2, H3 } from '@/design-system/typography/heading' import { Link } from '@/design-system/typography/link' import { Body, Intro } from '@/design-system/typography/paragraphs' import useSimulatorsData, { SimulatorData } from '@/hooks/useSimulatorsData' -import urssafLogo from '@/images/Urssaf.svg' import Meta from '../../components/utils/Meta' diff --git a/site/vite.config.ts b/site/vite.config.ts index 6deaa7949..e7e5e6f8d 100644 --- a/site/vite.config.ts +++ b/site/vite.config.ts @@ -78,7 +78,7 @@ export default defineConfig(({ command, mode }) => ({ "mon-entreprise.urssaf.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é.', - shareImage: '/source/images/logo-monentreprise.svg', + shareImage: '/source/assets/images/logo-monentreprise.svg', shareImageAlt: 'Logo mon-entreprise, site Urssaf', }, infrance: {