Skip to content

Move account and help menus to side nav footer #1988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
GregorShear wants to merge 1 commit into from
Closed

Move account and help menus to side nav footer #1988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/components/menus/HelpMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ function HelpMenu() {
icon={<HelpCircle />}
identifier="help-menu"
tooltip={intl.formatMessage({ id: 'helpMenu.tooltip' })}
hideArrow
customMenuPosition={{
anchorOrigin: { vertical: 'top', horizontal: 'left' },
transformOrigin: { vertical: 'bottom', horizontal: 'left' },
}}
>
<ExternalLinkMenuItem
link={intl.formatMessage({ id: 'helpMenu.docs.link' })}
Expand Down
5 changes: 5 additions & 0 deletions src/components/menus/UserMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ const UserMenu = ({ iconColor }: Props) => {
}
identifier="account-menu"
tooltip={intl.formatMessage({ id: 'accountMenu.tooltip' })}
hideArrow
customMenuPosition={{
anchorOrigin: { vertical: 'top', horizontal: 'left' },
transformOrigin: { vertical: 'bottom', horizontal: 'left' },
}}
>
<MenuItem sx={nonInteractiveMenuStyling}>
<ListItemIcon>
Expand Down
6 changes: 6 additions & 0 deletions src/components/navigation/Navigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import {
import { useIntl } from 'react-intl';

import { authenticatedRoutes } from 'src/app/routes';
import HelpMenu from 'src/components/menus/HelpMenu';
import UserMenu from 'src/components/menus/UserMenu';
import ListItemLink from 'src/components/navigation/ListItemLink';
import ModeSwitch from 'src/components/navigation/ModeSwitch';
import { paperBackground } from 'src/context/Theme';
Expand Down Expand Up @@ -118,6 +120,10 @@ const Navigation = ({ open, width, onNavigationToggle }: NavigationProps) => {
py: 1,
}}
>
<UserMenu iconColor={theme.palette.text.primary} />

<HelpMenu />

<ModeSwitch />

<Tooltip
Expand Down
6 changes: 0 additions & 6 deletions src/components/navigation/TopBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import { useTheme } from '@mui/material/styles';

import { HeaderPill } from 'src/components/AgentSkills/HeaderPill';
import CompanyLogo from 'src/components/graphics/CompanyLogo';
import HelpMenu from 'src/components/menus/HelpMenu';
import UserMenu from 'src/components/menus/UserMenu';
import PageTitle from 'src/components/navigation/PageTitle';
import SidePanelDocsOpenButton from 'src/components/sidePanelDocs/OpenButton';
import { UpdateAlert } from 'src/components/UpdateAlert';
Expand Down Expand Up @@ -45,10 +43,6 @@ const Topbar = () => {

<HeaderPill />

<HelpMenu />

<UserMenu iconColor={theme.palette.text.primary} />

<SidePanelDocsOpenButton />
</Stack>
</Toolbar>
Expand Down
Loading