mirror of
https://github.com/umami-software/umami.git
synced 2026-02-04 12:47:13 +01:00
Allow admins to view account websites.
This commit is contained in:
parent
cb14b8bbda
commit
5a22be5efa
19 changed files with 57 additions and 35 deletions
|
|
@ -28,6 +28,7 @@ export default function WebsiteDetails({ websiteId }) {
|
|||
|
||||
const BackButton = () => (
|
||||
<Button
|
||||
key="back-button"
|
||||
className={styles.backButton}
|
||||
icon={<Arrow />}
|
||||
size="xsmall"
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ import useFetch from 'hooks/useFetch';
|
|||
import Arrow from 'assets/arrow-right.svg';
|
||||
import styles from './WebsiteList.module.css';
|
||||
|
||||
export default function WebsiteList() {
|
||||
export default function WebsiteList({ userId }) {
|
||||
const router = useRouter();
|
||||
const { data } = useFetch('/api/websites');
|
||||
const { data } = useFetch('/api/websites', { userId });
|
||||
|
||||
if (!data) {
|
||||
return null;
|
||||
|
|
|
|||
|
|
@ -64,12 +64,6 @@ export default function BarChart({
|
|||
} else {
|
||||
const [label, value] = body[0].lines[0].split(':');
|
||||
|
||||
console.log(
|
||||
+title[0],
|
||||
new Date(+title[0]),
|
||||
dateFormat(new Date(+title[0]), 'EEE MMMM d yyyy', locale),
|
||||
);
|
||||
|
||||
setTooltip({
|
||||
title: dateFormat(new Date(+title[0]), 'EEE MMMM d yyyy', locale),
|
||||
value,
|
||||
|
|
|
|||
|
|
@ -1,10 +1,13 @@
|
|||
import React, { useState } from 'react';
|
||||
import { FormattedMessage } from 'react-intl';
|
||||
import { useRouter } from 'next/router';
|
||||
import classNames from 'classnames';
|
||||
import PageHeader from 'components/layout/PageHeader';
|
||||
import Button from 'components/common/Button';
|
||||
import Icon from 'components/common/Icon';
|
||||
import Table from 'components/common/Table';
|
||||
import Modal from 'components/common/Modal';
|
||||
import Toast from 'components/common/Toast';
|
||||
import AccountEditForm from 'components/forms/AccountEditForm';
|
||||
import ButtonLayout from 'components/layout/ButtonLayout';
|
||||
import DeleteForm from 'components/forms/DeleteForm';
|
||||
|
|
@ -13,11 +16,11 @@ import Pen from 'assets/pen.svg';
|
|||
import Plus from 'assets/plus.svg';
|
||||
import Trash from 'assets/trash.svg';
|
||||
import Check from 'assets/check.svg';
|
||||
import List from 'assets/list-ul.svg';
|
||||
import styles from './AccountSettings.module.css';
|
||||
import Toast from '../common/Toast';
|
||||
import { FormattedMessage } from 'react-intl';
|
||||
|
||||
export default function AccountSettings() {
|
||||
const router = useRouter();
|
||||
const [addAccount, setAddAccount] = useState();
|
||||
const [editAccount, setEditAccount] = useState();
|
||||
const [deleteAccount, setDeleteAccount] = useState();
|
||||
|
|
@ -30,6 +33,13 @@ export default function AccountSettings() {
|
|||
const Buttons = row =>
|
||||
row.username !== 'admin' ? (
|
||||
<ButtonLayout>
|
||||
<Button
|
||||
icon={<List />}
|
||||
size="small"
|
||||
tooltip={<FormattedMessage id="button.websites" defaultMessage="Websites" />}
|
||||
tooltipId={`button-websites-${row.username}`}
|
||||
onClick={() => router.push(`/dashboard/${row.user_id}/${row.username}`)}
|
||||
/>
|
||||
<Button icon={<Pen />} size="small" onClick={() => setEditAccount(row)}>
|
||||
<div>
|
||||
<FormattedMessage id="button.edit" defaultMessage="Edit" />
|
||||
|
|
@ -51,11 +61,12 @@ export default function AccountSettings() {
|
|||
},
|
||||
{
|
||||
key: 'is_admin',
|
||||
label: <FormattedMessage id="label.adminsitrator" defaultMessage="Administrator" />,
|
||||
label: <FormattedMessage id="label.administrator" defaultMessage="Administrator" />,
|
||||
className: 'col-6 col-md-4',
|
||||
render: Checkmark,
|
||||
},
|
||||
{
|
||||
key: 'actions',
|
||||
className: classNames(styles.buttons, 'col-12 col-md-4 pt-2 pt-md-0'),
|
||||
render: Buttons,
|
||||
},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue