Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Updated page titles.

Mike Caoa7e6c324602c
diff --git a/next.config.js b/next.config.js
index 7d5fd565a..58e0561ff 100644
--- a/next.config.js
+++ b/next.config.js
@@ -57,7 +57,13 @@ if (process.env.TRACKER_SCRIPT_NAME) {
}
}
-const redirects = [];
+const redirects = [
+ {
+ source: '/settings',
+ destination: process.env.CLOUD_MODE ? '/settings/profile' : '/settings/websites',
+ permanent: true,
+ },
+];
if (process.env.CLOUD_MODE) {
redirects.push({
diff --git a/pages/realtime/[id]/index.js b/pages/realtime/[id]/index.js
index 1cc826ee8..43475fa57 100644
--- a/pages/realtime/[id]/index.js
+++ b/pages/realtime/[id]/index.js
@@ -9,8 +9,10 @@ export default function RealtimeDetailsPage() {
const { id: websiteId } = router.query;
const { formatMessage, labels } = useMessages();
const { get, useQuery } = useApi();
- const { data: website } = useQuery(['websites', websiteId], () => get(`/websites/${websiteId}`));
- const title = formatMessage(labels.realtime) + ' | ' + website?.name;
+ const { data: website } = useQuery(['websites', websiteId], () =>
+ get(`/websites/${websiteId}`, { enabled: !!websiteId }),
+ );
+ const title = `${formatMessage(labels.realtime)}${website?.name ? ` - ${website.name}` : ''}`;
if (!websiteId) {
return null;
diff --git a/pages/settings/index.js b/pages/settings/index.js
deleted file mode 100644
index f76d64065..000000000
--- a/pages/settings/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export default () => null;
-
-export async function getServerSideProps() {
- const dest = process.env.CLOUD_MODE ? 'profile' : 'websites';
-
- return {
- redirect: {
- destination: `/settings/${dest}`,
- permanent: true,
- },
- };
-}
diff --git a/pages/settings/profile/index.js b/pages/settings/profile/index.js
index c7dd7d6c4..aef21bb6d 100644
--- a/pages/settings/profile/index.js
+++ b/pages/settings/profile/index.js
@@ -6,7 +6,7 @@ import useMessages from 'hooks/useMessages';
export default function ProfilePage() {
const { formatMessage, labels } = useMessages();
return (
- <AppLayout title={formatMessage(labels.profile)}>
+ <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.profile)}`}>
<SettingsLayout>
<ProfileSettings />
</SettingsLayout>
diff --git a/pages/settings/teams/[id]/index.js b/pages/settings/teams/[id]/index.js
index 400d57359..6eb631b15 100644
--- a/pages/settings/teams/[id]/index.js
+++ b/pages/settings/teams/[id]/index.js
@@ -14,7 +14,7 @@ export default function TeamDetailPage({ disabled }) {
}
return (
- <AppLayout title={formatMessage(labels.teams)}>
+ <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.teams)}`}>
<SettingsLayout>
<TeamSettings teamId={id} />
</SettingsLayout>
diff --git a/pages/settings/teams/index.js b/pages/settings/teams/index.js
index c2304ab0a..471ddf0fc 100644
--- a/pages/settings/teams/index.js
+++ b/pages/settings/teams/index.js
@@ -10,7 +10,7 @@ export default function TeamsPage({ disabled }) {
}
return (
- <AppLayout title={formatMessage(labels.teams)}>
+ <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.teams)}`}>
<SettingsLayout>
<TeamsList />
</SettingsLayout>
diff --git a/pages/settings/users/[id]/index.js b/pages/settings/users/[id]/index.js
index b25d5295a..94df69511 100644
--- a/pages/settings/users/[id]/index.js
+++ b/pages/settings/users/[id]/index.js
@@ -14,7 +14,7 @@ export default function TeamDetailPage({ disabled }) {
}
return (
- <AppLayout title={formatMessage(labels.users)}>
+ <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.users)}`}>
<SettingsLayout>
<UserSettings userId={id} />
</SettingsLayout>
diff --git a/pages/settings/users/index.js b/pages/settings/users/index.js
index 5dbb69664..6e021a748 100644
--- a/pages/settings/users/index.js
+++ b/pages/settings/users/index.js
@@ -10,7 +10,7 @@ export default function UsersPage({ disabled }) {
}
return (
- <AppLayout title={formatMessage(labels.users)}>
+ <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.users)}`}>
<SettingsLayout>
<UsersList />
</SettingsLayout>
diff --git a/pages/settings/websites/[id]/index.js b/pages/settings/websites/[id]/index.js
index 63afbf815..7b97b8f5f 100644
--- a/pages/settings/websites/[id]/index.js
+++ b/pages/settings/websites/[id]/index.js
@@ -14,7 +14,7 @@ export default function WebsiteSettingsPage({ disabled }) {
}
return (
- <AppLayout title={formatMessage(labels.websites)}>
+ <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.websites)}`}>
<SettingsLayout>
<WebsiteSettings websiteId={id} />
</SettingsLayout>
diff --git a/pages/settings/websites/index.js b/pages/settings/websites/index.js
index 4599e7935..c115b0814 100644
--- a/pages/settings/websites/index.js
+++ b/pages/settings/websites/index.js
@@ -10,7 +10,7 @@ export default function WebsitesPage({ disabled }) {
}
return (
- <AppLayout title={formatMessage(labels.websites)}>
+ <AppLayout title={`${formatMessage(labels.settings)} - ${formatMessage(labels.websites)}`}>
<SettingsLayout>
<WebsitesList />
</SettingsLayout>