Skip to content

fix: show notifications on mobile #17008

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

Merged
merged 1 commit into from
Mar 19, 2025
Merged

fix: show notifications on mobile #17008

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
3 changes: 1 addition & 2 deletions site/src/modules/dashboard/Navbar/MobileMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,8 @@ export const MobileMenu: FC<MobileMenuProps> = ({
<DropdownMenuTrigger asChild>
<Button
aria-label={open ? "Close menu" : "Open menu"}
size="lg"
size="icon-lg"
variant="subtle"
className="ml-auto md:hidden"
>
{open ? <XIcon /> : <MenuIcon />}
</Button>
Expand Down
42 changes: 22 additions & 20 deletions site/src/modules/dashboard/Navbar/NavbarView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export const NavbarView: FC<NavbarViewProps> = ({

<NavItems className="ml-4" />

<div className=" hidden md:flex items-center gap-3 ml-auto">
<div className="hidden md:flex items-center gap-3 ml-auto">
{proxyContextValue && (
<ProxyMenu proxyContextValue={proxyContextValue} />
)}
Expand All @@ -67,6 +67,17 @@ export const NavbarView: FC<NavbarViewProps> = ({
canViewHealth={canViewHealth}
/>

{user && (
<UserDropdown
user={user}
buildInfo={buildInfo}
supportLinks={supportLinks}
onSignOut={onSignOut}
/>
)}
</div>

<div className="ml-auto flex items-center gap-3 md:hidden">
<NotificationsInbox
fetchNotifications={API.getInboxNotifications}
markAllAsRead={() => {
Expand All @@ -79,26 +90,17 @@ export const NavbarView: FC<NavbarViewProps> = ({
}
/>

{user && (
<UserDropdown
user={user}
buildInfo={buildInfo}
supportLinks={supportLinks}
onSignOut={onSignOut}
/>
)}
<MobileMenu
proxyContextValue={proxyContextValue}
user={user}
supportLinks={supportLinks}
onSignOut={onSignOut}
canViewAuditLog={canViewAuditLog}
canViewOrganizations={canViewOrganizations}
canViewDeployment={canViewDeployment}
canViewHealth={canViewHealth}
/>
</div>

<MobileMenu
proxyContextValue={proxyContextValue}
user={user}
supportLinks={supportLinks}
onSignOut={onSignOut}
canViewAuditLog={canViewAuditLog}
canViewOrganizations={canViewOrganizations}
canViewDeployment={canViewDeployment}
canViewHealth={canViewHealth}
/>
</div>
);
};
Expand Down
Loading