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

Fixed default date range handling. Added header to share page.

Browse source
This commit is contained in:
Mike Cao 2025-10-05 16:02:23 -07:00
parent c5994e5eb6
commit caf04015bb
6 changed files with 28 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/app/(main)/settings/preferences/DateRangeSetting.tsx
View file

@ -14,7 +14,10 @@ export function DateRangeSetting() {
setDate(value);
};
const handleReset = () => setItem(DATE_RANGE_CONFIG, DEFAULT_DATE_RANGE_VALUE);
const handleReset = () => {
setItem(DATE_RANGE_CONFIG, DEFAULT_DATE_RANGE_VALUE);
setDate(DEFAULT_DATE_RANGE_VALUE);
};
return (
<Row gap="3">

23
src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
View file

@ -7,7 +7,7 @@ import { WebsiteShareForm } from '@/app/(main)/websites/[websiteId]/settings/Web
import { useMessages, useNavigation, useWebsite } from '@/components/hooks';
import { LinkButton } from '@/components/common/LinkButton';
export function WebsiteHeader() {
export function WebsiteHeader({ showActions }: { showActions?: boolean }) {
const website = useWebsite();
const { renderUrl, pathname } = useNavigation();
const isSettings = pathname.endsWith('/settings');
@ -20,15 +20,18 @@ export function WebsiteHeader() {
<PageHeader title={website.name} icon={<Favicon domain={website.domain} />} marginBottom="3">
<Row alignItems="center" gap="6">
<ActiveUsers websiteId={website.id} />
<Row alignItems="center" gap>
<ShareButton websiteId={website.id} shareId={website.shareId} />
<LinkButton href={renderUrl(`/websites/${website.id}/settings`, false)}>
<Icon>
<Edit />
</Icon>
<Text>Edit</Text>
</LinkButton>
</Row>
{showActions && (
<Row alignItems="center" gap>
<ShareButton websiteId={website.id} shareId={website.shareId} />
<LinkButton href={renderUrl(`/websites/${website.id}/settings`, false)}>
<Icon>
<Edit />
</Icon>
<Text>Edit</Text>
</LinkButton>
</Row>
)}
</Row>
</PageHeader>
);

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

@ -21,7 +21,7 @@ export function WebsiteLayout({ websiteId, children }: { websiteId: string; chil
</Column>
)}
<PageBody gap>
<WebsiteHeader />
<WebsiteHeader showActions />
<Column>{children}</Column>
</PageBody>
</Grid>

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

@ -6,6 +6,7 @@ import { useShareTokenQuery } from '@/components/hooks';
import { PageBody } from '@/components/common/PageBody';
import { Header } from './Header';
import { Footer } from './Footer';
import { WebsiteHeader } from '@/app/(main)/websites/[websiteId]/WebsiteHeader';
export function SharePage({ shareId }) {
const { shareToken, isLoading } = useShareTokenQuery(shareId);
@ -19,6 +20,7 @@ export function SharePage({ shareId }) {
<PageBody gap>
<Header />
<WebsiteProvider websiteId={shareToken.websiteId}>
<WebsiteHeader showActions={false} />
<WebsitePage websiteId={shareToken.websiteId} />
</WebsiteProvider>
<Footer />