mirror of
https://github.com/kremalicious/umami.git
synced 2024-06-29 01:07:55 +02:00
commit
4d2a51ca49
1
assets/external-link.svg
Normal file
1
assets/external-link.svg
Normal file
|
@ -0,0 +1 @@
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M497.6,0,334.4.17A14.4,14.4,0,0,0,320,14.57V47.88a14.4,14.4,0,0,0,14.69,14.4l73.63-2.72,2.06,2.06L131.52,340.49a12,12,0,0,0,0,17l23,23a12,12,0,0,0,17,0L450.38,101.62l2.06,2.06-2.72,73.63A14.4,14.4,0,0,0,464.12,192h33.31a14.4,14.4,0,0,0,14.4-14.4L512,14.4A14.4,14.4,0,0,0,497.6,0ZM432,288H416a16,16,0,0,0-16,16V458a6,6,0,0,1-6,6H54a6,6,0,0,1-6-6V118a6,6,0,0,1,6-6H208a16,16,0,0,0,16-16V80a16,16,0,0,0-16-16H48A48,48,0,0,0,0,112V464a48,48,0,0,0,48,48H400a48,48,0,0,0,48-48V304A16,16,0,0,0,432,288Z"/></svg>
|
After Width: | Height: | Size: 575 B |
|
@ -3,7 +3,6 @@ import Head from 'next/head';
|
||||||
import Menu from './Menu';
|
import Menu from './Menu';
|
||||||
import Button from './Button';
|
import Button from './Button';
|
||||||
import { menuOptions } from 'lib/lang';
|
import { menuOptions } from 'lib/lang';
|
||||||
import { setItem } from 'lib/web';
|
|
||||||
import useLocale from 'hooks/useLocale';
|
import useLocale from 'hooks/useLocale';
|
||||||
import useDocumentClick from 'hooks/useDocumentClick';
|
import useDocumentClick from 'hooks/useDocumentClick';
|
||||||
import Globe from 'assets/globe.svg';
|
import Globe from 'assets/globe.svg';
|
||||||
|
@ -17,7 +16,6 @@ export default function LanguageButton({ menuPosition = 'bottom', menuAlign = 'l
|
||||||
|
|
||||||
function handleSelect(value) {
|
function handleSelect(value) {
|
||||||
setLocale(value);
|
setLocale(value);
|
||||||
setItem('umami.locale', value);
|
|
||||||
setShowMenu(false);
|
setShowMenu(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ import { getDateRange } from '../../lib/date';
|
||||||
|
|
||||||
export default function RefreshButton({ websiteId }) {
|
export default function RefreshButton({ websiteId }) {
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
const dateRange = useDateRange(websiteId);
|
const [dateRange] = useDateRange(websiteId);
|
||||||
const [loading, setLoading] = useState(false);
|
const [loading, setLoading] = useState(false);
|
||||||
const completed = useSelector(state => state.queries[`/api/website/${websiteId}/metrics`]);
|
const completed = useSelector(state => state.queries[`/api/website/${websiteId}/metrics`]);
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
import React, { useMemo } from 'react';
|
import React, { useMemo } from 'react';
|
||||||
import tinycolor from 'tinycolor2';
|
import tinycolor from 'tinycolor2';
|
||||||
import BarChart from './BarChart';
|
import BarChart from './BarChart';
|
||||||
import { getTimezone, getDateArray, getDateLength } from 'lib/date';
|
import { getDateArray, getDateLength } from 'lib/date';
|
||||||
import useFetch from 'hooks/useFetch';
|
import useFetch from 'hooks/useFetch';
|
||||||
import useDateRange from 'hooks/useDateRange';
|
import useDateRange from 'hooks/useDateRange';
|
||||||
|
import useTimezone from 'hooks/useTimezone';
|
||||||
|
|
||||||
const COLORS = [
|
const COLORS = [
|
||||||
'#2680eb',
|
'#2680eb',
|
||||||
|
@ -17,15 +18,17 @@ const COLORS = [
|
||||||
];
|
];
|
||||||
|
|
||||||
export default function EventsChart({ websiteId, token }) {
|
export default function EventsChart({ websiteId, token }) {
|
||||||
const dateRange = useDateRange(websiteId);
|
const [dateRange] = useDateRange(websiteId);
|
||||||
const { startDate, endDate, unit, modified } = dateRange;
|
const { startDate, endDate, unit, modified } = dateRange;
|
||||||
|
const [timezone] = useTimezone();
|
||||||
|
|
||||||
const { data } = useFetch(
|
const { data } = useFetch(
|
||||||
`/api/website/${websiteId}/events`,
|
`/api/website/${websiteId}/events`,
|
||||||
{
|
{
|
||||||
start_at: +startDate,
|
start_at: +startDate,
|
||||||
end_at: +endDate,
|
end_at: +endDate,
|
||||||
unit,
|
unit,
|
||||||
tz: getTimezone(),
|
tz: timezone,
|
||||||
token,
|
token,
|
||||||
},
|
},
|
||||||
{ update: [modified] },
|
{ update: [modified] },
|
||||||
|
|
|
@ -9,7 +9,7 @@ import MetricCard from './MetricCard';
|
||||||
import styles from './MetricsBar.module.css';
|
import styles from './MetricsBar.module.css';
|
||||||
|
|
||||||
export default function MetricsBar({ websiteId, token, className }) {
|
export default function MetricsBar({ websiteId, token, className }) {
|
||||||
const dateRange = useDateRange(websiteId);
|
const [dateRange] = useDateRange(websiteId);
|
||||||
const { startDate, endDate, modified } = dateRange;
|
const { startDate, endDate, modified } = dateRange;
|
||||||
const { data } = useFetch(
|
const { data } = useFetch(
|
||||||
`/api/website/${websiteId}/metrics`,
|
`/api/website/${websiteId}/metrics`,
|
||||||
|
|
|
@ -29,7 +29,7 @@ export default function MetricsTable({
|
||||||
onDataLoad = () => {},
|
onDataLoad = () => {},
|
||||||
onExpand = () => {},
|
onExpand = () => {},
|
||||||
}) {
|
}) {
|
||||||
const dateRange = useDateRange(websiteId);
|
const [dateRange] = useDateRange(websiteId);
|
||||||
const { startDate, endDate, modified } = dateRange;
|
const { startDate, endDate, modified } = dateRange;
|
||||||
const { data } = useFetch(
|
const { data } = useFetch(
|
||||||
`/api/website/${websiteId}/rankings`,
|
`/api/website/${websiteId}/rankings`,
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
import React, { useMemo } from 'react';
|
import React, { useMemo } from 'react';
|
||||||
import { useDispatch } from 'react-redux';
|
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import PageviewsChart from './PageviewsChart';
|
import PageviewsChart from './PageviewsChart';
|
||||||
import MetricsBar from './MetricsBar';
|
import MetricsBar from './MetricsBar';
|
||||||
|
@ -8,8 +7,8 @@ import DateFilter from 'components/common/DateFilter';
|
||||||
import StickyHeader from 'components/helpers/StickyHeader';
|
import StickyHeader from 'components/helpers/StickyHeader';
|
||||||
import useFetch from 'hooks/useFetch';
|
import useFetch from 'hooks/useFetch';
|
||||||
import useDateRange from 'hooks/useDateRange';
|
import useDateRange from 'hooks/useDateRange';
|
||||||
import { getDateArray, getDateLength, getTimezone } from 'lib/date';
|
import useTimezone from 'hooks/useTimezone';
|
||||||
import { setDateRange } from 'redux/actions/websites';
|
import { getDateArray, getDateLength } from 'lib/date';
|
||||||
import styles from './WebsiteChart.module.css';
|
import styles from './WebsiteChart.module.css';
|
||||||
|
|
||||||
export default function WebsiteChart({
|
export default function WebsiteChart({
|
||||||
|
@ -20,9 +19,9 @@ export default function WebsiteChart({
|
||||||
showLink = false,
|
showLink = false,
|
||||||
onDataLoad = () => {},
|
onDataLoad = () => {},
|
||||||
}) {
|
}) {
|
||||||
const dispatch = useDispatch();
|
const [dateRange, setDateRange] = useDateRange(websiteId);
|
||||||
const dateRange = useDateRange(websiteId);
|
|
||||||
const { startDate, endDate, unit, value, modified } = dateRange;
|
const { startDate, endDate, unit, value, modified } = dateRange;
|
||||||
|
const [timezone] = useTimezone();
|
||||||
|
|
||||||
const { data } = useFetch(
|
const { data } = useFetch(
|
||||||
`/api/website/${websiteId}/pageviews`,
|
`/api/website/${websiteId}/pageviews`,
|
||||||
|
@ -30,7 +29,7 @@ export default function WebsiteChart({
|
||||||
start_at: +startDate,
|
start_at: +startDate,
|
||||||
end_at: +endDate,
|
end_at: +endDate,
|
||||||
unit,
|
unit,
|
||||||
tz: getTimezone(),
|
tz: timezone,
|
||||||
token,
|
token,
|
||||||
},
|
},
|
||||||
{ onDataLoad, update: [modified] },
|
{ onDataLoad, update: [modified] },
|
||||||
|
@ -46,10 +45,6 @@ export default function WebsiteChart({
|
||||||
return [[], []];
|
return [[], []];
|
||||||
}, [data]);
|
}, [data]);
|
||||||
|
|
||||||
function handleDateChange(values) {
|
|
||||||
dispatch(setDateRange(websiteId, values));
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<WebsiteHeader websiteId={websiteId} token={token} title={title} showLink={showLink} />
|
<WebsiteHeader websiteId={websiteId} token={token} title={title} showLink={showLink} />
|
||||||
|
@ -67,7 +62,7 @@ export default function WebsiteChart({
|
||||||
value={value}
|
value={value}
|
||||||
startDate={startDate}
|
startDate={startDate}
|
||||||
endDate={endDate}
|
endDate={endDate}
|
||||||
onChange={handleDateChange}
|
onChange={setDateRange}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</StickyHeader>
|
</StickyHeader>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
import React, { useState } from 'react';
|
import React, { useState } from 'react';
|
||||||
import { FormattedMessage } from 'react-intl';
|
import { FormattedMessage } from 'react-intl';
|
||||||
import { useRouter } from 'next/router';
|
import Link from 'next/link';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import PageHeader from 'components/layout/PageHeader';
|
import PageHeader from 'components/layout/PageHeader';
|
||||||
import Button from 'components/common/Button';
|
import Button from 'components/common/Button';
|
||||||
|
@ -16,11 +16,10 @@ import Pen from 'assets/pen.svg';
|
||||||
import Plus from 'assets/plus.svg';
|
import Plus from 'assets/plus.svg';
|
||||||
import Trash from 'assets/trash.svg';
|
import Trash from 'assets/trash.svg';
|
||||||
import Check from 'assets/check.svg';
|
import Check from 'assets/check.svg';
|
||||||
import List from 'assets/list-ul.svg';
|
import LinkIcon from 'assets/external-link.svg';
|
||||||
import styles from './AccountSettings.module.css';
|
import styles from './AccountSettings.module.css';
|
||||||
|
|
||||||
export default function AccountSettings() {
|
export default function AccountSettings() {
|
||||||
const router = useRouter();
|
|
||||||
const [addAccount, setAddAccount] = useState();
|
const [addAccount, setAddAccount] = useState();
|
||||||
const [editAccount, setEditAccount] = useState();
|
const [editAccount, setEditAccount] = useState();
|
||||||
const [deleteAccount, setDeleteAccount] = useState();
|
const [deleteAccount, setDeleteAccount] = useState();
|
||||||
|
@ -30,16 +29,18 @@ export default function AccountSettings() {
|
||||||
|
|
||||||
const Checkmark = ({ is_admin }) => (is_admin ? <Icon icon={<Check />} size="medium" /> : null);
|
const Checkmark = ({ is_admin }) => (is_admin ? <Icon icon={<Check />} size="medium" /> : null);
|
||||||
|
|
||||||
|
const DashboardLink = row =>
|
||||||
|
row.is_admin ? null : (
|
||||||
|
<Link href={`/dashboard/${row.user_id}/${row.username}`}>
|
||||||
|
<a>
|
||||||
|
<Icon icon={<LinkIcon />} />
|
||||||
|
</a>
|
||||||
|
</Link>
|
||||||
|
);
|
||||||
|
|
||||||
const Buttons = row =>
|
const Buttons = row =>
|
||||||
row.username !== 'admin' ? (
|
row.username !== 'admin' ? (
|
||||||
<ButtonLayout>
|
<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)}>
|
<Button icon={<Pen />} size="small" onClick={() => setEditAccount(row)}>
|
||||||
<div>
|
<div>
|
||||||
<FormattedMessage id="button.edit" defaultMessage="Edit" />
|
<FormattedMessage id="button.edit" defaultMessage="Edit" />
|
||||||
|
@ -57,17 +58,23 @@ export default function AccountSettings() {
|
||||||
{
|
{
|
||||||
key: 'username',
|
key: 'username',
|
||||||
label: <FormattedMessage id="label.username" defaultMessage="Username" />,
|
label: <FormattedMessage id="label.username" defaultMessage="Username" />,
|
||||||
className: 'col-6 col-md-4',
|
className: 'col-4 col-md-3',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
key: 'is_admin',
|
key: 'is_admin',
|
||||||
label: <FormattedMessage id="label.administrator" defaultMessage="Administrator" />,
|
label: <FormattedMessage id="label.administrator" defaultMessage="Administrator" />,
|
||||||
className: 'col-6 col-md-4',
|
className: 'col-4 col-md-3',
|
||||||
render: Checkmark,
|
render: Checkmark,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
key: 'dashboard',
|
||||||
|
label: <FormattedMessage id="label.dashboard" defaultMessage="Dashboard" />,
|
||||||
|
className: 'col-4 col-md-3',
|
||||||
|
render: DashboardLink,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
key: 'actions',
|
key: 'actions',
|
||||||
className: classNames(styles.buttons, 'col-12 col-md-4 pt-2 pt-md-0'),
|
className: classNames(styles.buttons, 'col-12 col-md-3 pt-2 pt-md-0'),
|
||||||
render: Buttons,
|
render: Buttons,
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
.buttons {
|
.buttons {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
|
26
components/settings/DateRangeSetting.js
Normal file
26
components/settings/DateRangeSetting.js
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
import React from 'react';
|
||||||
|
import { FormattedMessage } from 'react-intl';
|
||||||
|
import DateFilter from 'components/common/DateFilter';
|
||||||
|
import Button from 'components/common/Button';
|
||||||
|
import useDateRange from 'hooks/useDateRange';
|
||||||
|
import { DEFAULT_DATE_RANGE } from 'lib/constants';
|
||||||
|
import { getDateRange } from 'lib/date';
|
||||||
|
import styles from './DateRangeSetting.module.css';
|
||||||
|
|
||||||
|
export default function DateRangeSetting() {
|
||||||
|
const [dateRange, setDateRange] = useDateRange();
|
||||||
|
const { startDate, endDate, value } = dateRange;
|
||||||
|
|
||||||
|
function handleReset() {
|
||||||
|
setDateRange(getDateRange(DEFAULT_DATE_RANGE));
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<DateFilter value={value} startDate={startDate} endDate={endDate} onChange={setDateRange} />
|
||||||
|
<Button className={styles.button} size="small" onClick={handleReset}>
|
||||||
|
<FormattedMessage id="button.reset" defaultMessage="Reset" />
|
||||||
|
</Button>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
3
components/settings/DateRangeSetting.module.css
Normal file
3
components/settings/DateRangeSetting.module.css
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
.button {
|
||||||
|
margin-left: 10px;
|
||||||
|
}
|
|
@ -1,40 +1,27 @@
|
||||||
import React, { useState } from 'react';
|
import React, { useState } from 'react';
|
||||||
import { FormattedMessage } from 'react-intl';
|
import { FormattedMessage } from 'react-intl';
|
||||||
import { useDispatch, useSelector } from 'react-redux';
|
import { useSelector } from 'react-redux';
|
||||||
import PageHeader from 'components/layout/PageHeader';
|
import PageHeader from 'components/layout/PageHeader';
|
||||||
import Button from 'components/common/Button';
|
import Button from 'components/common/Button';
|
||||||
import Modal from 'components/common/Modal';
|
import Modal from 'components/common/Modal';
|
||||||
import Toast from 'components/common/Toast';
|
import Toast from 'components/common/Toast';
|
||||||
import ChangePasswordForm from 'components/forms/ChangePasswordForm';
|
import ChangePasswordForm from 'components/forms/ChangePasswordForm';
|
||||||
import DateFilter from 'components/common/DateFilter';
|
import TimezoneSetting from 'components/settings/TimezoneSetting';
|
||||||
import Dots from 'assets/ellipsis-h.svg';
|
import Dots from 'assets/ellipsis-h.svg';
|
||||||
import { getTimezone } from 'lib/date';
|
|
||||||
import { setItem } from 'lib/web';
|
|
||||||
import useDateRange from 'hooks/useDateRange';
|
|
||||||
import { setDateRange } from 'redux/actions/websites';
|
|
||||||
import styles from './ProfileSettings.module.css';
|
import styles from './ProfileSettings.module.css';
|
||||||
|
import DateRangeSetting from './DateRangeSetting';
|
||||||
|
|
||||||
export default function ProfileSettings() {
|
export default function ProfileSettings() {
|
||||||
const dispatch = useDispatch();
|
|
||||||
const user = useSelector(state => state.user);
|
const user = useSelector(state => state.user);
|
||||||
const [changePassword, setChangePassword] = useState(false);
|
const [changePassword, setChangePassword] = useState(false);
|
||||||
const [message, setMessage] = useState();
|
const [message, setMessage] = useState();
|
||||||
const { user_id } = user;
|
const { user_id } = user;
|
||||||
const timezone = getTimezone();
|
|
||||||
const dateRange = useDateRange(0);
|
|
||||||
const { startDate, endDate, value } = dateRange;
|
|
||||||
|
|
||||||
function handleSave() {
|
function handleSave() {
|
||||||
setChangePassword(false);
|
setChangePassword(false);
|
||||||
setMessage(<FormattedMessage id="message.save-success" defaultMessage="Saved successfully." />);
|
setMessage(<FormattedMessage id="message.save-success" defaultMessage="Saved successfully." />);
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleDateChange(values) {
|
|
||||||
const { value } = values;
|
|
||||||
setItem(`umami.date-range`, value === 'custom' ? values : value);
|
|
||||||
dispatch(setDateRange(0, values));
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<PageHeader>
|
<PageHeader>
|
||||||
|
@ -47,7 +34,7 @@ export default function ProfileSettings() {
|
||||||
</div>
|
</div>
|
||||||
</Button>
|
</Button>
|
||||||
</PageHeader>
|
</PageHeader>
|
||||||
<dl>
|
<dl className={styles.list}>
|
||||||
<dt>
|
<dt>
|
||||||
<FormattedMessage id="label.username" defaultMessage="Username" />
|
<FormattedMessage id="label.username" defaultMessage="Username" />
|
||||||
</dt>
|
</dt>
|
||||||
|
@ -55,17 +42,14 @@ export default function ProfileSettings() {
|
||||||
<dt>
|
<dt>
|
||||||
<FormattedMessage id="label.timezone" defaultMessage="Timezone" />
|
<FormattedMessage id="label.timezone" defaultMessage="Timezone" />
|
||||||
</dt>
|
</dt>
|
||||||
<dd>{timezone}</dd>
|
<dd>
|
||||||
|
<TimezoneSetting />
|
||||||
|
</dd>
|
||||||
<dt>
|
<dt>
|
||||||
<FormattedMessage id="label.default-date-range" defaultMessage="Default date range" />
|
<FormattedMessage id="label.default-date-range" defaultMessage="Default date range" />
|
||||||
</dt>
|
</dt>
|
||||||
<dd className={styles.date}>
|
<dd>
|
||||||
<DateFilter
|
<DateRangeSetting />
|
||||||
value={value}
|
|
||||||
startDate={startDate}
|
|
||||||
endDate={endDate}
|
|
||||||
onChange={handleDateChange}
|
|
||||||
/>
|
|
||||||
</dd>
|
</dd>
|
||||||
</dl>
|
</dl>
|
||||||
{changePassword && (
|
{changePassword && (
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
.date {
|
.list dd {
|
||||||
display: flex;
|
display: flex;
|
||||||
}
|
}
|
||||||
|
|
31
components/settings/TimezoneSetting.js
Normal file
31
components/settings/TimezoneSetting.js
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
import React from 'react';
|
||||||
|
import { FormattedMessage } from 'react-intl';
|
||||||
|
import { listTimeZones } from 'timezone-support';
|
||||||
|
import DropDown from '../common/DropDown';
|
||||||
|
import Button from '../common/Button';
|
||||||
|
import useTimezone from 'hooks/useTimezone';
|
||||||
|
import { getTimezone } from 'lib/date';
|
||||||
|
import styles from './TimezoneSetting.module.css';
|
||||||
|
|
||||||
|
export default function TimezoneSetting() {
|
||||||
|
const [timezone, saveTimezone] = useTimezone();
|
||||||
|
const options = listTimeZones().map(n => ({ label: n, value: n }));
|
||||||
|
|
||||||
|
function handleReset() {
|
||||||
|
saveTimezone(getTimezone());
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<DropDown
|
||||||
|
menuClassName={styles.menu}
|
||||||
|
value={timezone}
|
||||||
|
options={options}
|
||||||
|
onChange={saveTimezone}
|
||||||
|
/>
|
||||||
|
<Button className={styles.button} size="small" onClick={handleReset}>
|
||||||
|
<FormattedMessage id="button.reset" defaultMessage="Reset" />
|
||||||
|
</Button>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
8
components/settings/TimezoneSetting.module.css
Normal file
8
components/settings/TimezoneSetting.module.css
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
.menu {
|
||||||
|
max-height: 300px;
|
||||||
|
overflow-y: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.button {
|
||||||
|
margin-left: 10px;
|
||||||
|
}
|
|
@ -1,24 +1,41 @@
|
||||||
import { useSelector } from 'react-redux';
|
import { useDispatch, useSelector } from 'react-redux';
|
||||||
import { parseISO } from 'date-fns';
|
import { parseISO } from 'date-fns';
|
||||||
import { getDateRange } from 'lib/date';
|
import { getDateRange } from 'lib/date';
|
||||||
import { getItem } from 'lib/web';
|
import { getItem, setItem } from 'lib/web';
|
||||||
|
import { setDateRange } from '../redux/actions/websites';
|
||||||
|
import { DATE_RANGE_CONFIG, DEFAULT_DATE_RANGE } from 'lib/constants';
|
||||||
|
import useForceUpdate from './useForceUpdate';
|
||||||
|
|
||||||
export default function useDateRange(websiteId, defaultDateRange = '24hour') {
|
export default function useDateRange(websiteId, defaultDateRange = DEFAULT_DATE_RANGE) {
|
||||||
const globalDefault = getItem('umami.date-range');
|
const dispatch = useDispatch();
|
||||||
|
const dateRange = useSelector(state => state.websites[websiteId]?.dateRange);
|
||||||
|
const forceUpdate = useForceUpdate();
|
||||||
|
|
||||||
|
const globalDefault = getItem(DATE_RANGE_CONFIG);
|
||||||
let globalDateRange;
|
let globalDateRange;
|
||||||
|
|
||||||
if (typeof globalDefault === 'string') {
|
if (globalDefault) {
|
||||||
globalDateRange = getDateRange(globalDefault);
|
if (typeof globalDefault === 'string') {
|
||||||
} else if (typeof globalDefault === 'object') {
|
globalDateRange = getDateRange(globalDefault);
|
||||||
globalDateRange = {
|
} else if (typeof globalDefault === 'object') {
|
||||||
...globalDefault,
|
globalDateRange = {
|
||||||
startDate: parseISO(globalDefault.startDate),
|
...globalDefault,
|
||||||
endDate: parseISO(globalDefault.endDate),
|
startDate: parseISO(globalDefault.startDate),
|
||||||
};
|
endDate: parseISO(globalDefault.endDate),
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return useSelector(
|
function saveDateRange(values) {
|
||||||
state =>
|
const { value } = values;
|
||||||
state.websites[websiteId]?.dateRange || globalDateRange || getDateRange(defaultDateRange),
|
|
||||||
);
|
if (websiteId) {
|
||||||
|
dispatch(setDateRange(websiteId, values));
|
||||||
|
} else {
|
||||||
|
setItem(DATE_RANGE_CONFIG, value === 'custom' ? values : value);
|
||||||
|
forceUpdate();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return [dateRange || globalDateRange || getDateRange(defaultDateRange), saveDateRange];
|
||||||
}
|
}
|
||||||
|
|
9
hooks/useForceUpdate.js
Normal file
9
hooks/useForceUpdate.js
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
import { useCallback, useState } from 'react';
|
||||||
|
|
||||||
|
export default function useForceUpdate() {
|
||||||
|
const [, update] = useState(Object.create(null));
|
||||||
|
|
||||||
|
return useCallback(() => {
|
||||||
|
update(Object.create(null));
|
||||||
|
}, [update]);
|
||||||
|
}
|
|
@ -1,11 +1,14 @@
|
||||||
import { useDispatch, useSelector } from 'react-redux';
|
import { useDispatch, useSelector } from 'react-redux';
|
||||||
import { updateApp } from 'redux/actions/app';
|
import { updateApp } from 'redux/actions/app';
|
||||||
|
import { setItem } from 'lib/web';
|
||||||
|
import { LOCALE_CONFIG } from 'lib/constants';
|
||||||
|
|
||||||
export default function useLocale() {
|
export default function useLocale() {
|
||||||
const locale = useSelector(state => state.app.locale);
|
const locale = useSelector(state => state.app.locale);
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
|
|
||||||
function setLocale(value) {
|
function setLocale(value) {
|
||||||
|
setItem(LOCALE_CONFIG, value);
|
||||||
dispatch(updateApp({ locale: value }));
|
dispatch(updateApp({ locale: value }));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
17
hooks/useTimezone.js
Normal file
17
hooks/useTimezone.js
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
import { useState, useCallback } from 'react';
|
||||||
|
import { getTimezone } from 'lib/date';
|
||||||
|
import { getItem, setItem } from 'lib/web';
|
||||||
|
|
||||||
|
export default function useTimezone() {
|
||||||
|
const [timezone, setTimezone] = useState(getItem('umami.timezone') || getTimezone());
|
||||||
|
|
||||||
|
const saveTimezone = useCallback(
|
||||||
|
value => {
|
||||||
|
setItem('umami.timezone', value);
|
||||||
|
setTimezone(value);
|
||||||
|
},
|
||||||
|
[setTimezone],
|
||||||
|
);
|
||||||
|
|
||||||
|
return [timezone, saveTimezone];
|
||||||
|
}
|
|
@ -11,16 +11,17 @@
|
||||||
"button.login": "Log ind",
|
"button.login": "Log ind",
|
||||||
"button.more": "Mere",
|
"button.more": "Mere",
|
||||||
"button.refresh": "Opdater",
|
"button.refresh": "Opdater",
|
||||||
|
"button.reset": "Reset",
|
||||||
"button.save": "Gem",
|
"button.save": "Gem",
|
||||||
"button.single-day": "Enkelt dag",
|
"button.single-day": "Enkelt dag",
|
||||||
"button.view-details": "Vis detajler",
|
"button.view-details": "Vis detajler",
|
||||||
"button.websites": "Hjemmesider",
|
|
||||||
"label.accounts": "Kontoer",
|
"label.accounts": "Kontoer",
|
||||||
"label.administrator": "Administrator",
|
"label.administrator": "Administrator",
|
||||||
"label.confirm-password": "Godkendt adgangskode",
|
"label.confirm-password": "Godkendt adgangskode",
|
||||||
"label.current-password": "Nuværende adgangskode",
|
"label.current-password": "Nuværende adgangskode",
|
||||||
"label.custom-range": "Tilpasset interval",
|
"label.custom-range": "Tilpasset interval",
|
||||||
"label.dashboard": "Betjeningspanel",
|
"label.dashboard": "Betjeningspanel",
|
||||||
|
"label.default-date-range": "Default date range",
|
||||||
"label.domain": "Domæne",
|
"label.domain": "Domæne",
|
||||||
"label.enable-share-url": "Aktivér delings-URL",
|
"label.enable-share-url": "Aktivér delings-URL",
|
||||||
"label.invalid": "Ugyldig",
|
"label.invalid": "Ugyldig",
|
||||||
|
@ -39,6 +40,7 @@
|
||||||
"label.this-month": "Denne måned",
|
"label.this-month": "Denne måned",
|
||||||
"label.this-week": "Denne uge",
|
"label.this-week": "Denne uge",
|
||||||
"label.this-year": "Dette år",
|
"label.this-year": "Dette år",
|
||||||
|
"label.timezone": "Timezone",
|
||||||
"label.today": "Idag",
|
"label.today": "Idag",
|
||||||
"label.unknown": "Ukendt",
|
"label.unknown": "Ukendt",
|
||||||
"label.username": "Brugernavn",
|
"label.username": "Brugernavn",
|
||||||
|
|
|
@ -11,16 +11,17 @@
|
||||||
"button.login": "Anmelden",
|
"button.login": "Anmelden",
|
||||||
"button.more": "Mehr",
|
"button.more": "Mehr",
|
||||||
"button.refresh": "Aktualisieren",
|
"button.refresh": "Aktualisieren",
|
||||||
|
"button.reset": "Reset",
|
||||||
"button.save": "Speichern",
|
"button.save": "Speichern",
|
||||||
"button.single-day": "Ein Tag",
|
"button.single-day": "Ein Tag",
|
||||||
"button.view-details": "Details anzeigen",
|
"button.view-details": "Details anzeigen",
|
||||||
"button.websites": "Webseiten",
|
|
||||||
"label.accounts": "Konten",
|
"label.accounts": "Konten",
|
||||||
"label.administrator": "Administrator",
|
"label.administrator": "Administrator",
|
||||||
"label.confirm-password": "Passwort wiederholen",
|
"label.confirm-password": "Passwort wiederholen",
|
||||||
"label.current-password": "Derzeitiges Passwort",
|
"label.current-password": "Derzeitiges Passwort",
|
||||||
"label.custom-range": "Benutzerdefinierter Bereich",
|
"label.custom-range": "Benutzerdefinierter Bereich",
|
||||||
"label.dashboard": "Übersicht",
|
"label.dashboard": "Übersicht",
|
||||||
|
"label.default-date-range": "Default date range",
|
||||||
"label.domain": "Domain",
|
"label.domain": "Domain",
|
||||||
"label.enable-share-url": "Freigabe-URL aktivieren",
|
"label.enable-share-url": "Freigabe-URL aktivieren",
|
||||||
"label.invalid": "Ungültig",
|
"label.invalid": "Ungültig",
|
||||||
|
@ -39,6 +40,7 @@
|
||||||
"label.this-month": "Diesen Monat",
|
"label.this-month": "Diesen Monat",
|
||||||
"label.this-week": "Diese Woche",
|
"label.this-week": "Diese Woche",
|
||||||
"label.this-year": "Dieses Jahr",
|
"label.this-year": "Dieses Jahr",
|
||||||
|
"label.timezone": "Timezone",
|
||||||
"label.today": "Heute",
|
"label.today": "Heute",
|
||||||
"label.unknown": "Unbekannt",
|
"label.unknown": "Unbekannt",
|
||||||
"label.username": "Benutzername",
|
"label.username": "Benutzername",
|
||||||
|
|
|
@ -11,16 +11,17 @@
|
||||||
"button.login": "Login",
|
"button.login": "Login",
|
||||||
"button.more": "More",
|
"button.more": "More",
|
||||||
"button.refresh": "Refresh",
|
"button.refresh": "Refresh",
|
||||||
|
"button.reset": "Reset",
|
||||||
"button.save": "Save",
|
"button.save": "Save",
|
||||||
"button.single-day": "Single day",
|
"button.single-day": "Single day",
|
||||||
"button.view-details": "View details",
|
"button.view-details": "View details",
|
||||||
"button.websites": "Websites",
|
|
||||||
"label.accounts": "Accounts",
|
"label.accounts": "Accounts",
|
||||||
"label.administrator": "Administrator",
|
"label.administrator": "Administrator",
|
||||||
"label.confirm-password": "Confirm password",
|
"label.confirm-password": "Confirm password",
|
||||||
"label.current-password": "Current password",
|
"label.current-password": "Current password",
|
||||||
"label.custom-range": "Custom range",
|
"label.custom-range": "Custom range",
|
||||||
"label.dashboard": "Dashboard",
|
"label.dashboard": "Dashboard",
|
||||||
|
"label.default-date-range": "Default date range",
|
||||||
"label.domain": "Domain",
|
"label.domain": "Domain",
|
||||||
"label.enable-share-url": "Enable share URL",
|
"label.enable-share-url": "Enable share URL",
|
||||||
"label.invalid": "Invalid",
|
"label.invalid": "Invalid",
|
||||||
|
@ -39,6 +40,7 @@
|
||||||
"label.this-month": "This month",
|
"label.this-month": "This month",
|
||||||
"label.this-week": "This week",
|
"label.this-week": "This week",
|
||||||
"label.this-year": "This year",
|
"label.this-year": "This year",
|
||||||
|
"label.timezone": "Timezone",
|
||||||
"label.today": "Today",
|
"label.today": "Today",
|
||||||
"label.unknown": "Unknown",
|
"label.unknown": "Unknown",
|
||||||
"label.username": "Username",
|
"label.username": "Username",
|
||||||
|
|
|
@ -11,16 +11,17 @@
|
||||||
"button.login": "Iniciar sesión",
|
"button.login": "Iniciar sesión",
|
||||||
"button.more": "Más",
|
"button.more": "Más",
|
||||||
"button.refresh": "Refresh",
|
"button.refresh": "Refresh",
|
||||||
|
"button.reset": "Reset",
|
||||||
"button.save": "Guardar",
|
"button.save": "Guardar",
|
||||||
"button.single-day": "Single day",
|
"button.single-day": "Single day",
|
||||||
"button.view-details": "Ver detalles",
|
"button.view-details": "Ver detalles",
|
||||||
"button.websites": "Sitios",
|
|
||||||
"label.accounts": "Usuarios",
|
"label.accounts": "Usuarios",
|
||||||
"label.administrator": "Administrador",
|
"label.administrator": "Administrador",
|
||||||
"label.confirm-password": "Confirmar contraseña",
|
"label.confirm-password": "Confirmar contraseña",
|
||||||
"label.current-password": "Contraseña actual",
|
"label.current-password": "Contraseña actual",
|
||||||
"label.custom-range": "Custom range",
|
"label.custom-range": "Custom range",
|
||||||
"label.dashboard": "Panel de control",
|
"label.dashboard": "Panel de control",
|
||||||
|
"label.default-date-range": "Default date range",
|
||||||
"label.domain": "Dominio",
|
"label.domain": "Dominio",
|
||||||
"label.enable-share-url": "Habilitar compartir URL",
|
"label.enable-share-url": "Habilitar compartir URL",
|
||||||
"label.invalid": "Inválido",
|
"label.invalid": "Inválido",
|
||||||
|
@ -39,6 +40,7 @@
|
||||||
"label.this-month": "Este mes",
|
"label.this-month": "Este mes",
|
||||||
"label.this-week": "Esta semana",
|
"label.this-week": "Esta semana",
|
||||||
"label.this-year": "Este año",
|
"label.this-year": "Este año",
|
||||||
|
"label.timezone": "Timezone",
|
||||||
"label.today": "Hoy",
|
"label.today": "Hoy",
|
||||||
"label.unknown": "Unknown",
|
"label.unknown": "Unknown",
|
||||||
"label.username": "Nombre de usuario",
|
"label.username": "Nombre de usuario",
|
||||||
|
|
|
@ -11,16 +11,17 @@
|
||||||
"button.login": "Connexion",
|
"button.login": "Connexion",
|
||||||
"button.more": "Plus",
|
"button.more": "Plus",
|
||||||
"button.refresh": "Refresh",
|
"button.refresh": "Refresh",
|
||||||
|
"button.reset": "Reset",
|
||||||
"button.save": "Sauvegarder",
|
"button.save": "Sauvegarder",
|
||||||
"button.single-day": "Single day",
|
"button.single-day": "Single day",
|
||||||
"button.view-details": "Voir les details",
|
"button.view-details": "Voir les details",
|
||||||
"button.websites": "Sites",
|
|
||||||
"label.accounts": "Comptes",
|
"label.accounts": "Comptes",
|
||||||
"label.administrator": "Administrateur",
|
"label.administrator": "Administrateur",
|
||||||
"label.confirm-password": "Confirmation du mot de passe",
|
"label.confirm-password": "Confirmation du mot de passe",
|
||||||
"label.current-password": "Mot de passe actuel",
|
"label.current-password": "Mot de passe actuel",
|
||||||
"label.custom-range": "Plage personnalisée",
|
"label.custom-range": "Plage personnalisée",
|
||||||
"label.dashboard": "Tableau de bord",
|
"label.dashboard": "Tableau de bord",
|
||||||
|
"label.default-date-range": "Default date range",
|
||||||
"label.domain": "Domaine",
|
"label.domain": "Domaine",
|
||||||
"label.enable-share-url": "Activer le partage d'URL",
|
"label.enable-share-url": "Activer le partage d'URL",
|
||||||
"label.invalid": "Invalide",
|
"label.invalid": "Invalide",
|
||||||
|
@ -39,6 +40,7 @@
|
||||||
"label.this-month": "Ce mois ci",
|
"label.this-month": "Ce mois ci",
|
||||||
"label.this-week": "Cette semaine",
|
"label.this-week": "Cette semaine",
|
||||||
"label.this-year": "Cette année",
|
"label.this-year": "Cette année",
|
||||||
|
"label.timezone": "Timezone",
|
||||||
"label.today": "Aujourd'hui",
|
"label.today": "Aujourd'hui",
|
||||||
"label.unknown": "Unknown",
|
"label.unknown": "Unknown",
|
||||||
"label.username": "Nom d'utilisateur",
|
"label.username": "Nom d'utilisateur",
|
||||||
|
|
|
@ -11,16 +11,17 @@
|
||||||
"button.login": "ログイン",
|
"button.login": "ログイン",
|
||||||
"button.more": "さらに表示",
|
"button.more": "さらに表示",
|
||||||
"button.refresh": "Refresh",
|
"button.refresh": "Refresh",
|
||||||
|
"button.reset": "Reset",
|
||||||
"button.save": "保存",
|
"button.save": "保存",
|
||||||
"button.single-day": "Single day",
|
"button.single-day": "Single day",
|
||||||
"button.view-details": "詳細表示",
|
"button.view-details": "詳細表示",
|
||||||
"button.websites": "Webサイト",
|
|
||||||
"label.accounts": "アカウント",
|
"label.accounts": "アカウント",
|
||||||
"label.administrator": "管理者",
|
"label.administrator": "管理者",
|
||||||
"label.confirm-password": "パスワード(確認)",
|
"label.confirm-password": "パスワード(確認)",
|
||||||
"label.current-password": "現在のパスワード",
|
"label.current-password": "現在のパスワード",
|
||||||
"label.custom-range": "Custom range",
|
"label.custom-range": "Custom range",
|
||||||
"label.dashboard": "ダッシュボード",
|
"label.dashboard": "ダッシュボード",
|
||||||
|
"label.default-date-range": "Default date range",
|
||||||
"label.domain": "ドメイン",
|
"label.domain": "ドメイン",
|
||||||
"label.enable-share-url": "共有リンクを有効にする",
|
"label.enable-share-url": "共有リンクを有効にする",
|
||||||
"label.invalid": "無効",
|
"label.invalid": "無効",
|
||||||
|
@ -39,6 +40,7 @@
|
||||||
"label.this-month": "今月",
|
"label.this-month": "今月",
|
||||||
"label.this-week": "今週",
|
"label.this-week": "今週",
|
||||||
"label.this-year": "今年",
|
"label.this-year": "今年",
|
||||||
|
"label.timezone": "Timezone",
|
||||||
"label.today": "今日",
|
"label.today": "今日",
|
||||||
"label.unknown": "Unknown",
|
"label.unknown": "Unknown",
|
||||||
"label.username": "ユーザー名",
|
"label.username": "ユーザー名",
|
||||||
|
|
|
@ -11,16 +11,17 @@
|
||||||
"button.login": "Нэвтрэх",
|
"button.login": "Нэвтрэх",
|
||||||
"button.more": "Цааш",
|
"button.more": "Цааш",
|
||||||
"button.refresh": "Refresh",
|
"button.refresh": "Refresh",
|
||||||
|
"button.reset": "Reset",
|
||||||
"button.save": "Хадгалах",
|
"button.save": "Хадгалах",
|
||||||
"button.single-day": "Single day",
|
"button.single-day": "Single day",
|
||||||
"button.view-details": "Дэлгэрүүлж харах",
|
"button.view-details": "Дэлгэрүүлж харах",
|
||||||
"button.websites": "Вебүүд",
|
|
||||||
"label.accounts": "Хэрэглэгчид",
|
"label.accounts": "Хэрэглэгчид",
|
||||||
"label.administrator": "Админ",
|
"label.administrator": "Админ",
|
||||||
"label.confirm-password": "Шинэ нууц үгээ давтах",
|
"label.confirm-password": "Шинэ нууц үгээ давтах",
|
||||||
"label.current-password": "Ашиглаж буй нууц үг",
|
"label.current-password": "Ашиглаж буй нууц үг",
|
||||||
"label.custom-range": "Дурын хугацаа",
|
"label.custom-range": "Дурын хугацаа",
|
||||||
"label.dashboard": "Хянах самбар",
|
"label.dashboard": "Хянах самбар",
|
||||||
|
"label.default-date-range": "Default date range",
|
||||||
"label.domain": "Домэйн",
|
"label.domain": "Домэйн",
|
||||||
"label.enable-share-url": "Хуваалцах холбоос идэвхжүүлэх",
|
"label.enable-share-url": "Хуваалцах холбоос идэвхжүүлэх",
|
||||||
"label.invalid": "Буруу",
|
"label.invalid": "Буруу",
|
||||||
|
@ -39,6 +40,7 @@
|
||||||
"label.this-month": "Энэ сар",
|
"label.this-month": "Энэ сар",
|
||||||
"label.this-week": "Энэ долоо хоног",
|
"label.this-week": "Энэ долоо хоног",
|
||||||
"label.this-year": "Энэ жил",
|
"label.this-year": "Энэ жил",
|
||||||
|
"label.timezone": "Timezone",
|
||||||
"label.today": "Өнөөдөр",
|
"label.today": "Өнөөдөр",
|
||||||
"label.unknown": "Unknown",
|
"label.unknown": "Unknown",
|
||||||
"label.username": "Хэрэглэгчийн нэр",
|
"label.username": "Хэрэглэгчийн нэр",
|
||||||
|
|
|
@ -11,16 +11,17 @@
|
||||||
"button.login": "Inloggen",
|
"button.login": "Inloggen",
|
||||||
"button.more": "Toon meer",
|
"button.more": "Toon meer",
|
||||||
"button.refresh": "Vernieuwen",
|
"button.refresh": "Vernieuwen",
|
||||||
|
"button.reset": "Reset",
|
||||||
"button.save": "Opslaan",
|
"button.save": "Opslaan",
|
||||||
"button.single-day": "Enkele dag",
|
"button.single-day": "Enkele dag",
|
||||||
"button.view-details": "Meer details",
|
"button.view-details": "Meer details",
|
||||||
"button.websites": "Websites",
|
|
||||||
"label.accounts": "Accounts",
|
"label.accounts": "Accounts",
|
||||||
"label.administrator": "Administrator",
|
"label.administrator": "Administrator",
|
||||||
"label.confirm-password": "Wachtwoord bevestigen",
|
"label.confirm-password": "Wachtwoord bevestigen",
|
||||||
"label.current-password": "Huidig wachtwoord",
|
"label.current-password": "Huidig wachtwoord",
|
||||||
"label.custom-range": "Aangepast bereik",
|
"label.custom-range": "Aangepast bereik",
|
||||||
"label.dashboard": "Dashboard",
|
"label.dashboard": "Dashboard",
|
||||||
|
"label.default-date-range": "Default date range",
|
||||||
"label.domain": "Domein",
|
"label.domain": "Domein",
|
||||||
"label.enable-share-url": "Sta delen via openbare URL toe",
|
"label.enable-share-url": "Sta delen via openbare URL toe",
|
||||||
"label.invalid": "Ongeldig",
|
"label.invalid": "Ongeldig",
|
||||||
|
@ -39,6 +40,7 @@
|
||||||
"label.this-month": "Deze maand",
|
"label.this-month": "Deze maand",
|
||||||
"label.this-week": "Deze week",
|
"label.this-week": "Deze week",
|
||||||
"label.this-year": "Dit jaar",
|
"label.this-year": "Dit jaar",
|
||||||
|
"label.timezone": "Timezone",
|
||||||
"label.today": "Vandaag",
|
"label.today": "Vandaag",
|
||||||
"label.unknown": "Onbekend",
|
"label.unknown": "Onbekend",
|
||||||
"label.username": "Gebruikersnaam",
|
"label.username": "Gebruikersnaam",
|
||||||
|
|
|
@ -11,16 +11,17 @@
|
||||||
"button.login": "Войти",
|
"button.login": "Войти",
|
||||||
"button.more": "Больше",
|
"button.more": "Больше",
|
||||||
"button.refresh": "Refresh",
|
"button.refresh": "Refresh",
|
||||||
|
"button.reset": "Reset",
|
||||||
"button.save": "Сохранить",
|
"button.save": "Сохранить",
|
||||||
"button.single-day": "Single day",
|
"button.single-day": "Single day",
|
||||||
"button.view-details": "Посмотреть детали",
|
"button.view-details": "Посмотреть детали",
|
||||||
"button.websites": "Сайты",
|
|
||||||
"label.accounts": "Аккаунты",
|
"label.accounts": "Аккаунты",
|
||||||
"label.administrator": "Администратор",
|
"label.administrator": "Администратор",
|
||||||
"label.confirm-password": "Подтвердить пароль",
|
"label.confirm-password": "Подтвердить пароль",
|
||||||
"label.current-password": "Текущий пароль",
|
"label.current-password": "Текущий пароль",
|
||||||
"label.custom-range": "Другой период",
|
"label.custom-range": "Другой период",
|
||||||
"label.dashboard": "Информационная панель",
|
"label.dashboard": "Информационная панель",
|
||||||
|
"label.default-date-range": "Default date range",
|
||||||
"label.domain": "Домен",
|
"label.domain": "Домен",
|
||||||
"label.enable-share-url": "Разрешить делиться ссылкой",
|
"label.enable-share-url": "Разрешить делиться ссылкой",
|
||||||
"label.invalid": "Некорректный",
|
"label.invalid": "Некорректный",
|
||||||
|
@ -39,6 +40,7 @@
|
||||||
"label.this-month": "Этот месяц",
|
"label.this-month": "Этот месяц",
|
||||||
"label.this-week": "Эта неделя",
|
"label.this-week": "Эта неделя",
|
||||||
"label.this-year": "Этот год",
|
"label.this-year": "Этот год",
|
||||||
|
"label.timezone": "Timezone",
|
||||||
"label.today": "Сегодня",
|
"label.today": "Сегодня",
|
||||||
"label.unknown": "Unknown",
|
"label.unknown": "Unknown",
|
||||||
"label.username": "Имя пользователя",
|
"label.username": "Имя пользователя",
|
||||||
|
|
|
@ -11,16 +11,17 @@
|
||||||
"button.login": "Giriş Yap",
|
"button.login": "Giriş Yap",
|
||||||
"button.more": "Detaylı göster",
|
"button.more": "Detaylı göster",
|
||||||
"button.refresh": "Refresh",
|
"button.refresh": "Refresh",
|
||||||
|
"button.reset": "Reset",
|
||||||
"button.save": "Kaydet",
|
"button.save": "Kaydet",
|
||||||
"button.single-day": "Single day",
|
"button.single-day": "Single day",
|
||||||
"button.view-details": "Detayı incele",
|
"button.view-details": "Detayı incele",
|
||||||
"button.websites": "Web siteleri",
|
|
||||||
"label.accounts": "Hesaplar",
|
"label.accounts": "Hesaplar",
|
||||||
"label.administrator": "Yönetici",
|
"label.administrator": "Yönetici",
|
||||||
"label.confirm-password": "Parolayı onayla",
|
"label.confirm-password": "Parolayı onayla",
|
||||||
"label.current-password": "Mevcut parola",
|
"label.current-password": "Mevcut parola",
|
||||||
"label.custom-range": "Custom range",
|
"label.custom-range": "Custom range",
|
||||||
"label.dashboard": "Kontrol Paneli",
|
"label.dashboard": "Kontrol Paneli",
|
||||||
|
"label.default-date-range": "Default date range",
|
||||||
"label.domain": "Alan adı",
|
"label.domain": "Alan adı",
|
||||||
"label.enable-share-url": "Anonim paylaşım URL'i aktif",
|
"label.enable-share-url": "Anonim paylaşım URL'i aktif",
|
||||||
"label.invalid": "Geçeriz",
|
"label.invalid": "Geçeriz",
|
||||||
|
@ -39,6 +40,7 @@
|
||||||
"label.this-month": "Bu ay",
|
"label.this-month": "Bu ay",
|
||||||
"label.this-week": "Bu hafta",
|
"label.this-week": "Bu hafta",
|
||||||
"label.this-year": "Bu yıl",
|
"label.this-year": "Bu yıl",
|
||||||
|
"label.timezone": "Timezone",
|
||||||
"label.today": "Bugün",
|
"label.today": "Bugün",
|
||||||
"label.unknown": "Unknown",
|
"label.unknown": "Unknown",
|
||||||
"label.username": "Kullanıcı adı",
|
"label.username": "Kullanıcı adı",
|
||||||
|
|
|
@ -11,16 +11,17 @@
|
||||||
"button.login": "登录",
|
"button.login": "登录",
|
||||||
"button.more": "更多",
|
"button.more": "更多",
|
||||||
"button.refresh": "刷新",
|
"button.refresh": "刷新",
|
||||||
|
"button.reset": "Reset",
|
||||||
"button.save": "保存",
|
"button.save": "保存",
|
||||||
"button.single-day": "单日",
|
"button.single-day": "单日",
|
||||||
"button.view-details": "查看更多",
|
"button.view-details": "查看更多",
|
||||||
"button.websites": "网站",
|
|
||||||
"label.accounts": "账户",
|
"label.accounts": "账户",
|
||||||
"label.administrator": "管理员",
|
"label.administrator": "管理员",
|
||||||
"label.confirm-password": "确认密码",
|
"label.confirm-password": "确认密码",
|
||||||
"label.current-password": "目前密码",
|
"label.current-password": "目前密码",
|
||||||
"label.custom-range": "自定义时间段",
|
"label.custom-range": "自定义时间段",
|
||||||
"label.dashboard": "仪表板",
|
"label.dashboard": "仪表板",
|
||||||
|
"label.default-date-range": "Default date range",
|
||||||
"label.domain": "域名",
|
"label.domain": "域名",
|
||||||
"label.enable-share-url": "激活共享链接",
|
"label.enable-share-url": "激活共享链接",
|
||||||
"label.invalid": "输入无效",
|
"label.invalid": "输入无效",
|
||||||
|
@ -39,6 +40,7 @@
|
||||||
"label.this-month": "本月",
|
"label.this-month": "本月",
|
||||||
"label.this-week": "本周",
|
"label.this-week": "本周",
|
||||||
"label.this-year": "今年",
|
"label.this-year": "今年",
|
||||||
|
"label.timezone": "Timezone",
|
||||||
"label.today": "今天",
|
"label.today": "今天",
|
||||||
"label.unknown": "未知",
|
"label.unknown": "未知",
|
||||||
"label.username": "用户名",
|
"label.username": "用户名",
|
||||||
|
|
|
@ -1,4 +1,9 @@
|
||||||
export const AUTH_COOKIE_NAME = 'umami.auth';
|
export const AUTH_COOKIE_NAME = 'umami.auth';
|
||||||
|
export const LOCALE_CONFIG = 'umami.locale';
|
||||||
|
export const TIMEZONE_CONFIG = 'umami.timezone';
|
||||||
|
export const DATE_RANGE_CONFIG = 'umami.date-range';
|
||||||
|
|
||||||
|
export const DEFAULT_DATE_RANGE = '24hour';
|
||||||
|
|
||||||
export const POSTGRESQL = 'postgresql';
|
export const POSTGRESQL = 'postgresql';
|
||||||
export const MYSQL = 'mysql';
|
export const MYSQL = 'mysql';
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { format } from 'date-fns';
|
import { format } from 'date-fns';
|
||||||
import { enUS, nl, zhCN, tr, ru, de, ja, es, fr } from 'date-fns/locale';
|
import { enUS, nl, zhCN, tr, ru, de, ja, es, fr, da } from 'date-fns/locale';
|
||||||
import enMessages from 'lang-compiled/en-US.json';
|
import enMessages from 'lang-compiled/en-US.json';
|
||||||
import nlMessages from 'lang-compiled/nl-NL.json';
|
import nlMessages from 'lang-compiled/nl-NL.json';
|
||||||
import zhCNMessages from 'lang-compiled/zh-CN.json';
|
import zhCNMessages from 'lang-compiled/zh-CN.json';
|
||||||
|
@ -10,6 +10,7 @@ import jaMessages from 'lang-compiled/ja-JP.json';
|
||||||
import esMXMessages from 'lang-compiled/es-MX.json';
|
import esMXMessages from 'lang-compiled/es-MX.json';
|
||||||
import frMessages from 'lang-compiled/fr-FR.json';
|
import frMessages from 'lang-compiled/fr-FR.json';
|
||||||
import mnMNMessages from 'lang-compiled/mn-MN.json';
|
import mnMNMessages from 'lang-compiled/mn-MN.json';
|
||||||
|
import daMessages from 'lang-compiled/da-DK.json';
|
||||||
|
|
||||||
export const messages = {
|
export const messages = {
|
||||||
'en-US': enMessages,
|
'en-US': enMessages,
|
||||||
|
@ -22,6 +23,7 @@ export const messages = {
|
||||||
'es-MX': esMXMessages,
|
'es-MX': esMXMessages,
|
||||||
'fr-FR': frMessages,
|
'fr-FR': frMessages,
|
||||||
'mn-MN': mnMNMessages,
|
'mn-MN': mnMNMessages,
|
||||||
|
'da-DK': daMessages,
|
||||||
};
|
};
|
||||||
|
|
||||||
export const dateLocales = {
|
export const dateLocales = {
|
||||||
|
@ -29,6 +31,7 @@ export const dateLocales = {
|
||||||
'nl-NL': nl,
|
'nl-NL': nl,
|
||||||
'zh-CN': zhCN,
|
'zh-CN': zhCN,
|
||||||
'de-DE': de,
|
'de-DE': de,
|
||||||
|
'da-DK': da,
|
||||||
'ru-RU': ru,
|
'ru-RU': ru,
|
||||||
'tr-TR': tr,
|
'tr-TR': tr,
|
||||||
'ja-JP': ja,
|
'ja-JP': ja,
|
||||||
|
@ -40,6 +43,7 @@ export const dateLocales = {
|
||||||
export const menuOptions = [
|
export const menuOptions = [
|
||||||
{ label: 'English', value: 'en-US', display: 'EN' },
|
{ label: 'English', value: 'en-US', display: 'EN' },
|
||||||
{ label: '中文', value: 'zh-CN', display: 'CN' },
|
{ label: '中文', value: 'zh-CN', display: 'CN' },
|
||||||
|
{ label: 'Dansk', value: 'da-DK', display: 'DA' },
|
||||||
{ label: 'Deutsch', value: 'de-DE', display: 'DE' },
|
{ label: 'Deutsch', value: 'de-DE', display: 'DE' },
|
||||||
{ label: 'Español', value: 'es-MX', display: 'ES' },
|
{ label: 'Español', value: 'es-MX', display: 'ES' },
|
||||||
{ label: 'Français', value: 'fr-FR', display: 'FR' },
|
{ label: 'Français', value: 'fr-FR', display: 'FR' },
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "umami",
|
"name": "umami",
|
||||||
"version": "0.41.0",
|
"version": "0.42.0",
|
||||||
"description": "A simple, fast, website analytics alternative to Google Analytics. ",
|
"description": "A simple, fast, website analytics alternative to Google Analytics. ",
|
||||||
"author": "Mike Cao <mike@mikecao.com>",
|
"author": "Mike Cao <mike@mikecao.com>",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
@ -83,6 +83,7 @@
|
||||||
"redux-thunk": "^2.3.0",
|
"redux-thunk": "^2.3.0",
|
||||||
"request-ip": "^2.1.3",
|
"request-ip": "^2.1.3",
|
||||||
"thenby": "^1.3.4",
|
"thenby": "^1.3.4",
|
||||||
|
"timezone-support": "^2.0.2",
|
||||||
"tinycolor2": "^1.4.1",
|
"tinycolor2": "^1.4.1",
|
||||||
"unfetch": "^4.1.0",
|
"unfetch": "^4.1.0",
|
||||||
"uuid": "^8.3.0"
|
"uuid": "^8.3.0"
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
import { createSlice } from '@reduxjs/toolkit';
|
import { createSlice } from '@reduxjs/toolkit';
|
||||||
import { getItem } from 'lib/web';
|
import { getItem } from 'lib/web';
|
||||||
|
import { LOCALE_CONFIG } from 'lib/constants';
|
||||||
|
|
||||||
const app = createSlice({
|
const app = createSlice({
|
||||||
name: 'app',
|
name: 'app',
|
||||||
initialState: { locale: getItem('umami.locale') || 'en-US' },
|
initialState: { locale: getItem(LOCALE_CONFIG) || 'en-US' },
|
||||||
reducers: {
|
reducers: {
|
||||||
updateApp(state, action) {
|
updateApp(state, action) {
|
||||||
state = action.payload;
|
state = action.payload;
|
||||||
|
|
12
yarn.lock
12
yarn.lock
|
@ -2699,6 +2699,11 @@ commander@2, commander@^2.20.0:
|
||||||
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
|
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
|
||||||
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
|
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
|
||||||
|
|
||||||
|
commander@2.20.0:
|
||||||
|
version "2.20.0"
|
||||||
|
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
|
||||||
|
integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
|
||||||
|
|
||||||
commander@^6.0.0, commander@^6.1.0:
|
commander@^6.0.0, commander@^6.1.0:
|
||||||
version "6.1.0"
|
version "6.1.0"
|
||||||
resolved "https://registry.yarnpkg.com/commander/-/commander-6.1.0.tgz#f8d722b78103141006b66f4c7ba1e97315ba75bc"
|
resolved "https://registry.yarnpkg.com/commander/-/commander-6.1.0.tgz#f8d722b78103141006b66f4c7ba1e97315ba75bc"
|
||||||
|
@ -8608,6 +8613,13 @@ timers-browserify@^2.0.4:
|
||||||
dependencies:
|
dependencies:
|
||||||
setimmediate "^1.0.4"
|
setimmediate "^1.0.4"
|
||||||
|
|
||||||
|
timezone-support@^2.0.2:
|
||||||
|
version "2.0.2"
|
||||||
|
resolved "https://registry.yarnpkg.com/timezone-support/-/timezone-support-2.0.2.tgz#801d6924478b1b60f09b90699ce1127a6044cbe7"
|
||||||
|
integrity sha512-J/1PyHCX76vOPuJzCyHMQMH2wTjXCJ30R5EXaS/QTi+xYsL0thS0pubDrHCWnfG4zU1jpPJtctnBBRCOpcJZeQ==
|
||||||
|
dependencies:
|
||||||
|
commander "2.20.0"
|
||||||
|
|
||||||
tiny-lru@7.0.6:
|
tiny-lru@7.0.6:
|
||||||
version "7.0.6"
|
version "7.0.6"
|
||||||
resolved "https://registry.yarnpkg.com/tiny-lru/-/tiny-lru-7.0.6.tgz#b0c3cdede1e5882aa2d1ae21cb2ceccf2a331f24"
|
resolved "https://registry.yarnpkg.com/tiny-lru/-/tiny-lru-7.0.6.tgz#b0c3cdede1e5882aa2d1ae21cb2ceccf2a331f24"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user