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.

fix margins, teams button, and remove boards

Francis Cao28ba2a1666b2
diff --git a/src/app/(main)/SideNav.tsx b/src/app/(main)/SideNav.tsx
index 7ffc98227..df989f5e4 100644
--- a/src/app/(main)/SideNav.tsx
+++ b/src/app/(main)/SideNav.tsx
@@ -8,14 +8,7 @@ import {
SidebarProps,
ThemeButton,
} from '@umami/react-zen';
-import {
- Globe,
- LayoutDashboard,
- Link as LinkIcon,
- Logo,
- Pixel,
- PanelLeft,
-} from '@/components/icons';
+import { Globe, Link as LinkIcon, Logo, Pixel, PanelLeft } from '@/components/icons';
import { useMessages, useNavigation, useGlobalState } from '@/components/hooks';
import { TeamsButton } from '@/components/input/TeamsButton';
import { PanelButton } from '@/components/input/PanelButton';
@@ -30,12 +23,6 @@ export function SideNav(props: SidebarProps) {
const hasNav = !!(websiteId || pathname.startsWith('/admin') || pathname.includes('/settings'));
const links = [
- {
- id: 'boards',
- label: formatMessage(labels.boards),
- path: '/boards',
- icon: <LayoutDashboard />,
- },
{
id: 'websites',
label: formatMessage(labels.websites),
diff --git a/src/app/(main)/admin/teams/AdminTeamsPage.tsx b/src/app/(main)/admin/teams/AdminTeamsPage.tsx
index 1d4984e8a..736c7b5fe 100644
--- a/src/app/(main)/admin/teams/AdminTeamsPage.tsx
+++ b/src/app/(main)/admin/teams/AdminTeamsPage.tsx
@@ -9,7 +9,7 @@ export function AdminTeamsPage() {
const { formatMessage, labels } = useMessages();
return (
- <Column gap="6">
+ <Column gap="6" margin="2">
<PageHeader title={formatMessage(labels.teams)} />
<Panel>
<AdminTeamsDataTable />
diff --git a/src/app/(main)/admin/users/UsersPage.tsx b/src/app/(main)/admin/users/UsersPage.tsx
index 47ac5512f..3e492b345 100644
--- a/src/app/(main)/admin/users/UsersPage.tsx
+++ b/src/app/(main)/admin/users/UsersPage.tsx
@@ -12,7 +12,7 @@ export function UsersPage() {
const handleSave = () => {};
return (
- <Column gap="6">
+ <Column gap="6" margin="2">
<PageHeader title={formatMessage(labels.users)}>
<UserAddButton onSave={handleSave} />
</PageHeader>
diff --git a/src/app/(main)/admin/websites/AdminWebsitesPage.tsx b/src/app/(main)/admin/websites/AdminWebsitesPage.tsx
index 3ca61f78c..f66c5eb71 100644
--- a/src/app/(main)/admin/websites/AdminWebsitesPage.tsx
+++ b/src/app/(main)/admin/websites/AdminWebsitesPage.tsx
@@ -9,7 +9,7 @@ export function AdminWebsitesPage() {
const { formatMessage, labels } = useMessages();
return (
- <Column gap="6">
+ <Column gap="6" margin="2">
<PageHeader title={formatMessage(labels.websites)} />
<Panel>
<AdminWebsitesDataTable />
diff --git a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage.tsx b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage.tsx
index e5140cb2e..9f52e0e1f 100644
--- a/src/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage.tsx
+++ b/src/app/(main)/settings/websites/[websiteId]/WebsiteSettingsPage.tsx
@@ -8,7 +8,7 @@ import { Panel } from '@/components/common/Panel';
export function WebsiteSettingsPage({ websiteId }: { websiteId: string }) {
return (
<WebsiteProvider websiteId={websiteId}>
- <Column gap="6">
+ <Column gap="6" margin="2">
<WebsiteSettingsHeader />
<Panel>
<WebsiteSettings websiteId={websiteId} />
diff --git a/src/app/(main)/websites/[websiteId]/WebsiteLayout.tsx b/src/app/(main)/websites/[websiteId]/WebsiteLayout.tsx
index cf75e86a5..b1799ac82 100644
--- a/src/app/(main)/websites/[websiteId]/WebsiteLayout.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsiteLayout.tsx
@@ -10,7 +10,7 @@ export function WebsiteLayout({ websiteId, children }: { websiteId: string; chil
return (
<WebsiteProvider websiteId={websiteId}>
<Grid columns="auto 1fr" width="100%" height="100%">
- <Column height="100%" border="right" backgroundColor marginRight="2">
+ <Column height="100%" border="right" backgroundColor>
<WebsiteNav websiteId={websiteId} />
</Column>
<PageBody gap>
diff --git a/src/app/(main)/websites/[websiteId]/WebsitePage.tsx b/src/app/(main)/websites/[websiteId]/WebsitePage.tsx
index 4bc109ad1..7db6c03ff 100644
--- a/src/app/(main)/websites/[websiteId]/WebsitePage.tsx
+++ b/src/app/(main)/websites/[websiteId]/WebsitePage.tsx
@@ -26,7 +26,7 @@ export function WebsitePage({ websiteId }: { websiteId: string }) {
};
return (
- <Column gap>
+ <Column gap marginLeft="2">
<WebsiteControls websiteId={websiteId} />
<WebsiteMetricsBar websiteId={websiteId} showChange={true} />
<Panel minHeight="520px">
diff --git a/src/components/input/TeamsButton.tsx b/src/components/input/TeamsButton.tsx
index afed4c6d4..274e6c87c 100644
--- a/src/components/input/TeamsButton.tsx
+++ b/src/components/input/TeamsButton.tsx
@@ -33,10 +33,6 @@ export function TeamsButton({ showText = true, onAction }: TeamsButtonProps) {
return <Loading icon="dots" size="sm" placement="center" />;
}
- if (!data?.count) {
- return null;
- }
-
return (
<MenuTrigger>
<Pressable>