Améliore la navigation dans l'assistant au choix du statut

pull/2782/head
Johan Girod 2023-06-30 17:02:40 +02:00
parent d064ade08e
commit 4d5c3c256a
7 changed files with 27 additions and 25 deletions

View File

@ -15,6 +15,7 @@ import {
} from '@/hooks/useCurrentSimulatorData'
import { useIsEmbedded } from '@/hooks/useIsEmbedded'
import useSimulationConfig from '@/hooks/useSimulationConfig'
import { useSitePaths } from '@/sitePaths'
import { situationSelector } from '@/store/selectors/simulationSelectors'
import { Merge } from '@/types/utils'
@ -56,7 +57,7 @@ export default function SimulateurOrAssistantPage() {
autoloadLastSimulation,
})
useSearchParamsSimulationSharing()
const { absoluteSitePaths } = useSitePaths()
const trackInfo = {
chapter1:
typeof tracking !== 'string' && tracking && 'chapter1' in tracking
@ -82,6 +83,7 @@ export default function SimulateurOrAssistantPage() {
)}
{beta && <BetaBanner />}
{title && !inIframe && (
<>
<H1>

View File

@ -10,7 +10,7 @@ import { SmallBody } from '@/design-system/typography/paragraphs'
export default function StatutsDisponibles() {
const engine = useEngine()
const statutes = [
const statuts = [
'entreprise . catégorie juridique . EI . EI',
'entreprise . catégorie juridique . EI . auto-entrepreneur',
'entreprise . catégorie juridique . SARL . EURL',
@ -36,7 +36,7 @@ export default function StatutsDisponibles() {
professionnelle que vous exercez
</SmallBody>
<StyledUl noMarker>
{statutes.map((statut) => (
{statuts.map((statut) => (
<Statut key={statut} statut={statut} />
))}
</StyledUl>

View File

@ -7,7 +7,7 @@ import { useEngine, useRawSituation } from '@/components/utils/EngineContext'
import { Button } from '@/design-system/buttons'
import { Container } from '@/design-system/layout'
import { Strong } from '@/design-system/typography'
import { Body } from '@/design-system/typography/paragraphs'
import { Intro } from '@/design-system/typography/paragraphs'
import { EngineComparison } from '@/pages/simulateurs/comparaison-statuts/components/Comparateur'
import Détails from '@/pages/simulateurs/comparaison-statuts/components/Détails'
import ModifierOptions from '@/pages/simulateurs/comparaison-statuts/components/ModifierOptions'
@ -28,14 +28,12 @@ export default function Comparateur() {
return (
<>
<Trans i18nKey="choix-statut.commune.description">
<Body>
Bonne nouvelle : il ne reste plus que{' '}
<Strong>{namedEngines.length} statuts possibles</Strong>. Vous allez
maintenant pouvoir entrer dans le détail et comparer{' '}
<Strong>leurs revenus</Strong>, la <Strong>couverture sociale</Strong>{' '}
<Intro>
Vous allez maintenant pouvoir entrer dans le détail et comparer{' '}
<Strong>les revenus</Strong>, la <Strong>couverture sociale</Strong>{' '}
et la <Strong>gestion comptable et juridique</Strong> avant de faire
votre choix.
</Body>
</Intro>
</Trans>
<Container

View File

@ -1,4 +1,4 @@
import { useState } from 'react'
import { useEffect, useState } from 'react'
import { Trans, useTranslation } from 'react-i18next'
import { useDispatch } from 'react-redux'
@ -7,7 +7,7 @@ import { HelpButtonWithPopover } from '@/design-system/buttons'
import { H5 } from '@/design-system/typography/heading'
import { Link } from '@/design-system/typography/link'
import { Body } from '@/design-system/typography/paragraphs'
import { updateSituation } from '@/store/actions/actions'
import { resetSimulation, updateSituation } from '@/store/actions/actions'
import SearchCodeAPE from '../recherche-code-ape/SearchCodeAPE'
import Layout from './_components/Layout'
@ -18,6 +18,10 @@ export default function RechercheActivité() {
const { t } = useTranslation()
const dispatch = useDispatch()
useEffect(() => {
dispatch(resetSimulation())
}, [])
return (
<>
<Layout

View File

@ -1,7 +1,8 @@
import { useLocation } from 'react-router-dom'
import { Button } from '@/design-system/buttons'
import { Emoji } from '@/design-system/emoji'
import { Container, Grid } from '@/design-system/layout'
import { Container, Grid, Spacing } from '@/design-system/layout'
import { H3 } from '@/design-system/typography/heading'
import { Intro } from '@/design-system/typography/paragraphs'
import { useSitePaths } from '@/sitePaths'
@ -25,6 +26,14 @@ export default function Résultat() {
quelques pistes.
</Intro>
<Button
color="secondary"
light
to={absoluteSitePaths.assistants['choix-du-statut'].index}
>
<span aria-hidden></span> Recommencer le guide
</Button>
<Spacing md />
<Container
backgroundColor={(theme) =>
theme.darkMode

View File

@ -1,15 +1,12 @@
import { Trans } from 'react-i18next'
import { Navigate, Route, Routes, useLocation } from 'react-router-dom'
import { TrackChapter } from '@/components/ATInternetTracking'
import SimulateurOrAssistantPage from '@/components/SimulateurOrAssistantPage'
import { ScrollToTop } from '@/components/utils/Scroll'
import { Link } from '@/design-system/typography/link'
import useSimulatorsData from '@/hooks/useSimulatorsData'
import { useSitePaths } from '@/sitePaths'
import SocialSecurity from './sécurité-sociale'
export default function Assistants() {
const { relativeSitePaths, absoluteSitePaths } = useSitePaths()
const location = useLocation()
@ -35,15 +32,6 @@ export default function Assistants() {
<Navigate to={absoluteSitePaths.simulateursEtAssistants} replace />
}
/>
<Route
path={relativeSitePaths.assistants.sécuritéSociale}
element={
<TrackChapter chapter1="gerer">
{back}
<SocialSecurity />
</TrackChapter>
}
/>
{Object.entries(simulateurs)
.filter(([, simu]) => simu.pathId.startsWith('assistants.'))

View File

@ -76,6 +76,7 @@ export function companySituation(state: Situation = {}, action: Action) {
}
case 'SET_SIMULATION':
case 'RESET_SIMULATION':
return state['entreprise . SIREN'] ? state : {}
}