diff --git a/docs/user_guide/assets/images/mergeSidebar.es.png b/docs/user_guide/assets/images/mergeSidebar.es.png index 8f97598ed2..f69419b489 100644 Binary files a/docs/user_guide/assets/images/mergeSidebar.es.png and b/docs/user_guide/assets/images/mergeSidebar.es.png differ diff --git a/docs/user_guide/assets/images/mergeSidebar.png b/docs/user_guide/assets/images/mergeSidebar.png index 5a00664756..c67bd0acd2 100644 Binary files a/docs/user_guide/assets/images/mergeSidebar.png and b/docs/user_guide/assets/images/mergeSidebar.png differ diff --git a/docs/user_guide/assets/images/mergeSidebar.zh.png b/docs/user_guide/assets/images/mergeSidebar.zh.png index c4421ce22d..2f7ad8cb94 100644 Binary files a/docs/user_guide/assets/images/mergeSidebar.zh.png and b/docs/user_guide/assets/images/mergeSidebar.zh.png differ diff --git a/docs/user_guide/assets/images/mergeSidebarMove.es.png b/docs/user_guide/assets/images/mergeSidebarMove.es.png index b1ffe901b2..7e541b867c 100644 Binary files a/docs/user_guide/assets/images/mergeSidebarMove.es.png and b/docs/user_guide/assets/images/mergeSidebarMove.es.png differ diff --git a/docs/user_guide/assets/images/mergeSidebarMove.png b/docs/user_guide/assets/images/mergeSidebarMove.png index fbe58576d9..6a1df2a325 100644 Binary files a/docs/user_guide/assets/images/mergeSidebarMove.png and b/docs/user_guide/assets/images/mergeSidebarMove.png differ diff --git a/src/components/AppBar/UserGuideButton.tsx b/src/components/AppBar/UserGuideButton.tsx index 1e6cb45919..b77bfabb37 100644 --- a/src/components/AppBar/UserGuideButton.tsx +++ b/src/components/AppBar/UserGuideButton.tsx @@ -15,7 +15,7 @@ export default function UserGuideButton(): ReactElement { diff --git a/src/components/Login/Login.tsx b/src/components/Login/Login.tsx index 5d67731b90..66cd2a911d 100644 --- a/src/components/Login/Login.tsx +++ b/src/components/Login/Login.tsx @@ -161,7 +161,10 @@ export default function Login(): ReactElement { {/* User Guide, Sign Up, and Log In buttons */} - diff --git a/src/goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/SidebarDrop.tsx b/src/goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/SidebarDrop.tsx index c67a2ec81a..dc44e3e22f 100644 --- a/src/goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/SidebarDrop.tsx +++ b/src/goals/MergeDuplicates/MergeDupsStep/MergeDragDrop/SidebarDrop.tsx @@ -1,5 +1,5 @@ -import { ArrowForwardIos } from "@mui/icons-material"; -import { IconButton, Typography } from "@mui/material"; +import { ArrowForwardIos, HelpOutline } from "@mui/icons-material"; +import { Grid, IconButton, Typography } from "@mui/material"; import { ReactElement } from "react"; import { Droppable } from "react-beautiful-dnd"; @@ -8,6 +8,7 @@ import { MergeTreeSense } from "goals/MergeDuplicates/MergeDupsTreeTypes"; import { setSidebar } from "goals/MergeDuplicates/Redux/MergeDupsActions"; import { StoreState } from "types"; import { useAppDispatch, useAppSelector } from "types/hooks"; +import { openUserGuide } from "utilities/pathUtilities"; export default function SidebarDrop(): ReactElement { const dispatch = useAppDispatch(); @@ -30,13 +31,20 @@ export default function SidebarDrop(): ReactElement { {...providedDroppable.droppableProps} style={{ backgroundColor: "lightblue", height: "100%", padding: 20 }} > - dispatch(setSidebar())} - id="sidebar-close" - size="large" - > - - + + dispatch(setSidebar())} + > + + + openUserGuide("goals.html#merge-a-sense")} + > + + + {vernacular} {sidebar.mergeSenses.map((ms: MergeTreeSense, i: number) => ( diff --git a/src/utilities/pathUtilities.ts b/src/utilities/pathUtilities.ts index 977e2d9d46..08a5856be6 100644 --- a/src/utilities/pathUtilities.ts +++ b/src/utilities/pathUtilities.ts @@ -22,10 +22,10 @@ function getWindowOrigin(): string { /** Open the user guide in a new tab. * Leads to a 404 in development. - */ -export function openUserGuide(): void { + * Optional `page` could be, e.g., "account.html#log-in". */ +export function openUserGuide(page = ""): void { const origin = getWindowOrigin(); - window.open(`${origin}/docs/`); + window.open(`${origin}/docs/${page}`); } /**