mirror of
https://github.com/umami-software/umami.git
synced 2026-02-04 04:37:11 +01:00
fix margins, teams button, and remove boards
Some checks are pending
Node.js CI / build (postgresql, 18.18) (push) Waiting to run
Some checks are pending
Node.js CI / build (postgresql, 18.18) (push) Waiting to run
This commit is contained in:
parent
cfd49e1742
commit
28ba2a1666
8 changed files with 7 additions and 24 deletions
|
|
@ -8,14 +8,7 @@ import {
|
||||||
SidebarProps,
|
SidebarProps,
|
||||||
ThemeButton,
|
ThemeButton,
|
||||||
} from '@umami/react-zen';
|
} from '@umami/react-zen';
|
||||||
import {
|
import { Globe, Link as LinkIcon, Logo, Pixel, PanelLeft } from '@/components/icons';
|
||||||
Globe,
|
|
||||||
LayoutDashboard,
|
|
||||||
Link as LinkIcon,
|
|
||||||
Logo,
|
|
||||||
Pixel,
|
|
||||||
PanelLeft,
|
|
||||||
} from '@/components/icons';
|
|
||||||
import { useMessages, useNavigation, useGlobalState } from '@/components/hooks';
|
import { useMessages, useNavigation, useGlobalState } from '@/components/hooks';
|
||||||
import { TeamsButton } from '@/components/input/TeamsButton';
|
import { TeamsButton } from '@/components/input/TeamsButton';
|
||||||
import { PanelButton } from '@/components/input/PanelButton';
|
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 hasNav = !!(websiteId || pathname.startsWith('/admin') || pathname.includes('/settings'));
|
||||||
|
|
||||||
const links = [
|
const links = [
|
||||||
{
|
|
||||||
id: 'boards',
|
|
||||||
label: formatMessage(labels.boards),
|
|
||||||
path: '/boards',
|
|
||||||
icon: <LayoutDashboard />,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
id: 'websites',
|
id: 'websites',
|
||||||
label: formatMessage(labels.websites),
|
label: formatMessage(labels.websites),
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ export function AdminTeamsPage() {
|
||||||
const { formatMessage, labels } = useMessages();
|
const { formatMessage, labels } = useMessages();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Column gap="6">
|
<Column gap="6" margin="2">
|
||||||
<PageHeader title={formatMessage(labels.teams)} />
|
<PageHeader title={formatMessage(labels.teams)} />
|
||||||
<Panel>
|
<Panel>
|
||||||
<AdminTeamsDataTable />
|
<AdminTeamsDataTable />
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ export function UsersPage() {
|
||||||
const handleSave = () => {};
|
const handleSave = () => {};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Column gap="6">
|
<Column gap="6" margin="2">
|
||||||
<PageHeader title={formatMessage(labels.users)}>
|
<PageHeader title={formatMessage(labels.users)}>
|
||||||
<UserAddButton onSave={handleSave} />
|
<UserAddButton onSave={handleSave} />
|
||||||
</PageHeader>
|
</PageHeader>
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ export function AdminWebsitesPage() {
|
||||||
const { formatMessage, labels } = useMessages();
|
const { formatMessage, labels } = useMessages();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Column gap="6">
|
<Column gap="6" margin="2">
|
||||||
<PageHeader title={formatMessage(labels.websites)} />
|
<PageHeader title={formatMessage(labels.websites)} />
|
||||||
<Panel>
|
<Panel>
|
||||||
<AdminWebsitesDataTable />
|
<AdminWebsitesDataTable />
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ import { Panel } from '@/components/common/Panel';
|
||||||
export function WebsiteSettingsPage({ websiteId }: { websiteId: string }) {
|
export function WebsiteSettingsPage({ websiteId }: { websiteId: string }) {
|
||||||
return (
|
return (
|
||||||
<WebsiteProvider websiteId={websiteId}>
|
<WebsiteProvider websiteId={websiteId}>
|
||||||
<Column gap="6">
|
<Column gap="6" margin="2">
|
||||||
<WebsiteSettingsHeader />
|
<WebsiteSettingsHeader />
|
||||||
<Panel>
|
<Panel>
|
||||||
<WebsiteSettings websiteId={websiteId} />
|
<WebsiteSettings websiteId={websiteId} />
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ export function WebsiteLayout({ websiteId, children }: { websiteId: string; chil
|
||||||
return (
|
return (
|
||||||
<WebsiteProvider websiteId={websiteId}>
|
<WebsiteProvider websiteId={websiteId}>
|
||||||
<Grid columns="auto 1fr" width="100%" height="100%">
|
<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} />
|
<WebsiteNav websiteId={websiteId} />
|
||||||
</Column>
|
</Column>
|
||||||
<PageBody gap>
|
<PageBody gap>
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ export function WebsitePage({ websiteId }: { websiteId: string }) {
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Column gap>
|
<Column gap marginLeft="2">
|
||||||
<WebsiteControls websiteId={websiteId} />
|
<WebsiteControls websiteId={websiteId} />
|
||||||
<WebsiteMetricsBar websiteId={websiteId} showChange={true} />
|
<WebsiteMetricsBar websiteId={websiteId} showChange={true} />
|
||||||
<Panel minHeight="520px">
|
<Panel minHeight="520px">
|
||||||
|
|
|
||||||
|
|
@ -33,10 +33,6 @@ export function TeamsButton({ showText = true, onAction }: TeamsButtonProps) {
|
||||||
return <Loading icon="dots" size="sm" placement="center" />;
|
return <Loading icon="dots" size="sm" placement="center" />;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!data?.count) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<MenuTrigger>
|
<MenuTrigger>
|
||||||
<Pressable>
|
<Pressable>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue