watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Progress check-in.

Browse source
This commit is contained in:
Mike Cao 2023-02-04 08:59:52 -08:00
parent 30274a07fd
commit 54d5af5cbb
35 changed files with 540 additions and 405 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/layout/AppLayout.module.css
View file

@ -1,7 +1,7 @@
.layout {
display: grid;
grid-template-rows: 1fr;
grid-template-columns: minmax(60px, 200px) 1fr;
grid-template-columns: max-content 1fr;
height: 100vh;
overflow: hidden;
}

8
components/layout/Header.js
View file

@ -1,13 +1,13 @@
import HamburgerButton from 'components/common/HamburgerButton';
import UpdateNotice from 'components/common/UpdateNotice';
import LanguageButton from 'components/buttons/LanguageButton';
import ThemeButton from 'components/buttons/ThemeButton';
import UserButton from 'components/buttons/UserButton';
import LanguageButton from 'components/input/LanguageButton';
import ThemeButton from 'components/input/ThemeButton';
import UserButton from 'components/input/UserButton';
import useConfig from 'hooks/useConfig';
import useUser from 'hooks/useUser';
import { useRouter } from 'next/router';
import { Column, Row } from 'react-basics';
import SettingsButton from '../buttons/SettingsButton';
import SettingsButton from '../input/SettingsButton';
import styles from './Header.module.css';
import classNames from 'classnames';

6
components/layout/NavBar.js
View file

@ -3,9 +3,9 @@ import { useIntl } from 'react-intl';
import { Icon, Text } from 'react-basics';
import classNames from 'classnames';
import Icons from 'components/icons';
import ThemeButton from 'components/buttons/ThemeButton';
import LanguageButton from 'components/buttons/LanguageButton';
import LogoutButton from 'components/buttons/LogoutButton';
import ThemeButton from 'components/input/ThemeButton';
import LanguageButton from 'components/input/LanguageButton';
import LogoutButton from 'components/input/LogoutButton';
import { labels } from 'components/messages';
import useUser from 'hooks/useUser';
import NavGroup from './NavGroup';

27
components/layout/NavGroup.js
View file

@ -1,8 +1,9 @@
import { useState } from 'react';
import { Icon, Text, Icons } from 'react-basics';
import { Icon, Text, Tooltip } from 'react-basics';
import classNames from 'classnames';
import { useRouter } from 'next/router';
import Link from 'next/link';
import Icons from 'components/icons';
import styles from './NavGroup.module.css';
export default function NavGroup({
@ -35,17 +36,19 @@ export default function NavGroup({
<div className={styles.body}>
{items.map(({ label, url, icon, divider }) => {
return (
<Link key={label} href={url}>
<a
className={classNames(styles.item, {
[styles.divider]: divider,
[styles.selected]: pathname.startsWith(url),
})}
>
<Icon>{icon}</Icon>
<Text className={styles.text}>{label}</Text>
</a>
</Link>
<Tooltip key={label} label={label} position="right" disabled={!minimized}>
<Link href={url}>
<a
className={classNames(styles.item, {
[styles.divider]: divider,
[styles.selected]: pathname.startsWith(url),
})}
>
<Icon>{icon}</Icon>
<Text className={styles.text}>{label}</Text>
</a>
</Link>
</Tooltip>
);
})}
</div>

10
components/layout/NavGroup.module.css
View file

@ -24,15 +24,6 @@
display: block;
}
.items {
position: relative;
display: flex;
flex-direction: column;
gap: 20px;
margin-right: -2px;
width: 200px;
}
.item {
position: relative;
display: flex;
@ -43,6 +34,7 @@
gap: var(--size500);
font-weight: 600;
width: 200px;
margin-right: -2px;
}
a.item {