diff --git a/site/source/assets/images/missed_chance.svg b/site/source/assets/images/missed_chance.svg new file mode 100644 index 000000000..961c1b34c --- /dev/null +++ b/site/source/assets/images/missed_chance.svg @@ -0,0 +1 @@ +missed chances \ No newline at end of file diff --git a/site/source/components/App.tsx b/site/source/components/App.tsx index e0a02ea2e..3e092006f 100644 --- a/site/source/components/App.tsx +++ b/site/source/components/App.tsx @@ -1,7 +1,7 @@ import { ErrorBoundary } from '@sentry/react' import rules from 'modele-social' import { StrictMode, useMemo } from 'react' -import { Trans, useTranslation } from 'react-i18next' +import { useTranslation } from 'react-i18next' import { Route, Routes } from 'react-router-dom' import { css, styled } from 'styled-components' @@ -14,11 +14,7 @@ import { useEngine, useSetupSafeSituation, } from '@/components/utils/EngineContext' -import { Message } from '@/design-system' -import { Emoji } from '@/design-system/emoji' import { Container, Spacing } from '@/design-system/layout' -import { Link } from '@/design-system/typography/link' -import { Body } from '@/design-system/typography/paragraphs' import { useAxeCoreAnalysis } from '@/hooks/useAxeCoreAnalysis' import { useGetFullURL } from '@/hooks/useGetFullURL' import { useIsEmbedded } from '@/hooks/useIsEmbedded' @@ -69,7 +65,6 @@ export default function Root({ - @@ -79,41 +74,6 @@ export default function Root({ ) } -const BadNews = () => { - const { t } = useTranslation() - const { absoluteSitePaths } = useSitePaths() - - return ( - - ) -} - const Router = () => { const engine = useEngine() diff --git a/site/source/components/BadNews.tsx b/site/source/components/BadNews.tsx new file mode 100644 index 000000000..8b287c8f9 --- /dev/null +++ b/site/source/components/BadNews.tsx @@ -0,0 +1,105 @@ +import { Trans, useTranslation } from 'react-i18next' +import { styled } from 'styled-components' + +import missedChance from '@/assets/images/missed_chance.svg' +import { Message, PopoverWithTrigger } from '@/design-system' +import { Emoji } from '@/design-system/emoji' +import { Strong } from '@/design-system/typography' +import { Link } from '@/design-system/typography/link' +import { Li, Ul } from '@/design-system/typography/list' +import { Body, SmallBody } from '@/design-system/typography/paragraphs' +import { useSitePaths } from '@/sitePaths' + +export default function BadNews() { + const { t } = useTranslation() + const { absoluteSitePaths } = useSitePaths() + + return ( + + ) +} + +const StyledImg = styled.img` + margin: 0 auto; + display: block; + width: 100%; + max-width: 300px; +` diff --git a/site/source/components/layout/Header.tsx b/site/source/components/layout/Header.tsx index 8b093a6d5..4b7804371 100644 --- a/site/source/components/layout/Header.tsx +++ b/site/source/components/layout/Header.tsx @@ -3,7 +3,6 @@ import { styled } from 'styled-components' import { Logo } from '@/components/Logo' import SearchButton from '@/components/SearchButton' -import BrowserOnly from '@/components/utils/BrowserOnly' import { Emoji } from '@/design-system/emoji' import { Container } from '@/design-system/layout' import { Switch } from '@/design-system/switch' @@ -12,9 +11,11 @@ import { useDarkMode } from '@/hooks/useDarkMode' import { useGetFullURL } from '@/hooks/useGetFullURL' import { useSitePaths } from '@/sitePaths' +import BadNews from '../BadNews' import { Appear } from '../ui/animate' +import BrowserOnly from '../utils/BrowserOnly' import { Menu } from './Menu' -import NewsBanner from './NewsBanner' +import NewsBannerWrapper from './NewsBanner' export default function Header() { const { absoluteSitePaths } = useSitePaths() @@ -73,10 +74,12 @@ export default function Header() { + + {i18n.language === 'fr' && ( - + )} diff --git a/site/source/locales/ui-en.yaml b/site/source/locales/ui-en.yaml index 20626bf7b..fa45b5d9e 100644 --- a/site/source/locales/ui-en.yaml +++ b/site/source/locales/ui-en.yaml @@ -109,6 +109,7 @@ En savoir plus sur impots: gouv: fr, nouvelle fenĂȘtre: More information on impots.gouv.fr, new window En savoir plus, nouvelle fenĂȘtre: Find out more, new window +En savoir plus.: Find out more. English version of the website enabled.: English version of the website enabled. Enregistrer et continuer: Save and continue Enregistrer et voir le rĂ©sultat: Save and view results @@ -383,8 +384,21 @@ assistants: title: View your public data au bout de 10 ans: after 10 years badnews: - body: <0>Important notice: Simulator updates and user support are no longer - available. <3>To find out more, click here. + body: "<0>Important notice: Simulator updates and user support are no longer + provided. <3><0>The team that has been operating the simulators and wizards + on mon-entreprise.urssaf.fr for over five years has decided to stop work. + Here's why:<1><0>The team is made up of <2>two freelance + developers;<1>Payment of their invoices has been blocked <2>since + April;<2>The site development budget, 100% financed by Urssaf, has + been <2>significantly reduced for 2023. This, despite the <5>site's + obvious success;<3>This budget is <1>not sufficient to keep the + team working for the full year and to continue developing the + product;<2>This situation is <1>temporary, and should <4>return + to normal in the coming months. We apologize for any inconvenience + caused.<3><4>P.S. from the team: We tell you sincerely, it was very + hard to make this decision. We would have loved to have continued to develop + this site as we have all these years. We're so grateful that over 500,000 of + you use our tools every month!" label: Important information betawarning: "<0><0>This tool is in beta version: we are working on <3>validating the information and calculations, but <6>errors may diff --git a/site/source/locales/ui-fr.yaml b/site/source/locales/ui-fr.yaml index 95467788c..8e2291b48 100644 --- a/site/source/locales/ui-fr.yaml +++ b/site/source/locales/ui-fr.yaml @@ -113,6 +113,7 @@ En savoir plus sur impots: gouv: fr, nouvelle fenĂȘtre: En savoir plus sur impots.gouv.fr, nouvelle fenĂȘtre En savoir plus, nouvelle fenĂȘtre: En savoir plus, nouvelle fenĂȘtre +En savoir plus.: En savoir plus. English version of the website enabled.: English version of the website enabled. Enregistrer et continuer: Enregistrer et continuer Enregistrer et voir le rĂ©sultat: Enregistrer et voir le rĂ©sultat @@ -405,8 +406,23 @@ assistants: title: Voir vos donnĂ©es publiques au bout de 10 ans: au bout de 10 ans badnews: - body: <0>Important : La mise Ă  jour des simulateurs et le support - utilisateur ne sont plus assurĂ©s. <3>En savoir plus. + body: "<0>Important : La mise Ă  jour des simulateurs et le support + utilisateur ne sont plus assurĂ©s. <3><0>L'Ă©quipe qui opĂ©rait les simulateurs + et les assistants de mon-entreprise.urssaf.fr depuis plus de cinq ans a pris + la dĂ©cision d'arrĂȘter son travail. En voici l'explication + :<1><0>L'Ă©quipe est composĂ©e de <2>deux dĂ©veloppeurs indĂ©pendants + (travailleurs non salariĂ©s) ;<1>Le paiement de leurs factures est bloquĂ© + <2>depuis avril ;<2>Le budget du dĂ©veloppement du site, financĂ© par + l'Urssaf Ă  100%, est en <2>trĂšs nette baisse pour 2023. Ce, malgrĂ© le + <5>succĂšs manifeste du site ;<3>Ce budget n'est <1>pas suffisant + pour faire travailler l'Ă©quipe sur l'annĂ©e complĂšte et continuer Ă  + dĂ©velopper le produit ;<2>Cette situation est <1>temporaire, et + devrait <4>revenir Ă  la normale dans les prochains mois. Veuillez nous + excuser pour la gĂȘne occasionnĂ©e.<3><4>P.S de l'Ă©quipe : On vous le + dit sincĂšrement, ça Ă©tĂ© trĂšs dur de prendre cette dĂ©cision. On aurait + tellement aimĂ© continuer Ă  faire Ă©voluer ce site comme on l'a fait toutes + ces annĂ©es. On est super reconnaissants de voir plus de 500 000 d'entre vous + utiliser nos outils chaque mois !" label: Information importante betawarning: "<0><0>Cet outil est en version bĂȘta : nous travaillons Ă  <3>valider les informations et les calculs, mais des <6>erreurs peuvent diff --git a/site/source/pages/iframes/IframeFooter.tsx b/site/source/pages/iframes/IframeFooter.tsx index a0233167a..39806c04b 100644 --- a/site/source/pages/iframes/IframeFooter.tsx +++ b/site/source/pages/iframes/IframeFooter.tsx @@ -1,3 +1,4 @@ +import BadNews from '@/components/BadNews' import FeedbackButton from '@/components/Feedback' import Privacy from '@/components/layout/Footer/Privacy' import { Spacing } from '@/design-system/layout' @@ -10,8 +11,10 @@ export default function IframeFooter() { textAlign: 'center', }} > + + - +