From db3a9525b996e62eb12323c7c982a6bf032f9a63 Mon Sep 17 00:00:00 2001 From: Matthias Kretschmann Date: Sat, 3 Feb 2024 11:39:16 +0000 Subject: [PATCH] handle page titles --- app.json | 2 +- src/app/(main)/NavBar.tsx | 3 ++- src/app/(main)/dashboard/page.tsx | 3 ++- src/app/(main)/reports/[id]/page.tsx | 3 ++- src/app/(main)/reports/create/page.tsx | 3 ++- src/app/(main)/reports/page.tsx | 3 ++- src/app/(main)/settings/profile/page.tsx | 3 ++- src/app/(main)/settings/teams/page.tsx | 3 ++- src/app/(main)/settings/users/page.tsx | 3 ++- src/app/(main)/settings/websites/page.tsx | 3 ++- src/app/(main)/websites/page.tsx | 3 ++- src/app/layout.tsx | 2 +- src/app/login/LoginForm.tsx | 3 ++- src/app/login/page.tsx | 3 ++- src/app/logout/page.tsx | 3 ++- src/app/share/[...id]/page.tsx | 3 ++- 16 files changed, 30 insertions(+), 16 deletions(-) diff --git a/app.json b/app.json index cec5fda1..2089e5dc 100644 --- a/app.json +++ b/app.json @@ -1,5 +1,5 @@ { - "name": "Umami", + "name": "analytics", "description": "Umami is a simple, fast, website analytics alternative to Google Analytics.", "keywords": ["analytics", "charts", "statistics", "web-analytics"], "website": "https://umami.is", diff --git a/src/app/(main)/NavBar.tsx b/src/app/(main)/NavBar.tsx index e241a059..1ac4d211 100644 --- a/src/app/(main)/NavBar.tsx +++ b/src/app/(main)/NavBar.tsx @@ -10,6 +10,7 @@ import useMessages from 'components/hooks/useMessages'; import HamburgerButton from 'components/common/HamburgerButton'; import { usePathname } from 'next/navigation'; import styles from './NavBar.module.css'; +import appMeta from '../../../app.json'; export function NavBar() { const pathname = usePathname(); @@ -63,7 +64,7 @@ export function NavBar() { - umami + {appMeta.name}
{links.map(({ url, label }) => { diff --git a/src/app/(main)/dashboard/page.tsx b/src/app/(main)/dashboard/page.tsx index 1853a9f5..f2623a76 100644 --- a/src/app/(main)/dashboard/page.tsx +++ b/src/app/(main)/dashboard/page.tsx @@ -1,10 +1,11 @@ import Dashboard from 'app/(main)/dashboard/Dashboard'; import { Metadata } from 'next'; +import appMeta from '../../../../app.json'; export default function () { return ; } export const metadata: Metadata = { - title: 'Dashboard | umami', + title: `Dashboard | ${appMeta.name}`, }; diff --git a/src/app/(main)/reports/[id]/page.tsx b/src/app/(main)/reports/[id]/page.tsx index 9ba87f41..77b39706 100644 --- a/src/app/(main)/reports/[id]/page.tsx +++ b/src/app/(main)/reports/[id]/page.tsx @@ -1,5 +1,6 @@ import ReportDetails from './ReportDetails'; import { Metadata } from 'next'; +import appMeta from '../../../../../app.json'; export default function ReportDetailsPage({ params: { id } }) { if (!id) { @@ -10,5 +11,5 @@ export default function ReportDetailsPage({ params: { id } }) { } export const metadata: Metadata = { - title: 'Reports | umami', + title: `Reports | ${appMeta.name}`, }; diff --git a/src/app/(main)/reports/create/page.tsx b/src/app/(main)/reports/create/page.tsx index a1a761bc..be09dc33 100644 --- a/src/app/(main)/reports/create/page.tsx +++ b/src/app/(main)/reports/create/page.tsx @@ -1,10 +1,11 @@ import ReportTemplates from './ReportTemplates'; import { Metadata } from 'next'; +import appMeta from '../../../../../app.json'; export default function ReportsCreatePage() { return ; } export const metadata: Metadata = { - title: 'Create Report | umami', + title: `Create Report | ${appMeta.name}`, }; diff --git a/src/app/(main)/reports/page.tsx b/src/app/(main)/reports/page.tsx index 22e6e2a7..de4a152e 100644 --- a/src/app/(main)/reports/page.tsx +++ b/src/app/(main)/reports/page.tsx @@ -1,5 +1,6 @@ import ReportsHeader from './ReportsHeader'; import ReportsDataTable from './ReportsDataTable'; +import appMeta from '../../../../app.json'; export default function () { return ( @@ -10,5 +11,5 @@ export default function () { ); } export const metadata = { - title: 'Reports | umami', + title: `Reports | ${appMeta.name}`, }; diff --git a/src/app/(main)/settings/profile/page.tsx b/src/app/(main)/settings/profile/page.tsx index d7a3ad92..65ed5757 100644 --- a/src/app/(main)/settings/profile/page.tsx +++ b/src/app/(main)/settings/profile/page.tsx @@ -1,6 +1,7 @@ import ProfileHeader from './ProfileHeader'; import ProfileSettings from './ProfileSettings'; import { Metadata } from 'next'; +import appMeta from '../../../../../app.json'; export default function () { return ( @@ -12,5 +13,5 @@ export default function () { } export const metadata: Metadata = { - title: 'Profile Settings | umami', + title: `Profile Settings | ${appMeta.name}`, }; diff --git a/src/app/(main)/settings/teams/page.tsx b/src/app/(main)/settings/teams/page.tsx index 0cdb6f7d..2fa15c1f 100644 --- a/src/app/(main)/settings/teams/page.tsx +++ b/src/app/(main)/settings/teams/page.tsx @@ -1,6 +1,7 @@ import TeamsDataTable from './TeamsDataTable'; import TeamsHeader from './TeamsHeader'; import { Metadata } from 'next'; +import appMeta from '../../../../../app.json'; export default function () { if (process.env.cloudMode) { @@ -16,5 +17,5 @@ export default function () { } export const metadata: Metadata = { - title: 'Teams Settings | umami', + title: `Team Settings | ${appMeta.name}`, }; diff --git a/src/app/(main)/settings/users/page.tsx b/src/app/(main)/settings/users/page.tsx index 00ebe98c..45cbafc5 100644 --- a/src/app/(main)/settings/users/page.tsx +++ b/src/app/(main)/settings/users/page.tsx @@ -1,9 +1,10 @@ import UsersDataTable from './UsersDataTable'; import { Metadata } from 'next'; +import appMeta from '../../../../../app.json'; export default function () { return ; } export const metadata: Metadata = { - title: 'Users | umami', + title: `Users | ${appMeta.name}`, }; diff --git a/src/app/(main)/settings/websites/page.tsx b/src/app/(main)/settings/websites/page.tsx index d6d11898..80b2ba78 100644 --- a/src/app/(main)/settings/websites/page.tsx +++ b/src/app/(main)/settings/websites/page.tsx @@ -1,10 +1,11 @@ import { Metadata } from 'next'; import Websites from './Websites'; +import appMeta from '../../../../../app.json'; export default function () { return ; } export const metadata: Metadata = { - title: 'Websites Settings | umami', + title: `Website Settings | ${appMeta.name}`, }; diff --git a/src/app/(main)/websites/page.tsx b/src/app/(main)/websites/page.tsx index a1542510..d560b88d 100644 --- a/src/app/(main)/websites/page.tsx +++ b/src/app/(main)/websites/page.tsx @@ -1,6 +1,7 @@ import WebsitesHeader from 'app/(main)/settings/websites/WebsitesHeader'; import WebsitesBrowse from './WebsitesBrowse'; import { Metadata } from 'next'; +import appMeta from '../../../../app.json'; export default function WebsitesPage() { return ( @@ -12,5 +13,5 @@ export default function WebsitesPage() { } export const metadata: Metadata = { - title: 'Websites | umami', + title: `Websites | ${appMeta.name}`, }; diff --git a/src/app/layout.tsx b/src/app/layout.tsx index f9d14f7d..4e2dac43 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -30,5 +30,5 @@ export default function ({ children }) { } export const metadata: Metadata = { - title: 'umami', + title: 'analytics', }; diff --git a/src/app/login/LoginForm.tsx b/src/app/login/LoginForm.tsx index 78cf3dd3..4eb656da 100644 --- a/src/app/login/LoginForm.tsx +++ b/src/app/login/LoginForm.tsx @@ -16,6 +16,7 @@ import { setClientAuthToken } from 'lib/client'; import useMessages from 'components/hooks/useMessages'; import Logo from 'assets/logo.svg'; import styles from './LoginForm.module.css'; +import appMeta from '../../../app.json'; export function LoginForm() { const { formatMessage, labels, getMessage } = useMessages(); @@ -41,7 +42,7 @@ export function LoginForm() { -
umami
+
{appMeta.name}
diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx index 2ac3f724..bdf1a78c 100644 --- a/src/app/login/page.tsx +++ b/src/app/login/page.tsx @@ -1,6 +1,7 @@ import LoginForm from './LoginForm'; import { Metadata } from 'next'; import styles from './page.module.css'; +import appMeta from '../../../app.json'; async function getDisabled() { return !!process.env.LOGIN_DISABLED; @@ -21,5 +22,5 @@ export default async function LoginPage() { } export const metadata: Metadata = { - title: 'Login | umami', + title: `Login | ${appMeta.name}`, }; diff --git a/src/app/logout/page.tsx b/src/app/logout/page.tsx index 89a3bce9..bcbf8680 100644 --- a/src/app/logout/page.tsx +++ b/src/app/logout/page.tsx @@ -1,10 +1,11 @@ import Logout from './Logout'; import { Metadata } from 'next'; +import appMeta from '../../../app.json'; export default function () { return ; } export const metadata: Metadata = { - title: 'Logout | umami', + title: `Logout | ${appMeta.name}`, }; diff --git a/src/app/share/[...id]/page.tsx b/src/app/share/[...id]/page.tsx index 2a69f406..16d749a1 100644 --- a/src/app/share/[...id]/page.tsx +++ b/src/app/share/[...id]/page.tsx @@ -1,10 +1,11 @@ import Share from './Share'; import { Metadata } from 'next'; +import appMeta from '../../../../app.json'; export default function ({ params: { id } }) { return ; } export const metadata: Metadata = { - title: 'umami', + title: appMeta.name, };