Merge branch 'analytics' into dev

# Conflicts:
#	.gitignore
#	src/app/api/share/[slug]/route.ts
#	src/app/share/[...shareId]/SharePage.tsx
This commit is contained in:
Mike Cao committed 2026-01-22 17:44:45 -08:00
commit adea3e9b1c
7 files changed
+148 -62

No files matched your search

+12 -1
View File
@@ -1,7 +1,18 @@
import { Row, Text } from '@umami/react-zen';
import type { WhiteLabel } from '@/app/api/share/[shareId]/route';
import { CURRENT_VERSION, HOMEPAGE_URL } from '@/lib/constants';
export function Footer() {
export function Footer({ whiteLabel }: { whiteLabel?: WhiteLabel }) {
if (whiteLabel) {
return (
<Row as="footer" paddingY="6" justifyContent="flex-end">
<a href={whiteLabel.url} target="_blank">
<Text weight="bold">{whiteLabel.name}</Text>
</a>
</Row>
);
}
return (
<Row as="footer" paddingY="6" justifyContent="flex-end">
<a href={HOMEPAGE_URL} target="_blank">
+15 -6
View File
@@ -1,17 +1,26 @@
import { Icon, Row, Text, ThemeButton } from '@umami/react-zen';
import type { WhiteLabel } from '@/app/api/share/[shareId]/route';
import { LanguageButton } from '@/components/input/LanguageButton';
import { PreferencesButton } from '@/components/input/PreferencesButton';
import { Logo } from '@/components/svg';
export function Header() {
export function Header({ whiteLabel }: { whiteLabel?: WhiteLabel }) {
const logoUrl = whiteLabel?.url || 'https://umami.is';
const logoName = whiteLabel?.name || 'umami';
const logoImage = whiteLabel?.image;
return (
<Row as="header" justifyContent="space-between" alignItems="center" paddingY="3">
<a href="https://umami.is" target="_blank" rel="noopener">
<a href={logoUrl} target="_blank" rel="noopener">
<Row alignItems="center" gap>
<Icon>
<Logo />
</Icon>
<Text weight="bold">umami</Text>
{logoImage ? (
<img src={logoImage} alt={logoName} style={{ height: 24 }} />
) : (
<Icon>
<Logo />
</Icon>
)}
<Text weight="bold">{logoName}</Text>
</Row>
</a>
<Row alignItems="center" gap>
+3 -2
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>