From e00574553fda86f0cb964ee2f80e4fd904113022 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 31 May 2020 17:51:52 +0200 Subject: [PATCH] Moved some helper components for visits to visits/helpers --- src/visits/VisitsStats.js | 4 ++-- src/visits/{ => helpers}/GraphCard.js | 2 +- src/visits/{ => helpers}/GraphCard.scss | 0 src/visits/{ => helpers}/SortableBarGraph.js | 10 +++++----- test/visits/VisitsStats.test.js | 4 ++-- test/visits/{ => helpers}/GraphCard.test.js | 2 +- test/visits/{ => helpers}/SortableBarGraph.test.js | 10 +++++----- 7 files changed, 16 insertions(+), 16 deletions(-) rename src/visits/{ => helpers}/GraphCard.js (98%) rename src/visits/{ => helpers}/GraphCard.scss (100%) rename src/visits/{ => helpers}/SortableBarGraph.js (94%) rename test/visits/{ => helpers}/GraphCard.test.js (97%) rename test/visits/{ => helpers}/SortableBarGraph.test.js (91%) diff --git a/src/visits/VisitsStats.js b/src/visits/VisitsStats.js index 7802c98a..c30b8aa2 100644 --- a/src/visits/VisitsStats.js +++ b/src/visits/VisitsStats.js @@ -9,8 +9,8 @@ import DateRangeRow from '../utils/DateRangeRow'; import Message from '../utils/Message'; import { formatDate } from '../utils/helpers/date'; import { useToggle } from '../utils/helpers/hooks'; -import SortableBarGraph from './SortableBarGraph'; -import GraphCard from './GraphCard'; +import SortableBarGraph from './helpers/SortableBarGraph'; +import GraphCard from './helpers/GraphCard'; import LineChartCard from './helpers/LineChartCard'; import VisitsTable from './VisitsTable'; import { VisitsInfoType } from './types'; diff --git a/src/visits/GraphCard.js b/src/visits/helpers/GraphCard.js similarity index 98% rename from src/visits/GraphCard.js rename to src/visits/helpers/GraphCard.js index 9f06c2b7..155a3d9d 100644 --- a/src/visits/GraphCard.js +++ b/src/visits/helpers/GraphCard.js @@ -3,7 +3,7 @@ import { Doughnut, HorizontalBar } from 'react-chartjs-2'; import PropTypes from 'prop-types'; import React from 'react'; import { keys, values } from 'ramda'; -import { fillTheGaps } from '../utils/helpers/visits'; +import { fillTheGaps } from '../../utils/helpers/visits'; import './GraphCard.scss'; const propTypes = { diff --git a/src/visits/GraphCard.scss b/src/visits/helpers/GraphCard.scss similarity index 100% rename from src/visits/GraphCard.scss rename to src/visits/helpers/GraphCard.scss diff --git a/src/visits/SortableBarGraph.js b/src/visits/helpers/SortableBarGraph.js similarity index 94% rename from src/visits/SortableBarGraph.js rename to src/visits/helpers/SortableBarGraph.js index dc64e71f..efaa03f0 100644 --- a/src/visits/SortableBarGraph.js +++ b/src/visits/helpers/SortableBarGraph.js @@ -1,11 +1,11 @@ import React, { useState } from 'react'; import PropTypes from 'prop-types'; import { fromPairs, head, keys, pipe, prop, reverse, sortBy, splitEvery, toLower, toPairs, type, zipObj } from 'ramda'; -import SortingDropdown from '../utils/SortingDropdown'; -import PaginationDropdown from '../utils/PaginationDropdown'; -import { rangeOf } from '../utils/utils'; -import { roundTen } from '../utils/helpers/numbers'; -import SimplePaginator from '../common/SimplePaginator'; +import SortingDropdown from '../../utils/SortingDropdown'; +import PaginationDropdown from '../../utils/PaginationDropdown'; +import { rangeOf } from '../../utils/utils'; +import { roundTen } from '../../utils/helpers/numbers'; +import SimplePaginator from '../../common/SimplePaginator'; import GraphCard from './GraphCard'; const propTypes = { diff --git a/test/visits/VisitsStats.test.js b/test/visits/VisitsStats.test.js index 212127ad..c3872512 100644 --- a/test/visits/VisitsStats.test.js +++ b/test/visits/VisitsStats.test.js @@ -4,8 +4,8 @@ import { identity } from 'ramda'; import { Card, Progress } from 'reactstrap'; import createVisitStats from '../../src/visits/VisitsStats'; import Message from '../../src/utils/Message'; -import GraphCard from '../../src/visits/GraphCard'; -import SortableBarGraph from '../../src/visits/SortableBarGraph'; +import GraphCard from '../../src/visits/helpers/GraphCard'; +import SortableBarGraph from '../../src/visits/helpers/SortableBarGraph'; import DateRangeRow from '../../src/utils/DateRangeRow'; describe('', () => { diff --git a/test/visits/GraphCard.test.js b/test/visits/helpers/GraphCard.test.js similarity index 97% rename from test/visits/GraphCard.test.js rename to test/visits/helpers/GraphCard.test.js index 25400289..b75ce941 100644 --- a/test/visits/GraphCard.test.js +++ b/test/visits/helpers/GraphCard.test.js @@ -2,7 +2,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { Doughnut, HorizontalBar } from 'react-chartjs-2'; import { keys, values } from 'ramda'; -import GraphCard from '../../src/visits/GraphCard'; +import GraphCard from '../../../src/visits/helpers/GraphCard'; describe('', () => { let wrapper; diff --git a/test/visits/SortableBarGraph.test.js b/test/visits/helpers/SortableBarGraph.test.js similarity index 91% rename from test/visits/SortableBarGraph.test.js rename to test/visits/helpers/SortableBarGraph.test.js index e947d7f8..12f1d09a 100644 --- a/test/visits/SortableBarGraph.test.js +++ b/test/visits/helpers/SortableBarGraph.test.js @@ -1,11 +1,11 @@ import React from 'react'; import { shallow } from 'enzyme'; import { keys, range, values } from 'ramda'; -import SortableBarGraph from '../../src/visits/SortableBarGraph'; -import GraphCard from '../../src/visits/GraphCard'; -import SortingDropdown from '../../src/utils/SortingDropdown'; -import PaginationDropdown from '../../src/utils/PaginationDropdown'; -import { rangeOf } from '../../src/utils/utils'; +import SortableBarGraph from '../../../src/visits/helpers/SortableBarGraph'; +import GraphCard from '../../../src/visits/helpers/GraphCard'; +import SortingDropdown from '../../../src/utils/SortingDropdown'; +import PaginationDropdown from '../../../src/utils/PaginationDropdown'; +import { rangeOf } from '../../../src/utils/utils'; describe('', () => { let wrapper;