Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Add breadcrumb.

Brian Caofa2cc5dbbd8d
diff --git a/src/app/(main)/reports/[reportId]/ReportHeader.tsx b/src/app/(main)/reports/[reportId]/ReportHeader.tsx
index 69ed46a98..2936d806c 100644
--- a/src/app/(main)/reports/[reportId]/ReportHeader.tsx
+++ b/src/app/(main)/reports/[reportId]/ReportHeader.tsx
@@ -4,6 +4,7 @@ import { useMessages, useApi, useNavigation, useTeamUrl } from 'components/hooks
import { ReportContext } from './Report';
import styles from './ReportHeader.module.css';
import { REPORT_TYPES } from 'lib/constants';
+import Breadcrumb from 'components/common/Breadcrumb';
export function ReportHeader({ icon }) {
const { report, updateReport } = useContext(ReportContext);
@@ -57,9 +58,16 @@ export function ReportHeader({ icon }) {
<div className={styles.header}>
<div>
<div className={styles.type}>
- {formatMessage(
- labels[Object.keys(REPORT_TYPES).find(key => REPORT_TYPES[key] === report?.type)],
- )}
+ <Breadcrumb
+ data={[
+ { label: formatMessage(labels.reports), url: '/reports' },
+ {
+ label: formatMessage(
+ labels[Object.keys(REPORT_TYPES).find(key => REPORT_TYPES[key] === report?.type)],
+ ),
+ },
+ ]}
+ />
</div>
<div className={styles.title}>
<Icon size="lg">{icon}</Icon>
diff --git a/src/app/(main)/settings/users/[userId]/UserSettings.tsx b/src/app/(main)/settings/users/[userId]/UserSettings.tsx
index 1ea663f53..f9e17a85b 100644
--- a/src/app/(main)/settings/users/[userId]/UserSettings.tsx
+++ b/src/app/(main)/settings/users/[userId]/UserSettings.tsx
@@ -6,6 +6,7 @@ import PageHeader from 'components/layout/PageHeader';
import { useMessages } from 'components/hooks';
import UserWebsites from './UserWebsites';
import { UserContext } from './UserProvider';
+import Breadcrumb from 'components/common/Breadcrumb';
export function UserSettings({ userId }: { userId: string }) {
const { formatMessage, labels, messages } = useMessages();
@@ -17,9 +18,23 @@ export function UserSettings({ userId }: { userId: string }) {
showToast({ message: formatMessage(messages.saved), variant: 'success' });
};
+ const breadcrumb = (
+ <Breadcrumb
+ data={[
+ {
+ label: formatMessage(labels.users),
+ url: '/settings/users',
+ },
+ {
+ label: user.username,
+ },
+ ]}
+ />
+ );
+
return (
<>
- <PageHeader title={user?.username} icon={<Icons.User />} />
+ <PageHeader title={user?.username} icon={<Icons.User />} breadcrumb={breadcrumb} />
<Tabs selectedKey={tab} onSelect={setTab} style={{ marginBottom: 30, fontSize: 14 }}>
<Item key="details">{formatMessage(labels.details)}</Item>
<Item key="websites">{formatMessage(labels.websites)}</Item>
diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx
index ebe65fe01..99f9faa1d 100644
--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx
+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettings.tsx
@@ -1,14 +1,15 @@
-import { useState, Key, useContext } from 'react';
-import { Item, Tabs, Button, Text, Icon, useToasts } from 'react-basics';
-import Link from 'next/link';
+import { WebsiteContext } from 'app/(main)/websites/[websiteId]/WebsiteProvider';
+import Breadcrumb from 'components/common/Breadcrumb';
+import { useMessages } from 'components/hooks';
import Icons from 'components/icons';
import PageHeader from 'components/layout/PageHeader';
-import WebsiteEditForm from './WebsiteEditForm';
-import WebsiteData from './WebsiteData';
-import TrackingCode from './TrackingCode';
+import Link from 'next/link';
+import { Key, useContext, useState } from 'react';
+import { Button, Icon, Item, Tabs, Text, useToasts } from 'react-basics';
import ShareUrl from './ShareUrl';
-import { useMessages } from 'components/hooks';
-import { WebsiteContext } from 'app/(main)/websites/[websiteId]/WebsiteProvider';
+import TrackingCode from './TrackingCode';
+import WebsiteData from './WebsiteData';
+import WebsiteEditForm from './WebsiteEditForm';
export function WebsiteSettings({
websiteId,
@@ -28,9 +29,23 @@ export function WebsiteSettings({
showToast({ message: formatMessage(messages.saved), variant: 'success' });
};
+ const breadcrumb = (
+ <Breadcrumb
+ data={[
+ {
+ label: formatMessage(labels.websites),
+ url: website.teamId ? `/teams/${website.teamId}/settings/websites` : '/settings/websites',
+ },
+ {
+ label: website.name,
+ },
+ ]}
+ />
+ );
+
return (
<>
- <PageHeader title={website?.name} icon={<Icons.Globe />}>
+ <PageHeader title={website?.name} icon={<Icons.Globe />} breadcrumb={breadcrumb}>
<Link href={`/websites/${websiteId}`} target={openExternal ? '_blank' : null}>
<Button variant="primary">
<Icon>
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
index 58ec225a1..3d0292506 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteHeader.tsx
@@ -1,12 +1,12 @@
-import { ReactNode } from 'react';
import classNames from 'classnames';
-import { Text, Button, Icon } from 'react-basics';
-import Link from 'next/link';
-import { usePathname } from 'next/navigation';
import Favicon from 'components/common/Favicon';
-import ActiveUsers from 'components/metrics/ActiveUsers';
-import Icons from 'components/icons';
import { useMessages, useWebsite } from 'components/hooks';
+import Icons from 'components/icons';
+import ActiveUsers from 'components/metrics/ActiveUsers';
+import Link from 'next/link';
+import { usePathname } from 'next/navigation';
+import { ReactNode } from 'react';
+import { Button, Icon, Text } from 'react-basics';
import styles from './WebsiteHeader.module.css';
export function WebsiteHeader({
diff --git a/src/components/common/Breadcrumb.module.css b/src/components/common/Breadcrumb.module.css
new file mode 100644
index 000000000..70d88f366
--- /dev/null
+++ b/src/components/common/Breadcrumb.module.css
@@ -0,0 +1,10 @@
+.bar {
+ font-size: 11px;
+ font-weight: 700;
+ text-transform: uppercase;
+ color: var(--base600);
+}
+
+.link span {
+ color: var(--base700) !important;
+}
diff --git a/src/components/common/Breadcrumb.tsx b/src/components/common/Breadcrumb.tsx
new file mode 100644
index 000000000..fa7bde155
--- /dev/null
+++ b/src/components/common/Breadcrumb.tsx
@@ -0,0 +1,37 @@
+import Link from 'next/link';
+import { Flexbox, Icon, Icons, Text } from 'react-basics';
+import styles from './Breadcrumb.module.css';
+
+export interface BreadcrumbProps {
+ data: {
+ url?: string;
+ label: string;
+ }[];
+}
+
+export function Breadcrumb({ data }: BreadcrumbProps) {
+ return (
+ <Flexbox alignItems="center" gap={3} className={styles.bar}>
+ {data.map((a, i) => {
+ return (
+ <>
+ {a.url ? (
+ <Link href={a.url} className={styles.link}>
+ <Text>{a.label}</Text>
+ </Link>
+ ) : (
+ <Text>{a.label}</Text>
+ )}
+ {i !== data.length - 1 ? (
+ <Icon rotate={270}>
+ <Icons.ChevronDown />
+ </Icon>
+ ) : null}
+ </>
+ );
+ })}
+ </Flexbox>
+ );
+}
+
+export default Breadcrumb;
diff --git a/src/components/layout/PageHeader.module.css b/src/components/layout/PageHeader.module.css
index 8e186979a..b92bb1db9 100644
--- a/src/components/layout/PageHeader.module.css
+++ b/src/components/layout/PageHeader.module.css
@@ -27,6 +27,10 @@
flex: 1;
}
+.breadcrumb {
+ padding-top: 20px;
+}
+
.icon {
color: var(--base700);
margin-inline-end: 1rem;
diff --git a/src/components/layout/PageHeader.tsx b/src/components/layout/PageHeader.tsx
index 0d1f21123..53f1db9f2 100644
--- a/src/components/layout/PageHeader.tsx
+++ b/src/components/layout/PageHeader.tsx
@@ -7,23 +7,29 @@ export function PageHeader({
title,
icon,
className,
+ breadcrumb,
children,
}: {
title?: ReactNode;
icon?: ReactNode;
className?: string;
+ breadcrumb?: ReactNode;
children?: ReactNode;
}) {
return (
- <div className={classNames(styles.header, className)}>
- {icon && (
- <Icon size="lg" className={styles.icon}>
- {icon}
- </Icon>
- )}
- {title && <div className={styles.title}>{title}</div>}
- <div className={styles.actions}>{children}</div>
- </div>
+ <>
+ <div className={styles.breadcrumb}>{breadcrumb}</div>
+ <div className={classNames(styles.header, className)}>
+ {icon && (
+ <Icon size="lg" className={styles.icon}>
+ {icon}
+ </Icon>
+ )}
+
+ {title && <div className={styles.title}>{title}</div>}
+ <div className={styles.actions}>{children}</div>
+ </div>
+ </>
);
}