watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-19 12:05:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added All TIme Filter

Browse source
This commit is contained in:
Shubham Verma 2021-10-10 08:52:59 +05:30
parent 8b4690ad8d
commit 26f2447973
12 changed files with 102 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/metrics/EventsChart.js
View file

@ -7,10 +7,10 @@ import useDateRange from 'hooks/useDateRange';
import useTimezone from 'hooks/useTimezone';
import usePageQuery from 'hooks/usePageQuery';
import useShareToken from 'hooks/useShareToken';
import { EVENT_COLORS, TOKEN_HEADER } from 'lib/constants';
import { EVENT_COLORS, TOKEN_HEADER, DEFAULT_DATE_RANGE } from 'lib/constants';
export default function EventsChart({ websiteId, className, token }) {
const [dateRange] = useDateRange(websiteId);
export default function EventsChart({ websiteId, className, token, createdAt }) {
const [dateRange] = useDateRange(websiteId, DEFAULT_DATE_RANGE, createdAt);
const { startDate, endDate, unit, modified } = dateRange;
const [timezone] = useTimezone();
const { query } = usePageQuery();

10
components/metrics/MetricsBar.js
View file

@ -1,14 +1,14 @@
import React, { useState } from 'react';
import { FormattedMessage } from 'react-intl';
import classNames from 'classnames';
import ErrorMessage from 'components/common/ErrorMessage';
import Loading from 'components/common/Loading';
import useDateRange from 'hooks/useDateRange';
import ErrorMessage from 'components/common/ErrorMessage';
import useFetch from 'hooks/useFetch';
import useDateRange from 'hooks/useDateRange';
import usePageQuery from 'hooks/usePageQuery';
import useShareToken from 'hooks/useShareToken';
import { formatShortTime, formatNumber, formatLongNumber } from 'lib/format';
import { DEFAULT_DATE_RANGE, TOKEN_HEADER } from 'lib/constants';
import { formatLongNumber, formatNumber, formatShortTime } from 'lib/format';
import { useState } from 'react';
import { FormattedMessage } from 'react-intl';
import MetricCard from './MetricCard';
import styles from './MetricsBar.module.css';

5
components/metrics/MetricsTable.js
View file

@ -12,7 +12,7 @@ import usePageQuery from 'hooks/usePageQuery';
import useShareToken from 'hooks/useShareToken';
import ErrorMessage from 'components/common/ErrorMessage';
import DataTable from './DataTable';
import { DEFAULT_ANIMATION_DURATION, TOKEN_HEADER } from 'lib/constants';
import { DEFAULT_ANIMATION_DURATION, TOKEN_HEADER, DEFAULT_DATE_RANGE } from 'lib/constants';
import styles from './MetricsTable.module.css';
export default function MetricsTable({
@ -23,10 +23,11 @@ export default function MetricsTable({
filterOptions,
limit,
onDataLoad,
createdAt,
...props
}) {
const shareToken = useShareToken();
const [dateRange] = useDateRange(websiteId);
const [dateRange] = useDateRange(websiteId, DEFAULT_DATE_RANGE, createdAt);
const { startDate, endDate, modified } = dateRange;
const {
resolve,

3
components/metrics/PagesTable.js
View file

@ -11,7 +11,7 @@ import styles from './PagesTable.module.css';
export const FILTER_COMBINED = 0;
export const FILTER_RAW = 1;
export default function PagesTable({ websiteId, websiteDomain, showFilters, ...props }) {
export default function PagesTable({ websiteId, websiteDomain, showFilters, createdAt, ...props }) {
const [filter, setFilter] = useState(FILTER_COMBINED);
const {
resolve,
@ -52,6 +52,7 @@ export default function PagesTable({ websiteId, websiteDomain, showFilters, ...p
dataFilter={urlFilter}
filterOptions={{ domain: websiteDomain, raw: filter === FILTER_RAW }}
renderLabel={renderLink}
createdAt={createdAt}
{...props}
/>
</>

23
components/metrics/WebsiteChart.js
View file

@ -1,22 +1,21 @@
import Times from 'assets/times.svg';
import React, { useMemo } from 'react';
import classNames from 'classnames';
import Button from 'components/common/Button';
import PageviewsChart from './PageviewsChart';
import MetricsBar from './MetricsBar';
import WebsiteHeader from './WebsiteHeader';
import DateFilter from 'components/common/DateFilter';
import StickyHeader from 'components/helpers/StickyHeader';
import useDateRange from 'hooks/useDateRange';
import Button from 'components/common/Button';
import useFetch from 'hooks/useFetch';
import usePageQuery from 'hooks/usePageQuery';
import useDateRange from 'hooks/useDateRange';
import useTimezone from 'hooks/useTimezone';
import { DEFAULT_DATE_RANGE } from 'lib/constants';
import usePageQuery from 'hooks/usePageQuery';
import { getDateArray, getDateLength } from 'lib/date';
import { useMemo } from 'react';
import useShareToken from '../../hooks/useShareToken';
import { TOKEN_HEADER } from '../../lib/constants';
import ErrorMessage from '../common/ErrorMessage';
import MetricsBar from './MetricsBar';
import PageviewsChart from './PageviewsChart';
import Times from 'assets/times.svg';
import styles from './WebsiteChart.module.css';
import WebsiteHeader from './WebsiteHeader';
import ErrorMessage from '../common/ErrorMessage';
import useShareToken from '../../hooks/useShareToken';
import { TOKEN_HEADER, DEFAULT_DATE_RANGE } from '../../lib/constants';
export default function WebsiteChart({
websiteId,

9
components/metrics/WebsiteHeader.js
View file

@ -1,11 +1,12 @@
import Arrow from 'assets/arrow-right.svg';
import Favicon from 'components/common/Favicon';
import React from 'react';
import { FormattedMessage } from 'react-intl';
import Link from 'components/common/Link';
import PageHeader from 'components/layout/PageHeader';
import RefreshButton from 'components/common/RefreshButton';
import ButtonLayout from 'components/layout/ButtonLayout';
import PageHeader from 'components/layout/PageHeader';
import { FormattedMessage } from 'react-intl';
import Favicon from 'components/common/Favicon';
import ActiveUsers from './ActiveUsers';
import Arrow from 'assets/arrow-right.svg';
import styles from './WebsiteHeader.module.css';
export default function WebsiteHeader({ websiteId, title, domain, showLink = false, createdAt }) {