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

add websiteheader to share page. Fix overview WebsiteNav Bug

Browse source
This commit is contained in:
Francis Cao 2026-01-27 22:17:49 -08:00
parent c3dad5b7ef
commit c7a0d65590
2 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/app/(main)/websites/[websiteId]/WebsiteLayout.tsx
View file

@ -8,23 +8,25 @@ import { WebsiteNav } from './WebsiteNav';
export function WebsiteLayout({ websiteId, children }: { websiteId: string; children: ReactNode }) { export function WebsiteLayout({ websiteId, children }: { websiteId: string; children: ReactNode }) {
return ( return (
<WebsiteProvider websiteId={websiteId}> <Column backgroundColor="2">
<Grid columns={{ xs: '1fr', lg: 'auto 1fr' }} width="100%" height="100%"> <WebsiteProvider websiteId={websiteId}>
<Column <Grid columns={{ xs: '1fr', lg: 'auto 1fr' }} width="100%" height="100%">
display={{ xs: 'none', lg: 'flex' }} <Column
width="240px" display={{ xs: 'none', lg: 'flex' }}
height="100%" width="240px"
border="right" height="100%"
backgroundColor border="right"
marginRight="2" backgroundColor
> marginRight="2"
<WebsiteNav websiteId={websiteId} /> >
</Column> <WebsiteNav websiteId={websiteId} />
<PageBody gap> </Column>
<WebsiteHeader showActions /> <PageBody gap>
<Column>{children}</Column> <WebsiteHeader showActions />
</PageBody> <Column>{children}</Column>
</Grid> </PageBody>
</WebsiteProvider> </Grid>
</WebsiteProvider>
</Column>
); );
} }

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

@ -131,6 +131,7 @@ export function SharePage({ shareId, path = '' }: { shareId: string; path?: stri
<WebsiteProvider websiteId={websiteId}> <WebsiteProvider websiteId={websiteId}>
<ShareHeader whiteLabel={whiteLabel} /> <ShareHeader whiteLabel={whiteLabel} />
<Column> <Column>
<WebsiteHeader showActions={false} />
<PageComponent websiteId={websiteId} /> <PageComponent websiteId={websiteId} />
</Column> </Column>
<ShareFooter whiteLabel={whiteLabel} /> <ShareFooter whiteLabel={whiteLabel} />