From b7ca32ff8fafcdb5b3c0df450facece760af4378 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sat, 1 Sep 2018 10:33:16 +0200 Subject: [PATCH] Moved visits-related elements to visits folder --- src/common/MenuLayout.js | 2 +- src/reducers/index.js | 2 +- src/{short-urls => visits}/ShortUrlVisits.js | 10 +++++----- src/{short-urls => visits}/ShortUrlVisits.scss | 0 src/{short-urls => visits}/reducers/shortUrlVisits.js | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename src/{short-urls => visits}/ShortUrlVisits.js (98%) rename src/{short-urls => visits}/ShortUrlVisits.scss (100%) rename src/{short-urls => visits}/reducers/shortUrlVisits.js (96%) diff --git a/src/common/MenuLayout.js b/src/common/MenuLayout.js index a42b1d49..60e33a31 100644 --- a/src/common/MenuLayout.js +++ b/src/common/MenuLayout.js @@ -8,7 +8,7 @@ import burgerIcon from '@fortawesome/fontawesome-free-solid/faBars'; import FontAwesomeIcon from '@fortawesome/react-fontawesome'; import classnames from 'classnames'; import * as PropTypes from 'prop-types'; -import ShortUrlsVisits from '../short-urls/ShortUrlVisits'; +import ShortUrlsVisits from '../visits/ShortUrlVisits'; import { selectServer } from '../servers/reducers/selectedServer'; import CreateShortUrl from '../short-urls/CreateShortUrl'; import ShortUrls from '../short-urls/ShortUrls'; diff --git a/src/reducers/index.js b/src/reducers/index.js index 33a26e8b..aa087212 100644 --- a/src/reducers/index.js +++ b/src/reducers/index.js @@ -4,7 +4,7 @@ import selectedServerReducer from '../servers/reducers/selectedServer'; import shortUrlsListReducer from '../short-urls/reducers/shortUrlsList'; import shortUrlsListParamsReducer from '../short-urls/reducers/shortUrlsListParams'; import shortUrlCreationResultReducer from '../short-urls/reducers/shortUrlCreationResult'; -import shortUrlVisitsReducer from '../short-urls/reducers/shortUrlVisits'; +import shortUrlVisitsReducer from '../visits/reducers/shortUrlVisits'; import shortUrlTagsReducer from '../short-urls/reducers/shortUrlTags'; import tagsListReducer from '../tags/reducers/tagsList'; import tagDeleteReducer from '../tags/reducers/tagDelete'; diff --git a/src/short-urls/ShortUrlVisits.js b/src/visits/ShortUrlVisits.js similarity index 98% rename from src/short-urls/ShortUrlVisits.js rename to src/visits/ShortUrlVisits.js index 99e67687..90ea51b7 100644 --- a/src/short-urls/ShortUrlVisits.js +++ b/src/visits/ShortUrlVisits.js @@ -8,16 +8,16 @@ import { connect } from 'react-redux'; import { Card, CardBody, CardHeader, UncontrolledTooltip } from 'reactstrap'; import PropTypes from 'prop-types'; import DateInput from '../common/DateInput'; +import MutedMessage from '../utils/MuttedMessage'; +import ExternalLink from '../utils/ExternalLink'; +import { serverType } from '../servers/prop-types/index'; +import { getShortUrlVisits, shortUrlVisitsType } from './reducers/shortUrlVisits'; import { processOsStats, processBrowserStats, processCountriesStats, processReferrersStats, -} from '../visits/services/VisitsParser'; -import MutedMessage from '../utils/MuttedMessage'; -import ExternalLink from '../utils/ExternalLink'; -import { serverType } from '../servers/prop-types'; -import { getShortUrlVisits, shortUrlVisitsType } from './reducers/shortUrlVisits'; +} from './services/VisitsParser'; import './ShortUrlVisits.scss'; export class ShortUrlsVisitsComponent extends React.Component { diff --git a/src/short-urls/ShortUrlVisits.scss b/src/visits/ShortUrlVisits.scss similarity index 100% rename from src/short-urls/ShortUrlVisits.scss rename to src/visits/ShortUrlVisits.scss diff --git a/src/short-urls/reducers/shortUrlVisits.js b/src/visits/reducers/shortUrlVisits.js similarity index 96% rename from src/short-urls/reducers/shortUrlVisits.js rename to src/visits/reducers/shortUrlVisits.js index 65db1162..b3daf133 100644 --- a/src/short-urls/reducers/shortUrlVisits.js +++ b/src/visits/reducers/shortUrlVisits.js @@ -1,7 +1,7 @@ import { curry } from 'ramda'; import PropTypes from 'prop-types'; import shlinkApiClient from '../../api/ShlinkApiClient'; -import { shortUrlType } from './shortUrlsList'; +import { shortUrlType } from '../../short-urls/reducers/shortUrlsList'; /* eslint-disable padding-line-between-statements, newline-after-var */ const GET_SHORT_URL_VISITS_START = 'shlink/shortUrlVisits/GET_SHORT_URL_VISITS_START';