watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-10 23:57:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed share page. Updated device detect. Updated teams fetch.

Browse source
This commit is contained in:
Mike Cao 2025-09-25 11:21:44 -07:00
parent 27c342811e
commit 1b400da7b2
16 changed files with 118 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/app/(main)/SideNav.tsx
View file

@ -10,7 +10,7 @@ import {
} from '@umami/react-zen';
import { Globe, LinkIcon, LogoSvg, Grid2x2, PanelLeft } from '@/components/icons';
import { useMessages, useNavigation, useGlobalState } from '@/components/hooks';
import { TeamsButton } from '@/components/input/TeamsButton';
import { NavButton } from '@/components/input/NavButton';
import { PanelButton } from '@/components/input/PanelButton';
import { Key } from 'react';
import { SettingsButton } from '@/components/input/SettingsButton';
@ -48,8 +48,8 @@ export function SideNav(props: SidebarProps) {
};
return (
<Row height="100%" backgroundColor border="right">
<Sidebar {...props} isCollapsed={isCollapsed || hasNav} muteItems={false} showBorder={false}>
<Row height="100%" backgroundColor>
<Sidebar {...props} isCollapsed={isCollapsed || hasNav}>
<SidebarSection onClick={() => setIsCollapsed(false)}>
<SidebarHeader
label="umami"
@ -60,7 +60,7 @@ export function SideNav(props: SidebarProps) {
</SidebarHeader>
</SidebarSection>
<SidebarSection paddingTop="0" paddingBottom="0" justifyContent="center">
<TeamsButton showText={!hasNav && !isCollapsed} onAction={handleSelect} />
<NavButton showText={!hasNav && !isCollapsed} onAction={handleSelect} />
</SidebarSection>
<SidebarSection flexGrow={1}>
{links.map(({ id, path, label, icon }) => {

1
src/app/(main)/settings/SettingsLayout.tsx
View file

@ -53,7 +53,6 @@ export function SettingsLayout({ children }: { children: ReactNode }) {
title={formatMessage(labels.settings)}
selectedKey={selectedKey}
allowMinimize={false}
muteItems={false}
/>
</Column>
<Column gap="6" margin="2">

2
src/app/(main)/websites/[websiteId]/WebsiteExpandedView.tsx
View file

@ -182,7 +182,7 @@ export function WebsiteExpandedView({
return (
<Grid columns="auto 1fr" gap="6" height="100%" overflow="hidden">
<Column gap="6" border="right" paddingRight="3" overflowY="auto">
<SideMenu items={items} selectedKey={view} muteItems={false} />
<SideMenu items={items} selectedKey={view} />
</Column>
<Column overflow="hidden">
<MetricsExpandedTable

2
src/app/(main)/websites/[websiteId]/WebsiteNav.tsx
View file

@ -161,7 +161,7 @@ export function WebsiteNav({ websiteId }: { websiteId: string }) {
.find(({ path }) => path && pathname.endsWith(path.split('?')[0]))?.id;
return (
<SideMenu items={items} selectedKey={selectedKey} allowMinimize={false} muteItems={false}>
<SideMenu items={items} selectedKey={selectedKey} allowMinimize={false}>
<WebsiteSelect
websiteId={websiteId}
teamId={teamId}