watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-10 23:57:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'dev' of https://github.com/umami-software/umami into dev

Browse source 
# Conflicts:
#	src/components/metrics/ReferrersTable.tsx
This commit is contained in:
Mike Cao 2025-08-07 10:08:14 -07:00
commit 274d654833
17 changed files with 137 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx
View file

@ -6,6 +6,7 @@ import { WebsiteShareForm } from './WebsiteShareForm';
import { WebsiteTrackingCode } from './WebsiteTrackingCode';
import { WebsiteData } from './WebsiteData';
import { WebsiteEditForm } from './WebsiteEditForm';
import { SegmentsDataTable } from '@/app/(main)/websites/[websiteId]/segments/SegmentsDataTable';
export function WebsiteSettings({ websiteId }: { websiteId: string; openExternal?: boolean }) {
const website = useContext(WebsiteContext);
@ -17,6 +18,7 @@ export function WebsiteSettings({ websiteId }: { websiteId: string; openExternal
<Tab id="details">{formatMessage(labels.details)}</Tab>
<Tab id="tracking">{formatMessage(labels.trackingCode)}</Tab>
<Tab id="share"> {formatMessage(labels.shareUrl)}</Tab>
<Tab id="segments"> {formatMessage(labels.segments)}</Tab>
<Tab id="manage">{formatMessage(labels.manage)}</Tab>
</TabList>
<TabPanel id="details" style={{ width: 500 }}>
@ -28,6 +30,9 @@ export function WebsiteSettings({ websiteId }: { websiteId: string; openExternal
<TabPanel id="share" style={{ width: 500 }}>
<WebsiteShareForm websiteId={websiteId} shareId={website.shareId} />
</TabPanel>
<TabPanel id="segments">
<SegmentsDataTable websiteId={websiteId} />
</TabPanel>
<TabPanel id="manage">
<WebsiteData websiteId={websiteId} />
</TabPanel>