watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-07 22:27:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Updated filter bar.

Browse source
This commit is contained in:
Mike Cao 2025-04-02 23:18:03 -05:00
parent 34a8fa100c
commit 2b99274895
11 changed files with 1101 additions and 1048 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/(main)/App.tsx
View file

@ -38,7 +38,7 @@ export function App({ children }) {
gridRow="2 / 3"
alignItems="center"
overflow="auto"
backgroundColor="1"
backgroundColor="0"
>
<Page>
{children}

2
src/app/(main)/MenuBar.tsx
View file

@ -17,7 +17,7 @@ export function MenuBar(props: RowProps) {
paddingY="3"
paddingX="3"
paddingRight="5"
backgroundColor="1"
backgroundColor="0"
style={{ borderBottom: '1px solid var(--border-color)' }}
>
<Row>

4
src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
View file

@ -17,7 +17,7 @@ import { WebsiteTabs } from '@/app/(main)/websites/[websiteId]/WebsiteTabs';
import { useWebsite } from '@/components/hooks/useWebsite';
import { WebsiteFilterButton } from '@/app/(main)/websites/[websiteId]/WebsiteFilterButton';
import { WebsiteDateFilter } from '@/components/input/WebsiteDateFilter';
import { FilterTags } from '@/components/metrics/FilterTags';
import { FilterBar } from '@/components/metrics/FilterBar';
import { useMessages } from '@/components/hooks';
export function WebsiteHeader({
@ -73,7 +73,7 @@ export function WebsiteHeader({
</Row>
</Row>
{compareMode && items.map(item => <div key={item.value}>{item.label}</div>)}
<FilterTags websiteId={websiteId} />
<FilterBar websiteId={websiteId} />
<WebsiteTabs websiteId={websiteId} />
</Column>
);

4
src/app/(main)/websites/[websiteId]/compare/WebsiteComparePage.tsx
View file

@ -3,7 +3,7 @@ import { Grid } from '@umami/react-zen';
import { Panel } from '@/components/common/Panel';
import { WebsiteHeader } from '../WebsiteHeader';
import { WebsiteMetricsBar } from '../WebsiteMetricsBar';
import { FilterTags } from '@/components/metrics/FilterTags';
import { FilterBar } from '@/components/metrics/FilterBar';
import { WebsiteChart } from '../WebsiteChart';
import { WebsiteCompareTables } from './WebsiteCompareTables';
@ -11,7 +11,7 @@ export function WebsiteComparePage({ websiteId }) {
return (
<Grid gap="3">
<WebsiteHeader websiteId={websiteId} />
<FilterTags websiteId={websiteId} />
<FilterBar websiteId={websiteId} />
<WebsiteMetricsBar websiteId={websiteId} compareMode={true} showFilter={true} />
<Panel>
<WebsiteChart websiteId={websiteId} compareMode={true} />