diff --git a/source/sites/publicodes/Actions.tsx b/source/sites/publicodes/Actions.tsx index 8f9b04a9e5..36442c95b8 100644 --- a/source/sites/publicodes/Actions.tsx +++ b/source/sites/publicodes/Actions.tsx @@ -1,6 +1,7 @@ import NorthstarBanner from '@/components/Feedback/NorthstarBanner' import Title from '@/components/groupe/Title' import Meta from '@/components/utils/Meta' +import { ScrollToTop } from '@/components/utils/Scroll' import { Trans, useTranslation } from 'react-i18next' import { Route, Routes } from 'react-router-dom' import Action from './Action' @@ -17,7 +18,7 @@ export default () => { title={t("Passer à l'action")} description={t('meta.pages.actions.description')} /> - + Agir</Trans>} /> <ScoreBar actionMode /> <NorthstarBanner type="SET_RATING_ACTION" /> diff --git a/source/sites/publicodes/Contact.tsx b/source/sites/publicodes/Contact.tsx index 58fa464925..cfb0212dfd 100644 --- a/source/sites/publicodes/Contact.tsx +++ b/source/sites/publicodes/Contact.tsx @@ -1,4 +1,5 @@ import Title from '@/components/groupe/Title' +import { ScrollToTop } from '@/components/utils/Scroll' import { useState } from 'react' import { Trans, useTranslation } from 'react-i18next' import Meta from '../../components/utils/Meta' @@ -171,7 +172,7 @@ export default () => { title={t('meta.publicodes.Contact.titre')} description={t('meta.publicodes.Contact.description')} ></Meta> - + <ScrollToTop /> <Title title={<Trans>Contact</Trans>} /> <h2> 🙋‍♀️{' '} diff --git a/source/sites/publicodes/Simulateur.tsx b/source/sites/publicodes/Simulateur.tsx index 63f87f5c43..954512a276 100644 --- a/source/sites/publicodes/Simulateur.tsx +++ b/source/sites/publicodes/Simulateur.tsx @@ -20,6 +20,7 @@ import Simulation from '@/components/Simulation' import { useEngine } from '@/components/utils/EngineContext' import { Markdown } from '@/components/utils/markdown' import Meta from '@/components/utils/Meta' +import { ScrollToTop } from '@/components/utils/Scroll' import { useMatomo } from '@/contexts/MatomoContext' import { useGetCurrentSimulation } from '@/hooks/useGetCurrentSimulation' import { useSetUserId } from '@/hooks/useSetUserId' @@ -173,6 +174,7 @@ const SimulateurCore = ({ simulatorRootNameURL, simulatorRootRuleName }) => { description={evaluation.rawNode?.description} /> <Title title={t('Votre bilan climat personnel')} /> + <ScrollToTop /> <div> {!displayTutorial && ( <motion.div diff --git a/source/sites/publicodes/conference/GroupSwitch.tsx b/source/sites/publicodes/conference/GroupSwitch.tsx index ff0cdb6d38..d9330b897c 100644 --- a/source/sites/publicodes/conference/GroupSwitch.tsx +++ b/source/sites/publicodes/conference/GroupSwitch.tsx @@ -1,7 +1,8 @@ import Title from '@/components/groupe/Title' +import Meta from '@/components/utils/Meta' +import { ScrollToTop } from '@/components/utils/Scroll' import { useState } from 'react' import { useTranslation } from 'react-i18next' -import Meta from '../../../components/utils/Meta' import Instructions from './Instructions' import { generateRoomName } from './utils' @@ -18,7 +19,7 @@ export default () => { )} /> <Title data-cypress-id="group-title" title={t('Mode groupe')} /> - + <ScrollToTop /> <Instructions {...{ newRoom, setNewRoom }} /> </div> ) diff --git a/source/sites/publicodes/pages/GuideGroupe.js b/source/sites/publicodes/pages/GuideGroupe.js index 409d677603..36ee389cb5 100644 --- a/source/sites/publicodes/pages/GuideGroupe.js +++ b/source/sites/publicodes/pages/GuideGroupe.js @@ -1,8 +1,8 @@ -import { getTitle, splitName } from 'Components/publicodesUtils' -import useFetchDocumentation from 'Components/useFetchDocumentation' -import { Markdown } from 'Components/utils/markdown' -import Meta from 'Components/utils/Meta' -import { ScrollToTop } from 'Components/utils/Scroll' +import { getTitle, splitName } from '@/components/publicodesUtils' +import useFetchDocumentation from '@/components/useFetchDocumentation' +import { Markdown } from '@/components/utils/markdown' +import Meta from '@/components/utils/Meta' +import { ScrollToTop } from '@/components/utils/Scroll' import { utils } from 'publicodes' import { Trans, useTranslation } from 'react-i18next' import { useParams } from 'react-router' @@ -50,12 +50,12 @@ export default () => { return ( <GuideWrapper> <Meta title={titre} /> - <ScrollToTop /> <Link to={'/guide'}> <button className="ui__ button simple"> <Trans>◀ Retour</Trans> </button> </Link> + <ScrollToTop /> <div> <Markdown children={ diff --git a/source/sites/publicodes/pages/MarkdownPage.tsx b/source/sites/publicodes/pages/MarkdownPage.tsx index 8bfbcb40f4..76b8036b55 100644 --- a/source/sites/publicodes/pages/MarkdownPage.tsx +++ b/source/sites/publicodes/pages/MarkdownPage.tsx @@ -2,6 +2,7 @@ import { Markdown } from '@/components/utils/markdown' import { useTranslation } from 'react-i18next' import Meta from '@/components/utils/Meta' +import { ScrollToTop } from '@/components/utils/Scroll' import { getMarkdownInCurrentLang, Lang } from '@/locales/translation' export type PageProps = { @@ -23,6 +24,7 @@ export default ({ markdownFiles, title, description, image }: PageProps) => { {title && description && ( <Meta title={title} description={description} image={image} /> )} + <ScrollToTop /> <Markdown children={content} /> </section> ) diff --git a/source/sites/publicodes/pages/Stats.js b/source/sites/publicodes/pages/Stats.js index 1ae6898c9b..d80457f84f 100644 --- a/source/sites/publicodes/pages/Stats.js +++ b/source/sites/publicodes/pages/Stats.js @@ -1,6 +1,7 @@ import { QueryClient, QueryClientProvider } from 'react-query' -import StatsContent from 'Components/stats/StatsContent' +import StatsContent from '@/components/stats/StatsContent' +import { ScrollToTop } from '@/components/utils/Scroll' const queryClient = new QueryClient({ defaultOptions: { @@ -15,6 +16,7 @@ const queryClient = new QueryClient({ export default function Dashboard() { return ( <QueryClientProvider client={queryClient}> + <ScrollToTop /> <StatsContent /> </QueryClientProvider> )