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

More refactoring.

Browse source
This commit is contained in:
Mike Cao 2023-01-30 21:44:07 -08:00
parent 5f15ad0807
commit 02a1438cfe
41 changed files with 196 additions and 721 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/buttons/LanguageButton.js
View file

@ -1,9 +1,9 @@
import { Icon, Button, PopupTrigger, Popup, Tooltip, Icons, Text } from 'react-basics';
import { Icon, Button, PopupTrigger, Popup, Tooltip, Text } from 'react-basics';
import { useIntl } from 'react-intl';
import classNames from 'classnames';
import { languages } from 'lib/lang';
import useLocale from 'hooks/useLocale';
import { Globe } from 'components/icons';
import Icons from 'components/icons';
import { labels } from 'components/messages';
import styles from './LanguageButton.module.css';
@ -21,7 +21,7 @@ export default function LanguageButton({ tooltipPosition = 'top' }) {
<PopupTrigger action="hover">
<Button variant="quiet">
<Icon>
<Globe />
<Icons.Globe />
</Icon>
</Button>
<Tooltip position={tooltipPosition}>{formatMessage(labels.language)}</Tooltip>

6
components/buttons/ThemeButton.js
View file

@ -2,7 +2,7 @@ import { useTransition, animated } from 'react-spring';
import { Button, Icon, PopupTrigger, Tooltip } from 'react-basics';
import { useIntl } from 'react-intl';
import useTheme from 'hooks/useTheme';
import { Sun, Moon } from 'components/icons';
import Icons from 'components/icons';
import { labels } from 'components/messages';
import styles from './ThemeButton.module.css';
@ -28,11 +28,11 @@ export default function ThemeButton({ tooltipPosition = 'top' }) {
}
return (
<PopupTrigger action="hover" popupProps={{ position: 'top' }}>
<PopupTrigger action="hover">
<Button variant="quiet" className={styles.button} onClick={handleClick}>
{transitions((style, item) => (
<animated.div key={item} style={style}>
<Icon className={styles.icon}>{item === 'light' ? <Sun /> : <Moon />}</Icon>
<Icon className={styles.icon}>{item === 'light' ? <Icons.Sun /> : <Icons.Moon />}</Icon>
</animated.div>
))}
</Button>

2
components/buttons/UserButton.js
View file

@ -13,7 +13,7 @@ import styles from './UserButton.module.css';
export default function UserButton() {
const [show, setShow] = useState(false);
const ref = useRef();
const user = useUser();
const { user } = useUser();
const router = useRouter();
const { adminDisabled } = useConfig();