Skip to content

Commit 576661a

Browse files
me-andreccanos
andauthored
Navigation User Menu has PoweredBy on mobiles (#5464)
Co-authored-by: Carlos Cano <[email protected]>
1 parent 0cbe60d commit 576661a

File tree

2 files changed

+24
-7
lines changed

2 files changed

+24
-7
lines changed

src/main/ui/platformNavigation/PlatformNavigationBar.tsx

+17-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import NavigationBar, { NAVIGATION_CONTENT_HEIGHT_GUTTERS } from '../../../core/
22
import PlatformNavigationUserAvatar from './PlatformNavigationUserAvatar';
33
import PlatformSearch from '../platformSearch/PlatformSearch';
44
import PlatformNavigationMenuButton from './PlatformNavigationMenuButton';
5-
import { Box, Slide, Theme, useMediaQuery } from '@mui/material';
5+
import { Box, MenuItem, Slide, Theme, useMediaQuery } from '@mui/material';
66
import React, { cloneElement, ReactElement, Ref, useLayoutEffect, useRef, useState } from 'react';
7-
import PlatformNavigationUserMenu from './PlatformNavigationUserMenu';
7+
import PlatformNavigationUserMenu, { UserMenuDivider } from './PlatformNavigationUserMenu';
88
import UserMenuPlatformNavigationSegment from './platformNavigationMenu/UserMenuPlatformNavigationSegment';
99
import NavigationBarSideContent from '../../../core/ui/navigation/NavigationBarSideContent';
1010
import { gutters } from '../../../core/ui/grid/utils';
@@ -15,6 +15,7 @@ import { GUTTER_PX } from '../../../core/ui/grid/constants';
1515
import PlatformNavigationUncollapse from './PlatformNavigationUncollapse';
1616
import SkipLink from '../../../core/ui/keyboardNavigation/SkipLink';
1717
import { useTranslation } from 'react-i18next';
18+
import PoweredBy from '../poweredBy/PoweredBy';
1819

1920
export interface PlatformNavigationBarProps {
2021
breadcrumbs?: ReactElement<UncontrolledExpandable & { ref: Ref<Collapsible> }>;
@@ -99,8 +100,21 @@ const PlatformNavigationBar = ({ breadcrumbs }: PlatformNavigationBarProps) => {
99100
</PlatformSearch>
100101
{!isMobile && <PlatformNavigationMenuButton />}
101102
<PlatformNavigationUserAvatar drawer={isMobile}>
102-
<PlatformNavigationUserMenu surface={!isMobile}>
103+
<PlatformNavigationUserMenu
104+
surface={!isMobile}
105+
footer={
106+
isMobile && (
107+
<>
108+
<UserMenuDivider />
109+
<Box component={MenuItem} paddingY={gutters(0.5)}>
110+
<PoweredBy preview />
111+
</Box>
112+
</>
113+
)
114+
}
115+
>
103116
{isMobile && <UserMenuPlatformNavigationSegment />}
117+
{isMobile && <UserMenuDivider />}
104118
</PlatformNavigationUserMenu>
105119
</PlatformNavigationUserAvatar>
106120
</Box>

src/main/ui/platformNavigation/PlatformNavigationUserMenu.tsx

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { forwardRef, PropsWithChildren, useMemo, useState } from 'react';
1+
import React, { forwardRef, PropsWithChildren, ReactNode, useMemo, useState } from 'react';
22
import { Box, Divider, MenuList, Typography } from '@mui/material';
33
import AlkemioAvatar from '../../../core/ui/image/AlkemioAvatar';
44
import { BlockTitle, Caption } from '../../../core/ui/typography';
@@ -32,11 +32,14 @@ import usePlatformOrigin from '../../../domain/platform/routes/usePlatformOrigin
3232

3333
interface PlatformNavigationUserMenuProps {
3434
surface: boolean;
35+
footer?: ReactNode;
3536
onClose?: () => void;
3637
}
3738

39+
export const UserMenuDivider = () => <Divider sx={{ width: '85%', marginX: 'auto' }} />;
40+
3841
const PlatformNavigationUserMenu = forwardRef<HTMLDivElement, PropsWithChildren<PlatformNavigationUserMenuProps>>(
39-
({ surface, onClose, children }, ref) => {
42+
({ surface, onClose, footer, children }, ref) => {
4043
const { t } = useTranslation();
4144

4245
const { pathname } = useLocation();
@@ -113,9 +116,8 @@ const PlatformNavigationUserMenu = forwardRef<HTMLDivElement, PropsWithChildren<
113116
)}
114117
</PendingMembershipsUserMenuItem>
115118
)}
116-
<Divider sx={{ width: '85%', marginX: 'auto' }} />
119+
<UserMenuDivider />
117120
{children}
118-
{children && <Divider sx={{ width: '85%', marginX: 'auto' }} />}
119121
{isAdmin && (
120122
<NavigatableMenuItem iconComponent={SettingsIcon} route="/admin" onClick={onClose}>
121123
{t('common.administration')}
@@ -158,6 +160,7 @@ const PlatformNavigationUserMenu = forwardRef<HTMLDivElement, PropsWithChildren<
158160
<NavigatableMenuItem tabOnly iconComponent={ExitToAppOutlined} onClick={onClose}>
159161
{t('components.navigation.exitMenu')}
160162
</NavigatableMenuItem>
163+
{footer}
161164
</MenuList>
162165
</FocusTrap>
163166
</Wrapper>

0 commit comments

Comments
 (0)