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

Use useMessages hook everywhere.

Browse source
This commit is contained in:
Mike Cao 2023-03-22 14:05:55 -07:00
parent f3e1f18e1b
commit 9ddb8b5d25
73 changed files with 180 additions and 275 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/pages/settings/users/UserAddButton.js
View file

@ -1,10 +1,9 @@
import { useIntl } from 'react-intl';
import { Button, Icon, Text, Modal, Icons, ModalTrigger } from 'react-basics';
import UserAddForm from './UserAddForm';
import { labels } from 'components/messages';
import useMessages from 'hooks/useMessages';
export default function UserAddButton({ onSave }) {
const { formatMessage } = useIntl();
const { formatMessage, labels } = useMessages();
const handleSave = () => {
onSave();

5
components/pages/settings/users/UserAddForm.js
View file

@ -10,15 +10,14 @@ import {
SubmitButton,
Button,
} from 'react-basics';
import { useIntl } from 'react-intl';
import useApi from 'hooks/useApi';
import { ROLES } from 'lib/constants';
import { labels } from 'components/messages';
import useMessages from 'hooks/useMessages';
export default function UserAddForm({ onSave, onClose }) {
const { post, useMutation } = useApi();
const { mutate, error, isLoading } = useMutation(data => post(`/users`, data));
const { formatMessage } = useIntl();
const { formatMessage, labels } = useMessages();
const handleSubmit = async data => {
mutate(data, {

7
components/pages/settings/users/UserDeleteForm.js
View file

@ -1,11 +1,10 @@
import { useMutation } from '@tanstack/react-query';
import useApi from 'hooks/useApi';
import { Button, Form, FormButtons, SubmitButton } from 'react-basics';
import { useIntl, FormattedMessage } from 'react-intl';
import { labels, messages } from 'components/messages';
import useApi from 'hooks/useApi';
import useMessages from 'hooks/useMessages';
export default function UserDeleteForm({ userId, username, onSave, onClose }) {
const { formatMessage } = useIntl();
const { formatMessage, FormattedMessage, labels, messages } = useMessages();
const { del } = useApi();
const { mutate, error, isLoading } = useMutation(() => del(`/users/${userId}`));

5
components/pages/settings/users/UserEditForm.js
View file

@ -9,13 +9,12 @@ import {
SubmitButton,
PasswordField,
} from 'react-basics';
import { useIntl } from 'react-intl';
import useApi from 'hooks/useApi';
import { ROLES } from 'lib/constants';
import { labels, messages } from 'components/messages';
import useMessages from 'hooks/useMessages';
export default function UserEditForm({ userId, data, onSave }) {
const { formatMessage } = useIntl();
const { formatMessage, labels, messages } = useMessages();
const { post, useMutation } = useApi();
const { mutate, error } = useMutation(({ username }) => post(`/users/${userId}`, { username }));

5
components/pages/settings/users/UserSettings.js
View file

@ -1,16 +1,15 @@
import { useEffect, useState } from 'react';
import { useIntl } from 'react-intl';
import { Breadcrumbs, Item, Tabs, useToast } from 'react-basics';
import Link from 'next/link';
import UserEditForm from 'components/pages/settings/users//UserEditForm';
import Page from 'components/layout/Page';
import PageHeader from 'components/layout/PageHeader';
import useApi from 'hooks/useApi';
import { labels, messages } from 'components/messages';
import UserWebsites from './UserWebsites';
import useMessages from 'hooks/useMessages';
export default function UserSettings({ userId }) {
const { formatMessage } = useIntl();
const { formatMessage, labels, messages } = useMessages();
const [edit, setEdit] = useState(false);
const [values, setValues] = useState(null);
const [tab, setTab] = useState('details');

5
components/pages/settings/users/UserWebsites.js
View file

@ -1,11 +1,10 @@
import { Loading } from 'react-basics';
import { useIntl } from 'react-intl';
import useApi from 'hooks/useApi';
import WebsitesTable from 'components/pages/settings/websites/WebsitesTable';
import { messages } from 'components/messages';
import useMessages from 'hooks/useMessages';
export default function UserWebsites({ userId }) {
const { formatMessage } = useIntl();
const { formatMessage, messages } = useMessages();
const { get, useQuery } = useApi();
const { data, isLoading } = useQuery(['user:websites', userId], () =>
get(`/users/${userId}/websites`),

7
components/pages/settings/users/UsersList.js
View file

@ -1,4 +1,4 @@
import { useIntl } from 'react-intl';
import { useToast } from 'react-basics';
import Page from 'components/layout/Page';
import PageHeader from 'components/layout/PageHeader';
import EmptyPlaceholder from 'components/common/EmptyPlaceholder';
@ -6,11 +6,10 @@ import UsersTable from './UsersTable';
import UserAddButton from './UserAddButton';
import useApi from 'hooks/useApi';
import useUser from 'hooks/useUser';
import { useToast } from 'react-basics';
import { labels, messages } from 'components/messages';
import useMessages from 'hooks/useMessages';
export default function UsersList() {
const { formatMessage } = useIntl();
const { formatMessage, labels, messages } = useMessages();
const { user } = useUser();
const { get, useQuery } = useApi();
const { data, isLoading, error, refetch } = useQuery(['user'], () => get(`/users`), {

5
components/pages/settings/users/UsersTable.js
View file

@ -13,16 +13,15 @@ import {
ModalTrigger,
Modal,
} from 'react-basics';
import { useIntl } from 'react-intl';
import { formatDistance } from 'date-fns';
import Link from 'next/link';
import useUser from 'hooks/useUser';
import UserDeleteForm from './UserDeleteForm';
import { labels } from 'components/messages';
import { ROLES } from 'lib/constants';
import useMessages from 'hooks/useMessages';
export default function UsersTable({ data = [], onDelete }) {
const { formatMessage } = useIntl();
const { formatMessage, labels } = useMessages();
const { user } = useUser();
const columns = [