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

Merge branch 'analytics' into dev

Browse source 
# Conflicts:
#	.gitignore
#	src/app/api/share/[slug]/route.ts
#	src/app/share/[...shareId]/SharePage.tsx
This commit is contained in:
Mike Cao 2026-01-22 17:44:45 -08:00
commit adea3e9b1c
7 changed files with 148 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/app/share/[...shareId]/SharePage.tsx
View file

@ -56,7 +56,7 @@ export function SharePage({ shareId, path = '' }: { shareId: string; path?: stri
return null;
}
const { websiteId, parameters = {} } = shareToken;
const { websiteId, parameters = {}, whiteLabel } = shareToken;
// Check if the requested path is allowed
const pageKey = path || '';
@ -84,10 +84,11 @@ export function SharePage({ shareId, path = '' }: { shareId: string; path?: stri
</Column>
<PageBody gap>
<WebsiteProvider websiteId={websiteId}>
<WebsiteHeader showActions={false} />
<Header whiteLabel={whiteLabel} />
<Column>
<PageComponent websiteId={websiteId} />
</Column>
<Footer whiteLabel={whiteLabel} />
</WebsiteProvider>
</PageBody>
</Grid>