From ea37bf54e0fddcdb25ba7b786862430967a03410 Mon Sep 17 00:00:00 2001 From: ledouxm Date: Mon, 12 Aug 2024 09:31:23 +0200 Subject: [PATCH] feat: add info messages --- .../frontend/src/features/menu/ClauseMenu.tsx | 24 +++++++++++++++---- .../frontend/src/features/menu/HelpMenu.tsx | 2 +- packages/frontend/src/features/menu/Share.tsx | 15 +++++++++++- .../text-editor/TextEditorToolbar.tsx | 8 +++---- .../frontend/src/routes/pdf.$reportId.tsx | 20 ++++++++++++++-- 5 files changed, 56 insertions(+), 13 deletions(-) diff --git a/packages/frontend/src/features/menu/ClauseMenu.tsx b/packages/frontend/src/features/menu/ClauseMenu.tsx index a52289e0..d7930594 100644 --- a/packages/frontend/src/features/menu/ClauseMenu.tsx +++ b/packages/frontend/src/features/menu/ClauseMenu.tsx @@ -37,7 +37,18 @@ export const ClauseMenu = ({ isNational, ...props }: { isNational: boolean } & M if (isNational) return ( <> - + + } + {...props} + /> ); @@ -76,7 +87,10 @@ const ClauseForm = ({ ...props }: { clauses: Clause_v2[]; isNational: boolean } & ModalContentProps) => { const [mode, setMode] = useState("view"); - const [bannerProps, setBannerProps] = useState<{ status: BannerStatus; text: string; icon: string } | null>(null); + const [bannerProps, setBannerProps] = useState<{ status: BannerStatus; text: string; icon: string } | null>({ + ...initialBannerProps, + text: "Ces clauses sont spécifiques à votre UDAP et modifiables.", + }); const isEditing = mode === "edit"; const isAdding = mode === "add"; @@ -223,12 +237,12 @@ const ClauseForm = ({ type BannerStatus = "idle" | "success"; -const ClauseFormBanner = ({ status, icon, text }: { text: string; icon: string; status: BannerStatus }) => { +export const ClauseFormBanner = ({ status, icon, text }: { text: string; icon: string; status: BannerStatus }) => { const bgColor = status === "idle" ? "#E8EDFF" : "#B8FEC9"; const iconColor = status === "idle" ? "#0063CB" : "#18753C"; return ( - + $1"); } diff --git a/packages/frontend/src/features/menu/HelpMenu.tsx b/packages/frontend/src/features/menu/HelpMenu.tsx index e24f7d96..b971a95c 100644 --- a/packages/frontend/src/features/menu/HelpMenu.tsx +++ b/packages/frontend/src/features/menu/HelpMenu.tsx @@ -16,7 +16,7 @@ export const HelpMenu = ({ backButtonOnClick }: { backButtonOnClick: () => void - Si vous n'arrivez pas à vous connecter, essayez de réinitialiser les données locales : + Vous ne voyez pas vos dernières informations enregistrées ? Essayez de réinitialiser les données locales : diff --git a/packages/frontend/src/features/menu/Share.tsx b/packages/frontend/src/features/menu/Share.tsx index bee354aa..b3d85e18 100644 --- a/packages/frontend/src/features/menu/Share.tsx +++ b/packages/frontend/src/features/menu/Share.tsx @@ -7,6 +7,8 @@ import { ToggleSwitch } from "@codegouvfr/react-dsfr/ToggleSwitch"; import { useMutation } from "@tanstack/react-query"; import { css } from "#styled-system/css"; import { MenuTitle } from "./MenuTitle"; +import { ClauseFormBanner } from "./ClauseMenu"; +import { fr } from "@codegouvfr/react-dsfr"; export const ShareReport = ({ backButtonOnClick }: { backButtonOnClick: () => void }) => { const user = useUser()!; @@ -41,7 +43,18 @@ export const ShareReport = ({ backButtonOnClick }: { backButtonOnClick: () => vo return ( <> - Partage des CR + + } + > + Partage des CR + diff --git a/packages/frontend/src/features/text-editor/TextEditorToolbar.tsx b/packages/frontend/src/features/text-editor/TextEditorToolbar.tsx index ac2234d4..f3eff693 100644 --- a/packages/frontend/src/features/text-editor/TextEditorToolbar.tsx +++ b/packages/frontend/src/features/text-editor/TextEditorToolbar.tsx @@ -32,7 +32,7 @@ export const TextEditorToolbar = () => { className={toolbarButtonRecipe({ active: editor.isActive("bold"), })} - size="small" + size="medium" priority="tertiary no outline" iconId="fr-icon-bold" type="button" @@ -45,7 +45,7 @@ export const TextEditorToolbar = () => { className={toolbarButtonRecipe({ active: editor.isActive("italic"), })} - size="small" + size="medium" priority="tertiary no outline" type="button" iconId="fr-icon-italic" @@ -58,7 +58,7 @@ export const TextEditorToolbar = () => { className={toolbarButtonRecipe({ active: editor.isActive("underline"), })} - size="small" + size="medium" priority="tertiary no outline" iconId="ri-underline" type="button" @@ -91,7 +91,7 @@ const ColorInput = () => {