{t('Passer le contenu')} diff --git a/site/source/components/Feedback/FeedbackForm.tsx b/site/source/components/Feedback/FeedbackForm.tsx index 8f91071e6..4f6d5fbe5 100644 --- a/site/source/components/Feedback/FeedbackForm.tsx +++ b/site/source/components/Feedback/FeedbackForm.tsx @@ -1,11 +1,15 @@ import { useState } from 'react' -import { useTranslation } from 'react-i18next' +import { Trans, useTranslation } from 'react-i18next' import { useLocation } from 'react-router-dom' import styled from 'styled-components' import { ScrollToElement } from '@/components/utils/Scroll' import { TextAreaField, TextField } from '@/design-system' import { Button } from '@/design-system/buttons' +import { Emoji } from '@/design-system/emoji' +import { Spacing } from '@/design-system/layout' +import { Strong } from '@/design-system/typography' +import { H1 } from '@/design-system/typography/heading' import { Body } from '@/design-system/typography/paragraphs' type SubmitError = { @@ -15,7 +19,42 @@ type SubmitError = { const SHORT_MAX_LENGTH = 254 -export default function FeedbackForm() { +const FeedbackThankYouContent = () => { + const { t } = useTranslation() + + return ( + <> + + + + + +

+ Merci pour votre message ! +

+ + + Notre équipe prend en charge votre retour. + + + + + Nous avons à cœur d'améliorer en continu notre site,vos remarques nous + sont donc très précieuses. + + + + + ) +} + +export default function FeedbackForm({ + isNotSatisfied, + title, +}: { + isNotSatisfied: boolean + title: string +}) { const [isSubmittedSuccessfully, setIsSubmittedSuccessfully] = useState(false) const [isLoading, setIsLoading] = useState(false) const [submitError, setSubmitError] = useState( @@ -70,73 +109,94 @@ export default function FeedbackForm() { return ( - {isSubmittedSuccessfully && ( - Merci de votre retour ! - )} + {isSubmittedSuccessfully && } {!isSubmittedSuccessfully && ( - -
{ - e.preventDefault() - const message = ( - document.getElementById('message') as HTMLTextAreaElement - )?.value - const email = ( - document.getElementById('email') as HTMLInputElement - )?.value + <> +

{title}

- // message et email sont requis - const isMessageEmpty = !message || message === '' - const isEmailEmpty = !email || email === '' + + { + e.preventDefault() + const message = ( + document.getElementById('message') as HTMLTextAreaElement + )?.value + const email = ( + document.getElementById('email') as HTMLInputElement + )?.value - if (isMessageEmpty || isEmailEmpty) { - setSubmitError({ - message: isMessageEmpty ? requiredErrorMessage : '', - email: isEmailEmpty ? requiredErrorEmail : '', - }) + // message et email sont requis + const isMessageEmpty = !message || message === '' + const isEmailEmpty = !email || email === '' - return - } + if (isMessageEmpty || isEmailEmpty) { + setSubmitError({ + message: isMessageEmpty ? requiredErrorMessage : '', + email: isEmailEmpty ? requiredErrorEmail : '', + }) - void sendMessage({ message, email }) - }} - > - - Que pouvons-nous améliorer pour mieux répondre à vos attentes ? - - + {isNotSatisfied && ( + <> + + + Vous n’avez pas été satisfait(e) de votre expérience, nous + en sommes désolé(e)s. + + + )} - id="message" - rows={7} - isDisabled={isLoading} - errorMessage={submitError?.message} - /> - - + + + Que pouvons-nous améliorer pour mieux répondre à vos + attentes ? + + + + - - - {t('Envoyer')} - - -
+ + + + + {t('Envoyer')} + + + + )} ) @@ -174,13 +234,25 @@ const StyledButton = styled(Button)` margin-top: 1rem; ` -const StyledBody = styled(Body)` - font-size: 1.25rem; - font-family: ${({ theme }) => theme.fonts.main}; - text-align: center; - padding: 1rem 0; -` - const StyledDiv = styled.div` margin-top: 1rem; ` + +const StyledEmojiContainer = styled.div` + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + margin-top: 3rem; + & > span { + background-color: ${({ theme }) => theme.colors.extended.grey[200]}; + border-radius: 100%; + width: 7.5rem; + padding: 2rem; + font-size: 3rem; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + } +` diff --git a/site/source/components/Feedback/FeedbackRating.tsx b/site/source/components/Feedback/FeedbackRating.tsx new file mode 100644 index 000000000..d059bda30 --- /dev/null +++ b/site/source/components/Feedback/FeedbackRating.tsx @@ -0,0 +1,73 @@ +import styled from 'styled-components' + +import { Emoji } from '@/design-system/emoji' + +export type Feedback = 'mauvais' | 'moyen' | 'bien' | 'très bien' + +const FeedbackRating = ({ + submitFeedback, +}: { + submitFeedback: (feedbackValue: Feedback) => void +}) => { + return ( +
+
+ submitFeedback('mauvais')}> + + +
+
+ submitFeedback('moyen')}> + + +
+
+ submitFeedback('bien')}> + + +
+
+ submitFeedback('très bien')}> + + +
+
+ ) +} + +const EmojiButton = styled.button` + font-size: 1.5rem; + padding: 0.6rem; + border: none; + background: none; + transition: transform 0.05s; + will-change: transform; + :hover { + transform: scale(1.3); + } +` + +export default FeedbackRating diff --git a/site/source/components/Feedback/index.tsx b/site/source/components/Feedback/index.tsx index 37abc35b7..01f10d984 100644 --- a/site/source/components/Feedback/index.tsx +++ b/site/source/components/Feedback/index.tsx @@ -1,28 +1,27 @@ -import React, { useCallback, useContext, useState } from 'react' -import { Trans } from 'react-i18next' +import { useCallback, useContext, useRef, useState } from 'react' +import { Trans, useTranslation } from 'react-i18next' import { useLocation } from 'react-router-dom' import styled from 'styled-components' import { TrackingContext } from '@/ATInternetTracking' +import { Popover } from '@/design-system' import { Button } from '@/design-system/buttons' import { Emoji } from '@/design-system/emoji' -import { Grid, Spacing } from '@/design-system/layout' -import Popover from '@/design-system/popover/Popover' +import { FocusStyle } from '@/design-system/global-style' +import { Spacing } from '@/design-system/layout' import { Strong } from '@/design-system/typography' -import { Link } from '@/design-system/typography/link' -import { Body, SmallBody } from '@/design-system/typography/paragraphs' +import { H4 } from '@/design-system/typography/heading' +import { StyledLink } from '@/design-system/typography/link' +import { Body } from '@/design-system/typography/paragraphs' +import { useOnClickOutside } from '@/hooks/useClickOutside' import { CurrentSimulatorDataContext } from '@/pages/Simulateurs/metadata' import * as safeLocalStorage from '../../storage/safeLocalStorage' import { JeDonneMonAvis } from '../JeDonneMonAvis' import { INSCRIPTION_LINK } from '../layout/Footer/InscriptionBetaTesteur' -import Form from './FeedbackForm' - -type PageFeedbackProps = { - blacklist?: Array - customMessage?: React.ReactNode - customEventName?: string -} +import { useFeedback } from '../layout/Footer/useFeedback' +import FeedbackForm from './FeedbackForm' +import FeedbackRating, { Feedback } from './FeedbackRating' const localStorageKey = (url: string) => `app::feedback::v3::${url}` const setFeedbackGivenForUrl = (url: string) => { @@ -33,7 +32,7 @@ const setFeedbackGivenForUrl = (url: string) => { } // Ask for feedback again after 4 months -const askFeedback = (url: string) => { +const getShouldAskFeedback = (url: string) => { const previousFeedbackDate = safeLocalStorage.getItem(localStorageKey(url)) if (!previousFeedbackDate) { return true @@ -45,159 +44,282 @@ const askFeedback = (url: string) => { ) } -export default function PageFeedback({ customMessage }: PageFeedbackProps) { +const FeedbackButton = ({ isEmbedded }: { isEmbedded?: boolean }) => { + const [isFormOpen, setIsFormOpen] = useState(false) + const [isShowingThankMessage, setIsShowingThankMessage] = useState(false) + const [isShowingSuggestionForm, setIsShowingSuggestionForm] = useState(false) + const [isNotSatisfied, setIsNotSatisfied] = useState(false) + const { t } = useTranslation() const url = useLocation().pathname - const currentSimulatorData = useContext(CurrentSimulatorDataContext) - const [state, setState] = useState({ - showForm: false, - showThanks: false, - }) const tag = useContext(TrackingContext) + const containerRef = useRef(null) + const currentSimulatorData = useContext(CurrentSimulatorDataContext) - const handleFeedback = useCallback( - (rating: 'mauvais' | 'moyen' | 'bien' | 'très bien') => { + const { shouldShowRater, customTitle } = useFeedback() + + useOnClickOutside( + containerRef, + () => !isShowingSuggestionForm && setIsFormOpen(false) + ) + + const submitFeedback = useCallback( + (rating: Feedback) => { setFeedbackGivenForUrl(url) tag.events.send('click.action', { click_chapter1: 'satisfaction', click: rating, }) - const askDetails = ['mauvais', 'moyen'].includes(rating) - setState({ - showThanks: !askDetails, - showForm: askDetails, - }) + const isNotSatisfiedValue = ['mauvais', 'moyen'].includes(rating) + if (isNotSatisfiedValue) { + setIsNotSatisfied(true) + } + + setIsShowingThankMessage(!isNotSatisfiedValue) + setIsShowingSuggestionForm(isNotSatisfiedValue) }, [tag, url] ) - const openSuggestionForm = useCallback(() => { - setState({ ...state, showForm: true }) - }, [state]) + const shouldAskFeedback = getShouldAskFeedback(url) + + if (isFormOpen) { + return ( +
+ + setIsFormOpen(false)} + aria-label={t('Fermer le module "Donner son avis"')} + > + Fermer + + + + + + + {isShowingThankMessage || !shouldAskFeedback ? ( + <> + + + Merci de votre retour !{' '} + + + + + + Pour continuer à donner votre avis et accéder aux nouveautés en + avant-première,{' '} + + inscrivez-vous sur la liste des beta-testeur + + + + + ) : ( + <> + + {customTitle || Un avis sur cette page ?} + + On vous écoute. + + {shouldShowRater && ( + + )} + + )} + + {currentSimulatorData?.pathId === 'simulateurs.salarié' ? ( + + ) : ( + + )} + {isShowingSuggestionForm && ( + { + setIsShowingSuggestionForm(false) + setTimeout(() => setIsFormOpen(false)) + }} + > + + + )} +
+ ) + } return ( - - {state.showThanks || !askFeedback(url) ? ( - <> - - - Merci de votre retour ! - - - - - Pour continuer à donner votre avis et accéder aux nouveautés en - avant-première,{' '} - - inscrivez-vous sur la liste des beta-testeur - - - - - ) : ( - <> - - {customMessage || ( - - Êtes-vous satisfait de cette page ? - - )} - -
-
- handleFeedback('mauvais')}> - - -
-
- handleFeedback('moyen')}> - - -
-
- handleFeedback('bien')}> - - -
-
- handleFeedback('très bien')}> - - -
-
- - )} - {state.showForm && ( - setState({ showThanks: true, showForm: false })} - small - > -
- - )} - - - - {currentSimulatorData?.pathId === 'simulateurs.salarié' ? ( - - ) : ( - - )} - - - + setIsFormOpen(true)} + $isEmbedded={isEmbedded} + aria-haspopup="dialog" + aria-expanded={false} + > + + ) } -const EmojiButton = styled.button` - font-size: 1.5rem; - padding: 0.6rem; +const StyledButton = styled.button<{ $isEmbedded?: boolean }>` + position: fixed; + top: 10.5rem; + ${({ $isEmbedded }) => ($isEmbedded ? `top: 40rem;` : '')} + right: 0; + width: 3.75rem; + height: 3.75rem; + background-color: ${({ theme }) => theme.colors.bases.primary[700]}; + border-radius: 2.5rem 0 0 2.5rem; + font-size: 1.75rem; border: none; - background: none; - transition: transform 0.05s; - will-change: transform; - :hover { - transform: scale(1.3); + box-shadow: ${({ theme }) => + theme.darkMode ? theme.elevationsDarkMode[2] : theme.elevations[2]}; + z-index: 5; + &:hover { + background-color: ${({ theme }) => theme.colors.bases.primary[800]}; + + & img { + animation: wiggle 2.5s infinite; + transform-origin: 70% 70%; + } + } + + @media print { + display: none; + } + + @media (max-width: ${({ theme }) => theme.breakpointsWidth.md}) { + width: 3.25rem; + height: 3.25rem; + font-size: 1.5rem; + } + + @keyframes wiggle { + 0% { + transform: rotate(0deg); + } + 10% { + transform: rotate(14deg); + } /* The following five values can be played with to make the waving more or less extreme */ + 20% { + transform: rotate(-8deg); + } + 30% { + transform: rotate(14deg); + } + 40% { + transform: rotate(-4deg); + } + 50% { + transform: rotate(10deg); + } + 60% { + transform: rotate(0deg); + } /* Reset for the last half to pause */ + 100% { + transform: rotate(0deg); + } + } + &:focus { + ${FocusStyle} } ` -const Container = styled.div` - padding: 1rem 0 1.5rem 0; - text-align: center; +const StyledH4 = styled(H4)` + margin: 0; + color: ${({ theme }) => theme.colors.extended.grey[100]}; + font-size: 1rem; ` + +const StyledBody = styled(Body)` + margin: 0; +` + +const Section = styled.section<{ $isEmbedded?: boolean }>` + position: fixed; + top: 10.5rem; + ${({ $isEmbedded }) => ($isEmbedded ? `top: 40rem;` : '')} + right: 0; + width: 17.375rem; + background-color: ${({ theme }) => theme.colors.bases.primary[700]}; + border-radius: 2rem 0 0 2rem; + color: ${({ theme }) => theme.colors.extended.grey[100]}; + & ${Body} { + color: ${({ theme }) => theme.colors.extended.grey[100]}; + } + padding: 1.5rem; + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: center; + box-shadow: ${({ theme }) => + theme.darkMode ? theme.elevationsDarkMode[2] : theme.elevations[2]}; + z-index: 5; + @media print { + display: none; + } +` + +const ThankYouText = styled(Body)` + font-size: 14px; +` + +const CloseButtonContainer = styled.div` + display: flex; + justify-content: flex-end; + background-color: transparent; + width: 100%; + margin-bottom: ${({ theme }) => theme.spacings.sm}; +` + +const CloseButton = styled.button` + display: flex; + align-items: center; + background-color: transparent; + border: none; + padding: 0; + color: ${({ theme }) => theme.colors.extended.grey[100]}; + + svg { + fill: ${({ theme }) => theme.colors.extended.grey[100]}; + width: 1.5rem; + } +` + +export default FeedbackButton diff --git a/site/source/components/Simulation/index.tsx b/site/source/components/Simulation/index.tsx index 1d21430b8..186f5ccb0 100644 --- a/site/source/components/Simulation/index.tsx +++ b/site/source/components/Simulation/index.tsx @@ -5,7 +5,6 @@ import { Trans, useTranslation } from 'react-i18next' import { useSelector } from 'react-redux' import styled from 'styled-components' -import PageFeedback from '@/components/Feedback' import ShareOrSaveSimulationBanner from '@/components/ShareSimulationBanner' import { ConversationProps } from '@/components/conversation/Conversation' import { PopoverWithTrigger } from '@/design-system' @@ -135,22 +134,7 @@ export default function Simulation({ - {firstStepCompleted && !hideDetails && ( - <> -
- - - Êtes-vous satisfait de ce simulateur ? - - } - /> - -
- {explanations} - - )} + {firstStepCompleted && !hideDetails && explanations} ) } diff --git a/site/source/components/layout/Footer/Footer.tsx b/site/source/components/layout/Footer/Footer.tsx index f61644a07..fbe478ab6 100644 --- a/site/source/components/layout/Footer/Footer.tsx +++ b/site/source/components/layout/Footer/Footer.tsx @@ -1,30 +1,31 @@ import { Helmet } from 'react-helmet-async' import { Trans, useTranslation } from 'react-i18next' +import { useLocation } from 'react-router-dom' import styled, { ThemeProvider } from 'styled-components' -import PageFeedback from '@/components/Feedback' +import FeedbackButton from '@/components/Feedback' import LegalNotice from '@/components/LegalNotice' import { Button } from '@/design-system/buttons' import { Emoji } from '@/design-system/emoji' import { FooterContainer } from '@/design-system/footer' import { FooterColumn } from '@/design-system/footer/column' -import { Container, Grid, Spacing } from '@/design-system/layout' +import { Container, Grid } from '@/design-system/layout' import { Link } from '@/design-system/typography/link' import { Body } from '@/design-system/typography/paragraphs' import { alternateLinks, useSitePaths } from '@/sitePaths' import InscriptionBetaTesteur from './InscriptionBetaTesteur' import Privacy from './Privacy' -import { useShowFeedback } from './useShowFeedback' const hrefLangLink = alternateLinks() export default function Footer() { const { absoluteSitePaths } = useSitePaths() - const showFeedback = useShowFeedback() const { t, i18n } = useTranslation() const language = i18n.language as 'fr' | 'en' + const currentPath = useLocation().pathname + const currentEnv = import.meta.env.MODE const encodedUri = typeof window !== 'undefined' && @@ -65,7 +66,7 @@ export default function Footer() { : theme.colors.bases.tertiary[100] } > - {showFeedback && } + {language === 'en' && ( This website is provided by the{' '} diff --git a/site/source/components/layout/Footer/useFeedback.ts b/site/source/components/layout/Footer/useFeedback.ts new file mode 100644 index 000000000..21c992a7c --- /dev/null +++ b/site/source/components/layout/Footer/useFeedback.ts @@ -0,0 +1,49 @@ +import { useEffect, useState } from 'react' +import { useLocation } from 'react-router-dom' + +import useSimulatorsData from '@/pages/Simulateurs/metadata' +import { useSitePaths } from '@/sitePaths' + +const PAGE_TITLE = 'Un avis sur cette page ?' +const SIMULATOR_TITLE = 'Un avis sur ce simulateur ?' + +export const useFeedback = () => { + const [shouldShowRater, setShouldShowRater] = useState(false) + const currentPath = useLocation().pathname + const currentPathDecoded = decodeURI(currentPath) + const { absoluteSitePaths } = useSitePaths() + const simulators = useSimulatorsData() + + useEffect(() => { + if ( + // Exclure les pages exactes + ![ + absoluteSitePaths.index, + '', + '/', + absoluteSitePaths.simulateurs.index, + absoluteSitePaths.plan, + absoluteSitePaths.budget, + absoluteSitePaths.accessibilité, + ].includes(currentPathDecoded) && + // Exclure les pages et sous-pages + ![ + absoluteSitePaths.documentation.index, + absoluteSitePaths.gérer.index, + absoluteSitePaths.créer.index, + absoluteSitePaths.nouveautés, + absoluteSitePaths.stats, + absoluteSitePaths.développeur.index, + ].some((path) => currentPathDecoded.includes(path)) + ) { + setShouldShowRater(true) + } else { + setShouldShowRater(false) + } + }, [absoluteSitePaths, currentPathDecoded, shouldShowRater, simulators]) + + return { + customTitle: shouldShowRater ? SIMULATOR_TITLE : PAGE_TITLE, + shouldShowRater, + } +} diff --git a/site/source/components/layout/Footer/useShowFeedback.ts b/site/source/components/layout/Footer/useShowFeedback.ts deleted file mode 100644 index 583dfd53e..000000000 --- a/site/source/components/layout/Footer/useShowFeedback.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { useLocation } from 'react-router-dom' - -import useSimulatorsData from '@/pages/Simulateurs/metadata' -import { useSitePaths } from '@/sitePaths' - -export const useShowFeedback = () => { - const currentPath = useLocation().pathname - const { absoluteSitePaths } = useSitePaths() - const simulators = useSimulatorsData() - - const blacklisted = [ - absoluteSitePaths.gérer.déclarationIndépendant.beta.cotisations as string, - ].includes(currentPath) - - if (blacklisted) { - return false - } - - if ( - [ - simulators['déclaration-charges-sociales-indépendant'], - simulators['comparaison-statuts'], - simulators['demande-mobilité'], - ] - .map((s) => s.path as string) - .includes(currentPath) - ) { - return true - } - - return ![ - absoluteSitePaths.index, - ...Object.values(simulators).map((s) => s.path), - '', - '/', - ].includes(currentPath) -} diff --git a/site/source/design-system/global-style.ts b/site/source/design-system/global-style.ts index f6e811247..ef326763c 100644 --- a/site/source/design-system/global-style.ts +++ b/site/source/design-system/global-style.ts @@ -179,9 +179,6 @@ figure { .print-only { display: initial; } -} - -@media print { .print-hidden { display: none !important; } diff --git a/site/source/design-system/popover/Popover.tsx b/site/source/design-system/popover/Popover.tsx index 04e0d8e64..de401245a 100644 --- a/site/source/design-system/popover/Popover.tsx +++ b/site/source/design-system/popover/Popover.tsx @@ -1,6 +1,5 @@ import { useButton } from '@react-aria/button' import { useDialog } from '@react-aria/dialog' -import { FocusScope } from '@react-aria/focus' import { OverlayContainer, OverlayProps, @@ -208,7 +207,8 @@ const PopoverContainer = styled.div<{ $offsetTop: number | null }>` } `} ` -const CloseButtonContainer = styled.div` + +export const CloseButtonContainer = styled.div` border-bottom: 1px solid ${({ theme }) => theme.colors.extended.grey[300]}; display: flex; @@ -216,7 +216,7 @@ const CloseButtonContainer = styled.div` height: ${({ theme }) => theme.spacings.xxl}; justify-content: flex-end; ` -const CloseButton = styled.button` +export const CloseButton = styled.button` display: inline-flex; align-items: center; diff --git a/site/source/design-system/popover/PopoverWithTrigger.tsx b/site/source/design-system/popover/PopoverWithTrigger.tsx index 66eeabef7..5ba186c81 100644 --- a/site/source/design-system/popover/PopoverWithTrigger.tsx +++ b/site/source/design-system/popover/PopoverWithTrigger.tsx @@ -1,17 +1,11 @@ import { useOverlayTrigger } from '@react-aria/overlays' import { useOverlayTriggerState } from '@react-stately/overlays' import { AriaButtonProps } from '@react-types/button' -import React, { - ReactElement, - Ref, - RefObject, - useEffect, - useMemo, - useRef, -} from 'react' +import React, { ReactElement, Ref, RefObject, useEffect, useRef } from 'react' import { useLocation } from 'react-router-dom' import { Button } from '@/design-system/buttons' +import { omit } from '@/utils' import { Link } from '../typography/link' import Popover from './Popover' @@ -45,17 +39,13 @@ export default function PopoverWithTrigger({ openButtonRef ) - const triggerButton = useMemo( - () => - trigger({ - onPress: () => { - state.open() - }, - ref: openButtonRef, - ...triggerProps, - }), - [openButtonRef, triggerProps, trigger, state] - ) + const triggerButton = trigger({ + onPress: () => { + state.open() + }, + ref: openButtonRef, + ...omit(triggerProps, 'onPress'), + }) const { pathname } = useLocation() const pathnameRef = useRef(pathname) @@ -73,14 +63,18 @@ export default function PopoverWithTrigger({ state.close()} + onClose={() => { + state.close() + }} isDismissable role="dialog" small={small} contentRef={contentRef} > {typeof children === 'function' - ? children(() => state.close()) + ? children(() => { + state.close() + }) : children} )} diff --git a/site/source/hooks/useClickOutside.ts b/site/source/hooks/useClickOutside.ts new file mode 100644 index 000000000..395aeb88c --- /dev/null +++ b/site/source/hooks/useClickOutside.ts @@ -0,0 +1,29 @@ +import { RefObject, useEffect } from 'react' + +type Event = MouseEvent | TouchEvent + +export const useOnClickOutside = ( + ref: RefObject, + handler: (event: Event | null) => void +) => { + useEffect(() => { + const listener = (event: Event | null) => { + // Do nothing if clicking ref's element or descendent elements + if ( + !ref.current || + (event?.target instanceof HTMLElement && + ref.current.contains(event.target)) + ) { + return + } + handler(event) + } + document.addEventListener('mousedown', listener) + document.addEventListener('touchstart', listener) + + return () => { + document.removeEventListener('mousedown', listener) + document.removeEventListener('touchstart', listener) + } + }, [ref, handler]) +} diff --git a/site/source/pages/Iframes/IframeFooter.tsx b/site/source/pages/Iframes/IframeFooter.tsx index 3c6fd3bf2..6d9582c03 100644 --- a/site/source/pages/Iframes/IframeFooter.tsx +++ b/site/source/pages/Iframes/IframeFooter.tsx @@ -1,3 +1,4 @@ +import FeedbackButton from '@/components/Feedback' import Privacy from '@/components/layout/Footer/Privacy' import { Spacing } from '@/design-system/layout' @@ -9,6 +10,7 @@ export default function IframeFooter() { textAlign: 'center', }} > + diff --git a/site/source/pages/Simulateurs/EconomieCollaborative/VotreSituation.tsx b/site/source/pages/Simulateurs/EconomieCollaborative/VotreSituation.tsx index ee1893b99..66162fedc 100644 --- a/site/source/pages/Simulateurs/EconomieCollaborative/VotreSituation.tsx +++ b/site/source/pages/Simulateurs/EconomieCollaborative/VotreSituation.tsx @@ -2,7 +2,6 @@ import { useContext } from 'react' import { Trans, useTranslation } from 'react-i18next' import { Navigate } from 'react-router-dom' -import PageFeedback from '@/components/Feedback' import { FromBottom } from '@/components/ui/animate' import DefaultHelmet from '@/components/utils/DefaultHelmet' import { ScrollToTop } from '@/components/utils/Scroll' @@ -142,9 +141,7 @@ export default function VotreSituation() { )} - Êtes vous satisfait de cet assistant ?} - /> + {' '} diff --git a/site/source/pages/gerer/declaration-revenu-independants/cotisations.tsx b/site/source/pages/gerer/declaration-revenu-independants/cotisations.tsx index 3c9ec9d9e..b29f999a0 100644 --- a/site/source/pages/gerer/declaration-revenu-independants/cotisations.tsx +++ b/site/source/pages/gerer/declaration-revenu-independants/cotisations.tsx @@ -1,5 +1,4 @@ import Value, { Condition, WhenAlreadyDefined } from '@/components/EngineValue' -import PageFeedback from '@/components/Feedback' import ShareOrSaveSimulationBanner from '@/components/ShareSimulationBanner' import Conversation from '@/components/conversation/Conversation' import Progress from '@/components/ui/Progress' @@ -143,16 +142,6 @@ export default function Cotisations() { - - - theme.darkMode - ? theme.colors.extended.dark[600] - : theme.colors.bases.tertiary[100] - } - > - - )