watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-18 11:35:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

chore: added all time range

Browse source
This commit is contained in:
Shubham Verma 2021-10-09 19:22:32 +05:30
parent 2575cbfc11
commit 47bf8bf03a
7 changed files with 104 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/metrics/MetricsBar.js
View file

@ -1,20 +1,20 @@
import React, { useState } from 'react';
import { FormattedMessage } from 'react-intl';
import classNames from 'classnames';
import Loading from 'components/common/Loading';
import ErrorMessage from 'components/common/ErrorMessage';
import useFetch from 'hooks/useFetch';
import Loading from 'components/common/Loading';
import useDateRange from 'hooks/useDateRange';
import useFetch from 'hooks/useFetch';
import usePageQuery from 'hooks/usePageQuery';
import useShareToken from 'hooks/useShareToken';
import { formatShortTime, formatNumber, formatLongNumber } from 'lib/format';
import { TOKEN_HEADER } from 'lib/constants';
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';
export default function MetricsBar({ websiteId, className }) {
export default function MetricsBar({ websiteId, className, createdAt }) {
const shareToken = useShareToken();
const [dateRange] = useDateRange(websiteId);
const [dateRange] = useDateRange(websiteId, DEFAULT_DATE_RANGE, createdAt);
const { startDate, endDate, modified } = dateRange;
const [format, setFormat] = useState(true);
const {

27
components/metrics/WebsiteChart.js
View file

@ -1,21 +1,22 @@
import React, { useMemo } from 'react';
import Times from 'assets/times.svg';
import classNames from 'classnames';
import PageviewsChart from './PageviewsChart';
import MetricsBar from './MetricsBar';
import WebsiteHeader from './WebsiteHeader';
import Button from 'components/common/Button';
import DateFilter from 'components/common/DateFilter';
import StickyHeader from 'components/helpers/StickyHeader';
import Button from 'components/common/Button';
import useFetch from 'hooks/useFetch';
import useDateRange from 'hooks/useDateRange';
import useTimezone from 'hooks/useTimezone';
import useFetch from 'hooks/useFetch';
import usePageQuery from 'hooks/usePageQuery';
import useTimezone from 'hooks/useTimezone';
import { DEFAULT_DATE_RANGE } from 'lib/constants';
import { getDateArray, getDateLength } from 'lib/date';
import Times from 'assets/times.svg';
import styles from './WebsiteChart.module.css';
import ErrorMessage from '../common/ErrorMessage';
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 styles from './WebsiteChart.module.css';
import WebsiteHeader from './WebsiteHeader';
export default function WebsiteChart({
websiteId,
@ -24,10 +25,11 @@ export default function WebsiteChart({
stickyHeader = false,
showLink = false,
hideChart = false,
createdAt,
onDataLoad = () => {},
}) {
const shareToken = useShareToken();
const [dateRange, setDateRange] = useDateRange(websiteId);
const [dateRange, setDateRange] = useDateRange(websiteId, DEFAULT_DATE_RANGE, createdAt);
const { startDate, endDate, unit, value, modified } = dateRange;
const [timezone] = useTimezone();
const {
@ -77,7 +79,7 @@ export default function WebsiteChart({
>
{url && <PageFilter url={url} onClick={handleCloseFilter} />}
<div className="col-12 col-lg-9">
<MetricsBar websiteId={websiteId} />
<MetricsBar websiteId={websiteId} createdAt={createdAt} />
</div>
<div className={classNames(styles.filter, 'col-12 col-lg-3')}>
<DateFilter
@ -85,6 +87,7 @@ export default function WebsiteChart({
startDate={startDate}
endDate={endDate}
onChange={setDateRange}
createdAt={createdAt}
/>
</div>
</StickyHeader>