From 47fac2350fa61db503d686418b25d8324f732393 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Fri, 3 Dec 2021 13:59:32 +0200 Subject: [PATCH] Use generic ListReport for pages (#1505) --- assets/js/dashboard/api.js | 2 +- .../dashboard/{ => components}/lazy-loader.js | 0 assets/js/dashboard/datepicker.js | 2 +- assets/js/dashboard/query.js | 4 +- .../js/dashboard/stats/conversions/index.js | 6 +- .../stats/conversions/prop-breakdown.js | 4 +- assets/js/dashboard/stats/current-visitors.js | 2 +- assets/js/dashboard/stats/devices/index.js | 4 +- assets/js/dashboard/stats/locations/index.js | 4 +- assets/js/dashboard/stats/locations/map.js | 4 +- .../js/dashboard/stats/modals/entry-pages.js | 2 +- .../js/dashboard/stats/modals/exit-pages.js | 2 +- assets/js/dashboard/stats/modals/filter.js | 2 +- .../dashboard/stats/modals/google-keywords.js | 2 +- assets/js/dashboard/stats/modals/pages.js | 2 +- .../stats/modals/referrer-drilldown.js | 2 +- assets/js/dashboard/stats/modals/sources.js | 2 +- assets/js/dashboard/stats/modals/table.js | 2 +- .../js/dashboard/stats/pages/entry-pages.js | 128 ------------------ assets/js/dashboard/stats/pages/exit-pages.js | 123 ----------------- assets/js/dashboard/stats/pages/index.js | 80 ++++++++++- assets/js/dashboard/stats/pages/pages.js | 127 ----------------- assets/js/dashboard/stats/reports/list.js | 41 +++++- .../dashboard/stats/sources/referrer-list.js | 4 +- .../dashboard/stats/sources/search-terms.js | 2 +- .../js/dashboard/stats/sources/source-list.js | 8 +- assets/js/dashboard/stats/visitor-graph.js | 4 +- assets/js/dashboard/{ => util}/date.js | 0 .../dashboard/{ => util}/number-formatter.js | 0 assets/js/dashboard/{ => util}/storage.js | 0 assets/js/dashboard/{ => util}/url.js | 0 31 files changed, 142 insertions(+), 423 deletions(-) rename assets/js/dashboard/{ => components}/lazy-loader.js (100%) delete mode 100644 assets/js/dashboard/stats/pages/entry-pages.js delete mode 100644 assets/js/dashboard/stats/pages/exit-pages.js delete mode 100644 assets/js/dashboard/stats/pages/pages.js rename assets/js/dashboard/{ => util}/date.js (100%) rename assets/js/dashboard/{ => util}/number-formatter.js (100%) rename assets/js/dashboard/{ => util}/storage.js (100%) rename assets/js/dashboard/{ => util}/url.js (100%) diff --git a/assets/js/dashboard/api.js b/assets/js/dashboard/api.js index 5257eed73..ddbb90f79 100644 --- a/assets/js/dashboard/api.js +++ b/assets/js/dashboard/api.js @@ -1,4 +1,4 @@ -import {formatISO} from './date' +import {formatISO} from './util/date' let abortController = new AbortController() let SHARED_LINK_AUTH = null diff --git a/assets/js/dashboard/lazy-loader.js b/assets/js/dashboard/components/lazy-loader.js similarity index 100% rename from assets/js/dashboard/lazy-loader.js rename to assets/js/dashboard/components/lazy-loader.js diff --git a/assets/js/dashboard/datepicker.js b/assets/js/dashboard/datepicker.js index 7168b4778..5c046f9d1 100644 --- a/assets/js/dashboard/datepicker.js +++ b/assets/js/dashboard/datepicker.js @@ -18,7 +18,7 @@ import { parseUTCDate, isBefore, isAfter, -} from "./date"; +} from "./util/date"; import { navigateToQuery, QueryLink, QueryButton } from "./query"; function renderArrow(query, site, period, prevDate, nextDate) { diff --git a/assets/js/dashboard/query.js b/assets/js/dashboard/query.js index 627335586..74ec396c7 100644 --- a/assets/js/dashboard/query.js +++ b/assets/js/dashboard/query.js @@ -1,7 +1,7 @@ import React from 'react' import { Link, withRouter } from 'react-router-dom' -import {formatDay, formatMonthYYYY, nowForSite, parseUTCDate} from './date' -import * as storage from './storage' +import {formatDay, formatMonthYYYY, nowForSite, parseUTCDate} from './util/date' +import * as storage from './util/storage' const PERIODS = ['realtime', 'day', 'month', '7d', '30d', '6mo', '12mo', 'custom'] diff --git a/assets/js/dashboard/stats/conversions/index.js b/assets/js/dashboard/stats/conversions/index.js index 1aef2cdb7..e63ac2ee8 100644 --- a/assets/js/dashboard/stats/conversions/index.js +++ b/assets/js/dashboard/stats/conversions/index.js @@ -3,10 +3,10 @@ import { Link } from 'react-router-dom' import Bar from '../bar' import PropBreakdown from './prop-breakdown' -import numberFormatter from '../../number-formatter' +import numberFormatter from '../../util/number-formatter' import * as api from '../../api' -import * as url from '../../url' -import LazyLoader from '../../lazy-loader' +import * as url from '../../util/url' +import LazyLoader from '../../components/lazy-loader' const MOBILE_UPPER_WIDTH = 767 const DEFAULT_WIDTH = 1080 diff --git a/assets/js/dashboard/stats/conversions/prop-breakdown.js b/assets/js/dashboard/stats/conversions/prop-breakdown.js index 50fe54455..e142c0f33 100644 --- a/assets/js/dashboard/stats/conversions/prop-breakdown.js +++ b/assets/js/dashboard/stats/conversions/prop-breakdown.js @@ -1,9 +1,9 @@ import React from 'react'; import { Link } from 'react-router-dom' -import * as storage from '../../storage' +import * as storage from '../../util/storage' import Bar from '../bar' -import numberFormatter from '../../number-formatter' +import numberFormatter from '../../util/number-formatter' import * as api from '../../api' const MOBILE_UPPER_WIDTH = 767 diff --git a/assets/js/dashboard/stats/current-visitors.js b/assets/js/dashboard/stats/current-visitors.js index 7f6e6b59f..b27dfda37 100644 --- a/assets/js/dashboard/stats/current-visitors.js +++ b/assets/js/dashboard/stats/current-visitors.js @@ -1,7 +1,7 @@ import React from 'react'; import { Link } from 'react-router-dom' import * as api from '../api' -import * as url from '../url' +import * as url from '../util/url' import { appliedFilters } from '../query'; export default class CurrentVisitors extends React.Component { diff --git a/assets/js/dashboard/stats/devices/index.js b/assets/js/dashboard/stats/devices/index.js index e993ede30..106f5d2a0 100644 --- a/assets/js/dashboard/stats/devices/index.js +++ b/assets/js/dashboard/stats/devices/index.js @@ -1,9 +1,9 @@ import React from 'react'; -import * as storage from '../../storage' +import * as storage from '../../util/storage' import ListReport from '../reports/list' import * as api from '../../api' -import * as url from '../../url' +import * as url from '../../util/url' function Browsers({query, site}) { function fetchData() { diff --git a/assets/js/dashboard/stats/locations/index.js b/assets/js/dashboard/stats/locations/index.js index bb69f476f..ec6c22839 100644 --- a/assets/js/dashboard/stats/locations/index.js +++ b/assets/js/dashboard/stats/locations/index.js @@ -1,10 +1,10 @@ import React from 'react'; -import * as storage from '../../storage' +import * as storage from '../../util/storage' import CountriesMap from './map' import * as api from '../../api' -import {apiPath, sitePath} from '../../url' +import {apiPath, sitePath} from '../../util/url' import ListReport from '../reports/list' function Countries({query, site}) { diff --git a/assets/js/dashboard/stats/locations/map.js b/assets/js/dashboard/stats/locations/map.js index 4ec1a0ca1..11bb5ab2b 100644 --- a/assets/js/dashboard/stats/locations/map.js +++ b/assets/js/dashboard/stats/locations/map.js @@ -3,9 +3,9 @@ import Datamap from 'datamaps' import { withRouter } from 'react-router-dom' import * as d3 from "d3" -import numberFormatter from '../../number-formatter' +import numberFormatter from '../../util/number-formatter' import FadeIn from '../../fade-in' -import LazyLoader from '../../lazy-loader' +import LazyLoader from '../../components/lazy-loader' import MoreLink from '../more-link' import * as api from '../../api' import { navigateToQuery } from '../../query' diff --git a/assets/js/dashboard/stats/modals/entry-pages.js b/assets/js/dashboard/stats/modals/entry-pages.js index 198c32f36..22a298119 100644 --- a/assets/js/dashboard/stats/modals/entry-pages.js +++ b/assets/js/dashboard/stats/modals/entry-pages.js @@ -4,7 +4,7 @@ import { Link , withRouter } from 'react-router-dom' import Modal from './modal' import * as api from '../../api' -import numberFormatter, { durationFormatter } from '../../number-formatter' +import numberFormatter, { durationFormatter } from '../../util/number-formatter' import {parseQuery} from '../../query' class EntryPagesModal extends React.Component { diff --git a/assets/js/dashboard/stats/modals/exit-pages.js b/assets/js/dashboard/stats/modals/exit-pages.js index 21b895214..dc0953692 100644 --- a/assets/js/dashboard/stats/modals/exit-pages.js +++ b/assets/js/dashboard/stats/modals/exit-pages.js @@ -4,7 +4,7 @@ import { withRouter } from 'react-router-dom' import Modal from './modal' import * as api from '../../api' -import numberFormatter from '../../number-formatter' +import numberFormatter from '../../util/number-formatter' import {parseQuery} from '../../query' class ExitPagesModal extends React.Component { diff --git a/assets/js/dashboard/stats/modals/filter.js b/assets/js/dashboard/stats/modals/filter.js index 944d6c724..09ec95ff0 100644 --- a/assets/js/dashboard/stats/modals/filter.js +++ b/assets/js/dashboard/stats/modals/filter.js @@ -8,7 +8,7 @@ import SearchSelect from '../../components/search-select' import Modal from './modal' import { parseQuery, formattedFilters } from '../../query' import * as api from '../../api' -import {apiPath, siteBasePath} from '../../url' +import {apiPath, siteBasePath} from '../../util/url' export const FILTER_GROUPS = { 'page': ['page'], diff --git a/assets/js/dashboard/stats/modals/google-keywords.js b/assets/js/dashboard/stats/modals/google-keywords.js index b2ac56957..50c749822 100644 --- a/assets/js/dashboard/stats/modals/google-keywords.js +++ b/assets/js/dashboard/stats/modals/google-keywords.js @@ -3,7 +3,7 @@ import { Link, withRouter } from 'react-router-dom' import Modal from './modal' import * as api from '../../api' -import numberFormatter from '../../number-formatter' +import numberFormatter from '../../util/number-formatter' import {parseQuery, toHuman} from '../../query' import RocketIcon from './rocket-icon' diff --git a/assets/js/dashboard/stats/modals/pages.js b/assets/js/dashboard/stats/modals/pages.js index f243298b5..6a0f20fd0 100644 --- a/assets/js/dashboard/stats/modals/pages.js +++ b/assets/js/dashboard/stats/modals/pages.js @@ -4,7 +4,7 @@ import { withRouter } from 'react-router-dom' import Modal from './modal' import * as api from '../../api' -import numberFormatter, {durationFormatter} from '../../number-formatter' +import numberFormatter, {durationFormatter} from '../../util/number-formatter' import {parseQuery} from '../../query' class PagesModal extends React.Component { diff --git a/assets/js/dashboard/stats/modals/referrer-drilldown.js b/assets/js/dashboard/stats/modals/referrer-drilldown.js index 459d97c1e..1ecea42cb 100644 --- a/assets/js/dashboard/stats/modals/referrer-drilldown.js +++ b/assets/js/dashboard/stats/modals/referrer-drilldown.js @@ -3,7 +3,7 @@ import { Link, withRouter } from 'react-router-dom' import Modal from './modal' import * as api from '../../api' -import numberFormatter, {durationFormatter} from '../../number-formatter' +import numberFormatter, {durationFormatter} from '../../util/number-formatter' import {parseQuery, toHuman} from '../../query' class ReferrerDrilldownModal extends React.Component { diff --git a/assets/js/dashboard/stats/modals/sources.js b/assets/js/dashboard/stats/modals/sources.js index 2005422ca..334483a31 100644 --- a/assets/js/dashboard/stats/modals/sources.js +++ b/assets/js/dashboard/stats/modals/sources.js @@ -3,7 +3,7 @@ import { Link, withRouter } from 'react-router-dom' import Modal from './modal' import * as api from '../../api' -import numberFormatter, {durationFormatter} from '../../number-formatter' +import numberFormatter, {durationFormatter} from '../../util/number-formatter' import {parseQuery} from '../../query' const TITLES = { diff --git a/assets/js/dashboard/stats/modals/table.js b/assets/js/dashboard/stats/modals/table.js index 7f5c4feee..517234a41 100644 --- a/assets/js/dashboard/stats/modals/table.js +++ b/assets/js/dashboard/stats/modals/table.js @@ -3,7 +3,7 @@ import { Link, withRouter } from 'react-router-dom' import Modal from './modal' import * as api from '../../api' -import numberFormatter from '../../number-formatter' +import numberFormatter from '../../util/number-formatter' import {parseQuery} from '../../query' class ModalTable extends React.Component { diff --git a/assets/js/dashboard/stats/pages/entry-pages.js b/assets/js/dashboard/stats/pages/entry-pages.js deleted file mode 100644 index 58689fc31..000000000 --- a/assets/js/dashboard/stats/pages/entry-pages.js +++ /dev/null @@ -1,128 +0,0 @@ -import React from 'react'; -import { Link } from 'react-router-dom' -import FlipMove from 'react-flip-move'; - -import FadeIn from '../../fade-in' -import Bar from '../bar' -import MoreLink from '../more-link' -import numberFormatter from '../../number-formatter' -import * as api from '../../api' -import * as url from '../../url' -import LazyLoader from '../../lazy-loader' - -export default class EntryPages extends React.Component { - constructor(props) { - super(props) - this.state = {loading: true} - this.onVisible = this.onVisible.bind(this) - } - - componentDidUpdate(prevProps) { - if (this.props.query !== prevProps.query) { - this.setState({loading: true, pages: null}) - this.fetchPages() - } - } - - onVisible() { - this.fetchPages() - if (this.props.timer) this.props.timer.onTick(this.fetchPages.bind(this)) - } - - showConversionRate() { - return !!this.props.query.filters.goal - } - - fetchPages() { - api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/entry-pages`, this.props.query) - .then((res) => this.setState({loading: false, pages: res})) - } - - label() { - if (this.props.query.period === 'realtime') { - return 'Current visitors' - } - - if (this.showConversionRate()) { - return 'Conversions' - } - - return 'Unique Entrances' - } - - renderPage(page) { - const externalLink = url.externalLinkForPage(this.props.site.domain, page.name) - const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem" - - return ( -
- - - - {page.name} - - - - - - - {numberFormatter(page.unique_entrances)} - {this.showConversionRate() && {numberFormatter(page.conversion_rate)}%} -
- ) - } - - renderList() { - if (this.state.pages && this.state.pages.length > 0) { - return ( - <> -
- Page url -
- {this.label()} - {this.showConversionRate() && CR} -
-
- - - { this.state.pages.map(this.renderPage.bind(this)) } - - - ) - } - return ( -
- No data yet -
- ) - } - - render() { - const { loading } = this.state; - return ( - - { loading &&
} - - { this.renderList() } - - {!loading && } -
- ) - } -} diff --git a/assets/js/dashboard/stats/pages/exit-pages.js b/assets/js/dashboard/stats/pages/exit-pages.js deleted file mode 100644 index b7d2e3aaf..000000000 --- a/assets/js/dashboard/stats/pages/exit-pages.js +++ /dev/null @@ -1,123 +0,0 @@ -import React from 'react'; -import { Link } from 'react-router-dom' -import FlipMove from 'react-flip-move'; - -import FadeIn from '../../fade-in' -import Bar from '../bar' -import MoreLink from '../more-link' -import numberFormatter from '../../number-formatter' -import * as api from '../../api' -import * as url from '../../url' -import LazyLoader from '../../lazy-loader' - -export default class ExitPages extends React.Component { - constructor(props) { - super(props) - this.state = {loading: true} - this.onVisible = this.onVisible.bind(this) - } - - componentDidUpdate(prevProps) { - if (this.props.query !== prevProps.query) { - this.setState({loading: true, pages: null}) - this.fetchPages() - } - } - - onVisible() { - this.fetchPages() - if (this.props.timer) this.props.timer.onTick(this.fetchPages.bind(this)) - } - - showConversionRate() { - return !!this.props.query.filters.goal - } - - label() { - if (this.props.query.period === 'realtime') { - return 'Current visitors' - } - - if (this.showConversionRate()) { - return 'Conversions' - } - - return 'Unique Exits' - } - - fetchPages() { - api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/exit-pages`, this.props.query) - .then((res) => this.setState({loading: false, pages: res})) - } - - renderPage(page) { - const externalLink = url.externalLinkForPage(this.props.site.domain, page.name) - const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem" - - return ( -
- - - - {page.name} - - - - - - - {numberFormatter(page.unique_exits)} - {this.showConversionRate() && {numberFormatter(page.conversion_rate)}%} -
- ) - } - - renderList() { - if (this.state.pages && this.state.pages.length > 0) { - return ( - <> -
- Page url -
- {this.label()} - {this.showConversionRate() && CR} -
-
- - - { this.state.pages.map(this.renderPage.bind(this)) } - - - ) - } - - return
No data yet
- } - - render() { - const { loading } = this.state; - return ( - - { loading &&
} - - { this.renderList() } - - {!loading && } -
- ) - } -} diff --git a/assets/js/dashboard/stats/pages/index.js b/assets/js/dashboard/stats/pages/index.js index ac1ee2cff..a8c7232c9 100644 --- a/assets/js/dashboard/stats/pages/index.js +++ b/assets/js/dashboard/stats/pages/index.js @@ -1,9 +1,79 @@ import React from 'react'; -import * as storage from '../../storage' -import Visits from './pages' -import EntryPages from './entry-pages' -import ExitPages from './exit-pages' +import * as storage from '../../util/storage' +import * as url from '../../util/url' +import * as api from '../../api' +import ListReport from './../reports/list' + +function EntryPages({query, site}) { + function fetchData() { + return api.get(url.apiPath(site, '/entry-pages'), query, {limit: 9}) + } + + function externalLinkDest(page) { + return url.externalLinkForPage(site.domain, page.name) + } + + return ( + + ) +} + +function ExitPages({query, site}) { + function fetchData() { + return api.get(url.apiPath(site, '/exit-pages'), query, {limit: 9}) + } + + function externalLinkDest(page) { + return url.externalLinkForPage(site.domain, page.name) + } + + return ( + + ) +} + +function TopPages({query, site}) { + function fetchData() { + return api.get(url.apiPath(site, '/pages'), query, {limit: 9}) + } + + function externalLinkDest(page) { + return url.externalLinkForPage(site.domain, page.name) + } + + return ( + + ) +} const labelFor = { 'pages': 'Top Pages', @@ -36,7 +106,7 @@ export default class Pages extends React.Component { return case "pages": default: - return + return } } diff --git a/assets/js/dashboard/stats/pages/pages.js b/assets/js/dashboard/stats/pages/pages.js deleted file mode 100644 index 438dfdd0b..000000000 --- a/assets/js/dashboard/stats/pages/pages.js +++ /dev/null @@ -1,127 +0,0 @@ -import React from 'react'; -import { Link } from 'react-router-dom' -import FlipMove from 'react-flip-move'; - -import FadeIn from '../../fade-in' -import Bar from '../bar' -import MoreLink from '../more-link' -import numberFormatter from '../../number-formatter' -import * as api from '../../api' -import * as url from '../../url' -import LazyLoader from '../../lazy-loader' - -export default class Visits extends React.Component { - constructor(props) { - super(props) - this.state = {loading: true} - this.onVisible = this.onVisible.bind(this) - } - - componentDidUpdate(prevProps) { - if (this.props.query !== prevProps.query) { - this.setState({loading: true, pages: null}) - this.fetchPages() - } - } - - onVisible() { - this.fetchPages() - if (this.props.timer) this.props.timer.onTick(this.fetchPages.bind(this)) - } - - showConversionRate() { - return !!this.props.query.filters.goal - } - - fetchPages() { - api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/pages`, this.props.query) - .then((res) => this.setState({loading: false, pages: res})) - } - - label() { - if (this.props.query.period === 'realtime') { - return 'Current visitors' - } - - if (this.showConversionRate()) { - return 'Conversions' - } - - return 'Visitors' - } - - renderPage(page) { - const externalLink = url.externalLinkForPage(this.props.site.domain, page.name) - const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem" - - return ( -
- - - - {page.name} - - - - - - - {numberFormatter(page.visitors)} - {this.showConversionRate() && {numberFormatter(page.conversion_rate)}%} -
- ) - } - - renderList() { - if (this.state.pages && this.state.pages.length > 0) { - return ( - <> -
- Page url -
- { this.label() } - {this.showConversionRate() && CR} -
-
- - - { this.state.pages.map(this.renderPage.bind(this)) } - - - ) - } - - return
No data yet
- } - - render() { - const { loading } = this.state; - return ( - - { loading &&
} - - { this.renderList() } - - {!loading && } -
- ) - } -} diff --git a/assets/js/dashboard/stats/reports/list.js b/assets/js/dashboard/stats/reports/list.js index f75723176..c7e1ad0a5 100644 --- a/assets/js/dashboard/stats/reports/list.js +++ b/assets/js/dashboard/stats/reports/list.js @@ -3,9 +3,9 @@ import { Link } from 'react-router-dom' import FadeIn from '../../fade-in' import MoreLink from '../more-link' -import numberFormatter from '../../number-formatter' +import numberFormatter from '../../util/number-formatter' import Bar from '../bar' -import LazyLoader from '../../lazy-loader' +import LazyLoader from '../../components/lazy-loader' export default class ListReport extends React.Component { constructor(props) { @@ -40,13 +40,38 @@ export default class ListReport extends React.Component { return 'Conversions' } - return 'Visitors' + return this.valueLabel() } showConversionRate() { return !!this.props.query.filters.goal } + valueKey() { + return this.props.valueKey || 'visitors' + } + + valueLabel() { + return this.props.valueLabel || 'Visitors' + } + + renderExternalLink(item) { + if (this.props.externalLinkDest) { + const dest = this.props.externalLinkDest(item) + + return ( + + + + ) + } + } + renderListItem(listItem) { const query = new URLSearchParams(window.location.search) @@ -60,21 +85,23 @@ export default class ListReport extends React.Component { return (
- + {this.props.renderIcon && this.props.renderIcon(listItem)} {this.props.renderIcon && ' '} {listItem.name} + { this.renderExternalLink(listItem) } - {numberFormatter(listItem.visitors)} + {numberFormatter(listItem[this.valueKey()])} { listItem.percentage >= 0 ? ({listItem.percentage}%) @@ -93,7 +120,7 @@ export default class ListReport extends React.Component {
{ this.props.keyLabel } - {this.label()} + {this.label()} {this.showConversionRate() && CR}
diff --git a/assets/js/dashboard/stats/sources/referrer-list.js b/assets/js/dashboard/stats/sources/referrer-list.js index f4bc65c84..bf2147a29 100644 --- a/assets/js/dashboard/stats/sources/referrer-list.js +++ b/assets/js/dashboard/stats/sources/referrer-list.js @@ -5,9 +5,9 @@ import FlipMove from 'react-flip-move'; import FadeIn from '../../fade-in' import Bar from '../bar' import MoreLink from '../more-link' -import numberFormatter from '../../number-formatter' +import numberFormatter from '../../util/number-formatter' import * as api from '../../api' -import LazyLoader from '../../lazy-loader' +import LazyLoader from '../../components/lazy-loader' function LinkOption(props) { if (props.disabled) { diff --git a/assets/js/dashboard/stats/sources/search-terms.js b/assets/js/dashboard/stats/sources/search-terms.js index 5d5f89954..5ed68300e 100644 --- a/assets/js/dashboard/stats/sources/search-terms.js +++ b/assets/js/dashboard/stats/sources/search-terms.js @@ -2,7 +2,7 @@ import React from 'react'; import FadeIn from '../../fade-in' import Bar from '../bar' import MoreLink from '../more-link' -import numberFormatter from '../../number-formatter' +import numberFormatter from '../../util/number-formatter' import RocketIcon from '../modals/rocket-icon' import * as api from '../../api' diff --git a/assets/js/dashboard/stats/sources/source-list.js b/assets/js/dashboard/stats/sources/source-list.js index 9c6f3668b..c19bf2fa8 100644 --- a/assets/js/dashboard/stats/sources/source-list.js +++ b/assets/js/dashboard/stats/sources/source-list.js @@ -2,14 +2,14 @@ import React from 'react'; import { Link } from 'react-router-dom' import FlipMove from 'react-flip-move'; -import * as storage from '../../storage' +import * as storage from '../../util/storage' import FadeIn from '../../fade-in' import Bar from '../bar' import MoreLink from '../more-link' -import numberFormatter from '../../number-formatter' +import numberFormatter from '../../util/number-formatter' import * as api from '../../api' -import * as url from '../../url' -import LazyLoader from '../../lazy-loader' +import * as url from '../../util/url' +import LazyLoader from '../../components/lazy-loader' class AllSources extends React.Component { constructor(props) { diff --git a/assets/js/dashboard/stats/visitor-graph.js b/assets/js/dashboard/stats/visitor-graph.js index 24090042c..fda545359 100644 --- a/assets/js/dashboard/stats/visitor-graph.js +++ b/assets/js/dashboard/stats/visitor-graph.js @@ -2,9 +2,9 @@ import React from 'react'; import { withRouter } from 'react-router-dom' import Chart from 'chart.js/auto'; import { navigateToQuery } from '../query' -import numberFormatter, {durationFormatter} from '../number-formatter' +import numberFormatter, {durationFormatter} from '../util/number-formatter' import * as api from '../api' -import LazyLoader from '../lazy-loader' +import LazyLoader from '../components/lazy-loader' function buildDataSet(plot, present_index, ctx, label) { var gradient = ctx.createLinearGradient(0, 0, 0, 300); diff --git a/assets/js/dashboard/date.js b/assets/js/dashboard/util/date.js similarity index 100% rename from assets/js/dashboard/date.js rename to assets/js/dashboard/util/date.js diff --git a/assets/js/dashboard/number-formatter.js b/assets/js/dashboard/util/number-formatter.js similarity index 100% rename from assets/js/dashboard/number-formatter.js rename to assets/js/dashboard/util/number-formatter.js diff --git a/assets/js/dashboard/storage.js b/assets/js/dashboard/util/storage.js similarity index 100% rename from assets/js/dashboard/storage.js rename to assets/js/dashboard/util/storage.js diff --git a/assets/js/dashboard/url.js b/assets/js/dashboard/util/url.js similarity index 100% rename from assets/js/dashboard/url.js rename to assets/js/dashboard/util/url.js