From dad81d8cfacf7a7c4759bb31e44487b664d00d4d Mon Sep 17 00:00:00 2001 From: Johan Girod Date: Mon, 6 Mar 2023 14:53:39 +0100 Subject: [PATCH] Fix tracking pour la recherche du code ape --- site/source/components/App.tsx | 12 ++++++------ site/source/components/charts/PagesCharts.tsx | 2 +- site/source/pages/{Landing => _landing}/Landing.tsx | 0 .../pages/{Landing => _landing}/SearchOrCreate.tsx | 0 .../{Landing => _landing}/illustration.backup.svg | 0 .../pages/{Landing => _landing}/illustration.svg | 0 .../pages/{Landing => _landing}/illustration2.svg | 0 .../choix-statut-juridique/config.ts | 4 ++-- .../config.ts | 4 ++-- .../declaration-revenu-independants/config.ts | 4 ++-- .../pages/assistants/demande-mobilité/config.ts | 4 ++-- .../pages/assistants/pour-mon-entreprise/config.tsx | 2 +- .../assistants/recherche-code-ape/SearchCodeAPE.tsx | 2 ++ .../pages/assistants/recherche-code-ape/config.ts | 6 ++---- .../pages/assistants/recherche-code-ape/index.tsx | 2 ++ .../assistants/économie-collaborative/config.ts | 4 ++-- site/source/pages/{Budget => budget}/budget.md | 0 site/source/pages/{Budget => budget}/budget.yaml | 0 .../pages/{Budget/Budget.tsx => budget/index.tsx} | 0 site/source/pages/{Dev => dev}/IntegrationTest.tsx | 0 .../pages/{Iframes => iframes}/IframeFooter.tsx | 0 site/source/pages/{Iframes => iframes}/index.tsx | 0 .../Nouveautes.tsx => nouveautés/index.tsx} | 0 .../simulateurs/{configs => _configs}/config.ts | 0 .../simulateurs/{configs => _configs}/types.ts | 0 .../{images => _images}/AutoEntrepreneurPreview.png | Bin .../{images => _images}/RémunérationSASUPreview.png | Bin .../pages/simulateurs/artiste-auteur/config.ts | 4 ++-- .../simulateurs/artiste-auteur/simulationConfig.ts | 2 +- .../pages/simulateurs/auto-entrepreneur/config.ts | 4 ++-- .../auto-entrepreneur/simulationConfig.ts | 2 +- .../pages/simulateurs/auxiliaire-médical/config.ts | 4 ++-- site/source/pages/simulateurs/avocat/config.ts | 4 ++-- .../pages/simulateurs/chirurgien-dentiste/config.ts | 4 ++-- .../pages/simulateurs/chômage-partiel/config.ts | 4 ++-- .../simulateurs/chômage-partiel/simulationConfig.ts | 2 +- site/source/pages/simulateurs/cipav/config.tsx | 4 ++-- .../pages/simulateurs/cipav/simulationConfig.ts | 2 +- .../pages/simulateurs/comparaison-statuts/config.ts | 4 ++-- .../comparaison-statuts/simulationConfig.ts | 2 +- .../simulateurs/cout-creation-entreprise/config.ts | 4 ++-- site/source/pages/simulateurs/dividendes/config.ts | 4 ++-- .../simulateurs/dividendes/simulationConfig.ts | 2 +- site/source/pages/simulateurs/eirl/config.ts | 4 ++-- .../simulateurs/entreprise-individuelle/config.ts | 4 ++-- site/source/pages/simulateurs/eurl/config.tsx | 4 ++-- .../pages/simulateurs/expert-comptable/config.ts | 4 ++-- .../pages/simulateurs/impot-societe/config.tsx | 4 ++-- .../simulateurs/impot-societe/simulationConfig.ts | 2 +- site/source/pages/simulateurs/indépendant/config.ts | 4 ++-- .../simulateurs/indépendant/simulationConfig.ts | 2 +- site/source/pages/simulateurs/metadata-src.ts | 2 +- site/source/pages/simulateurs/médecin/config.ts | 4 ++-- site/source/pages/simulateurs/pamc/config.ts | 4 ++-- site/source/pages/simulateurs/pharmacien/config.ts | 4 ++-- .../pages/simulateurs/profession-libérale/config.ts | 4 ++-- .../profession-libérale/simulationConfig.ts | 2 +- site/source/pages/simulateurs/sage-femme/config.ts | 4 ++-- site/source/pages/simulateurs/salarié/config.ts | 4 ++-- .../pages/simulateurs/salarié/simulationConfig.ts | 2 +- site/source/pages/simulateurs/sasu/config.ts | 4 ++-- .../pages/simulateurs/sasu/simulationConfig.ts | 2 +- site/source/pages/{Stats => statistiques}/Chart.tsx | 0 .../DemandesUtilisateurs.tsx | 0 .../pages/{Stats => statistiques}/GlobalStats.tsx | 0 .../pages/{Stats => statistiques}/LazyStats.tsx | 0 .../{Stats => statistiques}/SatisfactionChart.tsx | 0 site/source/pages/{Stats => statistiques}/Stats.tsx | 0 .../pages/{Stats => statistiques}/illustration.svg | 0 site/source/pages/{Stats => statistiques}/types.ts | 0 site/source/pages/{Stats => statistiques}/utils.tsx | 0 site/source/store/reducers/rootReducer.ts | 2 +- site/vite-build-simulation-data.config.ts | 2 +- 73 files changed, 84 insertions(+), 82 deletions(-) rename site/source/pages/{Landing => _landing}/Landing.tsx (100%) rename site/source/pages/{Landing => _landing}/SearchOrCreate.tsx (100%) rename site/source/pages/{Landing => _landing}/illustration.backup.svg (100%) rename site/source/pages/{Landing => _landing}/illustration.svg (100%) rename site/source/pages/{Landing => _landing}/illustration2.svg (100%) rename site/source/pages/{Budget => budget}/budget.md (100%) rename site/source/pages/{Budget => budget}/budget.yaml (100%) rename site/source/pages/{Budget/Budget.tsx => budget/index.tsx} (100%) rename site/source/pages/{Dev => dev}/IntegrationTest.tsx (100%) rename site/source/pages/{Iframes => iframes}/IframeFooter.tsx (100%) rename site/source/pages/{Iframes => iframes}/index.tsx (100%) rename site/source/pages/{Nouveautes/Nouveautes.tsx => nouveautés/index.tsx} (100%) rename site/source/pages/simulateurs/{configs => _configs}/config.ts (100%) rename site/source/pages/simulateurs/{configs => _configs}/types.ts (100%) rename site/source/pages/simulateurs/{images => _images}/AutoEntrepreneurPreview.png (100%) rename site/source/pages/simulateurs/{images => _images}/RémunérationSASUPreview.png (100%) rename site/source/pages/{Stats => statistiques}/Chart.tsx (100%) rename site/source/pages/{Stats => statistiques}/DemandesUtilisateurs.tsx (100%) rename site/source/pages/{Stats => statistiques}/GlobalStats.tsx (100%) rename site/source/pages/{Stats => statistiques}/LazyStats.tsx (100%) rename site/source/pages/{Stats => statistiques}/SatisfactionChart.tsx (100%) rename site/source/pages/{Stats => statistiques}/Stats.tsx (100%) rename site/source/pages/{Stats => statistiques}/illustration.svg (100%) rename site/source/pages/{Stats => statistiques}/types.ts (100%) rename site/source/pages/{Stats => statistiques}/utils.tsx (100%) diff --git a/site/source/components/App.tsx b/site/source/components/App.tsx index 2454a57df..7fd9b8f53 100644 --- a/site/source/components/App.tsx +++ b/site/source/components/App.tsx @@ -22,19 +22,19 @@ import { useGetFullURL } from '@/hooks/useGetFullURL' import { useIsEmbedded } from '@/hooks/useIsEmbedded' import { useSaveAndRestoreScrollPosition } from '@/hooks/useSaveAndRestoreScrollPosition' import Accessibilité from '@/pages/Accessibilité' -import Budget from '@/pages/Budget/Budget' -import IntegrationTest from '@/pages/Dev/IntegrationTest' import Documentation from '@/pages/Documentation' -import Iframes from '@/pages/Iframes' -import Landing from '@/pages/Landing/Landing' -import Nouveautés from '@/pages/Nouveautes/Nouveautes' import Offline from '@/pages/Offline' import Plan from '@/pages/Plan' -import Stats from '@/pages/Stats/LazyStats' +import Landing from '@/pages/_landing/Landing' import Assistants from '@/pages/assistants/index' +import Budget from '@/pages/budget/index' +import IntegrationTest from '@/pages/dev/IntegrationTest' +import Iframes from '@/pages/iframes' import Integration from '@/pages/integration/index' +import Nouveautés from '@/pages/nouveautés/index' import Simulateurs from '@/pages/simulateurs' import SimulateursEtAssistants from '@/pages/simulateurs-et-assistants' +import Stats from '@/pages/statistiques/LazyStats' import { useSitePaths } from '@/sitePaths' import Provider, { ProviderProps } from './Provider' diff --git a/site/source/components/charts/PagesCharts.tsx b/site/source/components/charts/PagesCharts.tsx index 40652c73a..c200aa1d3 100644 --- a/site/source/components/charts/PagesCharts.tsx +++ b/site/source/components/charts/PagesCharts.tsx @@ -14,7 +14,7 @@ import { Strong } from '@/design-system/typography' import { Li, Ul } from '@/design-system/typography/list' import { Body } from '@/design-system/typography/paragraphs' import { useDarkMode } from '@/hooks/useDarkMode' -import { RealResponsiveContainer } from '@/pages/Stats/Chart' +import { RealResponsiveContainer } from '@/pages/statistiques/Chart' type Data = | Array<{ date: string; nombre: number }> diff --git a/site/source/pages/Landing/Landing.tsx b/site/source/pages/_landing/Landing.tsx similarity index 100% rename from site/source/pages/Landing/Landing.tsx rename to site/source/pages/_landing/Landing.tsx diff --git a/site/source/pages/Landing/SearchOrCreate.tsx b/site/source/pages/_landing/SearchOrCreate.tsx similarity index 100% rename from site/source/pages/Landing/SearchOrCreate.tsx rename to site/source/pages/_landing/SearchOrCreate.tsx diff --git a/site/source/pages/Landing/illustration.backup.svg b/site/source/pages/_landing/illustration.backup.svg similarity index 100% rename from site/source/pages/Landing/illustration.backup.svg rename to site/source/pages/_landing/illustration.backup.svg diff --git a/site/source/pages/Landing/illustration.svg b/site/source/pages/_landing/illustration.svg similarity index 100% rename from site/source/pages/Landing/illustration.svg rename to site/source/pages/_landing/illustration.svg diff --git a/site/source/pages/Landing/illustration2.svg b/site/source/pages/_landing/illustration2.svg similarity index 100% rename from site/source/pages/Landing/illustration2.svg rename to site/source/pages/_landing/illustration2.svg diff --git a/site/source/pages/assistants/choix-du-statut/choix-statut-juridique/config.ts b/site/source/pages/assistants/choix-du-statut/choix-statut-juridique/config.ts index 307d41515..6011a7cf3 100644 --- a/site/source/pages/assistants/choix-du-statut/choix-statut-juridique/config.ts +++ b/site/source/pages/assistants/choix-du-statut/choix-statut-juridique/config.ts @@ -1,6 +1,6 @@ import ChoixDuStatut from '..' -import { config } from '../../../simulateurs/configs/config' -import { SimulatorsDataParams } from '../../../simulateurs/configs/types' +import { config } from '../../../simulateurs/_configs/config' +import { SimulatorsDataParams } from '../../../simulateurs/_configs/types' export function choixStatutJuridiqueConfig({ t, diff --git a/site/source/pages/assistants/declaration-charges-sociales-independant/config.ts b/site/source/pages/assistants/declaration-charges-sociales-independant/config.ts index cfc98a885..a4ba5367c 100644 --- a/site/source/pages/assistants/declaration-charges-sociales-independant/config.ts +++ b/site/source/pages/assistants/declaration-charges-sociales-independant/config.ts @@ -1,6 +1,6 @@ import DéclarationChargeSocialeIndépendant from '.' -import { config } from '../../simulateurs/configs/config' -import { SimulatorsDataParams } from '../../simulateurs/configs/types' +import { config } from '../../simulateurs/_configs/config' +import { SimulatorsDataParams } from '../../simulateurs/_configs/types' export function déclarationChargesSocialesIndépendantConfig({ t, diff --git a/site/source/pages/assistants/declaration-revenu-independants/config.ts b/site/source/pages/assistants/declaration-revenu-independants/config.ts index 4db903f65..21e6d0439 100644 --- a/site/source/pages/assistants/declaration-revenu-independants/config.ts +++ b/site/source/pages/assistants/declaration-revenu-independants/config.ts @@ -1,6 +1,6 @@ import DéclarationRevenuIndépendant from '.' -import { config } from '../../simulateurs/configs/config' -import { SimulatorsDataParams } from '../../simulateurs/configs/types' +import { config } from '../../simulateurs/_configs/config' +import { SimulatorsDataParams } from '../../simulateurs/_configs/types' export function déclarationRevenuIndépendantBetaConfig({ t, diff --git a/site/source/pages/assistants/demande-mobilité/config.ts b/site/source/pages/assistants/demande-mobilité/config.ts index e28d5164f..0fce35080 100644 --- a/site/source/pages/assistants/demande-mobilité/config.ts +++ b/site/source/pages/assistants/demande-mobilité/config.ts @@ -1,6 +1,6 @@ import FormulaireMobilitéIndépendant from '.' -import { config } from '../../simulateurs/configs/config' -import { SimulatorsDataParams } from '../../simulateurs/configs/types' +import { config } from '../../simulateurs/_configs/config' +import { SimulatorsDataParams } from '../../simulateurs/_configs/types' export function demandeMobilitéConfig({ t, sitePaths }: SimulatorsDataParams) { return config({ diff --git a/site/source/pages/assistants/pour-mon-entreprise/config.tsx b/site/source/pages/assistants/pour-mon-entreprise/config.tsx index a4037f23f..501e30447 100644 --- a/site/source/pages/assistants/pour-mon-entreprise/config.tsx +++ b/site/source/pages/assistants/pour-mon-entreprise/config.tsx @@ -1,5 +1,5 @@ +import { SimulatorsDataParams } from '@/pages/simulateurs/_configs/types' import { config } from '@/pages/simulateurs/configs/config' -import { SimulatorsDataParams } from '@/pages/simulateurs/configs/types' import PourMonEntreprise from '.' diff --git a/site/source/pages/assistants/recherche-code-ape/SearchCodeAPE.tsx b/site/source/pages/assistants/recherche-code-ape/SearchCodeAPE.tsx index 07d7a7f81..38fb555ea 100644 --- a/site/source/pages/assistants/recherche-code-ape/SearchCodeAPE.tsx +++ b/site/source/pages/assistants/recherche-code-ape/SearchCodeAPE.tsx @@ -3,6 +3,7 @@ import { useEffect, useMemo, useRef, useState } from 'react' import { Trans, useTranslation } from 'react-i18next' import styled from 'styled-components' +import { TrackPage } from '@/components/ATInternetTracking' import FeedbackForm from '@/components/Feedback/FeedbackForm' import { FromTop } from '@/components/ui/animate' import { @@ -180,6 +181,7 @@ export default function SearchCodeAPE({ disabled }: SearchCodeApeProps) { {list.length > 0 && ( + + Cet assistant vous permet de trouver rapidement le code APE (activité diff --git a/site/source/pages/assistants/économie-collaborative/config.ts b/site/source/pages/assistants/économie-collaborative/config.ts index 173cc2f8d..6f8d487fa 100644 --- a/site/source/pages/assistants/économie-collaborative/config.ts +++ b/site/source/pages/assistants/économie-collaborative/config.ts @@ -1,6 +1,6 @@ import ÉconomieCollaborative from '.' -import { config } from '../../simulateurs/configs/config' -import { SimulatorsDataParams } from '../../simulateurs/configs/types' +import { config } from '../../simulateurs/_configs/config' +import { SimulatorsDataParams } from '../../simulateurs/_configs/types' export function économieCollaborativeConfig({ t, diff --git a/site/source/pages/Budget/budget.md b/site/source/pages/budget/budget.md similarity index 100% rename from site/source/pages/Budget/budget.md rename to site/source/pages/budget/budget.md diff --git a/site/source/pages/Budget/budget.yaml b/site/source/pages/budget/budget.yaml similarity index 100% rename from site/source/pages/Budget/budget.yaml rename to site/source/pages/budget/budget.yaml diff --git a/site/source/pages/Budget/Budget.tsx b/site/source/pages/budget/index.tsx similarity index 100% rename from site/source/pages/Budget/Budget.tsx rename to site/source/pages/budget/index.tsx diff --git a/site/source/pages/Dev/IntegrationTest.tsx b/site/source/pages/dev/IntegrationTest.tsx similarity index 100% rename from site/source/pages/Dev/IntegrationTest.tsx rename to site/source/pages/dev/IntegrationTest.tsx diff --git a/site/source/pages/Iframes/IframeFooter.tsx b/site/source/pages/iframes/IframeFooter.tsx similarity index 100% rename from site/source/pages/Iframes/IframeFooter.tsx rename to site/source/pages/iframes/IframeFooter.tsx diff --git a/site/source/pages/Iframes/index.tsx b/site/source/pages/iframes/index.tsx similarity index 100% rename from site/source/pages/Iframes/index.tsx rename to site/source/pages/iframes/index.tsx diff --git a/site/source/pages/Nouveautes/Nouveautes.tsx b/site/source/pages/nouveautés/index.tsx similarity index 100% rename from site/source/pages/Nouveautes/Nouveautes.tsx rename to site/source/pages/nouveautés/index.tsx diff --git a/site/source/pages/simulateurs/configs/config.ts b/site/source/pages/simulateurs/_configs/config.ts similarity index 100% rename from site/source/pages/simulateurs/configs/config.ts rename to site/source/pages/simulateurs/_configs/config.ts diff --git a/site/source/pages/simulateurs/configs/types.ts b/site/source/pages/simulateurs/_configs/types.ts similarity index 100% rename from site/source/pages/simulateurs/configs/types.ts rename to site/source/pages/simulateurs/_configs/types.ts diff --git a/site/source/pages/simulateurs/images/AutoEntrepreneurPreview.png b/site/source/pages/simulateurs/_images/AutoEntrepreneurPreview.png similarity index 100% rename from site/source/pages/simulateurs/images/AutoEntrepreneurPreview.png rename to site/source/pages/simulateurs/_images/AutoEntrepreneurPreview.png diff --git a/site/source/pages/simulateurs/images/RémunérationSASUPreview.png b/site/source/pages/simulateurs/_images/RémunérationSASUPreview.png similarity index 100% rename from site/source/pages/simulateurs/images/RémunérationSASUPreview.png rename to site/source/pages/simulateurs/_images/RémunérationSASUPreview.png diff --git a/site/source/pages/simulateurs/artiste-auteur/config.ts b/site/source/pages/simulateurs/artiste-auteur/config.ts index 162a47586..0ce2e9dc4 100644 --- a/site/source/pages/simulateurs/artiste-auteur/config.ts +++ b/site/source/pages/simulateurs/artiste-auteur/config.ts @@ -1,5 +1,5 @@ -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import ArtisteAuteur from './ArtisteAuteur' export function artisteAuteurConfig({ t, sitePaths }: SimulatorsDataParams) { diff --git a/site/source/pages/simulateurs/artiste-auteur/simulationConfig.ts b/site/source/pages/simulateurs/artiste-auteur/simulationConfig.ts index 3606a85bc..a8e7e9268 100644 --- a/site/source/pages/simulateurs/artiste-auteur/simulationConfig.ts +++ b/site/source/pages/simulateurs/artiste-auteur/simulationConfig.ts @@ -1,4 +1,4 @@ -import { SimulationConfig } from '../configs/types' +import { SimulationConfig } from '../_configs/types' export const configArtisteAuteur: SimulationConfig = { objectifs: [ diff --git a/site/source/pages/simulateurs/auto-entrepreneur/config.ts b/site/source/pages/simulateurs/auto-entrepreneur/config.ts index bcfef0c74..37ba0e6d2 100644 --- a/site/source/pages/simulateurs/auto-entrepreneur/config.ts +++ b/site/source/pages/simulateurs/auto-entrepreneur/config.ts @@ -1,5 +1,5 @@ -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import AutoEntrepreneurPreview from '../images/AutoEntrepreneurPreview.png' import AutoEntrepreneur, { SeoExplanations } from './AutoEntrepreneur' import { configAutoEntrepreneur } from './simulationConfig' diff --git a/site/source/pages/simulateurs/auto-entrepreneur/simulationConfig.ts b/site/source/pages/simulateurs/auto-entrepreneur/simulationConfig.ts index 04168a9c1..64177102c 100644 --- a/site/source/pages/simulateurs/auto-entrepreneur/simulationConfig.ts +++ b/site/source/pages/simulateurs/auto-entrepreneur/simulationConfig.ts @@ -1,4 +1,4 @@ -import { SimulationConfig } from '../configs/types' +import { SimulationConfig } from '../_configs/types' export const configAutoEntrepreneur: SimulationConfig = { 'objectifs exclusifs': [ diff --git a/site/source/pages/simulateurs/auxiliaire-médical/config.ts b/site/source/pages/simulateurs/auxiliaire-médical/config.ts index 41ce4a337..442008ba1 100644 --- a/site/source/pages/simulateurs/auxiliaire-médical/config.ts +++ b/site/source/pages/simulateurs/auxiliaire-médical/config.ts @@ -1,5 +1,5 @@ -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import { IndépendantPLSimulation } from '../indépendant/Indépendant' import { configAuxiliaire } from '../profession-libérale/simulationConfig' diff --git a/site/source/pages/simulateurs/avocat/config.ts b/site/source/pages/simulateurs/avocat/config.ts index 40a9f3169..49db13e56 100644 --- a/site/source/pages/simulateurs/avocat/config.ts +++ b/site/source/pages/simulateurs/avocat/config.ts @@ -1,5 +1,5 @@ -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import { IndépendantPLSimulation } from '../indépendant/Indépendant' import { configAvocat } from '../profession-libérale/simulationConfig' diff --git a/site/source/pages/simulateurs/chirurgien-dentiste/config.ts b/site/source/pages/simulateurs/chirurgien-dentiste/config.ts index 76a534f14..40f89297a 100644 --- a/site/source/pages/simulateurs/chirurgien-dentiste/config.ts +++ b/site/source/pages/simulateurs/chirurgien-dentiste/config.ts @@ -1,5 +1,5 @@ -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import { IndépendantPLSimulation } from '../indépendant/Indépendant' import { configDentiste } from '../profession-libérale/simulationConfig' diff --git a/site/source/pages/simulateurs/chômage-partiel/config.ts b/site/source/pages/simulateurs/chômage-partiel/config.ts index 3ad084558..c24e4e620 100644 --- a/site/source/pages/simulateurs/chômage-partiel/config.ts +++ b/site/source/pages/simulateurs/chômage-partiel/config.ts @@ -1,5 +1,5 @@ -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import ChômagePartielComponent, { SeoExplanations } from './ChômagePartiel' import ChômagePartielPreview from './ChômagePartielPreview.png' import { configChômagePartiel } from './simulationConfig' diff --git a/site/source/pages/simulateurs/chômage-partiel/simulationConfig.ts b/site/source/pages/simulateurs/chômage-partiel/simulationConfig.ts index dffb983e7..5f1f4116f 100644 --- a/site/source/pages/simulateurs/chômage-partiel/simulationConfig.ts +++ b/site/source/pages/simulateurs/chômage-partiel/simulationConfig.ts @@ -1,4 +1,4 @@ -import { SimulationConfig } from '../configs/types' +import { SimulationConfig } from '../_configs/types' export const configChômagePartiel: SimulationConfig = { objectifs: [ diff --git a/site/source/pages/simulateurs/cipav/config.tsx b/site/source/pages/simulateurs/cipav/config.tsx index d6be9acdc..41248ff8c 100644 --- a/site/source/pages/simulateurs/cipav/config.tsx +++ b/site/source/pages/simulateurs/cipav/config.tsx @@ -1,5 +1,5 @@ -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import { IndépendantPLSimulation } from '../indépendant/Indépendant' import cipavSimulationConfig from './simulationConfig' diff --git a/site/source/pages/simulateurs/cipav/simulationConfig.ts b/site/source/pages/simulateurs/cipav/simulationConfig.ts index 33b6ddc1d..6cf18f08d 100644 --- a/site/source/pages/simulateurs/cipav/simulationConfig.ts +++ b/site/source/pages/simulateurs/cipav/simulationConfig.ts @@ -1,4 +1,4 @@ -import { SimulationConfig } from '../configs/types' +import { SimulationConfig } from '../_configs/types' import { configProfessionLibérale } from '../profession-libérale/simulationConfig' const cipavSimulationConfig: SimulationConfig = { diff --git a/site/source/pages/simulateurs/comparaison-statuts/config.ts b/site/source/pages/simulateurs/comparaison-statuts/config.ts index 6b500d3aa..62dbae045 100644 --- a/site/source/pages/simulateurs/comparaison-statuts/config.ts +++ b/site/source/pages/simulateurs/comparaison-statuts/config.ts @@ -1,6 +1,6 @@ import SchemeComparaisonPage from '.' -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import { configComparateurStatuts } from './simulationConfig' export function comparaisonStatutsConfig({ diff --git a/site/source/pages/simulateurs/comparaison-statuts/simulationConfig.ts b/site/source/pages/simulateurs/comparaison-statuts/simulationConfig.ts index 442cd0d29..55e3440dc 100644 --- a/site/source/pages/simulateurs/comparaison-statuts/simulationConfig.ts +++ b/site/source/pages/simulateurs/comparaison-statuts/simulationConfig.ts @@ -1,4 +1,4 @@ -import { SimulationConfig } from '../configs/types' +import { SimulationConfig } from '../_configs/types' export const configComparateurStatuts: SimulationConfig = { 'objectifs exclusifs': [], diff --git a/site/source/pages/simulateurs/cout-creation-entreprise/config.ts b/site/source/pages/simulateurs/cout-creation-entreprise/config.ts index 416b2bbc8..944b71ca5 100644 --- a/site/source/pages/simulateurs/cout-creation-entreprise/config.ts +++ b/site/source/pages/simulateurs/cout-creation-entreprise/config.ts @@ -1,6 +1,6 @@ import CoutCreationEntreprise from '.' -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' export function coûtCréationEntrepriseConfig({ t, diff --git a/site/source/pages/simulateurs/dividendes/config.ts b/site/source/pages/simulateurs/dividendes/config.ts index 2a0824f84..adfa6a45d 100644 --- a/site/source/pages/simulateurs/dividendes/config.ts +++ b/site/source/pages/simulateurs/dividendes/config.ts @@ -1,5 +1,5 @@ -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import DividendesSimulation, { SeoExplanations } from './Dividendes' import { configDividendes } from './simulationConfig' diff --git a/site/source/pages/simulateurs/dividendes/simulationConfig.ts b/site/source/pages/simulateurs/dividendes/simulationConfig.ts index 2d75e52ce..ce992ce15 100644 --- a/site/source/pages/simulateurs/dividendes/simulationConfig.ts +++ b/site/source/pages/simulateurs/dividendes/simulationConfig.ts @@ -1,4 +1,4 @@ -import { SimulationConfig } from '../configs/types' +import { SimulationConfig } from '../_configs/types' export const configDividendes: SimulationConfig = { 'objectifs exclusifs': [ diff --git a/site/source/pages/simulateurs/eirl/config.ts b/site/source/pages/simulateurs/eirl/config.ts index b415df9be..045c30837 100644 --- a/site/source/pages/simulateurs/eirl/config.ts +++ b/site/source/pages/simulateurs/eirl/config.ts @@ -1,5 +1,5 @@ -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import AutoEntrepreneurPreview from '../images/AutoEntrepreneurPreview.png' import IndépendantSimulation from '../indépendant/Indépendant' import { configEirl } from '../indépendant/simulationConfig' diff --git a/site/source/pages/simulateurs/entreprise-individuelle/config.ts b/site/source/pages/simulateurs/entreprise-individuelle/config.ts index 2c7432308..b6cdbb888 100644 --- a/site/source/pages/simulateurs/entreprise-individuelle/config.ts +++ b/site/source/pages/simulateurs/entreprise-individuelle/config.ts @@ -1,5 +1,5 @@ -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import AutoEntrepreneurPreview from '../images/AutoEntrepreneurPreview.png' import { EntrepriseIndividuelle, diff --git a/site/source/pages/simulateurs/eurl/config.tsx b/site/source/pages/simulateurs/eurl/config.tsx index 9d72466ce..0be0a2c42 100644 --- a/site/source/pages/simulateurs/eurl/config.tsx +++ b/site/source/pages/simulateurs/eurl/config.tsx @@ -1,5 +1,5 @@ -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import RémunérationSASUPreview from '../images/RémunérationSASUPreview.png' import IndépendantSimulation from '../indépendant/Indépendant' import { configEurl } from '../indépendant/simulationConfig' diff --git a/site/source/pages/simulateurs/expert-comptable/config.ts b/site/source/pages/simulateurs/expert-comptable/config.ts index 0b1ed8ebe..e9140fc52 100644 --- a/site/source/pages/simulateurs/expert-comptable/config.ts +++ b/site/source/pages/simulateurs/expert-comptable/config.ts @@ -1,5 +1,5 @@ -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import { IndépendantPLSimulation } from '../indépendant/Indépendant' import { configExpertComptable } from '../profession-libérale/simulationConfig' diff --git a/site/source/pages/simulateurs/impot-societe/config.tsx b/site/source/pages/simulateurs/impot-societe/config.tsx index f33940c55..08b248f0a 100644 --- a/site/source/pages/simulateurs/impot-societe/config.tsx +++ b/site/source/pages/simulateurs/impot-societe/config.tsx @@ -1,6 +1,6 @@ import ISSimulation, { SeoExplanations } from '.' -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import ISSimulationConfig from './simulationConfig' export function impôtSociétéConfig({ t, sitePaths }: SimulatorsDataParams) { diff --git a/site/source/pages/simulateurs/impot-societe/simulationConfig.ts b/site/source/pages/simulateurs/impot-societe/simulationConfig.ts index c5e34a954..791ebcd1b 100644 --- a/site/source/pages/simulateurs/impot-societe/simulationConfig.ts +++ b/site/source/pages/simulateurs/impot-societe/simulationConfig.ts @@ -1,4 +1,4 @@ -import { SimulationConfig } from '../configs/types' +import { SimulationConfig } from '../_configs/types' const ISSimulationConfig: SimulationConfig = { 'unité par défaut': '€/an', diff --git a/site/source/pages/simulateurs/indépendant/config.ts b/site/source/pages/simulateurs/indépendant/config.ts index 13f0b5ba4..38248ff75 100644 --- a/site/source/pages/simulateurs/indépendant/config.ts +++ b/site/source/pages/simulateurs/indépendant/config.ts @@ -1,5 +1,5 @@ -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import IndépendantSimulation from './Indépendant' import { configIndépendant } from './simulationConfig' diff --git a/site/source/pages/simulateurs/indépendant/simulationConfig.ts b/site/source/pages/simulateurs/indépendant/simulationConfig.ts index c6dcdf743..4021b1b43 100644 --- a/site/source/pages/simulateurs/indépendant/simulationConfig.ts +++ b/site/source/pages/simulateurs/indépendant/simulationConfig.ts @@ -1,4 +1,4 @@ -import { SimulationConfig } from '../configs/types' +import { SimulationConfig } from '../_configs/types' export const configIndépendant: SimulationConfig = { 'objectifs exclusifs': [ diff --git a/site/source/pages/simulateurs/metadata-src.ts b/site/source/pages/simulateurs/metadata-src.ts index 8cc742f89..f2b882c8a 100644 --- a/site/source/pages/simulateurs/metadata-src.ts +++ b/site/source/pages/simulateurs/metadata-src.ts @@ -7,6 +7,7 @@ import { demandeMobilitéConfig } from '../assistants/demande-mobilité/config' import { pourMonEntrepriseConfig } from '../assistants/pour-mon-entreprise/config' import { rechercheCodeApeConfig } from '../assistants/recherche-code-ape/config' import { économieCollaborativeConfig } from '../assistants/économie-collaborative/config' +import { PageConfig, SimulatorsDataParams } from './_configs/types' import { artisteAuteurConfig } from './artiste-auteur/config' import { autoEntrepreneurConfig } from './auto-entrepreneur/config' import { auxiliaireMédicalConfig } from './auxiliaire-médical/config' @@ -15,7 +16,6 @@ import { chirurgienDentisteConfig } from './chirurgien-dentiste/config' import { chômagePartielConfig } from './chômage-partiel/config' import { cipavConfig } from './cipav/config' import { comparaisonStatutsConfig } from './comparaison-statuts/config' -import { PageConfig, SimulatorsDataParams } from './configs/types' import { coûtCréationEntrepriseConfig } from './cout-creation-entreprise/config.js' import { dividendesConfig } from './dividendes/config' import { eirlConfig } from './eirl/config' diff --git a/site/source/pages/simulateurs/médecin/config.ts b/site/source/pages/simulateurs/médecin/config.ts index fcd9a6aa8..e77fff3aa 100644 --- a/site/source/pages/simulateurs/médecin/config.ts +++ b/site/source/pages/simulateurs/médecin/config.ts @@ -1,5 +1,5 @@ -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import { IndépendantPLSimulation } from '../indépendant/Indépendant' import { configMédecin } from '../profession-libérale/simulationConfig' diff --git a/site/source/pages/simulateurs/pamc/config.ts b/site/source/pages/simulateurs/pamc/config.ts index 0793192ad..00bd30187 100644 --- a/site/source/pages/simulateurs/pamc/config.ts +++ b/site/source/pages/simulateurs/pamc/config.ts @@ -1,5 +1,5 @@ -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import { configProfessionLibérale } from '../profession-libérale/simulationConfig' import PAMCHome from './PAMCHome' diff --git a/site/source/pages/simulateurs/pharmacien/config.ts b/site/source/pages/simulateurs/pharmacien/config.ts index 00c92b42a..7e0490a92 100644 --- a/site/source/pages/simulateurs/pharmacien/config.ts +++ b/site/source/pages/simulateurs/pharmacien/config.ts @@ -1,5 +1,5 @@ -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import { IndépendantPLSimulation } from '../indépendant/Indépendant' import { configPharmacien } from '../profession-libérale/simulationConfig' diff --git a/site/source/pages/simulateurs/profession-libérale/config.ts b/site/source/pages/simulateurs/profession-libérale/config.ts index 29dafd8bf..5ee9621d9 100644 --- a/site/source/pages/simulateurs/profession-libérale/config.ts +++ b/site/source/pages/simulateurs/profession-libérale/config.ts @@ -1,5 +1,5 @@ -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import { IndépendantPLSimulation } from '../indépendant/Indépendant' import { configProfessionLibérale } from './simulationConfig' diff --git a/site/source/pages/simulateurs/profession-libérale/simulationConfig.ts b/site/source/pages/simulateurs/profession-libérale/simulationConfig.ts index 9588baf04..8dd47c97a 100644 --- a/site/source/pages/simulateurs/profession-libérale/simulationConfig.ts +++ b/site/source/pages/simulateurs/profession-libérale/simulationConfig.ts @@ -1,4 +1,4 @@ -import { SimulationConfig } from '../configs/types' +import { SimulationConfig } from '../_configs/types' import { configIndépendant } from '../indépendant/simulationConfig' export const configProfessionLibérale: SimulationConfig = { diff --git a/site/source/pages/simulateurs/sage-femme/config.ts b/site/source/pages/simulateurs/sage-femme/config.ts index 600caa415..e4764fb7a 100644 --- a/site/source/pages/simulateurs/sage-femme/config.ts +++ b/site/source/pages/simulateurs/sage-femme/config.ts @@ -1,5 +1,5 @@ -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import { IndépendantPLSimulation } from '../indépendant/Indépendant' import { configSageFemme } from '../profession-libérale/simulationConfig' diff --git a/site/source/pages/simulateurs/salarié/config.ts b/site/source/pages/simulateurs/salarié/config.ts index 70efeeeaf..3f2dc548b 100644 --- a/site/source/pages/simulateurs/salarié/config.ts +++ b/site/source/pages/simulateurs/salarié/config.ts @@ -1,5 +1,5 @@ -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import salaireBrutNetPreviewEN from './SalaireBrutNetPreviewEN.png' import salaireBrutNetPreviewFR from './SalaireBrutNetPreviewFR.png' import SalariéSimulation, { SeoExplanations } from './Salarié' diff --git a/site/source/pages/simulateurs/salarié/simulationConfig.ts b/site/source/pages/simulateurs/salarié/simulationConfig.ts index b6d75042a..f7195d564 100644 --- a/site/source/pages/simulateurs/salarié/simulationConfig.ts +++ b/site/source/pages/simulateurs/salarié/simulationConfig.ts @@ -1,4 +1,4 @@ -import { SimulationConfig } from '../configs/types' +import { SimulationConfig } from '../_configs/types' export const configSalarié: SimulationConfig = { 'objectifs exclusifs': [ diff --git a/site/source/pages/simulateurs/sasu/config.ts b/site/source/pages/simulateurs/sasu/config.ts index 0357b5512..a56b8f000 100644 --- a/site/source/pages/simulateurs/sasu/config.ts +++ b/site/source/pages/simulateurs/sasu/config.ts @@ -1,5 +1,5 @@ -import { config } from '../configs/config' -import { SimulatorsDataParams } from '../configs/types' +import { config } from '../_configs/config' +import { SimulatorsDataParams } from '../_configs/types' import RémunérationSASUPreview from '../images/RémunérationSASUPreview.png' import { SASUSimulation, SeoExplanations } from './SASU' import { configSASU } from './simulationConfig' diff --git a/site/source/pages/simulateurs/sasu/simulationConfig.ts b/site/source/pages/simulateurs/sasu/simulationConfig.ts index 60120758c..aa8496e51 100644 --- a/site/source/pages/simulateurs/sasu/simulationConfig.ts +++ b/site/source/pages/simulateurs/sasu/simulationConfig.ts @@ -1,4 +1,4 @@ -import { SimulationConfig } from '../configs/types' +import { SimulationConfig } from '../_configs/types' export const configSASU: SimulationConfig = { 'objectifs exclusifs': [ diff --git a/site/source/pages/Stats/Chart.tsx b/site/source/pages/statistiques/Chart.tsx similarity index 100% rename from site/source/pages/Stats/Chart.tsx rename to site/source/pages/statistiques/Chart.tsx diff --git a/site/source/pages/Stats/DemandesUtilisateurs.tsx b/site/source/pages/statistiques/DemandesUtilisateurs.tsx similarity index 100% rename from site/source/pages/Stats/DemandesUtilisateurs.tsx rename to site/source/pages/statistiques/DemandesUtilisateurs.tsx diff --git a/site/source/pages/Stats/GlobalStats.tsx b/site/source/pages/statistiques/GlobalStats.tsx similarity index 100% rename from site/source/pages/Stats/GlobalStats.tsx rename to site/source/pages/statistiques/GlobalStats.tsx diff --git a/site/source/pages/Stats/LazyStats.tsx b/site/source/pages/statistiques/LazyStats.tsx similarity index 100% rename from site/source/pages/Stats/LazyStats.tsx rename to site/source/pages/statistiques/LazyStats.tsx diff --git a/site/source/pages/Stats/SatisfactionChart.tsx b/site/source/pages/statistiques/SatisfactionChart.tsx similarity index 100% rename from site/source/pages/Stats/SatisfactionChart.tsx rename to site/source/pages/statistiques/SatisfactionChart.tsx diff --git a/site/source/pages/Stats/Stats.tsx b/site/source/pages/statistiques/Stats.tsx similarity index 100% rename from site/source/pages/Stats/Stats.tsx rename to site/source/pages/statistiques/Stats.tsx diff --git a/site/source/pages/Stats/illustration.svg b/site/source/pages/statistiques/illustration.svg similarity index 100% rename from site/source/pages/Stats/illustration.svg rename to site/source/pages/statistiques/illustration.svg diff --git a/site/source/pages/Stats/types.ts b/site/source/pages/statistiques/types.ts similarity index 100% rename from site/source/pages/Stats/types.ts rename to site/source/pages/statistiques/types.ts diff --git a/site/source/pages/Stats/utils.tsx b/site/source/pages/statistiques/utils.tsx similarity index 100% rename from site/source/pages/Stats/utils.tsx rename to site/source/pages/statistiques/utils.tsx diff --git a/site/source/store/reducers/rootReducer.ts b/site/source/store/reducers/rootReducer.ts index 5816e1909..24fb1c6c4 100644 --- a/site/source/store/reducers/rootReducer.ts +++ b/site/source/store/reducers/rootReducer.ts @@ -2,7 +2,7 @@ import { DottedName } from 'modele-social' import reduceReducers from 'reduce-reducers' import { Reducer, combineReducers } from 'redux' -import { SimulationConfig, Situation } from '@/pages/simulateurs/configs/types' +import { SimulationConfig, Situation } from '@/pages/simulateurs/_configs/types' import { Action } from '@/store/actions/actions' import { PreviousSimulation } from '@/store/selectors/previousSimulationSelectors' import { ImmutableType } from '@/types/utils' diff --git a/site/vite-build-simulation-data.config.ts b/site/vite-build-simulation-data.config.ts index cc32f768e..1508b2ef6 100644 --- a/site/vite-build-simulation-data.config.ts +++ b/site/vite-build-simulation-data.config.ts @@ -2,7 +2,7 @@ import { unlinkSync, writeFileSync } from 'fs' import path from 'path' import { defineConfig } from 'vite' -import { PageConfig } from '@/pages/simulateurs/configs/types' +import { PageConfig } from '@/pages/simulateurs/_configs/types' import { objectTransform } from './source/utils'