watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-22 05:25:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed pages.

Browse source
This commit is contained in:
Mike Cao 2024-02-06 00:38:33 -08:00
parent f7151a880e
commit b85109241b
22 changed files with 86 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/(main)/reports/funnel/FunnelChart.tsx
View file

@ -3,7 +3,7 @@ import { Loading, StatusLight } from 'react-basics';
import { useMessages, useTheme } from 'components/hooks';
import BarChart from 'components/metrics/BarChart';
import { formatLongNumber } from 'lib/format';
import { ReportContext } from '../[reportId]/ReportPage';
import { ReportContext } from '../[reportId]/Report';
import styles from './FunnelChart.module.css';
export interface FunnelChartProps {

2
src/app/(main)/reports/funnel/FunnelParameters.tsx
View file

@ -13,7 +13,7 @@ import {
} from 'react-basics';
import Icons from 'components/icons';
import UrlAddForm from './UrlAddForm';
import { ReportContext } from '../[reportId]/ReportPage';
import { ReportContext } from '../[reportId]/Report';
import BaseParameters from '../[reportId]/BaseParameters';
import ParameterList from '../[reportId]/ParameterList';
import PopupForm from '../[reportId]/PopupForm';

6
src/app/(main)/reports/funnel/FunnelReport.tsx
View file

@ -1,7 +1,7 @@
import FunnelChart from './FunnelChart';
import FunnelTable from './FunnelTable';
import FunnelParameters from './FunnelParameters';
import ReportPage from '../[reportId]/ReportPage';
import Report from '../[reportId]/Report';
import ReportHeader from '../[reportId]/ReportHeader';
import ReportMenu from '../[reportId]/ReportMenu';
import ReportBody from '../[reportId]/ReportBody';
@ -15,7 +15,7 @@ const defaultParameters = {
export default function FunnelReport({ reportId }: { reportId?: string }) {
return (
<ReportPage reportId={reportId} defaultParameters={defaultParameters}>
<Report reportId={reportId} defaultParameters={defaultParameters}>
<ReportHeader icon={<Funnel />} />
<ReportMenu>
<FunnelParameters />
@ -24,6 +24,6 @@ export default function FunnelReport({ reportId }: { reportId?: string }) {
<FunnelChart />
<FunnelTable />
</ReportBody>
</ReportPage>
</Report>
);
}

2
src/app/(main)/reports/funnel/FunnelTable.tsx
View file

@ -1,7 +1,7 @@
import { useContext } from 'react';
import ListTable from 'components/metrics/ListTable';
import { useMessages } from 'components/hooks';
import { ReportContext } from '../[reportId]/ReportPage';
import { ReportContext } from '../[reportId]/Report';
export function FunnelTable() {
const { report } = useContext(ReportContext);