Déplace le simulateur économie collaborative dans le chemin /simulateurs/
|
@ -47,7 +47,6 @@ import Landing from './pages/Landing/Landing'
|
|||
import Nouveautés from './pages/Nouveautés/Nouveautés'
|
||||
import Simulateurs from './pages/Simulateurs'
|
||||
import Stats from './pages/Stats/LazyStats'
|
||||
import ÉconomieCollaborative from './pages/ÉconomieCollaborative'
|
||||
import redirects from './redirects'
|
||||
import { constructLocalizedSitePath } from './sitePaths'
|
||||
|
||||
|
@ -145,10 +144,6 @@ const App = () => {
|
|||
{redirects}
|
||||
<Route path={sitePaths.créer.index} component={Créer} />
|
||||
<Route path={sitePaths.gérer.index} component={Gérer} />
|
||||
<Route
|
||||
path={sitePaths.économieCollaborative.index}
|
||||
component={ÉconomieCollaborative}
|
||||
/>
|
||||
<Route path={sitePaths.simulateurs.index} component={Simulateurs} />
|
||||
<Route
|
||||
path={sitePaths.documentation.index}
|
||||
|
|
|
@ -79,7 +79,7 @@ export function useSimulatorsMetadata() {
|
|||
'Un guide pour savoir comment déclarer vos revenus issus de plateformes en ligne (AirBnb, leboncoin, blablacar, etc.)'
|
||||
),
|
||||
icône: '🙋',
|
||||
sitePath: sitePaths.économieCollaborative.index
|
||||
sitePath: sitePaths.simulateurs.économieCollaborative.index
|
||||
},
|
||||
{
|
||||
name: t('Chômage partiel'),
|
||||
|
|
|
@ -12,6 +12,7 @@ import Home from './Home'
|
|||
import Indépendant from './Indépendant'
|
||||
import Salarié from './Salarié'
|
||||
import SchemeComparaison from './SchemeComparaison'
|
||||
import ÉconomieCollaborative from './ÉconomieCollaborative'
|
||||
|
||||
export default function Simulateurs() {
|
||||
const sitePaths = useContext(SitePathsContext)
|
||||
|
@ -83,6 +84,10 @@ export default function Simulateurs() {
|
|||
path={sitePaths.simulateurs['chômage-partiel']}
|
||||
component={ChômagePartiel}
|
||||
/>
|
||||
<Route
|
||||
path={sitePaths.simulateurs.économieCollaborative.index}
|
||||
component={ÉconomieCollaborative}
|
||||
/>
|
||||
</Switch>
|
||||
</>
|
||||
)
|
||||
|
|
|
@ -26,7 +26,7 @@ export default function Activité({
|
|||
const { state, dispatch } = useContext(StoreContext)
|
||||
const activité = getTranslatedActivité(title, language)
|
||||
if (!(title in state)) {
|
||||
return <Redirect to={sitePaths.économieCollaborative.index} />
|
||||
return <Redirect to={sitePaths.simulateurs.économieCollaborative.index} />
|
||||
}
|
||||
|
||||
if (activité.activités) {
|
|
@ -10,7 +10,7 @@ import { Link } from 'react-router-dom'
|
|||
import Animate from 'Components/ui/animate'
|
||||
import Checkbox from 'Components/ui/Checkbox'
|
||||
import InfoBulle from 'Components/ui/InfoBulle'
|
||||
import { debounce } from '../../../../utils'
|
||||
import { debounce } from '../../../../../utils'
|
||||
import { toggleActivité } from './actions'
|
||||
import { activités, getTranslatedActivité } from './activitésData'
|
||||
import NextButton from './NextButton'
|
||||
|
@ -168,7 +168,7 @@ export const ActivitéCard = ({
|
|||
<Link
|
||||
onClick={e => e.stopPropagation()}
|
||||
className="ui__ small simple button"
|
||||
to={sitePaths.économieCollaborative.index + '/' + title}
|
||||
to={sitePaths.simulateurs.économieCollaborative.index + '/' + title}
|
||||
>
|
||||
<Trans>Modifier</Trans>
|
||||
</Link>
|
|
@ -31,8 +31,10 @@ export default function NextButton({ activité, disabled }: NextButtonProps) {
|
|||
}}
|
||||
to={
|
||||
nextActivité
|
||||
? sitePaths.économieCollaborative.index + '/' + nextActivité
|
||||
: sitePaths.économieCollaborative.votreSituation
|
||||
? sitePaths.simulateurs.économieCollaborative.index +
|
||||
'/' +
|
||||
nextActivité
|
||||
: sitePaths.simulateurs.économieCollaborative.votreSituation
|
||||
}
|
||||
>
|
||||
{nextActivité || disabled ? (
|
|
@ -20,7 +20,7 @@ export default function VotreSituation() {
|
|||
const { state } = useContext(StoreContext)
|
||||
const { t } = useTranslation()
|
||||
if (!activitésEffectuéesSelector(state).length) {
|
||||
return <Redirect to={sitePaths.économieCollaborative.index} />
|
||||
return <Redirect to={sitePaths.simulateurs.économieCollaborative.index} />
|
||||
}
|
||||
const titre = t(
|
||||
'économieCollaborative.obligations.titre',
|
||||
|
@ -31,7 +31,9 @@ export default function VotreSituation() {
|
|||
if (nextActivité) {
|
||||
return (
|
||||
<Redirect
|
||||
to={sitePaths.économieCollaborative.index + '/' + nextActivité}
|
||||
to={
|
||||
sitePaths.simulateurs.économieCollaborative.index + '/' + nextActivité
|
||||
}
|
||||
/>
|
||||
)
|
||||
}
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 7.3 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 40 KiB After Width: | Height: | Size: 40 KiB |
|
@ -15,7 +15,7 @@ export default function ÉconomieCollaborative() {
|
|||
<>
|
||||
<div css="transform: translateY(2rem)">
|
||||
<NavLink
|
||||
to={sitePaths.économieCollaborative.index}
|
||||
to={sitePaths.simulateurs.économieCollaborative.index}
|
||||
exact
|
||||
activeClassName="ui__ hide"
|
||||
className="ui__ simple small push-left button "
|
||||
|
@ -33,15 +33,15 @@ export default function ÉconomieCollaborative() {
|
|||
<Switch>
|
||||
<Route
|
||||
exact
|
||||
path={sitePaths.économieCollaborative.index}
|
||||
path={sitePaths.simulateurs.économieCollaborative.index}
|
||||
component={ActivitésSelection}
|
||||
/>
|
||||
<Route
|
||||
path={sitePaths.économieCollaborative.votreSituation}
|
||||
path={sitePaths.simulateurs.économieCollaborative.votreSituation}
|
||||
component={VotreSituation}
|
||||
/>
|
||||
<Route
|
||||
path={sitePaths.économieCollaborative.index + '/:title'}
|
||||
path={sitePaths.simulateurs.économieCollaborative.index + '/:title'}
|
||||
component={Activité}
|
||||
/>
|
||||
</Switch>
|
|
@ -54,11 +54,11 @@ const sitePathsFr = {
|
|||
comparaison: '/comparaison-régimes-sociaux',
|
||||
salarié: '/salarié',
|
||||
'artiste-auteur': '/artiste-auteur',
|
||||
'chômage-partiel': '/chômage-partiel'
|
||||
},
|
||||
économieCollaborative: {
|
||||
index: '/économie-collaborative',
|
||||
votreSituation: '/votre-situation'
|
||||
'chômage-partiel': '/chômage-partiel',
|
||||
économieCollaborative: {
|
||||
index: '/économie-collaborative',
|
||||
votreSituation: '/votre-situation'
|
||||
}
|
||||
},
|
||||
nouveautés: '/nouveautés',
|
||||
stats: '/stats',
|
||||
|
@ -103,11 +103,11 @@ const sitePathsEn = {
|
|||
comparaison: '/social-scheme-comparaison',
|
||||
salarié: '/salaried',
|
||||
'artiste-auteur': '/artist-author',
|
||||
'chômage-partiel': '/partial-unemployement'
|
||||
},
|
||||
économieCollaborative: {
|
||||
index: '/sharing-economy',
|
||||
votreSituation: '/your-situation'
|
||||
'chômage-partiel': '/partial-unemployement',
|
||||
économieCollaborative: {
|
||||
index: '/sharing-economy',
|
||||
votreSituation: '/your-situation'
|
||||
}
|
||||
},
|
||||
nouveautés: '/news',
|
||||
integration: {
|
||||
|
|
|
@ -69,6 +69,11 @@
|
|||
to="/simulateurs/ch%C3%B4mage-partiel"
|
||||
status = 301
|
||||
|
||||
[[redirects]]
|
||||
from="/%C3%A9conomie-collaborative"
|
||||
to="/simulateurs/%C3%A9conomie-collaborative"
|
||||
status = 301
|
||||
|
||||
# SEO redirect
|
||||
[[redirects]]
|
||||
from = "/documentation/contrat-salari%C3%A9/salaire/*"
|
||||
|
|