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

Allow embedding of share page.

Browse source
This commit is contained in:
Mike Cao 2023-11-11 20:45:09 -08:00
parent 9cb6046844
commit eda2c07ea3
10 changed files with 58 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/app/(main)/Shell.tsx → src/app/(main)/App.tsx
View file

@ -4,7 +4,7 @@ import { usePathname } from 'next/navigation';
import UpdateNotice from 'components/common/UpdateNotice';
import { useRequireLogin, useConfig } from 'components/hooks';
export function Shell({ children }) {
export function App({ children }) {
const { user } = useRequireLogin();
const config = useConfig();
const pathname = usePathname();
@ -24,4 +24,4 @@ export function Shell({ children }) {
);
}
export default Shell;
export default App;

2
src/app/(main)/dashboard/page.tsx
View file

@ -1,7 +1,7 @@
import Dashboard from 'app/(main)/dashboard/Dashboard';
import { Metadata } from 'next';
export default function DashboardPage() {
export default function () {
return <Dashboard />;
}

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

@ -1,11 +1,11 @@
import Shell from './Shell';
import App from './App';
import NavBar from './NavBar';
import Page from 'components/layout/Page';
import styles from './layout.module.css';
export default function AppLayout({ children }) {
export default function ({ children }) {
return (
<Shell>
<App>
<main className={styles.layout}>
<nav className={styles.nav}>
<NavBar />
@ -14,6 +14,6 @@ export default function AppLayout({ children }) {
<Page>{children}</Page>
</section>
</main>
</Shell>
</App>
);
}

4
src/app/(main)/reports/ReportsDataTable.js → src/app/(main)/reports/ReportsDataTable.tsx
View file

@ -5,9 +5,9 @@ import useFilterQuery from 'components/hooks/useFilterQuery';
import DataTable from 'components/common/DataTable';
import useCache from 'store/cache';
export default function ReportsDataTable({ websiteId }) {
export default function ReportsDataTable({ websiteId }: { websiteId?: string }) {
const { get } = useApi();
const modified = useCache(state => state?.reports);
const modified = useCache(state => (state as any)?.reports);
const queryResult = useFilterQuery(['reports', { websiteId, modified }], params =>
get(websiteId ? `/websites/${websiteId}/reports` : `/reports`, params),
);

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

@ -1,7 +1,7 @@
import ReportsHeader from './ReportsHeader';
import ReportsDataTable from './ReportsDataTable';
export default function ReportsPage() {
export default function () {
return (
<>
<ReportsHeader />

14
src/app/layout.tsx
View file

@ -8,16 +8,16 @@ import 'styles/locale.css';
import 'styles/index.css';
import 'styles/variables.css';
export default function RootLayout({ children }) {
export default function ({ children }) {
return (
<html lang="en" data-scroll="0">
<head>
<link rel="icon" href={`/favicon.ico`} />
<link rel="apple-touch-icon" sizes="180x180" href={`/apple-touch-icon.png`} />
<link rel="icon" type="image/png" sizes="32x32" href={`/favicon-32x32.png`} />
<link rel="icon" type="image/png" sizes="16x16" href={`/favicon-16x16.png`} />
<link rel="manifest" href={`/site.webmanifest`} />
<link rel="mask-icon" href={`/safari-pinned-tab.svg`} color="#5bbad5" />
<link rel="icon" href="/favicon.ico" />
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
<link rel="manifest" href="/site.webmanifest" />
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5" />
<meta name="msapplication-TileColor" content="#da532c" />
<meta name="theme-color" content="#fafafa" media="(prefers-color-scheme: light)" />
<meta name="theme-color" content="#2f2f2f" media="(prefers-color-scheme: dark)" />

5
src/app/logout/page.tsx
View file

@ -1,5 +1,10 @@
import Logout from './Logout';
import { Metadata } from 'next';
export default function () {
return <Logout />;
}
export const metadata: Metadata = {
title: 'Logout | umami',
};

5
src/app/share/[...id]/page.tsx
View file

@ -1,5 +1,10 @@
import Share from './Share';
import { Metadata } from 'next';
export default function ({ params: { id } }) {
return <Share shareId={id[0]} />;
}
export const metadata: Metadata = {
title: 'umami',
};

2
src/pages/api/send.ts
View file

@ -74,7 +74,7 @@ export default async (req: NextApiRequestCollect, res: NextApiResponse) => {
await useCors(req, res);
if (req.method === 'POST') {
if (isbot(req.headers['user-agent']) && !process.env.DISABLE_BOT_CHECK) {
if (!process.env.DISABLE_BOT_CHECK && isbot(req.headers['user-agent'])) {
return ok(res);
}