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.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Fixed teams settings.
Mike Caob0c9197f2dbf
diff --git a/next.config.js b/next.config.jsindex 7554e2262..d7546d752 100644--- a/next.config.js+++ b/next.config.js@@ -167,6 +167,10 @@ const config = {source: '/telemetry.js',destination: '/api/scripts/telemetry',},+ {+ source: '/teams/:teamId/settings/:path*',+ destination: '/teams/:teamId/settings/:path*',+ },{source: '/teams/:teamId/:path*',destination: '/:path*',diff --git a/src/app/(main)/teams/[teamId]/layout.tsx b/src/app/(main)/teams/[teamId]/layout.tsxindex c804c7463..e10cdb943 100644--- a/src/app/(main)/teams/[teamId]/layout.tsx+++ b/src/app/(main)/teams/[teamId]/layout.tsx@@ -1,8 +1,13 @@import TeamProvider from './TeamProvider';import { Metadata } from 'next';+import TeamSettingsLayout from './settings/TeamSettingsLayout';export default function ({ children, params: { teamId } }) {- return <TeamProvider teamId={teamId}>{children}</TeamProvider>;+ return (+ <TeamProvider teamId={teamId}>+ <TeamSettingsLayout>{children}</TeamSettingsLayout>+ </TeamProvider>+ );}export const metadata: Metadata = {diff --git a/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx b/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsxnew file mode 100644index 000000000..f7df620a7--- /dev/null+++ b/src/app/(main)/teams/[teamId]/settings/TeamSettingsLayout.tsx@@ -0,0 +1,29 @@+'use client';+import { ReactNode } from 'react';+import { useMessages, useTeamUrl } from 'components/hooks';+import MenuLayout from 'components/layout/MenuLayout';++export default function TeamSettingsLayout({ children }: { children: ReactNode }) {+ const { formatMessage, labels } = useMessages();+ const { teamId } = useTeamUrl();++ const items = [+ {+ key: 'team',+ label: formatMessage(labels.team),+ url: `/teams/${teamId}/settings/team`,+ },+ {+ key: 'websites',+ label: formatMessage(labels.websites),+ url: `/teams/${teamId}/settings/websites`,+ },+ {+ key: 'members',+ label: formatMessage(labels.members),+ url: `/teams/${teamId}/settings/members`,+ },+ ].filter(n => n);++ return <MenuLayout items={items}>{children}</MenuLayout>;+}diff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditButton.tsx b/src/app/(main)/teams/[teamId]/settings/members/TeamMemberEditButton.tsxsimilarity index 100%rename from src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditButton.tsxrename to src/app/(main)/teams/[teamId]/settings/members/TeamMemberEditButton.tsxdiff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditForm.tsx b/src/app/(main)/teams/[teamId]/settings/members/TeamMemberEditForm.tsxsimilarity index 100%rename from src/app/(main)/settings/teams/[teamId]/members/TeamMemberEditForm.tsxrename to src/app/(main)/teams/[teamId]/settings/members/TeamMemberEditForm.tsxdiff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMemberRemoveButton.tsx b/src/app/(main)/teams/[teamId]/settings/members/TeamMemberRemoveButton.tsxsimilarity index 100%rename from src/app/(main)/settings/teams/[teamId]/members/TeamMemberRemoveButton.tsxrename to src/app/(main)/teams/[teamId]/settings/members/TeamMemberRemoveButton.tsxdiff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMembersDataTable.tsx b/src/app/(main)/teams/[teamId]/settings/members/TeamMembersDataTable.tsxsimilarity index 100%rename from src/app/(main)/settings/teams/[teamId]/members/TeamMembersDataTable.tsxrename to src/app/(main)/teams/[teamId]/settings/members/TeamMembersDataTable.tsxdiff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMembersPage.tsx b/src/app/(main)/teams/[teamId]/settings/members/TeamMembersPage.tsxsimilarity index 100%rename from src/app/(main)/settings/teams/[teamId]/members/TeamMembersPage.tsxrename to src/app/(main)/teams/[teamId]/settings/members/TeamMembersPage.tsxdiff --git a/src/app/(main)/settings/teams/[teamId]/members/TeamMembersTable.tsx b/src/app/(main)/teams/[teamId]/settings/members/TeamMembersTable.tsxsimilarity index 100%rename from src/app/(main)/settings/teams/[teamId]/members/TeamMembersTable.tsxrename to src/app/(main)/teams/[teamId]/settings/members/TeamMembersTable.tsxdiff --git a/src/app/(main)/settings/teams/[teamId]/members/page.tsx b/src/app/(main)/teams/[teamId]/settings/members/page.tsxsimilarity index 100%rename from src/app/(main)/settings/teams/[teamId]/members/page.tsxrename to src/app/(main)/teams/[teamId]/settings/members/page.tsxdiff --git a/src/app/(main)/settings/teams/[teamId]/team/TeamDeleteForm.tsx b/src/app/(main)/teams/[teamId]/settings/team/TeamDeleteForm.tsxsimilarity index 100%rename from src/app/(main)/settings/teams/[teamId]/team/TeamDeleteForm.tsxrename to src/app/(main)/teams/[teamId]/settings/team/TeamDeleteForm.tsxdiff --git a/src/app/(main)/settings/teams/[teamId]/team/TeamDetails.tsx b/src/app/(main)/teams/[teamId]/settings/team/TeamDetails.tsxsimilarity index 95%rename from src/app/(main)/settings/teams/[teamId]/team/TeamDetails.tsxrename to src/app/(main)/teams/[teamId]/settings/team/TeamDetails.tsxindex 0c5fe991e..70858ee4f 100644--- a/src/app/(main)/settings/teams/[teamId]/team/TeamDetails.tsx+++ b/src/app/(main)/teams/[teamId]/settings/team/TeamDetails.tsx@@ -5,7 +5,7 @@ import PageHeader from 'components/layout/PageHeader';import { ROLES } from 'lib/constants';import { useContext, useState } from 'react';import { Flexbox, Item, Tabs } from 'react-basics';-import TeamLeaveButton from '../../TeamLeaveButton';+import TeamLeaveButton from 'app/(main)/settings/teams/TeamLeaveButton';import TeamManage from './TeamManage';import TeamEditForm from './TeamEditForm';diff --git a/src/app/(main)/settings/teams/[teamId]/team/TeamEditForm.tsx b/src/app/(main)/teams/[teamId]/settings/team/TeamEditForm.tsxsimilarity index 100%rename from src/app/(main)/settings/teams/[teamId]/team/TeamEditForm.tsxrename to src/app/(main)/teams/[teamId]/settings/team/TeamEditForm.tsxdiff --git a/src/app/(main)/settings/teams/[teamId]/team/TeamManage.tsx b/src/app/(main)/teams/[teamId]/settings/team/TeamManage.tsxsimilarity index 100%rename from src/app/(main)/settings/teams/[teamId]/team/TeamManage.tsxrename to src/app/(main)/teams/[teamId]/settings/team/TeamManage.tsxdiff --git a/src/app/(main)/settings/teams/[teamId]/team/TeamPage.tsx b/src/app/(main)/teams/[teamId]/settings/team/TeamPage.tsxsimilarity index 100%rename from src/app/(main)/settings/teams/[teamId]/team/TeamPage.tsxrename to src/app/(main)/teams/[teamId]/settings/team/TeamPage.tsxdiff --git a/src/app/(main)/settings/teams/[teamId]/team/page.tsx b/src/app/(main)/teams/[teamId]/settings/team/page.tsxsimilarity index 100%rename from src/app/(main)/settings/teams/[teamId]/team/page.tsxrename to src/app/(main)/teams/[teamId]/settings/team/page.tsxdiff --git a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsiteRemoveButton.tsx b/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsiteRemoveButton.tsxsimilarity index 100%rename from src/app/(main)/settings/teams/[teamId]/websites/TeamWebsiteRemoveButton.tsxrename to src/app/(main)/teams/[teamId]/settings/websites/TeamWebsiteRemoveButton.tsxdiff --git a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesDataTable.tsx b/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesDataTable.tsxsimilarity index 100%rename from src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesDataTable.tsxrename to src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesDataTable.tsxdiff --git a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesPage.tsx b/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesPage.tsxsimilarity index 100%rename from src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesPage.tsxrename to src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesPage.tsxdiff --git a/src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesTable.tsx b/src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesTable.tsxsimilarity index 100%rename from src/app/(main)/settings/teams/[teamId]/websites/TeamWebsitesTable.tsxrename to src/app/(main)/teams/[teamId]/settings/websites/TeamWebsitesTable.tsxdiff --git a/src/app/(main)/settings/teams/[teamId]/websites/page.tsx b/src/app/(main)/teams/[teamId]/settings/websites/page.tsxsimilarity index 100%rename from src/app/(main)/settings/teams/[teamId]/websites/page.tsxrename to src/app/(main)/teams/[teamId]/settings/websites/page.tsx