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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Brian Cao 2023-05-22 15:38:05 -07:00
commit f01a745aad
147 changed files with 1095 additions and 628 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pages/api/websites/[id]/data.ts
View file

@ -1,13 +0,0 @@
import { NextApiResponse } from 'next';
import { useAuth } from 'lib/middleware';
import { NextApiRequestQueryBody, User } from 'lib/types';
import { ok } from 'next-basics';
export default async (
req: NextApiRequestQueryBody<unknown, unknown>,
res: NextApiResponse<User>,
) => {
await useAuth(req, res);
return ok(res, req.auth.user);
};

2
pages/api/websites/[id]/eventData.ts
View file

@ -35,7 +35,7 @@ export default async (
const { id: websiteId } = req.query;
if (req.method === 'POST') {
if (req.method === 'GET') {
if (!(await canViewWebsite(req.auth, websiteId))) {
return unauthorized(res);
}

13
pages/reports/event-data.js Normal file
View file

@ -0,0 +1,13 @@
import AppLayout from 'components/layout/AppLayout';
import EventDataReport from 'components/pages/reports/event-data/EventDataReport';
import { useMessages } from 'hooks';
export default function Report() {
const { formatMessage, labels } = useMessages();
return (
<AppLayout title={`${formatMessage(labels.eventData)} - ${formatMessage(labels.reports)}`}>
<EventDataReport />
</AppLayout>
);
}

5
pages/reports/event-data/index.js
View file

@ -1,5 +0,0 @@
import EventDataReport from 'components/pages/reports/EventDataReport';
export default function Report() {
return <EventDataReport />;
}

6
pages/reports/funnel.js
View file

@ -1,13 +1,13 @@
import AppLayout from 'components/layout/AppLayout';
import FunnelPage from 'components/pages/reports/funnel/FunnelPage';
import FunnelReport from 'components/pages/reports/funnel/FunnelReport';
import useMessages from 'hooks/useMessages';
export default function Funnel() {
const { formatMessage, labels } = useMessages();
return (
<AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.reports)}`}>
<FunnelPage />
<AppLayout title={`${formatMessage(labels.funnel)} - ${formatMessage(labels.reports)}`}>
<FunnelReport />
</AppLayout>
);
}

4
pages/reports/index.js
View file

@ -1,5 +1,5 @@
import AppLayout from 'components/layout/AppLayout';
import ReportsList from 'components/pages/reports/ReportsList';
import ReportList from 'components/pages/reports/ReportList';
import useMessages from 'hooks/useMessages';
export default function ReportsPage() {
@ -7,7 +7,7 @@ export default function ReportsPage() {
return (
<AppLayout title={formatMessage(labels.reports)}>
<ReportsList />
<ReportList />
</AppLayout>
);
}