Move stuff belonging to the component to shlink-web-component

src/api/services/ShlinkApiClient.ts

@@ -1,6 +1,6 @@
 import { isEmpty, isNil, reject } from 'ramda';
 import type { HttpClient } from '../../common/services/HttpClient';
-import type { ShortUrl, ShortUrlData } from '../../short-urls/data';
+import type { ShortUrl, ShortUrlData } from '../../shlink-web-component/short-urls/data';
 import { orderToString } from '../../utils/helpers/ordering';
 import { stringifyQuery } from '../../utils/helpers/query';
 import type { OptionalString } from '../../utils/utils';

src/api/types/index.ts

@@ -1,7 +1,7 @@
-import type { ShortUrl, ShortUrlMeta } from '../../short-urls/data';
+import type { ShortUrl, ShortUrlMeta } from '../../shlink-web-component/short-urls/data';
+import type { Visit } from '../../shlink-web-component/visits/types';
 import type { Order } from '../../utils/helpers/ordering';
 import type { OptionalString } from '../../utils/utils';
-import type { Visit } from '../../visits/types';
 
 export interface ShlinkShortUrlsResponse {
   data: ShortUrl[];

src/common/services/ReportExporter.ts

@@ -1,7 +1,7 @@
-import type { ExportableShortUrl } from '../../short-urls/data';
+import type { ExportableShortUrl } from '../../shlink-web-component/short-urls/data';
+import type { NormalizedVisit } from '../../shlink-web-component/visits/types';
 import type { JsonToCsv } from '../../utils/helpers/csvjson';
 import { saveCsv } from '../../utils/helpers/files';
-import type { NormalizedVisit } from '../../visits/types';
 
 export class ReportExporter {
   public constructor(private readonly window: Window, private readonly jsonToCsv: JsonToCsv) {}

src/container/index.ts

@@ -5,14 +5,14 @@ import { connect as reduxConnect } from 'react-redux';
 import { provideServices as provideApiServices } from '../api/services/provideServices';
 import { provideServices as provideAppServices } from '../app/services/provideServices';
 import { provideServices as provideCommonServices } from '../common/services/provideServices';
-import { provideServices as provideDomainsServices } from '../domains/services/provideServices';
 import { provideServices as provideMercureServices } from '../mercure/services/provideServices';
 import { provideServices as provideServersServices } from '../servers/services/provideServices';
 import { provideServices as provideSettingsServices } from '../settings/services/provideServices';
-import { provideServices as provideShortUrlsServices } from '../short-urls/services/provideServices';
+import { provideServices as provideDomainsServices } from '../shlink-web-component/domains/services/provideServices';
-import { provideServices as provideTagsServices } from '../tags/services/provideServices';
+import { provideServices as provideShortUrlsServices } from '../shlink-web-component/short-urls/services/provideServices';
+import { provideServices as provideTagsServices } from '../shlink-web-component/tags/services/provideServices';
+import { provideServices as provideVisitsServices } from '../shlink-web-component/visits/services/provideServices';
 import { provideServices as provideUtilsServices } from '../utils/services/provideServices';
-import { provideServices as provideVisitsServices } from '../visits/services/provideServices';
 import type { ConnectDecorator } from './types';
 
 type LazyActionMap = Record<string, Function>;

src/container/types.ts

@@ -1,21 +1,21 @@
 import type { Sidebar } from '../common/reducers/sidebar';
-import type { DomainsList } from '../domains/reducers/domainsList';
 import type { MercureInfo } from '../mercure/reducers/mercureInfo';
 import type { SelectedServer, ServersMap } from '../servers/data';
 import type { Settings } from '../settings/reducers/settings';
-import type { ShortUrlCreation } from '../short-urls/reducers/shortUrlCreation';
+import type { DomainsList } from '../shlink-web-component/domains/reducers/domainsList';
-import type { ShortUrlDeletion } from '../short-urls/reducers/shortUrlDeletion';
+import type { ShortUrlCreation } from '../shlink-web-component/short-urls/reducers/shortUrlCreation';
-import type { ShortUrlDetail } from '../short-urls/reducers/shortUrlDetail';
+import type { ShortUrlDeletion } from '../shlink-web-component/short-urls/reducers/shortUrlDeletion';
-import type { ShortUrlEdition } from '../short-urls/reducers/shortUrlEdition';
+import type { ShortUrlDetail } from '../shlink-web-component/short-urls/reducers/shortUrlDetail';
-import type { ShortUrlsList } from '../short-urls/reducers/shortUrlsList';
+import type { ShortUrlEdition } from '../shlink-web-component/short-urls/reducers/shortUrlEdition';
-import type { TagDeletion } from '../tags/reducers/tagDelete';
+import type { ShortUrlsList } from '../shlink-web-component/short-urls/reducers/shortUrlsList';
-import type { TagEdition } from '../tags/reducers/tagEdit';
+import type { TagDeletion } from '../shlink-web-component/tags/reducers/tagDelete';
-import type { TagsList } from '../tags/reducers/tagsList';
+import type { TagEdition } from '../shlink-web-component/tags/reducers/tagEdit';
-import type { DomainVisits } from '../visits/reducers/domainVisits';
+import type { TagsList } from '../shlink-web-component/tags/reducers/tagsList';
-import type { ShortUrlVisits } from '../visits/reducers/shortUrlVisits';
+import type { DomainVisits } from '../shlink-web-component/visits/reducers/domainVisits';
-import type { TagVisits } from '../visits/reducers/tagVisits';
+import type { ShortUrlVisits } from '../shlink-web-component/visits/reducers/shortUrlVisits';
-import type { VisitsInfo } from '../visits/reducers/types';
+import type { TagVisits } from '../shlink-web-component/visits/reducers/tagVisits';
-import type { VisitsOverview } from '../visits/reducers/visitsOverview';
+import type { VisitsInfo } from '../shlink-web-component/visits/reducers/types';
+import type { VisitsOverview } from '../shlink-web-component/visits/reducers/visitsOverview';
 
 export interface ShlinkState {
   servers: ServersMap;

src/mercure/helpers/boundToMercureHub.tsx

@@ -2,7 +2,7 @@ import { pipe } from 'ramda';
 import type { FC } from 'react';
 import { useEffect } from 'react';
 import { useParams } from 'react-router-dom';
-import type { CreateVisit } from '../../visits/types';
+import type { CreateVisit } from '../../shlink-web-component/visits/types';
 import type { MercureInfo } from '../reducers/mercureInfo';
 import { bindToMercureTopic } from './index';
 

src/reducers/index.ts

@@ -7,8 +7,17 @@ import { serversReducer } from '../servers/reducers/servers';
 import { settingsReducer } from '../settings/reducers/settings';
 
 export const initReducers = (container: IContainer) => combineReducers<ShlinkState>({
+  // Main shlink-web-client reducers
+  appUpdated: appUpdatesReducer,
   servers: serversReducer,
   selectedServer: container.selectedServerReducer,
+  settings: settingsReducer,
+  sidebar: sidebarReducer,
+
+  // TBD
+  mercureInfo: container.mercureInfoReducer,
+
+  // Nested shlink-web-component reducers
   shortUrlsList: container.shortUrlsListReducer,
   shortUrlCreation: container.shortUrlCreationReducer,
   shortUrlDeletion: container.shortUrlDeletionReducer,
@@ -22,10 +31,6 @@ export const initReducers = (container: IContainer) => combineReducers<ShlinkSta
   tagsList: container.tagsListReducer,
   tagDelete: container.tagDeleteReducer,
   tagEdit: container.tagEditReducer,
-  mercureInfo: container.mercureInfoReducer,
-  settings: settingsReducer,
   domainsList: container.domainsListReducer,
   visitsOverview: container.visitsOverviewReducer,
-  appUpdated: appUpdatesReducer,
-  sidebar: sidebarReducer,
 });

src/servers/helpers/VisitsHighlightCard.tsx

@@ -1,6 +1,6 @@
 import type { FC } from 'react';
+import type { PartialVisitsSummary } from '../../shlink-web-component/visits/reducers/visitsOverview';
 import { prettify } from '../../utils/helpers/numbers';
-import type { PartialVisitsSummary } from '../../visits/reducers/visitsOverview';
 import type { HighlightCardProps } from './HighlightCard';
 import { HighlightCard } from './HighlightCard';
 

src/servers/services/provideServices.ts

@@ -1,6 +1,7 @@
 import type Bottle from 'bottlejs';
 import { prop } from 'ramda';
 import type { ConnectDecorator } from '../../container/types';
+import { Overview } from '../../shlink-web-component/overview/Overview';
 import { CreateServer } from '../CreateServer';
 import { DeleteServerButton } from '../DeleteServerButton';
 import { DeleteServerModal } from '../DeleteServerModal';
@@ -11,7 +12,6 @@ import { withoutSelectedServer } from '../helpers/withoutSelectedServer';
 import { ManageServers } from '../ManageServers';
 import { ManageServersRow } from '../ManageServersRow';
 import { ManageServersRowDropdown } from '../ManageServersRowDropdown';
-import { Overview } from '../Overview';
 import { fetchServers } from '../reducers/remoteServers';
 import {
   resetSelectedServer,

src/settings/ShortUrlsListSettings.tsx

@@ -1,5 +1,5 @@
 import type { FC } from 'react';
-import { SHORT_URLS_ORDERABLE_FIELDS } from '../short-urls/data';
+import { SHORT_URLS_ORDERABLE_FIELDS } from '../shlink-web-component/short-urls/data';
 import { LabeledFormGroup } from '../utils/forms/LabeledFormGroup';
 import { OrderingDropdown } from '../utils/OrderingDropdown';
 import { SimpleCard } from '../utils/SimpleCard';

src/settings/TagsSettings.tsx

@@ -1,5 +1,5 @@
 import type { FC } from 'react';
-import { TAGS_ORDERABLE_FIELDS } from '../tags/data/TagsListChildrenProps';
+import { TAGS_ORDERABLE_FIELDS } from '../shlink-web-component/tags/data/TagsListChildrenProps';
 import { LabeledFormGroup } from '../utils/forms/LabeledFormGroup';
 import { OrderingDropdown } from '../utils/OrderingDropdown';
 import { SimpleCard } from '../utils/SimpleCard';

src/settings/reducers/settings.ts

@@ -1,8 +1,8 @@
 import type { PayloadAction, PrepareAction } from '@reduxjs/toolkit';
 import { createSlice } from '@reduxjs/toolkit';
 import { mergeDeepRight } from 'ramda';
-import type { ShortUrlsOrder } from '../../short-urls/data';
+import type { ShortUrlsOrder } from '../../shlink-web-component/short-urls/data';
-import type { TagsOrder } from '../../tags/data/TagsListChildrenProps';
+import type { TagsOrder } from '../../shlink-web-component/tags/data/TagsListChildrenProps';
 import type { DateInterval } from '../../utils/helpers/dateIntervals';
 import type { Theme } from '../../utils/theme';
 

src/shlink-web-component/domains/DomainRow.tsx

@@ -3,9 +3,9 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import type { FC } from 'react';
 import { useEffect } from 'react';
 import { UncontrolledTooltip } from 'reactstrap';
-import type { ShlinkDomainRedirects } from '../api/types';
+import type { ShlinkDomainRedirects } from '../../api/types';
-import type { SelectedServer } from '../servers/data';
+import type { SelectedServer } from '../../servers/data';
-import type { OptionalString } from '../utils/utils';
+import type { OptionalString } from '../../utils/utils';
 import type { Domain } from './data';
 import { DomainDropdown } from './helpers/DomainDropdown';
 import { DomainStatusIcon } from './helpers/DomainStatusIcon';

src/shlink-web-component/domains/DomainSelector.scss

@@ -1,5 +1,5 @@
-@import '../utils/base';
+@import '../../utils/base';
-@import '../utils/mixins/vertical-align';
+@import '../../utils/mixins/vertical-align';
 
 .domains-dropdown__toggle-btn.domains-dropdown__toggle-btn,
 .domains-dropdown__toggle-btn.domains-dropdown__toggle-btn:hover,

src/shlink-web-component/domains/DomainSelector.tsx

@@ -4,8 +4,8 @@ import { isEmpty, pipe } from 'ramda';
 import { useEffect } from 'react';
 import type { InputProps } from 'reactstrap';
 import { Button, DropdownItem, Input, InputGroup, UncontrolledTooltip } from 'reactstrap';
-import { DropdownBtn } from '../utils/DropdownBtn';
+import { DropdownBtn } from '../../utils/DropdownBtn';
-import { useToggle } from '../utils/helpers/hooks';
+import { useToggle } from '../../utils/helpers/hooks';
 import type { DomainsList } from './reducers/domainsList';
 import './DomainSelector.scss';
 

src/shlink-web-component/domains/ManageDomains.tsx

@@ -1,11 +1,11 @@
 import type { FC } from 'react';
 import { useEffect } from 'react';
-import { ShlinkApiError } from '../api/ShlinkApiError';
+import { ShlinkApiError } from '../../api/ShlinkApiError';
-import type { SelectedServer } from '../servers/data';
+import type { SelectedServer } from '../../servers/data';
-import { Message } from '../utils/Message';
+import { Message } from '../../utils/Message';
-import { Result } from '../utils/Result';
+import { Result } from '../../utils/Result';
-import { SearchField } from '../utils/SearchField';
+import { SearchField } from '../../utils/SearchField';
-import { SimpleCard } from '../utils/SimpleCard';
+import { SimpleCard } from '../../utils/SimpleCard';
 import { DomainRow } from './DomainRow';
 import type { EditDomainRedirects } from './reducers/domainRedirects';
 import type { DomainsList } from './reducers/domainsList';

src/shlink-web-component/domains/data/index.ts

@@ -1,4 +1,4 @@
-import type { ShlinkDomain } from '../../api/types';
+import type { ShlinkDomain } from '../../../api/types';
 
 export type DomainStatus = 'validating' | 'valid' | 'invalid';
 

src/shlink-web-component/domains/helpers/DomainDropdown.tsx

@@ -3,11 +3,11 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import type { FC } from 'react';
 import { Link } from 'react-router-dom';
 import { DropdownItem } from 'reactstrap';
-import type { SelectedServer } from '../../servers/data';
+import type { SelectedServer } from '../../../servers/data';
-import { getServerId } from '../../servers/data';
+import { getServerId } from '../../../servers/data';
-import { useFeature } from '../../utils/helpers/features';
+import { useFeature } from '../../../utils/helpers/features';
-import { useToggle } from '../../utils/helpers/hooks';
+import { useToggle } from '../../../utils/helpers/hooks';
-import { RowDropdownBtn } from '../../utils/RowDropdownBtn';
+import { RowDropdownBtn } from '../../../utils/RowDropdownBtn';
 import { DEFAULT_DOMAIN } from '../../visits/reducers/domainVisits';
 import type { Domain } from '../data';
 import type { EditDomainRedirects } from '../reducers/domainRedirects';

src/shlink-web-component/domains/helpers/DomainStatusIcon.tsx

@@ -8,8 +8,8 @@ import type { FC } from 'react';
 import { useEffect, useState } from 'react';
 import { ExternalLink } from 'react-external-link';
 import { UncontrolledTooltip } from 'reactstrap';
-import { useElementRef } from '../../utils/helpers/hooks';
+import { useElementRef } from '../../../utils/helpers/hooks';
-import type { MediaMatcher } from '../../utils/types';
+import type { MediaMatcher } from '../../../utils/types';
 import type { DomainStatus } from '../data';
 
 interface DomainStatusIconProps {

src/shlink-web-component/domains/helpers/EditDomainRedirectsModal.tsx

@@ -1,11 +1,11 @@
 import type { FC } from 'react';
 import { useState } from 'react';
 import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap';
-import type { ShlinkDomain } from '../../api/types';
+import type { ShlinkDomain } from '../../../api/types';
-import type { InputFormGroupProps } from '../../utils/forms/InputFormGroup';
+import type { InputFormGroupProps } from '../../../utils/forms/InputFormGroup';
-import { InputFormGroup } from '../../utils/forms/InputFormGroup';
+import { InputFormGroup } from '../../../utils/forms/InputFormGroup';
-import { InfoTooltip } from '../../utils/InfoTooltip';
+import { InfoTooltip } from '../../../utils/InfoTooltip';
-import { handleEventPreventingDefault, nonEmptyValueOrNull } from '../../utils/utils';
+import { handleEventPreventingDefault, nonEmptyValueOrNull } from '../../../utils/utils';
 import type { EditDomainRedirects } from '../reducers/domainRedirects';
 
 interface EditDomainRedirectsModalProps {

src/shlink-web-component/domains/reducers/domainRedirects.ts

@@ -1,6 +1,6 @@
-import type { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
+import type { ShlinkApiClientBuilder } from '../../../api/services/ShlinkApiClientBuilder';
-import type { ShlinkDomainRedirects } from '../../api/types';
+import type { ShlinkDomainRedirects } from '../../../api/types';
-import { createAsyncThunk } from '../../utils/helpers/redux';
+import { createAsyncThunk } from '../../../utils/helpers/redux';
 
 const EDIT_DOMAIN_REDIRECTS = 'shlink/domainRedirects/EDIT_DOMAIN_REDIRECTS';
 

src/shlink-web-component/domains/reducers/domainsList.ts

@@ -1,12 +1,12 @@
 import type { AsyncThunk, SliceCaseReducers } from '@reduxjs/toolkit';
 import { createAction, createSlice } from '@reduxjs/toolkit';
-import type { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
+import type { ShlinkApiClientBuilder } from '../../../api/services/ShlinkApiClientBuilder';
-import type { ShlinkDomainRedirects } from '../../api/types';
+import type { ShlinkDomainRedirects } from '../../../api/types';
-import type { ProblemDetailsError } from '../../api/types/errors';
+import type { ProblemDetailsError } from '../../../api/types/errors';
-import { parseApiError } from '../../api/utils';
+import { parseApiError } from '../../../api/utils';
-import { hasServerData } from '../../servers/data';
+import { hasServerData } from '../../../servers/data';
-import { createAsyncThunk } from '../../utils/helpers/redux';
+import { createAsyncThunk } from '../../../utils/helpers/redux';
-import { replaceAuthorityFromUri } from '../../utils/helpers/uri';
+import { replaceAuthorityFromUri } from '../../../utils/helpers/uri';
 import type { Domain, DomainStatus } from '../data';
 import type { EditDomainRedirects } from './domainRedirects';
 

src/shlink-web-component/domains/services/provideServices.ts

@@ -1,6 +1,6 @@
 import type Bottle from 'bottlejs';
 import { prop } from 'ramda';
-import type { ConnectDecorator } from '../../container/types';
+import type { ConnectDecorator } from '../../../container/types';
 import { DomainSelector } from '../DomainSelector';
 import { ManageDomains } from '../ManageDomains';
 import { editDomainRedirects } from '../reducers/domainRedirects';

src/shlink-web-component/overview/Overview.tsx

@@ -2,22 +2,22 @@ import type { FC } from 'react';
 import { useEffect } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
 import { Card, CardBody, CardHeader, Row } from 'reactstrap';
-import type { ShlinkShortUrlsListParams } from '../api/types';
+import type { ShlinkShortUrlsListParams } from '../../api/types';
-import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub';
+import { boundToMercureHub } from '../../mercure/helpers/boundToMercureHub';
-import { Topics } from '../mercure/helpers/Topics';
+import { Topics } from '../../mercure/helpers/Topics';
-import type { Settings } from '../settings/reducers/settings';
+import type { SelectedServer } from '../../servers/data';
+import { getServerId } from '../../servers/data';
+import { HighlightCard } from '../../servers/helpers/HighlightCard';
+import { VisitsHighlightCard } from '../../servers/helpers/VisitsHighlightCard';
+import type { Settings } from '../../settings/reducers/settings';
+import { useFeature } from '../../utils/helpers/features';
+import { prettify } from '../../utils/helpers/numbers';
 import type { CreateShortUrlProps } from '../short-urls/CreateShortUrl';
 import type { ShortUrlsList as ShortUrlsListState } from '../short-urls/reducers/shortUrlsList';
 import { ITEMS_IN_OVERVIEW_PAGE } from '../short-urls/reducers/shortUrlsList';
 import type { ShortUrlsTableType } from '../short-urls/ShortUrlsTable';
 import type { TagsList } from '../tags/reducers/tagsList';
-import { useFeature } from '../utils/helpers/features';
-import { prettify } from '../utils/helpers/numbers';
 import type { VisitsOverview } from '../visits/reducers/visitsOverview';
-import type { SelectedServer } from './data';
-import { getServerId } from './data';
-import { HighlightCard } from './helpers/HighlightCard';
-import { VisitsHighlightCard } from './helpers/VisitsHighlightCard';
 
 interface OverviewConnectProps {
   shortUrlsList: ShortUrlsListState;

src/shlink-web-component/short-urls/CreateShortUrl.tsx

@@ -1,7 +1,7 @@
 import type { FC } from 'react';
 import { useMemo } from 'react';
-import type { SelectedServer } from '../servers/data';
+import type { SelectedServer } from '../../servers/data';
-import type { Settings, ShortUrlCreationSettings } from '../settings/reducers/settings';
+import type { Settings, ShortUrlCreationSettings } from '../../settings/reducers/settings';
 import type { ShortUrlData } from './data';
 import type { CreateShortUrlResultProps } from './helpers/CreateShortUrlResult';
 import type { ShortUrlCreation } from './reducers/shortUrlCreation';

src/shlink-web-component/short-urls/EditShortUrl.tsx

@@ -5,13 +5,13 @@ import { useEffect, useMemo } from 'react';
 import { ExternalLink } from 'react-external-link';
 import { useLocation, useParams } from 'react-router-dom';
 import { Button, Card } from 'reactstrap';
-import { ShlinkApiError } from '../api/ShlinkApiError';
+import { ShlinkApiError } from '../../api/ShlinkApiError';
-import type { SelectedServer } from '../servers/data';
+import type { SelectedServer } from '../../servers/data';
-import type { Settings } from '../settings/reducers/settings';
+import type { Settings } from '../../settings/reducers/settings';
-import { useGoBack } from '../utils/helpers/hooks';
+import { useGoBack } from '../../utils/helpers/hooks';
-import { parseQuery } from '../utils/helpers/query';
+import { parseQuery } from '../../utils/helpers/query';
-import { Message } from '../utils/Message';
+import { Message } from '../../utils/Message';
-import { Result } from '../utils/Result';
+import { Result } from '../../utils/Result';
 import type { ShortUrlIdentifier } from './data';
 import { shortUrlDataFromShortUrl, urlDecodeShortCode } from './helpers';
 import type { ShortUrlDetail } from './reducers/shortUrlDetail';

src/shlink-web-component/short-urls/Paginator.tsx

@@ -1,14 +1,14 @@
 import { Link } from 'react-router-dom';
 import { Pagination, PaginationItem, PaginationLink } from 'reactstrap';
-import type { ShlinkPaginator } from '../api/types';
+import type { ShlinkPaginator } from '../../api/types';
 import type {
-  NumberOrEllipsis } from '../utils/helpers/pagination';
+  NumberOrEllipsis } from '../../utils/helpers/pagination';
 import {
   keyForPage,
   pageIsEllipsis,
   prettifyPageNumber,
   progressivePagination,
-} from '../utils/helpers/pagination';
+} from '../../utils/helpers/pagination';
 
 interface PaginatorProps {
   paginator?: ShlinkPaginator;

src/shlink-web-component/short-urls/ShortUrlForm.scss

@@ -1,4 +1,4 @@
-@import '../utils/base';
+@import '../../utils/base';
 
 .short-url-form p:last-child {
   margin-bottom: 0;

src/shlink-web-component/short-urls/ShortUrlForm.tsx

@@ -8,17 +8,17 @@ import type { ChangeEvent, FC } from 'react';
 import { useEffect, useState } from 'react';
 import { Button, FormGroup, Input, Row } from 'reactstrap';
 import type { InputType } from 'reactstrap/types/lib/Input';
+import type { SelectedServer } from '../../servers/data';
+import { Checkbox } from '../../utils/Checkbox';
+import type { DateTimeInputProps } from '../../utils/dates/DateTimeInput';
+import { DateTimeInput } from '../../utils/dates/DateTimeInput';
+import { formatIsoDate } from '../../utils/helpers/date';
+import { useFeature } from '../../utils/helpers/features';
+import { IconInput } from '../../utils/IconInput';
+import { SimpleCard } from '../../utils/SimpleCard';
+import { handleEventPreventingDefault, hasValue } from '../../utils/utils';
 import type { DomainSelectorProps } from '../domains/DomainSelector';
-import type { SelectedServer } from '../servers/data';
 import type { TagsSelectorProps } from '../tags/helpers/TagsSelector';
-import { Checkbox } from '../utils/Checkbox';
-import type { DateTimeInputProps } from '../utils/dates/DateTimeInput';
-import { DateTimeInput } from '../utils/dates/DateTimeInput';
-import { formatIsoDate } from '../utils/helpers/date';
-import { useFeature } from '../utils/helpers/features';
-import { IconInput } from '../utils/IconInput';
-import { SimpleCard } from '../utils/SimpleCard';
-import { handleEventPreventingDefault, hasValue } from '../utils/utils';
 import type { DeviceLongUrls, ShortUrlData } from './data';
 import { ShortUrlFormCheckboxGroup } from './helpers/ShortUrlFormCheckboxGroup';
 import { UseExistingIfFoundInfoIcon } from './UseExistingIfFoundInfoIcon';

src/shlink-web-component/short-urls/ShortUrlsFilteringBar.tsx

@@ -4,17 +4,17 @@ import classNames from 'classnames';
 import { isEmpty, pipe } from 'ramda';
 import type { FC } from 'react';
 import { Button, InputGroup, Row, UncontrolledTooltip } from 'reactstrap';
-import type { SelectedServer } from '../servers/data';
+import type { SelectedServer } from '../../servers/data';
-import type { Settings } from '../settings/reducers/settings';
+import type { Settings } from '../../settings/reducers/settings';
+import { DateRangeSelector } from '../../utils/dates/DateRangeSelector';
+import { formatIsoDate } from '../../utils/helpers/date';
+import type { DateRange } from '../../utils/helpers/dateIntervals';
+import { datesToDateRange } from '../../utils/helpers/dateIntervals';
+import { useFeature } from '../../utils/helpers/features';
+import type { OrderDir } from '../../utils/helpers/ordering';
+import { OrderingDropdown } from '../../utils/OrderingDropdown';
+import { SearchField } from '../../utils/SearchField';
 import type { TagsSelectorProps } from '../tags/helpers/TagsSelector';
-import { DateRangeSelector } from '../utils/dates/DateRangeSelector';
-import { formatIsoDate } from '../utils/helpers/date';
-import type { DateRange } from '../utils/helpers/dateIntervals';
-import { datesToDateRange } from '../utils/helpers/dateIntervals';
-import { useFeature } from '../utils/helpers/features';
-import type { OrderDir } from '../utils/helpers/ordering';
-import { OrderingDropdown } from '../utils/OrderingDropdown';
-import { SearchField } from '../utils/SearchField';
 import type { ShortUrlsOrder, ShortUrlsOrderableFields } from './data';
 import { SHORT_URLS_ORDERABLE_FIELDS } from './data';
 import type { ExportShortUrlsBtnProps } from './helpers/ExportShortUrlsBtn';

src/shlink-web-component/short-urls/ShortUrlsList.tsx

@@ -2,17 +2,17 @@ import { pipe } from 'ramda';
 import { useEffect, useState } from 'react';
 import { useLocation, useParams } from 'react-router-dom';
 import { Card } from 'reactstrap';
-import type { ShlinkShortUrlsListParams, ShlinkShortUrlsOrder } from '../api/types';
+import type { ShlinkShortUrlsListParams, ShlinkShortUrlsOrder } from '../../api/types';
-import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub';
+import { boundToMercureHub } from '../../mercure/helpers/boundToMercureHub';
-import { Topics } from '../mercure/helpers/Topics';
+import { Topics } from '../../mercure/helpers/Topics';
-import type { SelectedServer } from '../servers/data';
+import type { SelectedServer } from '../../servers/data';
-import { getServerId } from '../servers/data';
+import { getServerId } from '../../servers/data';
-import type { Settings } from '../settings/reducers/settings';
+import type { Settings } from '../../settings/reducers/settings';
-import { DEFAULT_SHORT_URLS_ORDERING } from '../settings/reducers/settings';
+import { DEFAULT_SHORT_URLS_ORDERING } from '../../settings/reducers/settings';
-import { useFeature } from '../utils/helpers/features';
+import { useFeature } from '../../utils/helpers/features';
-import type { OrderDir } from '../utils/helpers/ordering';
+import type { OrderDir } from '../../utils/helpers/ordering';
-import { determineOrderDir } from '../utils/helpers/ordering';
+import { determineOrderDir } from '../../utils/helpers/ordering';
-import { TableOrderIcon } from '../utils/table/TableOrderIcon';
+import { TableOrderIcon } from '../../utils/table/TableOrderIcon';
 import type { ShortUrlsOrder, ShortUrlsOrderableFields } from './data';
 import { useShortUrlsQuery } from './helpers/hooks';
 import { Paginator } from './Paginator';

src/shlink-web-component/short-urls/ShortUrlsTable.tsx

@@ -1,7 +1,7 @@
 import classNames from 'classnames';
 import { isEmpty } from 'ramda';
 import type { ReactNode } from 'react';
-import type { SelectedServer } from '../servers/data';
+import type { SelectedServer } from '../../servers/data';
 import type { ShortUrlsOrderableFields } from './data';
 import type { ShortUrlsRowType } from './helpers/ShortUrlsRow';
 import type { ShortUrlsList as ShortUrlsListState } from './reducers/shortUrlsList';

src/shlink-web-component/short-urls/UseExistingIfFoundInfoIcon.tsx

@@ -1,7 +1,7 @@
 import { faInfoCircle as infoIcon } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Modal, ModalBody, ModalHeader } from 'reactstrap';
-import { useToggle } from '../utils/helpers/hooks';
+import { useToggle } from '../../utils/helpers/hooks';
 import './UseExistingIfFoundInfoIcon.scss';
 
 const InfoModal = ({ isOpen, toggle }: { isOpen: boolean; toggle: () => void }) => (

src/shlink-web-component/short-urls/data/index.ts

@@ -1,6 +1,6 @@
-import type { ShlinkVisitsSummary } from '../../api/types';
+import type { ShlinkVisitsSummary } from '../../../api/types';
-import type { Order } from '../../utils/helpers/ordering';
+import type { Order } from '../../../utils/helpers/ordering';
-import type { Nullable, OptionalString } from '../../utils/utils';
+import type { Nullable, OptionalString } from '../../../utils/utils';
 
 export interface DeviceLongUrls {
   android?: OptionalString;

src/shlink-web-component/short-urls/helpers/CreateShortUrlResult.tsx

@@ -4,9 +4,9 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { useEffect } from 'react';
 import CopyToClipboard from 'react-copy-to-clipboard';
 import { Tooltip } from 'reactstrap';
-import { ShlinkApiError } from '../../api/ShlinkApiError';
+import { ShlinkApiError } from '../../../api/ShlinkApiError';
-import type { TimeoutToggle } from '../../utils/helpers/hooks';
+import type { TimeoutToggle } from '../../../utils/helpers/hooks';
-import { Result } from '../../utils/Result';
+import { Result } from '../../../utils/Result';
 import type { ShortUrlCreation } from '../reducers/shortUrlCreation';
 import './CreateShortUrlResult.scss';
 

src/shlink-web-component/short-urls/helpers/DeleteShortUrlModal.tsx

@@ -1,10 +1,10 @@
 import { pipe } from 'ramda';
 import { useEffect, useState } from 'react';
 import { Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap';
-import { ShlinkApiError } from '../../api/ShlinkApiError';
+import { ShlinkApiError } from '../../../api/ShlinkApiError';
-import { isInvalidDeletionError } from '../../api/utils';
+import { isInvalidDeletionError } from '../../../api/utils';
-import { Result } from '../../utils/Result';
+import { Result } from '../../../utils/Result';
-import { handleEventPreventingDefault } from '../../utils/utils';
+import { handleEventPreventingDefault } from '../../../utils/utils';
 import type { ShortUrlIdentifier, ShortUrlModalProps } from '../data';
 import type { ShortUrlDeletion } from '../reducers/shortUrlDeletion';
 

src/shlink-web-component/short-urls/helpers/ExportShortUrlsBtn.tsx

@@ -1,11 +1,11 @@
 import type { FC } from 'react';
 import { useCallback } from 'react';
-import type { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
+import type { ShlinkApiClientBuilder } from '../../../api/services/ShlinkApiClientBuilder';
-import type { ReportExporter } from '../../common/services/ReportExporter';
+import type { ReportExporter } from '../../../common/services/ReportExporter';
-import type { SelectedServer } from '../../servers/data';
+import type { SelectedServer } from '../../../servers/data';
-import { isServerWithId } from '../../servers/data';
+import { isServerWithId } from '../../../servers/data';
-import { ExportBtn } from '../../utils/ExportBtn';
+import { ExportBtn } from '../../../utils/ExportBtn';
-import { useToggle } from '../../utils/helpers/hooks';
+import { useToggle } from '../../../utils/helpers/hooks';
 import type { ShortUrl } from '../data';
 import { useShortUrlsQuery } from './hooks';
 

src/shlink-web-component/short-urls/helpers/QrCodeModal.tsx

@@ -3,12 +3,12 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { useMemo, useState } from 'react';
 import { ExternalLink } from 'react-external-link';
 import { Button, FormGroup, Modal, ModalBody, ModalHeader, Row } from 'reactstrap';
-import type { ImageDownloader } from '../../common/services/ImageDownloader';
+import type { ImageDownloader } from '../../../common/services/ImageDownloader';
-import type { SelectedServer } from '../../servers/data';
+import type { SelectedServer } from '../../../servers/data';
-import { CopyToClipboardIcon } from '../../utils/CopyToClipboardIcon';
+import { CopyToClipboardIcon } from '../../../utils/CopyToClipboardIcon';
-import { useFeature } from '../../utils/helpers/features';
+import { useFeature } from '../../../utils/helpers/features';
-import type { QrCodeFormat, QrErrorCorrection } from '../../utils/helpers/qrCodes';
+import type { QrCodeFormat, QrErrorCorrection } from '../../../utils/helpers/qrCodes';
-import { buildQrCodeUrl } from '../../utils/helpers/qrCodes';
+import { buildQrCodeUrl } from '../../../utils/helpers/qrCodes';
 import type { ShortUrlModalProps } from '../data';
 import { QrErrorCorrectionDropdown } from './qr-codes/QrErrorCorrectionDropdown';
 import { QrFormatDropdown } from './qr-codes/QrFormatDropdown';

src/shlink-web-component/short-urls/helpers/ShortUrlDetailLink.tsx

@@ -1,7 +1,7 @@
 import type { FC } from 'react';
 import { Link } from 'react-router-dom';
-import type { SelectedServer, ServerWithId } from '../../servers/data';
+import type { SelectedServer, ServerWithId } from '../../../servers/data';
-import { isServerWithId } from '../../servers/data';
+import { isServerWithId } from '../../../servers/data';
 import type { ShortUrl } from '../data';
 import { urlEncodeShortCode } from './index';
 

src/shlink-web-component/short-urls/helpers/ShortUrlFormCheckboxGroup.tsx

@@ -1,6 +1,6 @@
 import type { ChangeEvent, FC, PropsWithChildren } from 'react';
-import { Checkbox } from '../../utils/Checkbox';
+import { Checkbox } from '../../../utils/Checkbox';
-import { InfoTooltip } from '../../utils/InfoTooltip';
+import { InfoTooltip } from '../../../utils/InfoTooltip';
 
 type ShortUrlFormCheckboxGroupProps = PropsWithChildren<{
   checked?: boolean;

src/shlink-web-component/short-urls/helpers/ShortUrlStatus.tsx

@@ -4,8 +4,8 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { isBefore } from 'date-fns';
 import type { FC, ReactNode } from 'react';
 import { UncontrolledTooltip } from 'reactstrap';
-import { formatHumanFriendly, now, parseISO } from '../../utils/helpers/date';
+import { formatHumanFriendly, now, parseISO } from '../../../utils/helpers/date';
-import { useElementRef } from '../../utils/helpers/hooks';
+import { useElementRef } from '../../../utils/helpers/hooks';
 import type { ShortUrl } from '../data';
 
 interface ShortUrlStatusProps {

src/shlink-web-component/short-urls/helpers/ShortUrlVisitsCount.tsx

@@ -2,10 +2,10 @@ import { faInfoCircle as infoIcon } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import classNames from 'classnames';
 import { UncontrolledTooltip } from 'reactstrap';
-import type { SelectedServer } from '../../servers/data';
+import type { SelectedServer } from '../../../servers/data';
-import { formatHumanFriendly, parseISO } from '../../utils/helpers/date';
+import { formatHumanFriendly, parseISO } from '../../../utils/helpers/date';
-import { useElementRef } from '../../utils/helpers/hooks';
+import { useElementRef } from '../../../utils/helpers/hooks';
-import { prettify } from '../../utils/helpers/numbers';
+import { prettify } from '../../../utils/helpers/numbers';
 import type { ShortUrl } from '../data';
 import { ShortUrlDetailLink } from './ShortUrlDetailLink';
 import './ShortUrlVisitsCount.scss';

src/shlink-web-component/short-urls/helpers/ShortUrlsFilterDropdown.tsx

@@ -1,6 +1,6 @@
 import { DropdownItem } from 'reactstrap';
-import { DropdownBtn } from '../../utils/DropdownBtn';
+import { DropdownBtn } from '../../../utils/DropdownBtn';
-import { hasValue } from '../../utils/utils';
+import { hasValue } from '../../../utils/utils';
 import type { ShortUrlsFilter } from '../data';
 
 interface ShortUrlsFilterDropdownProps {

src/shlink-web-component/short-urls/helpers/ShortUrlsRow.scss

@@ -1,6 +1,6 @@
-@import '../../utils/base';
+@import '../../../utils/base';
-@import '../../utils/mixins/text-ellipsis';
+@import '../../../utils/mixins/text-ellipsis';
-@import '../../utils/mixins/vertical-align';
+@import '../../../utils/mixins/vertical-align';
 
 .short-urls-row__cell.short-urls-row__cell {
   vertical-align: middle !important;

src/shlink-web-component/short-urls/helpers/ShortUrlsRow.tsx

@@ -1,12 +1,12 @@
 import type { FC } from 'react';
 import { useEffect, useRef } from 'react';
 import { ExternalLink } from 'react-external-link';
-import type { SelectedServer } from '../../servers/data';
+import type { SelectedServer } from '../../../servers/data';
-import type { Settings } from '../../settings/reducers/settings';
+import type { Settings } from '../../../settings/reducers/settings';
-import { CopyToClipboardIcon } from '../../utils/CopyToClipboardIcon';
+import { CopyToClipboardIcon } from '../../../utils/CopyToClipboardIcon';
-import { Time } from '../../utils/dates/Time';
+import { Time } from '../../../utils/dates/Time';
-import type { TimeoutToggle } from '../../utils/helpers/hooks';
+import type { TimeoutToggle } from '../../../utils/helpers/hooks';
-import type { ColorGenerator } from '../../utils/services/ColorGenerator';
+import type { ColorGenerator } from '../../../utils/services/ColorGenerator';
 import type { ShortUrl } from '../data';
 import { useShortUrlsQuery } from './hooks';
 import type { ShortUrlsRowMenuType } from './ShortUrlsRowMenu';

src/shlink-web-component/short-urls/helpers/ShortUrlsRowMenu.tsx

@@ -7,9 +7,9 @@ import {
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import type { FC } from 'react';
 import { DropdownItem } from 'reactstrap';
-import type { SelectedServer } from '../../servers/data';
+import type { SelectedServer } from '../../../servers/data';
-import { useToggle } from '../../utils/helpers/hooks';
+import { useToggle } from '../../../utils/helpers/hooks';
-import { RowDropdownBtn } from '../../utils/RowDropdownBtn';
+import { RowDropdownBtn } from '../../../utils/RowDropdownBtn';
 import type { ShortUrl, ShortUrlModalProps } from '../data';
 import { ShortUrlDetailLink } from './ShortUrlDetailLink';
 

src/shlink-web-component/short-urls/helpers/Tags.tsx

@@ -1,7 +1,7 @@
 import { isEmpty } from 'ramda';
 import type { FC } from 'react';
+import type { ColorGenerator } from '../../../utils/services/ColorGenerator';
 import { Tag } from '../../tags/helpers/Tag';
-import type { ColorGenerator } from '../../utils/services/ColorGenerator';
 
 interface TagsProps {
   tags: string[];

src/shlink-web-component/short-urls/helpers/hooks.ts

@@ -1,11 +1,11 @@
 import { isEmpty, pipe } from 'ramda';
 import { useMemo } from 'react';
 import { useLocation, useNavigate, useParams } from 'react-router-dom';
-import type { TagsFilteringMode } from '../../api/types';
+import type { TagsFilteringMode } from '../../../api/types';
-import { orderToString, stringToOrder } from '../../utils/helpers/ordering';
+import { orderToString, stringToOrder } from '../../../utils/helpers/ordering';
-import { parseQuery, stringifyQuery } from '../../utils/helpers/query';
+import { parseQuery, stringifyQuery } from '../../../utils/helpers/query';
-import type { BooleanString } from '../../utils/utils';
+import type { BooleanString } from '../../../utils/utils';
-import { parseOptionalBooleanToString } from '../../utils/utils';
+import { parseOptionalBooleanToString } from '../../../utils/utils';
 import type { ShortUrlsOrder, ShortUrlsOrderableFields } from '../data';
 
 interface ShortUrlsQueryCommon {

src/shlink-web-component/short-urls/helpers/index.ts

@@ -1,6 +1,6 @@
 import { isNil } from 'ramda';
-import type { ShortUrlCreationSettings } from '../../settings/reducers/settings';
+import type { ShortUrlCreationSettings } from '../../../settings/reducers/settings';
-import type { OptionalString } from '../../utils/utils';
+import type { OptionalString } from '../../../utils/utils';
 import { DEFAULT_DOMAIN } from '../../visits/reducers/domainVisits';
 import type { ShortUrl, ShortUrlData } from '../data';
 

src/shlink-web-component/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown.tsx

@@ -1,7 +1,7 @@
 import type { FC } from 'react';
 import { DropdownItem } from 'reactstrap';
-import { DropdownBtn } from '../../../utils/DropdownBtn';
+import { DropdownBtn } from '../../../../utils/DropdownBtn';
-import type { QrErrorCorrection } from '../../../utils/helpers/qrCodes';
+import type { QrErrorCorrection } from '../../../../utils/helpers/qrCodes';
 
 interface QrErrorCorrectionDropdownProps {
   errorCorrection: QrErrorCorrection;

src/shlink-web-component/short-urls/helpers/qr-codes/QrFormatDropdown.tsx

@@ -1,7 +1,7 @@
 import type { FC } from 'react';
 import { DropdownItem } from 'reactstrap';
-import { DropdownBtn } from '../../../utils/DropdownBtn';
+import { DropdownBtn } from '../../../../utils/DropdownBtn';
-import type { QrCodeFormat } from '../../../utils/helpers/qrCodes';
+import type { QrCodeFormat } from '../../../../utils/helpers/qrCodes';
 
 interface QrFormatDropdownProps {
   format: QrCodeFormat;

src/shlink-web-component/short-urls/reducers/shortUrlCreation.ts

@@ -1,9 +1,9 @@
 import type { PayloadAction } from '@reduxjs/toolkit';
 import { createSlice } from '@reduxjs/toolkit';
-import type { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
+import type { ShlinkApiClientBuilder } from '../../../api/services/ShlinkApiClientBuilder';
-import type { ProblemDetailsError } from '../../api/types/errors';
+import type { ProblemDetailsError } from '../../../api/types/errors';
-import { parseApiError } from '../../api/utils';
+import { parseApiError } from '../../../api/utils';
-import { createAsyncThunk } from '../../utils/helpers/redux';
+import { createAsyncThunk } from '../../../utils/helpers/redux';
 import type { ShortUrl, ShortUrlData } from '../data';
 
 const REDUCER_PREFIX = 'shlink/shortUrlCreation';

src/shlink-web-component/short-urls/reducers/shortUrlDeletion.ts

@@ -1,8 +1,8 @@
 import { createAction, createSlice } from '@reduxjs/toolkit';
-import type { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
+import type { ShlinkApiClientBuilder } from '../../../api/services/ShlinkApiClientBuilder';
-import type { ProblemDetailsError } from '../../api/types/errors';
+import type { ProblemDetailsError } from '../../../api/types/errors';
-import { parseApiError } from '../../api/utils';
+import { parseApiError } from '../../../api/utils';
-import { createAsyncThunk } from '../../utils/helpers/redux';
+import { createAsyncThunk } from '../../../utils/helpers/redux';
 import type { ShortUrl, ShortUrlIdentifier } from '../data';
 
 const REDUCER_PREFIX = 'shlink/shortUrlDeletion';

src/shlink-web-component/short-urls/reducers/shortUrlDetail.ts

@@ -1,9 +1,9 @@
 import type { PayloadAction } from '@reduxjs/toolkit';
 import { createSlice } from '@reduxjs/toolkit';
-import type { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
+import type { ShlinkApiClientBuilder } from '../../../api/services/ShlinkApiClientBuilder';
-import type { ProblemDetailsError } from '../../api/types/errors';
+import type { ProblemDetailsError } from '../../../api/types/errors';
-import { parseApiError } from '../../api/utils';
+import { parseApiError } from '../../../api/utils';
-import { createAsyncThunk } from '../../utils/helpers/redux';
+import { createAsyncThunk } from '../../../utils/helpers/redux';
 import type { ShortUrl, ShortUrlIdentifier } from '../data';
 import { shortUrlMatches } from '../helpers';
 

src/shlink-web-component/short-urls/reducers/shortUrlEdition.ts

@@ -1,9 +1,9 @@
 import type { PayloadAction } from '@reduxjs/toolkit';
 import { createSlice } from '@reduxjs/toolkit';
-import type { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
+import type { ShlinkApiClientBuilder } from '../../../api/services/ShlinkApiClientBuilder';
-import type { ProblemDetailsError } from '../../api/types/errors';
+import type { ProblemDetailsError } from '../../../api/types/errors';
-import { parseApiError } from '../../api/utils';
+import { parseApiError } from '../../../api/utils';
-import { createAsyncThunk } from '../../utils/helpers/redux';
+import { createAsyncThunk } from '../../../utils/helpers/redux';
 import type { EditShortUrlData, ShortUrl, ShortUrlIdentifier } from '../data';
 
 const REDUCER_PREFIX = 'shlink/shortUrlEdition';

src/shlink-web-component/short-urls/reducers/shortUrlsList.ts

@@ -1,8 +1,8 @@
 import { createSlice } from '@reduxjs/toolkit';
 import { assocPath, last, pipe, reject } from 'ramda';
-import type { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
+import type { ShlinkApiClientBuilder } from '../../../api/services/ShlinkApiClientBuilder';
-import type { ShlinkShortUrlsListParams, ShlinkShortUrlsResponse } from '../../api/types';
+import type { ShlinkShortUrlsListParams, ShlinkShortUrlsResponse } from '../../../api/types';
-import { createAsyncThunk } from '../../utils/helpers/redux';
+import { createAsyncThunk } from '../../../utils/helpers/redux';
 import { createNewVisits } from '../../visits/reducers/visitCreation';
 import type { ShortUrl } from '../data';
 import { shortUrlMatches } from '../helpers';

src/shlink-web-component/short-urls/services/provideServices.ts

@@ -1,6 +1,6 @@
 import type Bottle from 'bottlejs';
 import { prop } from 'ramda';
-import type { ConnectDecorator } from '../../container/types';
+import type { ConnectDecorator } from '../../../container/types';
 import { CreateShortUrl } from '../CreateShortUrl';
 import { EditShortUrl } from '../EditShortUrl';
 import { CreateShortUrlResult } from '../helpers/CreateShortUrlResult';

src/shlink-web-component/tags/TagsList.tsx

@@ -2,16 +2,16 @@ import { pipe } from 'ramda';
 import type { FC } from 'react';
 import { useEffect, useState } from 'react';
 import { Row } from 'reactstrap';
-import { ShlinkApiError } from '../api/ShlinkApiError';
+import { ShlinkApiError } from '../../api/ShlinkApiError';
-import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub';
+import { boundToMercureHub } from '../../mercure/helpers/boundToMercureHub';
-import { Topics } from '../mercure/helpers/Topics';
+import { Topics } from '../../mercure/helpers/Topics';
-import type { SelectedServer } from '../servers/data';
+import type { SelectedServer } from '../../servers/data';
-import type { Settings } from '../settings/reducers/settings';
+import type { Settings } from '../../settings/reducers/settings';
-import { determineOrderDir, sortList } from '../utils/helpers/ordering';
+import { determineOrderDir, sortList } from '../../utils/helpers/ordering';
-import { Message } from '../utils/Message';
+import { Message } from '../../utils/Message';
-import { OrderingDropdown } from '../utils/OrderingDropdown';
+import { OrderingDropdown } from '../../utils/OrderingDropdown';
-import { Result } from '../utils/Result';
+import { Result } from '../../utils/Result';
-import { SearchField } from '../utils/SearchField';
+import { SearchField } from '../../utils/SearchField';
 import type { SimplifiedTag } from './data';
 import type { TagsOrder, TagsOrderableFields } from './data/TagsListChildrenProps';
 import { TAGS_ORDERABLE_FIELDS } from './data/TagsListChildrenProps';

src/shlink-web-component/tags/TagsTable.scss

@@ -1,5 +1,5 @@
-@import '../utils/base';
+@import '../../utils/base';
-@import '../utils/mixins/sticky-cell';
+@import '../../utils/mixins/sticky-cell';
 
 .tags-table__header-cell.tags-table__header-cell {
   @include sticky-cell(false);

src/shlink-web-component/tags/TagsTable.tsx

@@ -2,11 +2,11 @@ import { splitEvery } from 'ramda';
 import type { FC } from 'react';
 import { useEffect, useRef } from 'react';
 import { useLocation } from 'react-router-dom';
-import { SimplePaginator } from '../common/SimplePaginator';
+import { SimplePaginator } from '../../common/SimplePaginator';
-import { useQueryState } from '../utils/helpers/hooks';
+import { useQueryState } from '../../utils/helpers/hooks';
-import { parseQuery } from '../utils/helpers/query';
+import { parseQuery } from '../../utils/helpers/query';
-import { SimpleCard } from '../utils/SimpleCard';
+import { SimpleCard } from '../../utils/SimpleCard';
-import { TableOrderIcon } from '../utils/table/TableOrderIcon';
+import { TableOrderIcon } from '../../utils/table/TableOrderIcon';
 import type { TagsListChildrenProps, TagsOrder, TagsOrderableFields } from './data/TagsListChildrenProps';
 import type { TagsTableRowProps } from './TagsTableRow';
 import './TagsTable.scss';

src/shlink-web-component/tags/TagsTableRow.tsx

@@ -3,12 +3,12 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import type { FC } from 'react';
 import { Link } from 'react-router-dom';
 import { DropdownItem } from 'reactstrap';
-import type { SelectedServer } from '../servers/data';
+import type { SelectedServer } from '../../servers/data';
-import { getServerId } from '../servers/data';
+import { getServerId } from '../../servers/data';
-import { useToggle } from '../utils/helpers/hooks';
+import { useToggle } from '../../utils/helpers/hooks';
-import { prettify } from '../utils/helpers/numbers';
+import { prettify } from '../../utils/helpers/numbers';
-import { RowDropdownBtn } from '../utils/RowDropdownBtn';
+import { RowDropdownBtn } from '../../utils/RowDropdownBtn';
-import type { ColorGenerator } from '../utils/services/ColorGenerator';
+import type { ColorGenerator } from '../../utils/services/ColorGenerator';
 import type { SimplifiedTag, TagModalProps } from './data';
 import { TagBullet } from './helpers/TagBullet';
 

src/shlink-web-component/tags/data/TagsListChildrenProps.ts

@@ -1,5 +1,5 @@
-import type { SelectedServer } from '../../servers/data';
+import type { SelectedServer } from '../../../servers/data';
-import type { Order } from '../../utils/helpers/ordering';
+import type { Order } from '../../../utils/helpers/ordering';
 import type { SimplifiedTag } from './index';
 
 export const TAGS_ORDERABLE_FIELDS = {

src/shlink-web-component/tags/data/index.ts

@@ -1,4 +1,4 @@
-import type { ShlinkTagsStats } from '../../api/types';
+import type { ShlinkTagsStats } from '../../../api/types';
 
 export type TagStats = Omit<ShlinkTagsStats, 'tag'>;
 

src/shlink-web-component/tags/helpers/DeleteTagConfirmModal.tsx

@@ -1,6 +1,6 @@
 import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap';
-import { ShlinkApiError } from '../../api/ShlinkApiError';
+import { ShlinkApiError } from '../../../api/ShlinkApiError';
-import { Result } from '../../utils/Result';
+import { Result } from '../../../utils/Result';
 import type { TagModalProps } from '../data';
 import type { TagDeletion } from '../reducers/tagDelete';
 

src/shlink-web-component/tags/helpers/EditTagModal.tsx

@@ -4,11 +4,11 @@ import { pipe } from 'ramda';
 import { useState } from 'react';
 import { HexColorPicker } from 'react-colorful';
 import { Button, Input, InputGroup, Modal, ModalBody, ModalFooter, ModalHeader, Popover } from 'reactstrap';
-import { ShlinkApiError } from '../../api/ShlinkApiError';
+import { ShlinkApiError } from '../../../api/ShlinkApiError';
-import { useToggle } from '../../utils/helpers/hooks';
+import { useToggle } from '../../../utils/helpers/hooks';
-import { Result } from '../../utils/Result';
+import { Result } from '../../../utils/Result';
-import type { ColorGenerator } from '../../utils/services/ColorGenerator';
+import type { ColorGenerator } from '../../../utils/services/ColorGenerator';
-import { handleEventPreventingDefault } from '../../utils/utils';
+import { handleEventPreventingDefault } from '../../../utils/utils';
 import type { TagModalProps } from '../data';
 import type { EditTag, TagEdition } from '../reducers/tagEdit';
 import './EditTagModal.scss';

src/shlink-web-component/tags/helpers/Tag.tsx

@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 import type { FC, MouseEventHandler, PropsWithChildren } from 'react';
-import type { ColorGenerator } from '../../utils/services/ColorGenerator';
+import type { ColorGenerator } from '../../../utils/services/ColorGenerator';
 import './Tag.scss';
 
 type TagProps = PropsWithChildren<{

src/shlink-web-component/tags/helpers/TagBullet.tsx

@@ -1,4 +1,4 @@
-import type { ColorGenerator } from '../../utils/services/ColorGenerator';
+import type { ColorGenerator } from '../../../utils/services/ColorGenerator';
 import './TagBullet.scss';
 
 interface TagBulletProps {

src/shlink-web-component/tags/helpers/TagsSelector.tsx

@@ -1,8 +1,8 @@
 import { useEffect } from 'react';
 import type { SuggestionComponentProps, TagComponentProps } from 'react-tag-autocomplete';
 import ReactTags from 'react-tag-autocomplete';
-import type { Settings } from '../../settings/reducers/settings';
+import type { Settings } from '../../../settings/reducers/settings';
-import type { ColorGenerator } from '../../utils/services/ColorGenerator';
+import type { ColorGenerator } from '../../../utils/services/ColorGenerator';
 import type { TagsList } from '../reducers/tagsList';
 import { Tag } from './Tag';
 import { TagBullet } from './TagBullet';

src/shlink-web-component/tags/reducers/tagDelete.ts

@@ -1,8 +1,8 @@
 import { createAction, createSlice } from '@reduxjs/toolkit';
-import type { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
+import type { ShlinkApiClientBuilder } from '../../../api/services/ShlinkApiClientBuilder';
-import type { ProblemDetailsError } from '../../api/types/errors';
+import type { ProblemDetailsError } from '../../../api/types/errors';
-import { parseApiError } from '../../api/utils';
+import { parseApiError } from '../../../api/utils';
-import { createAsyncThunk } from '../../utils/helpers/redux';
+import { createAsyncThunk } from '../../../utils/helpers/redux';
 
 const REDUCER_PREFIX = 'shlink/tagDelete';
 

src/shlink-web-component/tags/reducers/tagEdit.ts

@@ -1,11 +1,11 @@
 import type { PayloadAction } from '@reduxjs/toolkit';
 import { createAction, createSlice } from '@reduxjs/toolkit';
 import { pick } from 'ramda';
-import type { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
+import type { ShlinkApiClientBuilder } from '../../../api/services/ShlinkApiClientBuilder';
-import type { ProblemDetailsError } from '../../api/types/errors';
+import type { ProblemDetailsError } from '../../../api/types/errors';
-import { parseApiError } from '../../api/utils';
+import { parseApiError } from '../../../api/utils';
-import { createAsyncThunk } from '../../utils/helpers/redux';
+import { createAsyncThunk } from '../../../utils/helpers/redux';
-import type { ColorGenerator } from '../../utils/services/ColorGenerator';
+import type { ColorGenerator } from '../../../utils/services/ColorGenerator';
 
 const REDUCER_PREFIX = 'shlink/tagEdit';
 

src/shlink-web-component/tags/reducers/tagsList.ts

@@ -1,12 +1,12 @@
 import { createAction, createSlice } from '@reduxjs/toolkit';
 import { isEmpty, reject } from 'ramda';
-import type { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
+import type { ShlinkApiClientBuilder } from '../../../api/services/ShlinkApiClientBuilder';
-import type { ShlinkTags } from '../../api/types';
+import type { ShlinkTags } from '../../../api/types';
-import type { ProblemDetailsError } from '../../api/types/errors';
+import type { ProblemDetailsError } from '../../../api/types/errors';
-import { parseApiError } from '../../api/utils';
+import { parseApiError } from '../../../api/utils';
+import { supportedFeatures } from '../../../utils/helpers/features';
+import { createAsyncThunk } from '../../../utils/helpers/redux';
 import type { createShortUrl } from '../../short-urls/reducers/shortUrlCreation';
-import { supportedFeatures } from '../../utils/helpers/features';
-import { createAsyncThunk } from '../../utils/helpers/redux';
 import { createNewVisits } from '../../visits/reducers/visitCreation';
 import type { CreateVisit } from '../../visits/types';
 import type { TagStats } from '../data';

src/shlink-web-component/tags/services/provideServices.ts

@@ -1,7 +1,7 @@
 import type { IContainer } from 'bottlejs';
 import type Bottle from 'bottlejs';
 import { prop } from 'ramda';
-import type { ConnectDecorator } from '../../container/types';
+import type { ConnectDecorator } from '../../../container/types';
 import { DeleteTagConfirmModal } from '../helpers/DeleteTagConfirmModal';
 import { EditTagModal } from '../helpers/EditTagModal';
 import { TagsSelector } from '../helpers/TagsSelector';

src/shlink-web-component/visits/DomainVisits.tsx

@@ -1,9 +1,9 @@
 import { useParams } from 'react-router-dom';
-import type { ShlinkVisitsParams } from '../api/types';
+import type { ShlinkVisitsParams } from '../../api/types';
-import type { ReportExporter } from '../common/services/ReportExporter';
+import type { ReportExporter } from '../../common/services/ReportExporter';
-import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub';
+import { boundToMercureHub } from '../../mercure/helpers/boundToMercureHub';
-import { Topics } from '../mercure/helpers/Topics';
+import { Topics } from '../../mercure/helpers/Topics';
-import { useGoBack } from '../utils/helpers/hooks';
+import { useGoBack } from '../../utils/helpers/hooks';
 import type { DomainVisits as DomainVisitsState, LoadDomainVisits } from './reducers/domainVisits';
 import type { NormalizedVisit } from './types';
 import type { CommonVisitsProps } from './types/CommonVisitsProps';

src/shlink-web-component/visits/NonOrphanVisits.tsx

@@ -1,7 +1,7 @@
-import type { ReportExporter } from '../common/services/ReportExporter';
+import type { ReportExporter } from '../../common/services/ReportExporter';
-import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub';
+import { boundToMercureHub } from '../../mercure/helpers/boundToMercureHub';
-import { Topics } from '../mercure/helpers/Topics';
+import { Topics } from '../../mercure/helpers/Topics';
-import { useGoBack } from '../utils/helpers/hooks';
+import { useGoBack } from '../../utils/helpers/hooks';
 import type { LoadVisits, VisitsInfo } from './reducers/types';
 import type { NormalizedVisit, VisitsParams } from './types';
 import type { CommonVisitsProps } from './types/CommonVisitsProps';

src/shlink-web-component/visits/OrphanVisits.tsx

@@ -1,7 +1,7 @@
-import type { ReportExporter } from '../common/services/ReportExporter';
+import type { ReportExporter } from '../../common/services/ReportExporter';
-import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub';
+import { boundToMercureHub } from '../../mercure/helpers/boundToMercureHub';
-import { Topics } from '../mercure/helpers/Topics';
+import { Topics } from '../../mercure/helpers/Topics';
-import { useGoBack } from '../utils/helpers/hooks';
+import { useGoBack } from '../../utils/helpers/hooks';
 import type { LoadOrphanVisits } from './reducers/orphanVisits';
 import type { VisitsInfo } from './reducers/types';
 import type { NormalizedVisit, VisitsParams } from './types';

src/shlink-web-component/visits/ShortUrlVisits.tsx

@@ -1,13 +1,13 @@
 import { useEffect } from 'react';
 import { useLocation, useParams } from 'react-router-dom';
-import type { ReportExporter } from '../common/services/ReportExporter';
+import type { ReportExporter } from '../../common/services/ReportExporter';
-import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub';
+import { boundToMercureHub } from '../../mercure/helpers/boundToMercureHub';
-import { Topics } from '../mercure/helpers/Topics';
+import { Topics } from '../../mercure/helpers/Topics';
+import { useGoBack } from '../../utils/helpers/hooks';
+import { parseQuery } from '../../utils/helpers/query';
 import type { ShortUrlIdentifier } from '../short-urls/data';
 import { urlDecodeShortCode } from '../short-urls/helpers';
 import type { ShortUrlDetail } from '../short-urls/reducers/shortUrlDetail';
-import { useGoBack } from '../utils/helpers/hooks';
-import { parseQuery } from '../utils/helpers/query';
 import type { LoadShortUrlVisits, ShortUrlVisits as ShortUrlVisitsState } from './reducers/shortUrlVisits';
 import { ShortUrlVisitsHeader } from './ShortUrlVisitsHeader';
 import type { NormalizedVisit, VisitsParams } from './types';

src/shlink-web-component/visits/ShortUrlVisitsHeader.tsx

@@ -1,7 +1,7 @@
 import { ExternalLink } from 'react-external-link';
 import { UncontrolledTooltip } from 'reactstrap';
+import { Time } from '../../utils/dates/Time';
 import type { ShortUrlDetail } from '../short-urls/reducers/shortUrlDetail';
-import { Time } from '../utils/dates/Time';
 import type { ShortUrlVisits } from './reducers/shortUrlVisits';
 import { VisitsHeader } from './VisitsHeader';
 import './ShortUrlVisitsHeader.scss';

src/shlink-web-component/visits/TagVisits.tsx

@@ -1,10 +1,10 @@
 import { useParams } from 'react-router-dom';
-import type { ShlinkVisitsParams } from '../api/types';
+import type { ShlinkVisitsParams } from '../../api/types';
-import type { ReportExporter } from '../common/services/ReportExporter';
+import type { ReportExporter } from '../../common/services/ReportExporter';
-import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub';
+import { boundToMercureHub } from '../../mercure/helpers/boundToMercureHub';
-import { Topics } from '../mercure/helpers/Topics';
+import { Topics } from '../../mercure/helpers/Topics';
-import { useGoBack } from '../utils/helpers/hooks';
+import { useGoBack } from '../../utils/helpers/hooks';
-import type { ColorGenerator } from '../utils/services/ColorGenerator';
+import type { ColorGenerator } from '../../utils/services/ColorGenerator';
 import type { LoadTagVisits, TagVisits as TagVisitsState } from './reducers/tagVisits';
 import { TagVisitsHeader } from './TagVisitsHeader';
 import type { NormalizedVisit } from './types';

src/shlink-web-component/visits/TagVisitsHeader.tsx

@@ -1,5 +1,5 @@
+import type { ColorGenerator } from '../../utils/services/ColorGenerator';
 import { Tag } from '../tags/helpers/Tag';
-import type { ColorGenerator } from '../utils/services/ColorGenerator';
 import type { TagVisits } from './reducers/tagVisits';
 import { VisitsHeader } from './VisitsHeader';
 import './ShortUrlVisitsHeader.scss';

src/shlink-web-component/visits/VisitsStats.tsx

@@ -7,16 +7,16 @@ import type { FC, PropsWithChildren } from 'react';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { Navigate, Route, Routes, useLocation } from 'react-router-dom';
 import { Button, Progress, Row } from 'reactstrap';
-import { ShlinkApiError } from '../api/ShlinkApiError';
+import { ShlinkApiError } from '../../api/ShlinkApiError';
-import type { Settings } from '../settings/reducers/settings';
+import type { Settings } from '../../settings/reducers/settings';
-import { DateRangeSelector } from '../utils/dates/DateRangeSelector';
+import { DateRangeSelector } from '../../utils/dates/DateRangeSelector';
-import { ExportBtn } from '../utils/ExportBtn';
+import { ExportBtn } from '../../utils/ExportBtn';
-import type { DateInterval, DateRange } from '../utils/helpers/dateIntervals';
+import type { DateInterval, DateRange } from '../../utils/helpers/dateIntervals';
-import { toDateRange } from '../utils/helpers/dateIntervals';
+import { toDateRange } from '../../utils/helpers/dateIntervals';
-import { prettify } from '../utils/helpers/numbers';
+import { prettify } from '../../utils/helpers/numbers';
-import { Message } from '../utils/Message';
+import { Message } from '../../utils/Message';
-import { NavPillItem, NavPills } from '../utils/NavPills';
+import { NavPillItem, NavPills } from '../../utils/NavPills';
-import { Result } from '../utils/Result';
+import { Result } from '../../utils/Result';
 import { DoughnutChartCard } from './charts/DoughnutChartCard';
 import { LineChartCard } from './charts/LineChartCard';
 import { SortableBarChartCard } from './charts/SortableBarChartCard';

src/shlink-web-component/visits/VisitsTable.scss

@@ -1,5 +1,5 @@
-@import '../utils/base';
+@import '../../utils/base';
-@import '../utils/mixins/sticky-cell';
+@import '../../utils/mixins/sticky-cell';
 
 .visits-table {
   margin: 1.5rem 0 0;

src/shlink-web-component/visits/VisitsTable.tsx

@@ -4,14 +4,14 @@ import classNames from 'classnames';
 import { min, splitEvery } from 'ramda';
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { UncontrolledTooltip } from 'reactstrap';
-import { SimplePaginator } from '../common/SimplePaginator';
+import { SimplePaginator } from '../../common/SimplePaginator';
-import { Time } from '../utils/dates/Time';
+import { Time } from '../../utils/dates/Time';
-import { prettify } from '../utils/helpers/numbers';
+import { prettify } from '../../utils/helpers/numbers';
-import type { Order } from '../utils/helpers/ordering';
+import type { Order } from '../../utils/helpers/ordering';
-import { determineOrderDir, sortList } from '../utils/helpers/ordering';
+import { determineOrderDir, sortList } from '../../utils/helpers/ordering';
-import { SearchField } from '../utils/SearchField';
+import { SearchField } from '../../utils/SearchField';
-import { TableOrderIcon } from '../utils/table/TableOrderIcon';
+import { TableOrderIcon } from '../../utils/table/TableOrderIcon';
-import type { MediaMatcher } from '../utils/types';
+import type { MediaMatcher } from '../../utils/types';
 import type { NormalizedOrphanVisit, NormalizedVisit } from './types';
 import './VisitsTable.scss';
 

src/shlink-web-component/visits/charts/DoughnutChart.tsx

@@ -3,8 +3,8 @@ import { keys, values } from 'ramda';
 import type { FC } from 'react';
 import { memo, useState } from 'react';
 import { Doughnut } from 'react-chartjs-2';
-import { renderPieChartLabel } from '../../utils/helpers/charts';
+import { renderPieChartLabel } from '../../../utils/helpers/charts';
-import { isDarkThemeEnabled, PRIMARY_DARK_COLOR, PRIMARY_LIGHT_COLOR } from '../../utils/theme';
+import { isDarkThemeEnabled, PRIMARY_DARK_COLOR, PRIMARY_LIGHT_COLOR } from '../../../utils/theme';
 import type { Stats } from '../types';
 import { DoughnutChartLegend } from './DoughnutChartLegend';
 

src/shlink-web-component/visits/charts/DoughnutChartLegend.scss

@@ -1,4 +1,4 @@
-@import '../../utils/base';
+@import '../../../utils/base';
 
 .doughnut-chart-legend {
   list-style-type: none;

src/shlink-web-component/visits/charts/HorizontalBarChart.tsx

@@ -3,11 +3,11 @@ import { keys, values } from 'ramda';
 import type { FC, MutableRefObject } from 'react';
 import { useRef } from 'react';
 import { Bar, getElementAtEvent } from 'react-chartjs-2';
-import { pointerOnHover, renderChartLabel } from '../../utils/helpers/charts';
+import { pointerOnHover, renderChartLabel } from '../../../utils/helpers/charts';
-import { prettify } from '../../utils/helpers/numbers';
+import { prettify } from '../../../utils/helpers/numbers';
-import { fillTheGaps } from '../../utils/helpers/visits';
+import { HIGHLIGHTED_COLOR, HIGHLIGHTED_COLOR_ALPHA, MAIN_COLOR, MAIN_COLOR_ALPHA } from '../../../utils/theme';
-import { HIGHLIGHTED_COLOR, HIGHLIGHTED_COLOR_ALPHA, MAIN_COLOR, MAIN_COLOR_ALPHA } from '../../utils/theme';
 import type { Stats } from '../types';
+import { fillTheGaps } from '../utils';
 
 export interface HorizontalBarChartProps {
   stats: Stats;