diff --git a/shlink-web-component/Main.tsx b/shlink-web-component/src/Main.tsx similarity index 98% rename from shlink-web-component/Main.tsx rename to shlink-web-component/src/Main.tsx index 5a6238c2..40108304 100644 --- a/shlink-web-component/Main.tsx +++ b/shlink-web-component/src/Main.tsx @@ -4,7 +4,7 @@ import classNames from 'classnames'; import type { FC, ReactNode } from 'react'; import { useEffect } from 'react'; import { Navigate, Route, Routes, useLocation } from 'react-router-dom'; -import { useToggle } from '../shlink-frontend-kit/src'; +import { useToggle } from '../../shlink-frontend-kit/src'; import { AsideMenu } from './common/AsideMenu'; import { useFeature } from './utils/features'; import { useSwipeable } from './utils/helpers/hooks'; diff --git a/shlink-web-component/ShlinkWebComponent.tsx b/shlink-web-component/src/ShlinkWebComponent.tsx similarity index 100% rename from shlink-web-component/ShlinkWebComponent.tsx rename to shlink-web-component/src/ShlinkWebComponent.tsx diff --git a/shlink-web-component/api-contract/ShlinkApiClient.ts b/shlink-web-component/src/api-contract/ShlinkApiClient.ts similarity index 100% rename from shlink-web-component/api-contract/ShlinkApiClient.ts rename to shlink-web-component/src/api-contract/ShlinkApiClient.ts diff --git a/shlink-web-component/api-contract/errors.ts b/shlink-web-component/src/api-contract/errors.ts similarity index 100% rename from shlink-web-component/api-contract/errors.ts rename to shlink-web-component/src/api-contract/errors.ts diff --git a/shlink-web-component/api-contract/index.ts b/shlink-web-component/src/api-contract/index.ts similarity index 100% rename from shlink-web-component/api-contract/index.ts rename to shlink-web-component/src/api-contract/index.ts diff --git a/shlink-web-component/api-contract/types.ts b/shlink-web-component/src/api-contract/types.ts similarity index 97% rename from shlink-web-component/api-contract/types.ts rename to shlink-web-component/src/api-contract/types.ts index 19946622..f0922674 100644 --- a/shlink-web-component/api-contract/types.ts +++ b/shlink-web-component/src/api-contract/types.ts @@ -1,4 +1,4 @@ -import type { Order } from '../../shlink-frontend-kit/src'; +import type { Order } from '../../../shlink-frontend-kit/src'; import type { ShortUrl, ShortUrlMeta } from '../short-urls/data'; import type { Visit } from '../visits/types'; diff --git a/shlink-web-component/api-contract/utils.ts b/shlink-web-component/src/api-contract/utils.ts similarity index 100% rename from shlink-web-component/api-contract/utils.ts rename to shlink-web-component/src/api-contract/utils.ts diff --git a/shlink-web-component/common/AsideMenu.scss b/shlink-web-component/src/common/AsideMenu.scss similarity index 92% rename from shlink-web-component/common/AsideMenu.scss rename to shlink-web-component/src/common/AsideMenu.scss index d648607a..b27ade15 100644 --- a/shlink-web-component/common/AsideMenu.scss +++ b/shlink-web-component/src/common/AsideMenu.scss @@ -1,5 +1,5 @@ -@import '../../src/utils/base'; -@import '../../src/utils/mixins/vertical-align'; +@import '../../../src/utils/base'; +@import '../../../src/utils/mixins/vertical-align'; .aside-menu { width: $asideMenuWidth; diff --git a/shlink-web-component/common/AsideMenu.tsx b/shlink-web-component/src/common/AsideMenu.tsx similarity index 100% rename from shlink-web-component/common/AsideMenu.tsx rename to shlink-web-component/src/common/AsideMenu.tsx diff --git a/shlink-web-component/common/ShlinkApiError.tsx b/shlink-web-component/src/common/ShlinkApiError.tsx similarity index 100% rename from shlink-web-component/common/ShlinkApiError.tsx rename to shlink-web-component/src/common/ShlinkApiError.tsx diff --git a/shlink-web-component/container/index.ts b/shlink-web-component/src/container/index.ts similarity index 100% rename from shlink-web-component/container/index.ts rename to shlink-web-component/src/container/index.ts diff --git a/shlink-web-component/container/provideServices.ts b/shlink-web-component/src/container/provideServices.ts similarity index 100% rename from shlink-web-component/container/provideServices.ts rename to shlink-web-component/src/container/provideServices.ts diff --git a/shlink-web-component/container/store.ts b/shlink-web-component/src/container/store.ts similarity index 100% rename from shlink-web-component/container/store.ts rename to shlink-web-component/src/container/store.ts diff --git a/shlink-web-component/domains/DomainRow.tsx b/shlink-web-component/src/domains/DomainRow.tsx similarity index 100% rename from shlink-web-component/domains/DomainRow.tsx rename to shlink-web-component/src/domains/DomainRow.tsx diff --git a/shlink-web-component/domains/DomainSelector.scss b/shlink-web-component/src/domains/DomainSelector.scss similarity index 88% rename from shlink-web-component/domains/DomainSelector.scss rename to shlink-web-component/src/domains/DomainSelector.scss index ad6d71d1..4bb6ce01 100644 --- a/shlink-web-component/domains/DomainSelector.scss +++ b/shlink-web-component/src/domains/DomainSelector.scss @@ -1,5 +1,5 @@ -@import '../../src/utils/base'; -@import '../../src/utils/mixins/vertical-align'; +@import '../../../src/utils/base'; +@import '../../../src/utils/mixins/vertical-align'; .domains-dropdown__toggle-btn.domains-dropdown__toggle-btn, .domains-dropdown__toggle-btn.domains-dropdown__toggle-btn:hover, diff --git a/shlink-web-component/domains/DomainSelector.tsx b/shlink-web-component/src/domains/DomainSelector.tsx similarity index 96% rename from shlink-web-component/domains/DomainSelector.tsx rename to shlink-web-component/src/domains/DomainSelector.tsx index 02658c8f..678a2dc5 100644 --- a/shlink-web-component/domains/DomainSelector.tsx +++ b/shlink-web-component/src/domains/DomainSelector.tsx @@ -4,7 +4,7 @@ import { isEmpty, pipe } from 'ramda'; import { useEffect } from 'react'; import type { InputProps } from 'reactstrap'; import { Button, DropdownItem, Input, InputGroup, UncontrolledTooltip } from 'reactstrap'; -import { DropdownBtn, useToggle } from '../../shlink-frontend-kit/src'; +import { DropdownBtn, useToggle } from '../../../shlink-frontend-kit/src'; import type { DomainsList } from './reducers/domainsList'; import './DomainSelector.scss'; diff --git a/shlink-web-component/domains/ManageDomains.tsx b/shlink-web-component/src/domains/ManageDomains.tsx similarity index 98% rename from shlink-web-component/domains/ManageDomains.tsx rename to shlink-web-component/src/domains/ManageDomains.tsx index 859bf95b..e50bc5eb 100644 --- a/shlink-web-component/domains/ManageDomains.tsx +++ b/shlink-web-component/src/domains/ManageDomains.tsx @@ -1,6 +1,6 @@ import type { FC } from 'react'; import { useEffect } from 'react'; -import { Message, Result, SearchField, SimpleCard } from '../../shlink-frontend-kit/src'; +import { Message, Result, SearchField, SimpleCard } from '../../../shlink-frontend-kit/src'; import { ShlinkApiError } from '../common/ShlinkApiError'; import { DomainRow } from './DomainRow'; import type { EditDomainRedirects } from './reducers/domainRedirects'; diff --git a/shlink-web-component/domains/data/index.ts b/shlink-web-component/src/domains/data/index.ts similarity index 100% rename from shlink-web-component/domains/data/index.ts rename to shlink-web-component/src/domains/data/index.ts diff --git a/shlink-web-component/domains/helpers/DomainDropdown.tsx b/shlink-web-component/src/domains/helpers/DomainDropdown.tsx similarity index 95% rename from shlink-web-component/domains/helpers/DomainDropdown.tsx rename to shlink-web-component/src/domains/helpers/DomainDropdown.tsx index 7202c2b6..07e668d2 100644 --- a/shlink-web-component/domains/helpers/DomainDropdown.tsx +++ b/shlink-web-component/src/domains/helpers/DomainDropdown.tsx @@ -3,7 +3,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import type { FC } from 'react'; import { Link } from 'react-router-dom'; import { DropdownItem } from 'reactstrap'; -import { RowDropdownBtn, useToggle } from '../../../shlink-frontend-kit/src'; +import { RowDropdownBtn, useToggle } from '../../../../shlink-frontend-kit/src'; import { useFeature } from '../../utils/features'; import { useRoutesPrefix } from '../../utils/routesPrefix'; import { DEFAULT_DOMAIN } from '../../visits/reducers/domainVisits'; diff --git a/shlink-web-component/domains/helpers/DomainStatusIcon.tsx b/shlink-web-component/src/domains/helpers/DomainStatusIcon.tsx similarity index 96% rename from shlink-web-component/domains/helpers/DomainStatusIcon.tsx rename to shlink-web-component/src/domains/helpers/DomainStatusIcon.tsx index 0ac700f1..e89230b9 100644 --- a/shlink-web-component/domains/helpers/DomainStatusIcon.tsx +++ b/shlink-web-component/src/domains/helpers/DomainStatusIcon.tsx @@ -8,7 +8,7 @@ import type { FC } from 'react'; import { useEffect, useState } from 'react'; import { ExternalLink } from 'react-external-link'; import { UncontrolledTooltip } from 'reactstrap'; -import { useElementRef } from '../../../shlink-frontend-kit/src'; +import { useElementRef } from '../../../../shlink-frontend-kit/src'; import type { MediaMatcher } from '../../utils/types'; import type { DomainStatus } from '../data'; diff --git a/shlink-web-component/domains/helpers/EditDomainRedirectsModal.tsx b/shlink-web-component/src/domains/helpers/EditDomainRedirectsModal.tsx similarity index 95% rename from shlink-web-component/domains/helpers/EditDomainRedirectsModal.tsx rename to shlink-web-component/src/domains/helpers/EditDomainRedirectsModal.tsx index 7a9500e7..1c681bae 100644 --- a/shlink-web-component/domains/helpers/EditDomainRedirectsModal.tsx +++ b/shlink-web-component/src/domains/helpers/EditDomainRedirectsModal.tsx @@ -1,8 +1,8 @@ import type { FC } from 'react'; import { useState } from 'react'; import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap'; -import type { InputFormGroupProps } from '../../../shlink-frontend-kit/src'; -import { InputFormGroup } from '../../../shlink-frontend-kit/src'; +import type { InputFormGroupProps } from '../../../../shlink-frontend-kit/src'; +import { InputFormGroup } from '../../../../shlink-frontend-kit/src'; import type { ShlinkDomain } from '../../api-contract'; import { InfoTooltip } from '../../utils/components/InfoTooltip'; import { handleEventPreventingDefault, nonEmptyValueOrNull } from '../../utils/helpers'; diff --git a/shlink-web-component/domains/reducers/domainRedirects.ts b/shlink-web-component/src/domains/reducers/domainRedirects.ts similarity index 100% rename from shlink-web-component/domains/reducers/domainRedirects.ts rename to shlink-web-component/src/domains/reducers/domainRedirects.ts diff --git a/shlink-web-component/domains/reducers/domainsList.ts b/shlink-web-component/src/domains/reducers/domainsList.ts similarity index 100% rename from shlink-web-component/domains/reducers/domainsList.ts rename to shlink-web-component/src/domains/reducers/domainsList.ts diff --git a/shlink-web-component/domains/services/provideServices.ts b/shlink-web-component/src/domains/services/provideServices.ts similarity index 100% rename from shlink-web-component/domains/services/provideServices.ts rename to shlink-web-component/src/domains/services/provideServices.ts diff --git a/shlink-web-component/index.ts b/shlink-web-component/src/index.ts similarity index 100% rename from shlink-web-component/index.ts rename to shlink-web-component/src/index.ts diff --git a/shlink-web-component/mercure/helpers/Topics.ts b/shlink-web-component/src/mercure/helpers/Topics.ts similarity index 100% rename from shlink-web-component/mercure/helpers/Topics.ts rename to shlink-web-component/src/mercure/helpers/Topics.ts diff --git a/shlink-web-component/mercure/helpers/boundToMercureHub.tsx b/shlink-web-component/src/mercure/helpers/boundToMercureHub.tsx similarity index 100% rename from shlink-web-component/mercure/helpers/boundToMercureHub.tsx rename to shlink-web-component/src/mercure/helpers/boundToMercureHub.tsx diff --git a/shlink-web-component/mercure/helpers/index.ts b/shlink-web-component/src/mercure/helpers/index.ts similarity index 100% rename from shlink-web-component/mercure/helpers/index.ts rename to shlink-web-component/src/mercure/helpers/index.ts diff --git a/shlink-web-component/mercure/reducers/mercureInfo.ts b/shlink-web-component/src/mercure/reducers/mercureInfo.ts similarity index 100% rename from shlink-web-component/mercure/reducers/mercureInfo.ts rename to shlink-web-component/src/mercure/reducers/mercureInfo.ts diff --git a/shlink-web-component/mercure/services/provideServices.ts b/shlink-web-component/src/mercure/services/provideServices.ts similarity index 100% rename from shlink-web-component/mercure/services/provideServices.ts rename to shlink-web-component/src/mercure/services/provideServices.ts diff --git a/shlink-web-component/overview/Overview.tsx b/shlink-web-component/src/overview/Overview.tsx similarity index 100% rename from shlink-web-component/overview/Overview.tsx rename to shlink-web-component/src/overview/Overview.tsx diff --git a/shlink-web-component/overview/helpers/HighlightCard.scss b/shlink-web-component/src/overview/helpers/HighlightCard.scss similarity index 90% rename from shlink-web-component/overview/helpers/HighlightCard.scss rename to shlink-web-component/src/overview/helpers/HighlightCard.scss index 009957bc..f025bf3b 100644 --- a/shlink-web-component/overview/helpers/HighlightCard.scss +++ b/shlink-web-component/src/overview/helpers/HighlightCard.scss @@ -1,4 +1,4 @@ -@import '../../../src/utils/base'; +@import '../../../../src/utils/base'; .highlight-card.highlight-card { text-align: center; diff --git a/shlink-web-component/overview/helpers/HighlightCard.tsx b/shlink-web-component/src/overview/helpers/HighlightCard.tsx similarity index 94% rename from shlink-web-component/overview/helpers/HighlightCard.tsx rename to shlink-web-component/src/overview/helpers/HighlightCard.tsx index 32eab2bd..7cc80488 100644 --- a/shlink-web-component/overview/helpers/HighlightCard.tsx +++ b/shlink-web-component/src/overview/helpers/HighlightCard.tsx @@ -3,7 +3,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import type { FC, PropsWithChildren, ReactNode } from 'react'; import { Link } from 'react-router-dom'; import { Card, CardText, CardTitle, UncontrolledTooltip } from 'reactstrap'; -import { useElementRef } from '../../../shlink-frontend-kit/src'; +import { useElementRef } from '../../../../shlink-frontend-kit/src'; import './HighlightCard.scss'; export type HighlightCardProps = PropsWithChildren<{ diff --git a/shlink-web-component/overview/helpers/VisitsHighlightCard.tsx b/shlink-web-component/src/overview/helpers/VisitsHighlightCard.tsx similarity index 100% rename from shlink-web-component/overview/helpers/VisitsHighlightCard.tsx rename to shlink-web-component/src/overview/helpers/VisitsHighlightCard.tsx diff --git a/shlink-web-component/overview/services/provideServices.ts b/shlink-web-component/src/overview/services/provideServices.ts similarity index 100% rename from shlink-web-component/overview/services/provideServices.ts rename to shlink-web-component/src/overview/services/provideServices.ts diff --git a/shlink-web-component/short-urls/CreateShortUrl.tsx b/shlink-web-component/src/short-urls/CreateShortUrl.tsx similarity index 100% rename from shlink-web-component/short-urls/CreateShortUrl.tsx rename to shlink-web-component/src/short-urls/CreateShortUrl.tsx diff --git a/shlink-web-component/short-urls/EditShortUrl.tsx b/shlink-web-component/src/short-urls/EditShortUrl.tsx similarity index 98% rename from shlink-web-component/short-urls/EditShortUrl.tsx rename to shlink-web-component/src/short-urls/EditShortUrl.tsx index 2f717a50..1649bc81 100644 --- a/shlink-web-component/short-urls/EditShortUrl.tsx +++ b/shlink-web-component/src/short-urls/EditShortUrl.tsx @@ -5,7 +5,7 @@ import { useEffect, useMemo } from 'react'; import { ExternalLink } from 'react-external-link'; import { useLocation, useParams } from 'react-router-dom'; import { Button, Card } from 'reactstrap'; -import { Message, Result } from '../../shlink-frontend-kit/src'; +import { Message, Result } from '../../../shlink-frontend-kit/src'; import { ShlinkApiError } from '../common/ShlinkApiError'; import { useGoBack } from '../utils/helpers/hooks'; import { parseQuery } from '../utils/helpers/query'; diff --git a/shlink-web-component/short-urls/Paginator.tsx b/shlink-web-component/src/short-urls/Paginator.tsx similarity index 100% rename from shlink-web-component/short-urls/Paginator.tsx rename to shlink-web-component/src/short-urls/Paginator.tsx diff --git a/shlink-web-component/short-urls/ShortUrlForm.scss b/shlink-web-component/src/short-urls/ShortUrlForm.scss similarity index 73% rename from shlink-web-component/short-urls/ShortUrlForm.scss rename to shlink-web-component/src/short-urls/ShortUrlForm.scss index 46a3ab9a..c03b9328 100644 --- a/shlink-web-component/short-urls/ShortUrlForm.scss +++ b/shlink-web-component/src/short-urls/ShortUrlForm.scss @@ -1,4 +1,4 @@ -@import '../../src/utils/base'; +@import '../../../src/utils/base'; .short-url-form p:last-child { margin-bottom: 0; diff --git a/shlink-web-component/short-urls/ShortUrlForm.tsx b/shlink-web-component/src/short-urls/ShortUrlForm.tsx similarity index 99% rename from shlink-web-component/short-urls/ShortUrlForm.tsx rename to shlink-web-component/src/short-urls/ShortUrlForm.tsx index 430ec22e..8128657c 100644 --- a/shlink-web-component/short-urls/ShortUrlForm.tsx +++ b/shlink-web-component/src/short-urls/ShortUrlForm.tsx @@ -8,7 +8,7 @@ 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 { Checkbox, SimpleCard } from '../../shlink-frontend-kit/src'; +import { Checkbox, SimpleCard } from '../../../shlink-frontend-kit/src'; import type { DomainSelectorProps } from '../domains/DomainSelector'; import type { TagsSelectorProps } from '../tags/helpers/TagsSelector'; import { IconInput } from '../utils/components/IconInput'; diff --git a/shlink-web-component/short-urls/ShortUrlsFilteringBar.scss b/shlink-web-component/src/short-urls/ShortUrlsFilteringBar.scss similarity index 100% rename from shlink-web-component/short-urls/ShortUrlsFilteringBar.scss rename to shlink-web-component/src/short-urls/ShortUrlsFilteringBar.scss diff --git a/shlink-web-component/short-urls/ShortUrlsFilteringBar.tsx b/shlink-web-component/src/short-urls/ShortUrlsFilteringBar.tsx similarity index 96% rename from shlink-web-component/short-urls/ShortUrlsFilteringBar.tsx rename to shlink-web-component/src/short-urls/ShortUrlsFilteringBar.tsx index 8ed5e9e8..f771a6f5 100644 --- a/shlink-web-component/short-urls/ShortUrlsFilteringBar.tsx +++ b/shlink-web-component/src/short-urls/ShortUrlsFilteringBar.tsx @@ -4,8 +4,8 @@ import classNames from 'classnames'; import { isEmpty, pipe } from 'ramda'; import type { FC } from 'react'; import { Button, InputGroup, Row, UncontrolledTooltip } from 'reactstrap'; -import type { OrderDir } from '../../shlink-frontend-kit/src'; -import { OrderingDropdown, SearchField } from '../../shlink-frontend-kit/src'; +import type { OrderDir } from '../../../shlink-frontend-kit/src'; +import { OrderingDropdown, SearchField } from '../../../shlink-frontend-kit/src'; import type { TagsSelectorProps } from '../tags/helpers/TagsSelector'; import { DateRangeSelector } from '../utils/dates/DateRangeSelector'; import { formatIsoDate } from '../utils/dates/helpers/date'; diff --git a/shlink-web-component/short-urls/ShortUrlsList.tsx b/shlink-web-component/src/short-urls/ShortUrlsList.tsx similarity index 94% rename from shlink-web-component/short-urls/ShortUrlsList.tsx rename to shlink-web-component/src/short-urls/ShortUrlsList.tsx index 7073c966..b9b8d30b 100644 --- a/shlink-web-component/short-urls/ShortUrlsList.tsx +++ b/shlink-web-component/src/short-urls/ShortUrlsList.tsx @@ -2,9 +2,9 @@ import { pipe } from 'ramda'; import { useEffect, useState } from 'react'; import { useLocation, useParams } from 'react-router-dom'; import { Card } from 'reactstrap'; -import type { OrderDir } from '../../shlink-frontend-kit/src'; -import { determineOrderDir } from '../../shlink-frontend-kit/src'; -import { DEFAULT_SHORT_URLS_ORDERING } from '../../src/settings/reducers/settings'; +import type { OrderDir } from '../../../shlink-frontend-kit/src'; +import { determineOrderDir } from '../../../shlink-frontend-kit/src'; +import { DEFAULT_SHORT_URLS_ORDERING } from '../../../src/settings/reducers/settings'; import type { ShlinkShortUrlsListParams, ShlinkShortUrlsOrder } from '../api-contract'; import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub'; import { Topics } from '../mercure/helpers/Topics'; diff --git a/shlink-web-component/short-urls/ShortUrlsTable.scss b/shlink-web-component/src/short-urls/ShortUrlsTable.scss similarity index 100% rename from shlink-web-component/short-urls/ShortUrlsTable.scss rename to shlink-web-component/src/short-urls/ShortUrlsTable.scss diff --git a/shlink-web-component/short-urls/ShortUrlsTable.tsx b/shlink-web-component/src/short-urls/ShortUrlsTable.tsx similarity index 100% rename from shlink-web-component/short-urls/ShortUrlsTable.tsx rename to shlink-web-component/src/short-urls/ShortUrlsTable.tsx diff --git a/shlink-web-component/short-urls/UseExistingIfFoundInfoIcon.scss b/shlink-web-component/src/short-urls/UseExistingIfFoundInfoIcon.scss similarity index 100% rename from shlink-web-component/short-urls/UseExistingIfFoundInfoIcon.scss rename to shlink-web-component/src/short-urls/UseExistingIfFoundInfoIcon.scss diff --git a/shlink-web-component/short-urls/UseExistingIfFoundInfoIcon.tsx b/shlink-web-component/src/short-urls/UseExistingIfFoundInfoIcon.tsx similarity index 96% rename from shlink-web-component/short-urls/UseExistingIfFoundInfoIcon.tsx rename to shlink-web-component/src/short-urls/UseExistingIfFoundInfoIcon.tsx index 5247af47..675e3bfb 100644 --- a/shlink-web-component/short-urls/UseExistingIfFoundInfoIcon.tsx +++ b/shlink-web-component/src/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 '../../shlink-frontend-kit/src'; +import { useToggle } from '../../../shlink-frontend-kit/src'; import './UseExistingIfFoundInfoIcon.scss'; const InfoModal = ({ isOpen, toggle }: { isOpen: boolean; toggle: () => void }) => ( diff --git a/shlink-web-component/short-urls/data/index.ts b/shlink-web-component/src/short-urls/data/index.ts similarity index 97% rename from shlink-web-component/short-urls/data/index.ts rename to shlink-web-component/src/short-urls/data/index.ts index 3bb4ce53..a3c3a481 100644 --- a/shlink-web-component/short-urls/data/index.ts +++ b/shlink-web-component/src/short-urls/data/index.ts @@ -1,4 +1,4 @@ -import type { Order } from '../../../shlink-frontend-kit/src'; +import type { Order } from '../../../../shlink-frontend-kit/src'; import type { ShlinkVisitsSummary } from '../../api-contract'; import type { Nullable, OptionalString } from '../../utils/helpers'; diff --git a/shlink-web-component/short-urls/helpers/CreateShortUrlResult.scss b/shlink-web-component/src/short-urls/helpers/CreateShortUrlResult.scss similarity index 100% rename from shlink-web-component/short-urls/helpers/CreateShortUrlResult.scss rename to shlink-web-component/src/short-urls/helpers/CreateShortUrlResult.scss diff --git a/shlink-web-component/short-urls/helpers/CreateShortUrlResult.tsx b/shlink-web-component/src/short-urls/helpers/CreateShortUrlResult.tsx similarity index 97% rename from shlink-web-component/short-urls/helpers/CreateShortUrlResult.tsx rename to shlink-web-component/src/short-urls/helpers/CreateShortUrlResult.tsx index 9ee067bd..f6b09d66 100644 --- a/shlink-web-component/short-urls/helpers/CreateShortUrlResult.tsx +++ b/shlink-web-component/src/short-urls/helpers/CreateShortUrlResult.tsx @@ -4,7 +4,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { useEffect } from 'react'; import CopyToClipboard from 'react-copy-to-clipboard'; import { Tooltip } from 'reactstrap'; -import { Result } from '../../../shlink-frontend-kit/src'; +import { Result } from '../../../../shlink-frontend-kit/src'; import { ShlinkApiError } from '../../common/ShlinkApiError'; import type { TimeoutToggle } from '../../utils/helpers/hooks'; import type { ShortUrlCreation } from '../reducers/shortUrlCreation'; diff --git a/shlink-web-component/short-urls/helpers/DeleteShortUrlModal.tsx b/shlink-web-component/src/short-urls/helpers/DeleteShortUrlModal.tsx similarity index 97% rename from shlink-web-component/short-urls/helpers/DeleteShortUrlModal.tsx rename to shlink-web-component/src/short-urls/helpers/DeleteShortUrlModal.tsx index 22c9d447..511113c4 100644 --- a/shlink-web-component/short-urls/helpers/DeleteShortUrlModal.tsx +++ b/shlink-web-component/src/short-urls/helpers/DeleteShortUrlModal.tsx @@ -1,7 +1,7 @@ import { pipe } from 'ramda'; import { useEffect, useState } from 'react'; import { Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap'; -import { Result } from '../../../shlink-frontend-kit/src'; +import { Result } from '../../../../shlink-frontend-kit/src'; import { isInvalidDeletionError } from '../../api-contract/utils'; import { ShlinkApiError } from '../../common/ShlinkApiError'; import { handleEventPreventingDefault } from '../../utils/helpers'; diff --git a/shlink-web-component/short-urls/helpers/ExportShortUrlsBtn.tsx b/shlink-web-component/src/short-urls/helpers/ExportShortUrlsBtn.tsx similarity index 96% rename from shlink-web-component/short-urls/helpers/ExportShortUrlsBtn.tsx rename to shlink-web-component/src/short-urls/helpers/ExportShortUrlsBtn.tsx index 9c844729..9329df9f 100644 --- a/shlink-web-component/short-urls/helpers/ExportShortUrlsBtn.tsx +++ b/shlink-web-component/src/short-urls/helpers/ExportShortUrlsBtn.tsx @@ -1,6 +1,6 @@ import type { FC } from 'react'; import { useCallback } from 'react'; -import { useToggle } from '../../../shlink-frontend-kit/src'; +import { useToggle } from '../../../../shlink-frontend-kit/src'; import type { ShlinkApiClient } from '../../api-contract'; import { ExportBtn } from '../../utils/components/ExportBtn'; import type { ReportExporter } from '../../utils/services/ReportExporter'; diff --git a/shlink-web-component/short-urls/helpers/QrCodeModal.scss b/shlink-web-component/src/short-urls/helpers/QrCodeModal.scss similarity index 100% rename from shlink-web-component/short-urls/helpers/QrCodeModal.scss rename to shlink-web-component/src/short-urls/helpers/QrCodeModal.scss diff --git a/shlink-web-component/short-urls/helpers/QrCodeModal.tsx b/shlink-web-component/src/short-urls/helpers/QrCodeModal.tsx similarity index 100% rename from shlink-web-component/short-urls/helpers/QrCodeModal.tsx rename to shlink-web-component/src/short-urls/helpers/QrCodeModal.tsx diff --git a/shlink-web-component/short-urls/helpers/ShortUrlDetailLink.tsx b/shlink-web-component/src/short-urls/helpers/ShortUrlDetailLink.tsx similarity index 100% rename from shlink-web-component/short-urls/helpers/ShortUrlDetailLink.tsx rename to shlink-web-component/src/short-urls/helpers/ShortUrlDetailLink.tsx diff --git a/shlink-web-component/short-urls/helpers/ShortUrlFormCheckboxGroup.tsx b/shlink-web-component/src/short-urls/helpers/ShortUrlFormCheckboxGroup.tsx similarity index 91% rename from shlink-web-component/short-urls/helpers/ShortUrlFormCheckboxGroup.tsx rename to shlink-web-component/src/short-urls/helpers/ShortUrlFormCheckboxGroup.tsx index e13afbbb..657b60da 100644 --- a/shlink-web-component/short-urls/helpers/ShortUrlFormCheckboxGroup.tsx +++ b/shlink-web-component/src/short-urls/helpers/ShortUrlFormCheckboxGroup.tsx @@ -1,5 +1,5 @@ import type { ChangeEvent, FC, PropsWithChildren } from 'react'; -import { Checkbox } from '../../../shlink-frontend-kit/src'; +import { Checkbox } from '../../../../shlink-frontend-kit/src'; import { InfoTooltip } from '../../utils/components/InfoTooltip'; type ShortUrlFormCheckboxGroupProps = PropsWithChildren<{ diff --git a/shlink-web-component/short-urls/helpers/ShortUrlStatus.tsx b/shlink-web-component/src/short-urls/helpers/ShortUrlStatus.tsx similarity index 97% rename from shlink-web-component/short-urls/helpers/ShortUrlStatus.tsx rename to shlink-web-component/src/short-urls/helpers/ShortUrlStatus.tsx index 594ef376..1a3cc6c9 100644 --- a/shlink-web-component/short-urls/helpers/ShortUrlStatus.tsx +++ b/shlink-web-component/src/short-urls/helpers/ShortUrlStatus.tsx @@ -4,7 +4,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { isBefore } from 'date-fns'; import type { FC, ReactNode } from 'react'; import { UncontrolledTooltip } from 'reactstrap'; -import { useElementRef } from '../../../shlink-frontend-kit/src'; +import { useElementRef } from '../../../../shlink-frontend-kit/src'; import { formatHumanFriendly, now, parseISO } from '../../utils/dates/helpers/date'; import type { ShortUrl } from '../data'; diff --git a/shlink-web-component/short-urls/helpers/ShortUrlVisitsCount.scss b/shlink-web-component/src/short-urls/helpers/ShortUrlVisitsCount.scss similarity index 100% rename from shlink-web-component/short-urls/helpers/ShortUrlVisitsCount.scss rename to shlink-web-component/src/short-urls/helpers/ShortUrlVisitsCount.scss diff --git a/shlink-web-component/short-urls/helpers/ShortUrlVisitsCount.tsx b/shlink-web-component/src/short-urls/helpers/ShortUrlVisitsCount.tsx similarity index 97% rename from shlink-web-component/short-urls/helpers/ShortUrlVisitsCount.tsx rename to shlink-web-component/src/short-urls/helpers/ShortUrlVisitsCount.tsx index 3b3ad7ba..9cb4d750 100644 --- a/shlink-web-component/short-urls/helpers/ShortUrlVisitsCount.tsx +++ b/shlink-web-component/src/short-urls/helpers/ShortUrlVisitsCount.tsx @@ -2,7 +2,7 @@ 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 { useElementRef } from '../../../shlink-frontend-kit/src'; +import { useElementRef } from '../../../../shlink-frontend-kit/src'; import { formatHumanFriendly, parseISO } from '../../utils/dates/helpers/date'; import { prettify } from '../../utils/helpers/numbers'; import type { ShortUrl } from '../data'; diff --git a/shlink-web-component/short-urls/helpers/ShortUrlsFilterDropdown.tsx b/shlink-web-component/src/short-urls/helpers/ShortUrlsFilterDropdown.tsx similarity index 96% rename from shlink-web-component/short-urls/helpers/ShortUrlsFilterDropdown.tsx rename to shlink-web-component/src/short-urls/helpers/ShortUrlsFilterDropdown.tsx index 5ae96c11..f4054b19 100644 --- a/shlink-web-component/short-urls/helpers/ShortUrlsFilterDropdown.tsx +++ b/shlink-web-component/src/short-urls/helpers/ShortUrlsFilterDropdown.tsx @@ -1,5 +1,5 @@ import { DropdownItem } from 'reactstrap'; -import { DropdownBtn } from '../../../shlink-frontend-kit/src'; +import { DropdownBtn } from '../../../../shlink-frontend-kit/src'; import { hasValue } from '../../utils/helpers'; import type { ShortUrlsFilter } from '../data'; diff --git a/shlink-web-component/short-urls/helpers/ShortUrlsRow.scss b/shlink-web-component/src/short-urls/helpers/ShortUrlsRow.scss similarity index 83% rename from shlink-web-component/short-urls/helpers/ShortUrlsRow.scss rename to shlink-web-component/src/short-urls/helpers/ShortUrlsRow.scss index b906c1b8..e1a6d4dc 100644 --- a/shlink-web-component/short-urls/helpers/ShortUrlsRow.scss +++ b/shlink-web-component/src/short-urls/helpers/ShortUrlsRow.scss @@ -1,6 +1,6 @@ -@import '../../../src/utils/base'; -@import '../../../src/utils/mixins/text-ellipsis'; -@import '../../../src/utils/mixins/vertical-align'; +@import '../../../../src/utils/base'; +@import '../../../../src/utils/mixins/text-ellipsis'; +@import '../../../../src/utils/mixins/vertical-align'; .short-urls-row__cell.short-urls-row__cell { vertical-align: middle !important; diff --git a/shlink-web-component/short-urls/helpers/ShortUrlsRow.tsx b/shlink-web-component/src/short-urls/helpers/ShortUrlsRow.tsx similarity index 98% rename from shlink-web-component/short-urls/helpers/ShortUrlsRow.tsx rename to shlink-web-component/src/short-urls/helpers/ShortUrlsRow.tsx index 9e19917c..96441d8e 100644 --- a/shlink-web-component/short-urls/helpers/ShortUrlsRow.tsx +++ b/shlink-web-component/src/short-urls/helpers/ShortUrlsRow.tsx @@ -1,7 +1,7 @@ import type { FC } from 'react'; import { useEffect, useRef } from 'react'; import { ExternalLink } from 'react-external-link'; -import type { TimeoutToggle } from '../../../src/utils/helpers/hooks'; +import type { TimeoutToggle } from '../../../../src/utils/helpers/hooks'; import { CopyToClipboardIcon } from '../../utils/components/CopyToClipboardIcon'; import { Time } from '../../utils/dates/Time'; import type { ColorGenerator } from '../../utils/services/ColorGenerator'; diff --git a/shlink-web-component/short-urls/helpers/ShortUrlsRowMenu.tsx b/shlink-web-component/src/short-urls/helpers/ShortUrlsRowMenu.tsx similarity index 95% rename from shlink-web-component/short-urls/helpers/ShortUrlsRowMenu.tsx rename to shlink-web-component/src/short-urls/helpers/ShortUrlsRowMenu.tsx index 089e34ec..65f0faee 100644 --- a/shlink-web-component/short-urls/helpers/ShortUrlsRowMenu.tsx +++ b/shlink-web-component/src/short-urls/helpers/ShortUrlsRowMenu.tsx @@ -7,7 +7,7 @@ import { import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import type { FC } from 'react'; import { DropdownItem } from 'reactstrap'; -import { RowDropdownBtn, useToggle } from '../../../shlink-frontend-kit/src'; +import { RowDropdownBtn, useToggle } from '../../../../shlink-frontend-kit/src'; import type { ShortUrl, ShortUrlModalProps } from '../data'; import { ShortUrlDetailLink } from './ShortUrlDetailLink'; diff --git a/shlink-web-component/short-urls/helpers/Tags.tsx b/shlink-web-component/src/short-urls/helpers/Tags.tsx similarity index 100% rename from shlink-web-component/short-urls/helpers/Tags.tsx rename to shlink-web-component/src/short-urls/helpers/Tags.tsx diff --git a/shlink-web-component/short-urls/helpers/hooks.ts b/shlink-web-component/src/short-urls/helpers/hooks.ts similarity index 97% rename from shlink-web-component/short-urls/helpers/hooks.ts rename to shlink-web-component/src/short-urls/helpers/hooks.ts index 1b766cf3..1a36a2b8 100644 --- a/shlink-web-component/short-urls/helpers/hooks.ts +++ b/shlink-web-component/src/short-urls/helpers/hooks.ts @@ -1,7 +1,7 @@ import { isEmpty, pipe } from 'ramda'; import { useCallback, useMemo } from 'react'; import { useLocation, useNavigate } from 'react-router-dom'; -import { orderToString, stringToOrder } from '../../../shlink-frontend-kit/src'; +import { orderToString, stringToOrder } from '../../../../shlink-frontend-kit/src'; import type { TagsFilteringMode } from '../../api-contract'; import type { BooleanString } from '../../utils/helpers'; import { parseOptionalBooleanToString } from '../../utils/helpers'; diff --git a/shlink-web-component/short-urls/helpers/index.ts b/shlink-web-component/src/short-urls/helpers/index.ts similarity index 100% rename from shlink-web-component/short-urls/helpers/index.ts rename to shlink-web-component/src/short-urls/helpers/index.ts diff --git a/shlink-web-component/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown.tsx b/shlink-web-component/src/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown.tsx similarity index 93% rename from shlink-web-component/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown.tsx rename to shlink-web-component/src/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown.tsx index ac3c487c..7773106d 100644 --- a/shlink-web-component/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown.tsx +++ b/shlink-web-component/src/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown.tsx @@ -1,6 +1,6 @@ import type { FC } from 'react'; import { DropdownItem } from 'reactstrap'; -import { DropdownBtn } from '../../../../shlink-frontend-kit/src'; +import { DropdownBtn } from '../../../../../shlink-frontend-kit/src'; import type { QrErrorCorrection } from '../../../utils/helpers/qrCodes'; interface QrErrorCorrectionDropdownProps { diff --git a/shlink-web-component/short-urls/helpers/qr-codes/QrFormatDropdown.tsx b/shlink-web-component/src/short-urls/helpers/qr-codes/QrFormatDropdown.tsx similarity index 89% rename from shlink-web-component/short-urls/helpers/qr-codes/QrFormatDropdown.tsx rename to shlink-web-component/src/short-urls/helpers/qr-codes/QrFormatDropdown.tsx index 77842bff..f5a90874 100644 --- a/shlink-web-component/short-urls/helpers/qr-codes/QrFormatDropdown.tsx +++ b/shlink-web-component/src/short-urls/helpers/qr-codes/QrFormatDropdown.tsx @@ -1,6 +1,6 @@ import type { FC } from 'react'; import { DropdownItem } from 'reactstrap'; -import { DropdownBtn } from '../../../../shlink-frontend-kit/src'; +import { DropdownBtn } from '../../../../../shlink-frontend-kit/src'; import type { QrCodeFormat } from '../../../utils/helpers/qrCodes'; interface QrFormatDropdownProps { diff --git a/shlink-web-component/short-urls/reducers/shortUrlCreation.ts b/shlink-web-component/src/short-urls/reducers/shortUrlCreation.ts similarity index 100% rename from shlink-web-component/short-urls/reducers/shortUrlCreation.ts rename to shlink-web-component/src/short-urls/reducers/shortUrlCreation.ts diff --git a/shlink-web-component/short-urls/reducers/shortUrlDeletion.ts b/shlink-web-component/src/short-urls/reducers/shortUrlDeletion.ts similarity index 100% rename from shlink-web-component/short-urls/reducers/shortUrlDeletion.ts rename to shlink-web-component/src/short-urls/reducers/shortUrlDeletion.ts diff --git a/shlink-web-component/short-urls/reducers/shortUrlDetail.ts b/shlink-web-component/src/short-urls/reducers/shortUrlDetail.ts similarity index 100% rename from shlink-web-component/short-urls/reducers/shortUrlDetail.ts rename to shlink-web-component/src/short-urls/reducers/shortUrlDetail.ts diff --git a/shlink-web-component/short-urls/reducers/shortUrlEdition.ts b/shlink-web-component/src/short-urls/reducers/shortUrlEdition.ts similarity index 100% rename from shlink-web-component/short-urls/reducers/shortUrlEdition.ts rename to shlink-web-component/src/short-urls/reducers/shortUrlEdition.ts diff --git a/shlink-web-component/short-urls/reducers/shortUrlsList.ts b/shlink-web-component/src/short-urls/reducers/shortUrlsList.ts similarity index 100% rename from shlink-web-component/short-urls/reducers/shortUrlsList.ts rename to shlink-web-component/src/short-urls/reducers/shortUrlsList.ts diff --git a/shlink-web-component/short-urls/services/provideServices.ts b/shlink-web-component/src/short-urls/services/provideServices.ts similarity index 100% rename from shlink-web-component/short-urls/services/provideServices.ts rename to shlink-web-component/src/short-urls/services/provideServices.ts diff --git a/shlink-web-component/tags/TagsList.tsx b/shlink-web-component/src/tags/TagsList.tsx similarity index 97% rename from shlink-web-component/tags/TagsList.tsx rename to shlink-web-component/src/tags/TagsList.tsx index 203c8941..ce390731 100644 --- a/shlink-web-component/tags/TagsList.tsx +++ b/shlink-web-component/src/tags/TagsList.tsx @@ -2,7 +2,7 @@ import { pipe } from 'ramda'; import type { FC } from 'react'; import { useEffect, useState } from 'react'; import { Row } from 'reactstrap'; -import { determineOrderDir, Message, OrderingDropdown, Result, SearchField, sortList } from '../../shlink-frontend-kit/src'; +import { determineOrderDir, Message, OrderingDropdown, Result, SearchField, sortList } from '../../../shlink-frontend-kit/src'; import { ShlinkApiError } from '../common/ShlinkApiError'; import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub'; import { Topics } from '../mercure/helpers/Topics'; diff --git a/shlink-web-component/tags/TagsTable.scss b/shlink-web-component/src/tags/TagsTable.scss similarity index 63% rename from shlink-web-component/tags/TagsTable.scss rename to shlink-web-component/src/tags/TagsTable.scss index 24032b8e..c154a3fe 100644 --- a/shlink-web-component/tags/TagsTable.scss +++ b/shlink-web-component/src/tags/TagsTable.scss @@ -1,5 +1,5 @@ -@import '../../src/utils/base'; -@import '../../src/utils/mixins/sticky-cell'; +@import '../../../src/utils/base'; +@import '../../../src/utils/mixins/sticky-cell'; .tags-table__header-cell.tags-table__header-cell { @include sticky-cell(false); diff --git a/shlink-web-component/tags/TagsTable.tsx b/shlink-web-component/src/tags/TagsTable.tsx similarity index 97% rename from shlink-web-component/tags/TagsTable.tsx rename to shlink-web-component/src/tags/TagsTable.tsx index 57537a07..3f494814 100644 --- a/shlink-web-component/tags/TagsTable.tsx +++ b/shlink-web-component/src/tags/TagsTable.tsx @@ -2,7 +2,7 @@ import { splitEvery } from 'ramda'; import type { FC } from 'react'; import { useEffect, useRef } from 'react'; import { useLocation } from 'react-router-dom'; -import { SimpleCard } from '../../shlink-frontend-kit/src'; +import { SimpleCard } from '../../../shlink-frontend-kit/src'; import { SimplePaginator } from '../utils/components/SimplePaginator'; import { useQueryState } from '../utils/helpers/hooks'; import { parseQuery } from '../utils/helpers/query'; diff --git a/shlink-web-component/tags/TagsTableRow.tsx b/shlink-web-component/src/tags/TagsTableRow.tsx similarity index 96% rename from shlink-web-component/tags/TagsTableRow.tsx rename to shlink-web-component/src/tags/TagsTableRow.tsx index 16e0af75..b691762c 100644 --- a/shlink-web-component/tags/TagsTableRow.tsx +++ b/shlink-web-component/src/tags/TagsTableRow.tsx @@ -3,7 +3,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import type { FC } from 'react'; import { Link } from 'react-router-dom'; import { DropdownItem } from 'reactstrap'; -import { RowDropdownBtn, useToggle } from '../../shlink-frontend-kit/src'; +import { RowDropdownBtn, useToggle } from '../../../shlink-frontend-kit/src'; import { prettify } from '../utils/helpers/numbers'; import { useRoutesPrefix } from '../utils/routesPrefix'; import type { ColorGenerator } from '../utils/services/ColorGenerator'; diff --git a/shlink-web-component/tags/data/TagsListChildrenProps.ts b/shlink-web-component/src/tags/data/TagsListChildrenProps.ts similarity index 84% rename from shlink-web-component/tags/data/TagsListChildrenProps.ts rename to shlink-web-component/src/tags/data/TagsListChildrenProps.ts index 5cf5f960..3a3ae9e8 100644 --- a/shlink-web-component/tags/data/TagsListChildrenProps.ts +++ b/shlink-web-component/src/tags/data/TagsListChildrenProps.ts @@ -1,4 +1,4 @@ -import type { Order } from '../../../shlink-frontend-kit/src'; +import type { Order } from '../../../../shlink-frontend-kit/src'; import type { SimplifiedTag } from './index'; export const TAGS_ORDERABLE_FIELDS = { diff --git a/shlink-web-component/tags/data/index.ts b/shlink-web-component/src/tags/data/index.ts similarity index 100% rename from shlink-web-component/tags/data/index.ts rename to shlink-web-component/src/tags/data/index.ts diff --git a/shlink-web-component/tags/helpers/DeleteTagConfirmModal.tsx b/shlink-web-component/src/tags/helpers/DeleteTagConfirmModal.tsx similarity index 95% rename from shlink-web-component/tags/helpers/DeleteTagConfirmModal.tsx rename to shlink-web-component/src/tags/helpers/DeleteTagConfirmModal.tsx index 0d218db3..a3861274 100644 --- a/shlink-web-component/tags/helpers/DeleteTagConfirmModal.tsx +++ b/shlink-web-component/src/tags/helpers/DeleteTagConfirmModal.tsx @@ -1,5 +1,5 @@ import { Button, Modal, ModalBody, ModalFooter, ModalHeader } from 'reactstrap'; -import { Result } from '../../../shlink-frontend-kit/src'; +import { Result } from '../../../../shlink-frontend-kit/src'; import { ShlinkApiError } from '../../common/ShlinkApiError'; import type { TagModalProps } from '../data'; import type { TagDeletion } from '../reducers/tagDelete'; diff --git a/shlink-web-component/tags/helpers/EditTagModal.scss b/shlink-web-component/src/tags/helpers/EditTagModal.scss similarity index 100% rename from shlink-web-component/tags/helpers/EditTagModal.scss rename to shlink-web-component/src/tags/helpers/EditTagModal.scss diff --git a/shlink-web-component/tags/helpers/EditTagModal.tsx b/shlink-web-component/src/tags/helpers/EditTagModal.tsx similarity index 97% rename from shlink-web-component/tags/helpers/EditTagModal.tsx rename to shlink-web-component/src/tags/helpers/EditTagModal.tsx index e835d572..d076ca4c 100644 --- a/shlink-web-component/tags/helpers/EditTagModal.tsx +++ b/shlink-web-component/src/tags/helpers/EditTagModal.tsx @@ -4,7 +4,7 @@ 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 { Result, useToggle } from '../../../shlink-frontend-kit/src'; +import { Result, useToggle } from '../../../../shlink-frontend-kit/src'; import { ShlinkApiError } from '../../common/ShlinkApiError'; import { handleEventPreventingDefault } from '../../utils/helpers'; import type { ColorGenerator } from '../../utils/services/ColorGenerator'; diff --git a/shlink-web-component/tags/helpers/Tag.scss b/shlink-web-component/src/tags/helpers/Tag.scss similarity index 100% rename from shlink-web-component/tags/helpers/Tag.scss rename to shlink-web-component/src/tags/helpers/Tag.scss diff --git a/shlink-web-component/tags/helpers/Tag.tsx b/shlink-web-component/src/tags/helpers/Tag.tsx similarity index 100% rename from shlink-web-component/tags/helpers/Tag.tsx rename to shlink-web-component/src/tags/helpers/Tag.tsx diff --git a/shlink-web-component/tags/helpers/TagBullet.scss b/shlink-web-component/src/tags/helpers/TagBullet.scss similarity index 100% rename from shlink-web-component/tags/helpers/TagBullet.scss rename to shlink-web-component/src/tags/helpers/TagBullet.scss diff --git a/shlink-web-component/tags/helpers/TagBullet.tsx b/shlink-web-component/src/tags/helpers/TagBullet.tsx similarity index 100% rename from shlink-web-component/tags/helpers/TagBullet.tsx rename to shlink-web-component/src/tags/helpers/TagBullet.tsx diff --git a/shlink-web-component/tags/helpers/TagsSelector.tsx b/shlink-web-component/src/tags/helpers/TagsSelector.tsx similarity index 100% rename from shlink-web-component/tags/helpers/TagsSelector.tsx rename to shlink-web-component/src/tags/helpers/TagsSelector.tsx diff --git a/shlink-web-component/tags/reducers/tagDelete.ts b/shlink-web-component/src/tags/reducers/tagDelete.ts similarity index 100% rename from shlink-web-component/tags/reducers/tagDelete.ts rename to shlink-web-component/src/tags/reducers/tagDelete.ts diff --git a/shlink-web-component/tags/reducers/tagEdit.ts b/shlink-web-component/src/tags/reducers/tagEdit.ts similarity index 100% rename from shlink-web-component/tags/reducers/tagEdit.ts rename to shlink-web-component/src/tags/reducers/tagEdit.ts diff --git a/shlink-web-component/tags/reducers/tagsList.ts b/shlink-web-component/src/tags/reducers/tagsList.ts similarity index 100% rename from shlink-web-component/tags/reducers/tagsList.ts rename to shlink-web-component/src/tags/reducers/tagsList.ts diff --git a/shlink-web-component/tags/services/provideServices.ts b/shlink-web-component/src/tags/services/provideServices.ts similarity index 100% rename from shlink-web-component/tags/services/provideServices.ts rename to shlink-web-component/src/tags/services/provideServices.ts diff --git a/shlink-web-component/utils/components/CopyToClipboardIcon.scss b/shlink-web-component/src/utils/components/CopyToClipboardIcon.scss similarity index 100% rename from shlink-web-component/utils/components/CopyToClipboardIcon.scss rename to shlink-web-component/src/utils/components/CopyToClipboardIcon.scss diff --git a/shlink-web-component/utils/components/CopyToClipboardIcon.tsx b/shlink-web-component/src/utils/components/CopyToClipboardIcon.tsx similarity index 100% rename from shlink-web-component/utils/components/CopyToClipboardIcon.tsx rename to shlink-web-component/src/utils/components/CopyToClipboardIcon.tsx diff --git a/shlink-web-component/utils/components/ExportBtn.tsx b/shlink-web-component/src/utils/components/ExportBtn.tsx similarity index 100% rename from shlink-web-component/utils/components/ExportBtn.tsx rename to shlink-web-component/src/utils/components/ExportBtn.tsx diff --git a/shlink-web-component/utils/components/IconInput.scss b/shlink-web-component/src/utils/components/IconInput.scss similarity index 83% rename from shlink-web-component/utils/components/IconInput.scss rename to shlink-web-component/src/utils/components/IconInput.scss index 8a07ea92..b698ecca 100644 --- a/shlink-web-component/utils/components/IconInput.scss +++ b/shlink-web-component/src/utils/components/IconInput.scss @@ -1,5 +1,5 @@ -@import '../../../src/utils/mixins/vertical-align'; -@import '../../../src/utils/base'; +@import '../../../../src/utils/mixins/vertical-align'; +@import '../../../../src/utils/base'; .icon-input-container { position: relative; diff --git a/shlink-web-component/utils/components/IconInput.tsx b/shlink-web-component/src/utils/components/IconInput.tsx similarity index 92% rename from shlink-web-component/utils/components/IconInput.tsx rename to shlink-web-component/src/utils/components/IconInput.tsx index f11eb187..16a199fb 100644 --- a/shlink-web-component/utils/components/IconInput.tsx +++ b/shlink-web-component/src/utils/components/IconInput.tsx @@ -4,7 +4,7 @@ import classNames from 'classnames'; import type { FC } from 'react'; import type { InputProps } from 'reactstrap'; import { Input } from 'reactstrap'; -import { useElementRef } from '../../../shlink-frontend-kit/src'; +import { useElementRef } from '../../../../shlink-frontend-kit/src'; import './IconInput.scss'; type IconInputProps = InputProps & { diff --git a/shlink-web-component/utils/components/InfoTooltip.tsx b/shlink-web-component/src/utils/components/InfoTooltip.tsx similarity index 91% rename from shlink-web-component/utils/components/InfoTooltip.tsx rename to shlink-web-component/src/utils/components/InfoTooltip.tsx index 3e08e3a2..71532c87 100644 --- a/shlink-web-component/utils/components/InfoTooltip.tsx +++ b/shlink-web-component/src/utils/components/InfoTooltip.tsx @@ -3,7 +3,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import type { Placement } from '@popperjs/core'; import type { FC, PropsWithChildren } from 'react'; import { UncontrolledTooltip } from 'reactstrap'; -import { useElementRef } from '../../../shlink-frontend-kit/src'; +import { useElementRef } from '../../../../shlink-frontend-kit/src'; export type InfoTooltipProps = PropsWithChildren<{ className?: string; diff --git a/shlink-web-component/utils/components/PaginationDropdown.tsx b/shlink-web-component/src/utils/components/PaginationDropdown.tsx similarity index 100% rename from shlink-web-component/utils/components/PaginationDropdown.tsx rename to shlink-web-component/src/utils/components/PaginationDropdown.tsx diff --git a/shlink-web-component/utils/components/SimplePaginator.scss b/shlink-web-component/src/utils/components/SimplePaginator.scss similarity index 100% rename from shlink-web-component/utils/components/SimplePaginator.scss rename to shlink-web-component/src/utils/components/SimplePaginator.scss diff --git a/shlink-web-component/utils/components/SimplePaginator.tsx b/shlink-web-component/src/utils/components/SimplePaginator.tsx similarity index 100% rename from shlink-web-component/utils/components/SimplePaginator.tsx rename to shlink-web-component/src/utils/components/SimplePaginator.tsx diff --git a/shlink-web-component/utils/dates/DateInput.scss b/shlink-web-component/src/utils/dates/DateInput.scss similarity index 96% rename from shlink-web-component/utils/dates/DateInput.scss rename to shlink-web-component/src/utils/dates/DateInput.scss index 57bb43dc..0025d5e4 100644 --- a/shlink-web-component/utils/dates/DateInput.scss +++ b/shlink-web-component/src/utils/dates/DateInput.scss @@ -1,5 +1,5 @@ -@import '../../../src/utils/mixins/vertical-align'; -@import '../../../src/utils/base'; +@import '../../../../src/utils/mixins/vertical-align'; +@import '../../../../src/utils/base'; .react-datepicker__close-icon.react-datepicker__close-icon { @include vertical-align(); diff --git a/shlink-web-component/utils/dates/DateInput.tsx b/shlink-web-component/src/utils/dates/DateInput.tsx similarity index 100% rename from shlink-web-component/utils/dates/DateInput.tsx rename to shlink-web-component/src/utils/dates/DateInput.tsx diff --git a/shlink-web-component/utils/dates/DateIntervalDropdownItems.tsx b/shlink-web-component/src/utils/dates/DateIntervalDropdownItems.tsx similarity index 100% rename from shlink-web-component/utils/dates/DateIntervalDropdownItems.tsx rename to shlink-web-component/src/utils/dates/DateIntervalDropdownItems.tsx diff --git a/shlink-web-component/utils/dates/DateIntervalSelector.tsx b/shlink-web-component/src/utils/dates/DateIntervalSelector.tsx similarity index 88% rename from shlink-web-component/utils/dates/DateIntervalSelector.tsx rename to shlink-web-component/src/utils/dates/DateIntervalSelector.tsx index fb4f88a4..68b3a845 100644 --- a/shlink-web-component/utils/dates/DateIntervalSelector.tsx +++ b/shlink-web-component/src/utils/dates/DateIntervalSelector.tsx @@ -1,5 +1,5 @@ import type { FC } from 'react'; -import { DropdownBtn } from '../../../shlink-frontend-kit/src'; +import { DropdownBtn } from '../../../../shlink-frontend-kit/src'; import type { DateIntervalDropdownProps } from './DateIntervalDropdownItems'; import { DateIntervalDropdownItems } from './DateIntervalDropdownItems'; import { rangeOrIntervalToString } from './helpers/dateIntervals'; diff --git a/shlink-web-component/utils/dates/DateRangeRow.tsx b/shlink-web-component/src/utils/dates/DateRangeRow.tsx similarity index 100% rename from shlink-web-component/utils/dates/DateRangeRow.tsx rename to shlink-web-component/src/utils/dates/DateRangeRow.tsx diff --git a/shlink-web-component/utils/dates/DateRangeSelector.tsx b/shlink-web-component/src/utils/dates/DateRangeSelector.tsx similarity index 97% rename from shlink-web-component/utils/dates/DateRangeSelector.tsx rename to shlink-web-component/src/utils/dates/DateRangeSelector.tsx index 2953340c..02270ccd 100644 --- a/shlink-web-component/utils/dates/DateRangeSelector.tsx +++ b/shlink-web-component/src/utils/dates/DateRangeSelector.tsx @@ -1,6 +1,6 @@ import { useState } from 'react'; import { DropdownItem } from 'reactstrap'; -import { DropdownBtn } from '../../../shlink-frontend-kit/src'; +import { DropdownBtn } from '../../../../shlink-frontend-kit/src'; import { useEffectExceptFirstTime } from '../helpers/hooks'; import { DateIntervalDropdownItems } from './DateIntervalDropdownItems'; import { DateRangeRow } from './DateRangeRow'; diff --git a/shlink-web-component/utils/dates/DateTimeInput.tsx b/shlink-web-component/src/utils/dates/DateTimeInput.tsx similarity index 100% rename from shlink-web-component/utils/dates/DateTimeInput.tsx rename to shlink-web-component/src/utils/dates/DateTimeInput.tsx diff --git a/shlink-web-component/utils/dates/Time.tsx b/shlink-web-component/src/utils/dates/Time.tsx similarity index 100% rename from shlink-web-component/utils/dates/Time.tsx rename to shlink-web-component/src/utils/dates/Time.tsx diff --git a/shlink-web-component/utils/dates/helpers/date.ts b/shlink-web-component/src/utils/dates/helpers/date.ts similarity index 100% rename from shlink-web-component/utils/dates/helpers/date.ts rename to shlink-web-component/src/utils/dates/helpers/date.ts diff --git a/shlink-web-component/utils/dates/helpers/dateIntervals.ts b/shlink-web-component/src/utils/dates/helpers/dateIntervals.ts similarity index 100% rename from shlink-web-component/utils/dates/helpers/dateIntervals.ts rename to shlink-web-component/src/utils/dates/helpers/dateIntervals.ts diff --git a/shlink-web-component/utils/features.ts b/shlink-web-component/src/utils/features.ts similarity index 100% rename from shlink-web-component/utils/features.ts rename to shlink-web-component/src/utils/features.ts diff --git a/shlink-web-component/utils/helpers/charts.ts b/shlink-web-component/src/utils/helpers/charts.ts similarity index 100% rename from shlink-web-component/utils/helpers/charts.ts rename to shlink-web-component/src/utils/helpers/charts.ts diff --git a/shlink-web-component/utils/helpers/files.ts b/shlink-web-component/src/utils/helpers/files.ts similarity index 100% rename from shlink-web-component/utils/helpers/files.ts rename to shlink-web-component/src/utils/helpers/files.ts diff --git a/shlink-web-component/utils/helpers/hooks.ts b/shlink-web-component/src/utils/helpers/hooks.ts similarity index 100% rename from shlink-web-component/utils/helpers/hooks.ts rename to shlink-web-component/src/utils/helpers/hooks.ts diff --git a/shlink-web-component/utils/helpers/index.ts b/shlink-web-component/src/utils/helpers/index.ts similarity index 100% rename from shlink-web-component/utils/helpers/index.ts rename to shlink-web-component/src/utils/helpers/index.ts diff --git a/shlink-web-component/utils/helpers/json.ts b/shlink-web-component/src/utils/helpers/json.ts similarity index 100% rename from shlink-web-component/utils/helpers/json.ts rename to shlink-web-component/src/utils/helpers/json.ts diff --git a/shlink-web-component/utils/helpers/numbers.ts b/shlink-web-component/src/utils/helpers/numbers.ts similarity index 100% rename from shlink-web-component/utils/helpers/numbers.ts rename to shlink-web-component/src/utils/helpers/numbers.ts diff --git a/shlink-web-component/utils/helpers/pagination.ts b/shlink-web-component/src/utils/helpers/pagination.ts similarity index 100% rename from shlink-web-component/utils/helpers/pagination.ts rename to shlink-web-component/src/utils/helpers/pagination.ts diff --git a/shlink-web-component/utils/helpers/qrCodes.ts b/shlink-web-component/src/utils/helpers/qrCodes.ts similarity index 100% rename from shlink-web-component/utils/helpers/qrCodes.ts rename to shlink-web-component/src/utils/helpers/qrCodes.ts diff --git a/shlink-web-component/utils/helpers/query.ts b/shlink-web-component/src/utils/helpers/query.ts similarity index 100% rename from shlink-web-component/utils/helpers/query.ts rename to shlink-web-component/src/utils/helpers/query.ts diff --git a/shlink-web-component/utils/helpers/version.ts b/shlink-web-component/src/utils/helpers/version.ts similarity index 100% rename from shlink-web-component/utils/helpers/version.ts rename to shlink-web-component/src/utils/helpers/version.ts diff --git a/shlink-web-component/utils/redux.ts b/shlink-web-component/src/utils/redux.ts similarity index 100% rename from shlink-web-component/utils/redux.ts rename to shlink-web-component/src/utils/redux.ts diff --git a/shlink-web-component/utils/routesPrefix.ts b/shlink-web-component/src/utils/routesPrefix.ts similarity index 100% rename from shlink-web-component/utils/routesPrefix.ts rename to shlink-web-component/src/utils/routesPrefix.ts diff --git a/shlink-web-component/utils/services/ColorGenerator.ts b/shlink-web-component/src/utils/services/ColorGenerator.ts similarity index 100% rename from shlink-web-component/utils/services/ColorGenerator.ts rename to shlink-web-component/src/utils/services/ColorGenerator.ts diff --git a/shlink-web-component/utils/services/ImageDownloader.ts b/shlink-web-component/src/utils/services/ImageDownloader.ts similarity index 100% rename from shlink-web-component/utils/services/ImageDownloader.ts rename to shlink-web-component/src/utils/services/ImageDownloader.ts diff --git a/shlink-web-component/utils/services/LocalStorage.ts b/shlink-web-component/src/utils/services/LocalStorage.ts similarity index 100% rename from shlink-web-component/utils/services/LocalStorage.ts rename to shlink-web-component/src/utils/services/LocalStorage.ts diff --git a/shlink-web-component/utils/services/ReportExporter.ts b/shlink-web-component/src/utils/services/ReportExporter.ts similarity index 100% rename from shlink-web-component/utils/services/ReportExporter.ts rename to shlink-web-component/src/utils/services/ReportExporter.ts diff --git a/shlink-web-component/utils/services/provideServices.ts b/shlink-web-component/src/utils/services/provideServices.ts similarity index 100% rename from shlink-web-component/utils/services/provideServices.ts rename to shlink-web-component/src/utils/services/provideServices.ts diff --git a/shlink-web-component/utils/settings.ts b/shlink-web-component/src/utils/settings.ts similarity index 97% rename from shlink-web-component/utils/settings.ts rename to shlink-web-component/src/utils/settings.ts index 0173c593..20bd24f6 100644 --- a/shlink-web-component/utils/settings.ts +++ b/shlink-web-component/src/utils/settings.ts @@ -1,5 +1,5 @@ import { createContext, useContext } from 'react'; -import type { Theme } from '../../src/utils/theme'; +import type { Theme } from '../../../src/utils/theme'; import type { ShortUrlsOrder } from '../short-urls/data'; import type { TagsOrder } from '../tags/data/TagsListChildrenProps'; import type { DateInterval } from './dates/helpers/dateIntervals'; diff --git a/shlink-web-component/utils/table/TableOrderIcon.tsx b/shlink-web-component/src/utils/table/TableOrderIcon.tsx similarity index 90% rename from shlink-web-component/utils/table/TableOrderIcon.tsx rename to shlink-web-component/src/utils/table/TableOrderIcon.tsx index 0c343246..d055284f 100644 --- a/shlink-web-component/utils/table/TableOrderIcon.tsx +++ b/shlink-web-component/src/utils/table/TableOrderIcon.tsx @@ -1,6 +1,6 @@ import { faCaretDown as caretDownIcon, faCaretUp as caretUpIcon } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import type { Order } from '../../../shlink-frontend-kit/src'; +import type { Order } from '../../../../shlink-frontend-kit/src'; interface TableOrderIconProps { currentOrder: Order; diff --git a/shlink-web-component/utils/types/index.ts b/shlink-web-component/src/utils/types/index.ts similarity index 100% rename from shlink-web-component/utils/types/index.ts rename to shlink-web-component/src/utils/types/index.ts diff --git a/shlink-web-component/visits/DomainVisits.tsx b/shlink-web-component/src/visits/DomainVisits.tsx similarity index 100% rename from shlink-web-component/visits/DomainVisits.tsx rename to shlink-web-component/src/visits/DomainVisits.tsx diff --git a/shlink-web-component/visits/NonOrphanVisits.tsx b/shlink-web-component/src/visits/NonOrphanVisits.tsx similarity index 100% rename from shlink-web-component/visits/NonOrphanVisits.tsx rename to shlink-web-component/src/visits/NonOrphanVisits.tsx diff --git a/shlink-web-component/visits/OrphanVisits.tsx b/shlink-web-component/src/visits/OrphanVisits.tsx similarity index 100% rename from shlink-web-component/visits/OrphanVisits.tsx rename to shlink-web-component/src/visits/OrphanVisits.tsx diff --git a/shlink-web-component/visits/ShortUrlVisits.tsx b/shlink-web-component/src/visits/ShortUrlVisits.tsx similarity index 100% rename from shlink-web-component/visits/ShortUrlVisits.tsx rename to shlink-web-component/src/visits/ShortUrlVisits.tsx diff --git a/shlink-web-component/visits/ShortUrlVisitsHeader.scss b/shlink-web-component/src/visits/ShortUrlVisitsHeader.scss similarity index 100% rename from shlink-web-component/visits/ShortUrlVisitsHeader.scss rename to shlink-web-component/src/visits/ShortUrlVisitsHeader.scss diff --git a/shlink-web-component/visits/ShortUrlVisitsHeader.tsx b/shlink-web-component/src/visits/ShortUrlVisitsHeader.tsx similarity index 100% rename from shlink-web-component/visits/ShortUrlVisitsHeader.tsx rename to shlink-web-component/src/visits/ShortUrlVisitsHeader.tsx diff --git a/shlink-web-component/visits/TagVisits.tsx b/shlink-web-component/src/visits/TagVisits.tsx similarity index 100% rename from shlink-web-component/visits/TagVisits.tsx rename to shlink-web-component/src/visits/TagVisits.tsx diff --git a/shlink-web-component/visits/TagVisitsHeader.tsx b/shlink-web-component/src/visits/TagVisitsHeader.tsx similarity index 100% rename from shlink-web-component/visits/TagVisitsHeader.tsx rename to shlink-web-component/src/visits/TagVisitsHeader.tsx diff --git a/shlink-web-component/visits/VisitsHeader.tsx b/shlink-web-component/src/visits/VisitsHeader.tsx similarity index 100% rename from shlink-web-component/visits/VisitsHeader.tsx rename to shlink-web-component/src/visits/VisitsHeader.tsx diff --git a/shlink-web-component/visits/VisitsStats.tsx b/shlink-web-component/src/visits/VisitsStats.tsx similarity index 99% rename from shlink-web-component/visits/VisitsStats.tsx rename to shlink-web-component/src/visits/VisitsStats.tsx index b6b3c423..d2b9fc1d 100644 --- a/shlink-web-component/visits/VisitsStats.tsx +++ b/shlink-web-component/src/visits/VisitsStats.tsx @@ -7,7 +7,7 @@ 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 { Message, NavPillItem, NavPills, Result } from '../../shlink-frontend-kit/src'; +import { Message, NavPillItem, NavPills, Result } from '../../../shlink-frontend-kit/src'; import { ShlinkApiError } from '../common/ShlinkApiError'; import { ExportBtn } from '../utils/components/ExportBtn'; import { DateRangeSelector } from '../utils/dates/DateRangeSelector'; diff --git a/shlink-web-component/visits/VisitsTable.scss b/shlink-web-component/src/visits/VisitsTable.scss similarity index 87% rename from shlink-web-component/visits/VisitsTable.scss rename to shlink-web-component/src/visits/VisitsTable.scss index 30a5e946..4916bc74 100644 --- a/shlink-web-component/visits/VisitsTable.scss +++ b/shlink-web-component/src/visits/VisitsTable.scss @@ -1,5 +1,5 @@ -@import '../../src/utils/base'; -@import '../../src/utils/mixins/sticky-cell'; +@import '../../../src/utils/base'; +@import '../../../src/utils/mixins/sticky-cell'; .visits-table { margin: 1.5rem 0 0; diff --git a/shlink-web-component/visits/VisitsTable.tsx b/shlink-web-component/src/visits/VisitsTable.tsx similarity index 98% rename from shlink-web-component/visits/VisitsTable.tsx rename to shlink-web-component/src/visits/VisitsTable.tsx index 38b79fb9..44ee06f2 100644 --- a/shlink-web-component/visits/VisitsTable.tsx +++ b/shlink-web-component/src/visits/VisitsTable.tsx @@ -4,8 +4,8 @@ import classNames from 'classnames'; import { min, splitEvery } from 'ramda'; import { useEffect, useMemo, useRef, useState } from 'react'; import { UncontrolledTooltip } from 'reactstrap'; -import type { Order } from '../../shlink-frontend-kit/src'; -import { determineOrderDir, SearchField, sortList } from '../../shlink-frontend-kit/src'; +import type { Order } from '../../../shlink-frontend-kit/src'; +import { determineOrderDir, SearchField, sortList } from '../../../shlink-frontend-kit/src'; import { SimplePaginator } from '../utils/components/SimplePaginator'; import { Time } from '../utils/dates/Time'; import { prettify } from '../utils/helpers/numbers'; diff --git a/shlink-web-component/visits/charts/ChartCard.scss b/shlink-web-component/src/visits/charts/ChartCard.scss similarity index 100% rename from shlink-web-component/visits/charts/ChartCard.scss rename to shlink-web-component/src/visits/charts/ChartCard.scss diff --git a/shlink-web-component/visits/charts/ChartCard.tsx b/shlink-web-component/src/visits/charts/ChartCard.tsx similarity index 100% rename from shlink-web-component/visits/charts/ChartCard.tsx rename to shlink-web-component/src/visits/charts/ChartCard.tsx diff --git a/shlink-web-component/visits/charts/DoughnutChart.tsx b/shlink-web-component/src/visits/charts/DoughnutChart.tsx similarity index 97% rename from shlink-web-component/visits/charts/DoughnutChart.tsx rename to shlink-web-component/src/visits/charts/DoughnutChart.tsx index f095e17d..fbba2dc0 100644 --- a/shlink-web-component/visits/charts/DoughnutChart.tsx +++ b/shlink-web-component/src/visits/charts/DoughnutChart.tsx @@ -3,7 +3,7 @@ import { keys, values } from 'ramda'; import type { FC } from 'react'; import { memo, useState } from 'react'; import { Doughnut } from 'react-chartjs-2'; -import { isDarkThemeEnabled, PRIMARY_DARK_COLOR, PRIMARY_LIGHT_COLOR } from '../../../src/utils/theme'; +import { isDarkThemeEnabled, PRIMARY_DARK_COLOR, PRIMARY_LIGHT_COLOR } from '../../../../src/utils/theme'; import { renderPieChartLabel } from '../../utils/helpers/charts'; import type { Stats } from '../types'; import { DoughnutChartLegend } from './DoughnutChartLegend'; diff --git a/shlink-web-component/visits/charts/DoughnutChartCard.tsx b/shlink-web-component/src/visits/charts/DoughnutChartCard.tsx similarity index 100% rename from shlink-web-component/visits/charts/DoughnutChartCard.tsx rename to shlink-web-component/src/visits/charts/DoughnutChartCard.tsx diff --git a/shlink-web-component/visits/charts/DoughnutChartLegend.scss b/shlink-web-component/src/visits/charts/DoughnutChartLegend.scss similarity index 92% rename from shlink-web-component/visits/charts/DoughnutChartLegend.scss rename to shlink-web-component/src/visits/charts/DoughnutChartLegend.scss index e0fefa91..af3a3cd9 100644 --- a/shlink-web-component/visits/charts/DoughnutChartLegend.scss +++ b/shlink-web-component/src/visits/charts/DoughnutChartLegend.scss @@ -1,4 +1,4 @@ -@import '../../../src/utils/base'; +@import '../../../../src/utils/base'; .doughnut-chart-legend { list-style-type: none; diff --git a/shlink-web-component/visits/charts/DoughnutChartLegend.tsx b/shlink-web-component/src/visits/charts/DoughnutChartLegend.tsx similarity index 100% rename from shlink-web-component/visits/charts/DoughnutChartLegend.tsx rename to shlink-web-component/src/visits/charts/DoughnutChartLegend.tsx diff --git a/shlink-web-component/visits/charts/HorizontalBarChart.tsx b/shlink-web-component/src/visits/charts/HorizontalBarChart.tsx similarity index 98% rename from shlink-web-component/visits/charts/HorizontalBarChart.tsx rename to shlink-web-component/src/visits/charts/HorizontalBarChart.tsx index e272d7ea..873fd0ee 100644 --- a/shlink-web-component/visits/charts/HorizontalBarChart.tsx +++ b/shlink-web-component/src/visits/charts/HorizontalBarChart.tsx @@ -3,7 +3,7 @@ import { keys, values } from 'ramda'; import type { FC, MutableRefObject } from 'react'; import { useRef } from 'react'; import { Bar, getElementAtEvent } from 'react-chartjs-2'; -import { HIGHLIGHTED_COLOR, HIGHLIGHTED_COLOR_ALPHA, MAIN_COLOR, MAIN_COLOR_ALPHA } from '../../../src/utils/theme'; +import { HIGHLIGHTED_COLOR, HIGHLIGHTED_COLOR_ALPHA, MAIN_COLOR, MAIN_COLOR_ALPHA } from '../../../../src/utils/theme'; import { pointerOnHover, renderChartLabel } from '../../utils/helpers/charts'; import { prettify } from '../../utils/helpers/numbers'; import type { Stats } from '../types'; diff --git a/shlink-web-component/visits/charts/LineChartCard.scss b/shlink-web-component/src/visits/charts/LineChartCard.scss similarity index 77% rename from shlink-web-component/visits/charts/LineChartCard.scss rename to shlink-web-component/src/visits/charts/LineChartCard.scss index 7ce84c2d..5f31c927 100644 --- a/shlink-web-component/visits/charts/LineChartCard.scss +++ b/shlink-web-component/src/visits/charts/LineChartCard.scss @@ -1,4 +1,4 @@ -@import '../../../src/utils/base'; +@import '../../../../src/utils/base'; .line-chart-card__body canvas { height: 300px !important; diff --git a/shlink-web-component/visits/charts/LineChartCard.tsx b/shlink-web-component/src/visits/charts/LineChartCard.tsx similarity index 98% rename from shlink-web-component/visits/charts/LineChartCard.tsx rename to shlink-web-component/src/visits/charts/LineChartCard.tsx index a2841cd2..1ce55d43 100644 --- a/shlink-web-component/visits/charts/LineChartCard.tsx +++ b/shlink-web-component/src/visits/charts/LineChartCard.tsx @@ -23,8 +23,8 @@ import { DropdownToggle, UncontrolledDropdown, } from 'reactstrap'; -import { ToggleSwitch, useToggle } from '../../../shlink-frontend-kit/src'; -import { HIGHLIGHTED_COLOR, MAIN_COLOR } from '../../../src/utils/theme'; +import { ToggleSwitch, useToggle } from '../../../../shlink-frontend-kit/src'; +import { HIGHLIGHTED_COLOR, MAIN_COLOR } from '../../../../src/utils/theme'; import { formatInternational } from '../../utils/dates/helpers/date'; import { rangeOf } from '../../utils/helpers'; import { pointerOnHover, renderChartLabel } from '../../utils/helpers/charts'; diff --git a/shlink-web-component/visits/charts/SortableBarChartCard.tsx b/shlink-web-component/src/visits/charts/SortableBarChartCard.tsx similarity index 97% rename from shlink-web-component/visits/charts/SortableBarChartCard.tsx rename to shlink-web-component/src/visits/charts/SortableBarChartCard.tsx index 5fb67518..3fa67184 100644 --- a/shlink-web-component/visits/charts/SortableBarChartCard.tsx +++ b/shlink-web-component/src/visits/charts/SortableBarChartCard.tsx @@ -1,8 +1,8 @@ import { fromPairs, pipe, reverse, sortBy, splitEvery, toLower, toPairs, type, zipObj } from 'ramda'; import type { FC, ReactNode } from 'react'; import { useState } from 'react'; -import type { Order } from '../../../shlink-frontend-kit/src'; -import { OrderingDropdown } from '../../../shlink-frontend-kit/src'; +import type { Order } from '../../../../shlink-frontend-kit/src'; +import { OrderingDropdown } from '../../../../shlink-frontend-kit/src'; import { PaginationDropdown } from '../../utils/components/PaginationDropdown'; import { SimplePaginator } from '../../utils/components/SimplePaginator'; import { rangeOf } from '../../utils/helpers'; diff --git a/shlink-web-component/visits/helpers/MapModal.scss b/shlink-web-component/src/visits/helpers/MapModal.scss similarity index 90% rename from shlink-web-component/visits/helpers/MapModal.scss rename to shlink-web-component/src/visits/helpers/MapModal.scss index 14344782..bb1aedee 100644 --- a/shlink-web-component/visits/helpers/MapModal.scss +++ b/shlink-web-component/src/visits/helpers/MapModal.scss @@ -1,5 +1,5 @@ -@import '../../../src/utils/base'; -@import '../../../src/utils/mixins/fit-with-margin'; +@import '../../../../src/utils/base'; +@import '../../../../src/utils/mixins/fit-with-margin'; .map-modal__modal.map-modal__modal { @media (min-width: $mdMin) { diff --git a/shlink-web-component/visits/helpers/MapModal.tsx b/shlink-web-component/src/visits/helpers/MapModal.tsx similarity index 100% rename from shlink-web-component/visits/helpers/MapModal.tsx rename to shlink-web-component/src/visits/helpers/MapModal.tsx diff --git a/shlink-web-component/visits/helpers/OpenMapModalBtn.scss b/shlink-web-component/src/visits/helpers/OpenMapModalBtn.scss similarity index 100% rename from shlink-web-component/visits/helpers/OpenMapModalBtn.scss rename to shlink-web-component/src/visits/helpers/OpenMapModalBtn.scss diff --git a/shlink-web-component/visits/helpers/OpenMapModalBtn.tsx b/shlink-web-component/src/visits/helpers/OpenMapModalBtn.tsx similarity index 96% rename from shlink-web-component/visits/helpers/OpenMapModalBtn.tsx rename to shlink-web-component/src/visits/helpers/OpenMapModalBtn.tsx index 5952b17e..0ebfd04b 100644 --- a/shlink-web-component/visits/helpers/OpenMapModalBtn.tsx +++ b/shlink-web-component/src/visits/helpers/OpenMapModalBtn.tsx @@ -2,7 +2,7 @@ import { faMapMarkedAlt as mapIcon } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { useState } from 'react'; import { Button, Dropdown, DropdownItem, DropdownMenu, UncontrolledTooltip } from 'reactstrap'; -import { useDomId, useToggle } from '../../../shlink-frontend-kit/src'; +import { useDomId, useToggle } from '../../../../shlink-frontend-kit/src'; import type { CityStats } from '../types'; import { MapModal } from './MapModal'; import './OpenMapModalBtn.scss'; diff --git a/shlink-web-component/visits/helpers/VisitsFilterDropdown.tsx b/shlink-web-component/src/visits/helpers/VisitsFilterDropdown.tsx similarity index 96% rename from shlink-web-component/visits/helpers/VisitsFilterDropdown.tsx rename to shlink-web-component/src/visits/helpers/VisitsFilterDropdown.tsx index 47b258fb..83700748 100644 --- a/shlink-web-component/visits/helpers/VisitsFilterDropdown.tsx +++ b/shlink-web-component/src/visits/helpers/VisitsFilterDropdown.tsx @@ -1,6 +1,6 @@ import type { DropdownItemProps } from 'reactstrap'; import { DropdownItem } from 'reactstrap'; -import { DropdownBtn } from '../../../shlink-frontend-kit/src'; +import { DropdownBtn } from '../../../../shlink-frontend-kit/src'; import { hasValue } from '../../utils/helpers'; import type { OrphanVisitType, VisitsFilter } from '../types'; diff --git a/shlink-web-component/visits/helpers/hooks.ts b/shlink-web-component/src/visits/helpers/hooks.ts similarity index 100% rename from shlink-web-component/visits/helpers/hooks.ts rename to shlink-web-component/src/visits/helpers/hooks.ts diff --git a/shlink-web-component/visits/reducers/common.ts b/shlink-web-component/src/visits/reducers/common.ts similarity index 100% rename from shlink-web-component/visits/reducers/common.ts rename to shlink-web-component/src/visits/reducers/common.ts diff --git a/shlink-web-component/visits/reducers/domainVisits.ts b/shlink-web-component/src/visits/reducers/domainVisits.ts similarity index 100% rename from shlink-web-component/visits/reducers/domainVisits.ts rename to shlink-web-component/src/visits/reducers/domainVisits.ts diff --git a/shlink-web-component/visits/reducers/nonOrphanVisits.ts b/shlink-web-component/src/visits/reducers/nonOrphanVisits.ts similarity index 100% rename from shlink-web-component/visits/reducers/nonOrphanVisits.ts rename to shlink-web-component/src/visits/reducers/nonOrphanVisits.ts diff --git a/shlink-web-component/visits/reducers/orphanVisits.ts b/shlink-web-component/src/visits/reducers/orphanVisits.ts similarity index 100% rename from shlink-web-component/visits/reducers/orphanVisits.ts rename to shlink-web-component/src/visits/reducers/orphanVisits.ts diff --git a/shlink-web-component/visits/reducers/shortUrlVisits.ts b/shlink-web-component/src/visits/reducers/shortUrlVisits.ts similarity index 100% rename from shlink-web-component/visits/reducers/shortUrlVisits.ts rename to shlink-web-component/src/visits/reducers/shortUrlVisits.ts diff --git a/shlink-web-component/visits/reducers/tagVisits.ts b/shlink-web-component/src/visits/reducers/tagVisits.ts similarity index 100% rename from shlink-web-component/visits/reducers/tagVisits.ts rename to shlink-web-component/src/visits/reducers/tagVisits.ts diff --git a/shlink-web-component/visits/reducers/types/index.ts b/shlink-web-component/src/visits/reducers/types/index.ts similarity index 100% rename from shlink-web-component/visits/reducers/types/index.ts rename to shlink-web-component/src/visits/reducers/types/index.ts diff --git a/shlink-web-component/visits/reducers/visitCreation.ts b/shlink-web-component/src/visits/reducers/visitCreation.ts similarity index 100% rename from shlink-web-component/visits/reducers/visitCreation.ts rename to shlink-web-component/src/visits/reducers/visitCreation.ts diff --git a/shlink-web-component/visits/reducers/visitsOverview.ts b/shlink-web-component/src/visits/reducers/visitsOverview.ts similarity index 100% rename from shlink-web-component/visits/reducers/visitsOverview.ts rename to shlink-web-component/src/visits/reducers/visitsOverview.ts diff --git a/shlink-web-component/visits/services/VisitsParser.ts b/shlink-web-component/src/visits/services/VisitsParser.ts similarity index 100% rename from shlink-web-component/visits/services/VisitsParser.ts rename to shlink-web-component/src/visits/services/VisitsParser.ts diff --git a/shlink-web-component/visits/services/provideServices.ts b/shlink-web-component/src/visits/services/provideServices.ts similarity index 100% rename from shlink-web-component/visits/services/provideServices.ts rename to shlink-web-component/src/visits/services/provideServices.ts diff --git a/shlink-web-component/visits/types/helpers.ts b/shlink-web-component/src/visits/types/helpers.ts similarity index 100% rename from shlink-web-component/visits/types/helpers.ts rename to shlink-web-component/src/visits/types/helpers.ts diff --git a/shlink-web-component/visits/types/index.ts b/shlink-web-component/src/visits/types/index.ts similarity index 100% rename from shlink-web-component/visits/types/index.ts rename to shlink-web-component/src/visits/types/index.ts diff --git a/shlink-web-component/visits/utils/index.ts b/shlink-web-component/src/visits/utils/index.ts similarity index 100% rename from shlink-web-component/visits/utils/index.ts rename to shlink-web-component/src/visits/utils/index.ts diff --git a/src/api/services/ShlinkApiClient.ts b/src/api/services/ShlinkApiClient.ts index 1f123b56..3ac8148c 100644 --- a/src/api/services/ShlinkApiClient.ts +++ b/src/api/services/ShlinkApiClient.ts @@ -16,10 +16,10 @@ import type { ShlinkTagsStatsResponse, ShlinkVisits, ShlinkVisitsOverview, - ShlinkVisitsParams } from '../../../shlink-web-component/api-contract'; -import { isRegularNotFound, parseApiError } from '../../../shlink-web-component/api-contract/utils'; -import type { ShortUrl, ShortUrlData } from '../../../shlink-web-component/short-urls/data'; -import { stringifyQuery } from '../../../shlink-web-component/utils/helpers/query'; + ShlinkVisitsParams } from '../../../shlink-web-component/src/api-contract'; +import { isRegularNotFound, parseApiError } from '../../../shlink-web-component/src/api-contract/utils'; +import type { ShortUrl, ShortUrlData } from '../../../shlink-web-component/src/short-urls/data'; +import { stringifyQuery } from '../../../shlink-web-component/src/utils/helpers/query'; import type { HttpClient } from '../../common/services/HttpClient'; import { replaceAuthorityFromUri } from '../../utils/helpers/uri'; import type { OptionalString } from '../../utils/utils'; diff --git a/src/app/App.tsx b/src/app/App.tsx index 8f984067..16468ad1 100644 --- a/src/app/App.tsx +++ b/src/app/App.tsx @@ -2,7 +2,7 @@ import classNames from 'classnames'; import type { FC } from 'react'; import { useEffect } from 'react'; import { Route, Routes, useLocation } from 'react-router-dom'; -import type { Settings } from '../../shlink-web-component'; +import type { Settings } from '../../shlink-web-component/src'; import { AppUpdateBanner } from '../common/AppUpdateBanner'; import { NotFound } from '../common/NotFound'; import type { ServersMap } from '../servers/data'; diff --git a/src/common/MenuLayout.tsx b/src/common/MenuLayout.tsx index e70b40bc..4661dc2f 100644 --- a/src/common/MenuLayout.tsx +++ b/src/common/MenuLayout.tsx @@ -1,7 +1,7 @@ import type { FC } from 'react'; import { useEffect } from 'react'; -import type { Settings } from '../../shlink-web-component'; -import { ShlinkWebComponent } from '../../shlink-web-component'; +import type { Settings } from '../../shlink-web-component/src'; +import { ShlinkWebComponent } from '../../shlink-web-component/src'; import type { ShlinkApiClientBuilder } from '../api/services/ShlinkApiClientBuilder'; import { isReachableServer } from '../servers/data'; import { withSelectedServer } from '../servers/helpers/withSelectedServer'; diff --git a/src/container/types.ts b/src/container/types.ts index 995c258a..50b78ecf 100644 --- a/src/container/types.ts +++ b/src/container/types.ts @@ -1,4 +1,4 @@ -import type { Settings } from '../../shlink-web-component'; +import type { Settings } from '../../shlink-web-component/src'; import type { Sidebar } from '../common/reducers/sidebar'; import type { SelectedServer, ServersMap } from '../servers/data'; diff --git a/src/servers/reducers/selectedServer.ts b/src/servers/reducers/selectedServer.ts index 912fd6a7..9f85d6dd 100644 --- a/src/servers/reducers/selectedServer.ts +++ b/src/servers/reducers/selectedServer.ts @@ -1,6 +1,6 @@ import { createAction, createSlice } from '@reduxjs/toolkit'; import { memoizeWith, pipe } from 'ramda'; -import type { ShlinkHealth } from '../../../shlink-web-component/api-contract'; +import type { ShlinkHealth } from '../../../shlink-web-component/src/api-contract'; import type { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder'; import { createAsyncThunk } from '../../utils/helpers/redux'; import { versionToPrintable, versionToSemVer as toSemVer } from '../../utils/helpers/version'; diff --git a/src/settings/RealTimeUpdatesSettings.tsx b/src/settings/RealTimeUpdatesSettings.tsx index f883f133..4e28e1dd 100644 --- a/src/settings/RealTimeUpdatesSettings.tsx +++ b/src/settings/RealTimeUpdatesSettings.tsx @@ -1,7 +1,7 @@ import classNames from 'classnames'; import { FormGroup, Input } from 'reactstrap'; import { LabeledFormGroup, SimpleCard, ToggleSwitch, useDomId } from '../../shlink-frontend-kit/src'; -import type { Settings } from '../../shlink-web-component'; +import type { Settings } from '../../shlink-web-component/src'; import { FormText } from '../utils/forms/FormText'; type RealTimeUpdatesProps = { diff --git a/src/settings/ShortUrlCreationSettings.tsx b/src/settings/ShortUrlCreationSettings.tsx index d7ee1128..bb0c17d8 100644 --- a/src/settings/ShortUrlCreationSettings.tsx +++ b/src/settings/ShortUrlCreationSettings.tsx @@ -1,7 +1,7 @@ import type { FC, ReactNode } from 'react'; import { DropdownItem, FormGroup } from 'reactstrap'; import { DropdownBtn, LabeledFormGroup, SimpleCard, ToggleSwitch } from '../../shlink-frontend-kit/src'; -import type { Settings } from '../../shlink-web-component'; +import type { Settings } from '../../shlink-web-component/src'; import { FormText } from '../utils/forms/FormText'; import type { Defined } from '../utils/types'; diff --git a/src/settings/ShortUrlsListSettings.tsx b/src/settings/ShortUrlsListSettings.tsx index 4be09724..686c39f8 100644 --- a/src/settings/ShortUrlsListSettings.tsx +++ b/src/settings/ShortUrlsListSettings.tsx @@ -1,7 +1,7 @@ import type { FC } from 'react'; import { LabeledFormGroup, OrderingDropdown, SimpleCard } from '../../shlink-frontend-kit/src'; -import type { Settings } from '../../shlink-web-component'; -import { SHORT_URLS_ORDERABLE_FIELDS } from '../../shlink-web-component/short-urls/data'; +import type { Settings } from '../../shlink-web-component/src'; +import { SHORT_URLS_ORDERABLE_FIELDS } from '../../shlink-web-component/src/short-urls/data'; import type { Defined } from '../utils/types'; import { DEFAULT_SHORT_URLS_ORDERING } from './reducers/settings'; diff --git a/src/settings/TagsSettings.tsx b/src/settings/TagsSettings.tsx index 86ade4aa..f1ffd3ae 100644 --- a/src/settings/TagsSettings.tsx +++ b/src/settings/TagsSettings.tsx @@ -1,7 +1,7 @@ import type { FC } from 'react'; import { LabeledFormGroup, OrderingDropdown, SimpleCard } from '../../shlink-frontend-kit/src'; -import type { Settings } from '../../shlink-web-component'; -import { TAGS_ORDERABLE_FIELDS } from '../../shlink-web-component/tags/data/TagsListChildrenProps'; +import type { Settings } from '../../shlink-web-component/src'; +import { TAGS_ORDERABLE_FIELDS } from '../../shlink-web-component/src/tags/data/TagsListChildrenProps'; import type { Defined } from '../utils/types'; type TagsSettingsOptions = Defined; diff --git a/src/settings/UserInterfaceSettings.tsx b/src/settings/UserInterfaceSettings.tsx index 720a57f8..547f70f6 100644 --- a/src/settings/UserInterfaceSettings.tsx +++ b/src/settings/UserInterfaceSettings.tsx @@ -2,7 +2,7 @@ import { faMoon, faSun } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import type { FC } from 'react'; import { SimpleCard, ToggleSwitch } from '../../shlink-frontend-kit/src'; -import type { Settings } from '../../shlink-web-component'; +import type { Settings } from '../../shlink-web-component/src'; import type { Theme } from '../utils/theme'; import { changeThemeInMarkup } from '../utils/theme'; import type { Defined } from '../utils/types'; diff --git a/src/settings/VisitsSettings.tsx b/src/settings/VisitsSettings.tsx index 27e1c7c8..fe71a739 100644 --- a/src/settings/VisitsSettings.tsx +++ b/src/settings/VisitsSettings.tsx @@ -1,8 +1,8 @@ import type { FC } from 'react'; import { FormGroup } from 'reactstrap'; import { LabeledFormGroup, SimpleCard, ToggleSwitch } from '../../shlink-frontend-kit/src'; -import type { Settings } from '../../shlink-web-component'; -import type { DateInterval } from '../../shlink-web-component/utils/dates/helpers/dateIntervals'; +import type { Settings } from '../../shlink-web-component/src'; +import type { DateInterval } from '../../shlink-web-component/src/utils/dates/helpers/dateIntervals'; import { DateIntervalSelector } from '../utils/dates/DateIntervalSelector'; import { FormText } from '../utils/forms/FormText'; diff --git a/src/settings/reducers/settings.ts b/src/settings/reducers/settings.ts index 7d1ed4bd..5dae6a42 100644 --- a/src/settings/reducers/settings.ts +++ b/src/settings/reducers/settings.ts @@ -1,7 +1,7 @@ import type { PayloadAction, PrepareAction } from '@reduxjs/toolkit'; import { createSlice } from '@reduxjs/toolkit'; import { mergeDeepRight } from 'ramda'; -import type { Settings } from '../../../shlink-web-component'; +import type { Settings } from '../../../shlink-web-component/src'; import type { Defined } from '../../utils/types'; type ShortUrlsOrder = Defined['defaultOrdering']>; diff --git a/src/utils/dates/DateIntervalSelector.tsx b/src/utils/dates/DateIntervalSelector.tsx index d847dfba..d64dfc2f 100644 --- a/src/utils/dates/DateIntervalSelector.tsx +++ b/src/utils/dates/DateIntervalSelector.tsx @@ -1,8 +1,8 @@ import type { FC } from 'react'; import { DropdownItem } from 'reactstrap'; import { DropdownBtn } from '../../../shlink-frontend-kit/src'; -import type { Settings } from '../../../shlink-web-component'; -import { rangeOrIntervalToString } from '../../../shlink-web-component/utils/dates/helpers/dateIntervals'; +import type { Settings } from '../../../shlink-web-component/src'; +import { rangeOrIntervalToString } from '../../../shlink-web-component/src/utils/dates/helpers/dateIntervals'; import type { Defined } from '../types'; type DateInterval = Defined['defaultInterval']; diff --git a/src/utils/helpers/hooks.ts b/src/utils/helpers/hooks.ts index 29ee0857..1e3d7bad 100644 --- a/src/utils/helpers/hooks.ts +++ b/src/utils/helpers/hooks.ts @@ -1,6 +1,6 @@ import { useRef, useState } from 'react'; import { useLocation, useNavigate } from 'react-router-dom'; -import { parseQuery } from '../../../shlink-web-component/utils/helpers/query'; +import { parseQuery } from '../../../shlink-web-component/src/utils/helpers/query'; const DEFAULT_DELAY = 2000; diff --git a/test/api/ShlinkApiError.test.tsx b/test/api/ShlinkApiError.test.tsx index 2d9cf2c6..23cb8dcd 100644 --- a/test/api/ShlinkApiError.test.tsx +++ b/test/api/ShlinkApiError.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; -import type { ShlinkApiErrorProps } from '../../shlink-web-component/common/ShlinkApiError'; -import { ShlinkApiError } from '../../shlink-web-component/common/ShlinkApiError'; +import type { ShlinkApiErrorProps } from '../../shlink-web-component/src/common/ShlinkApiError'; +import { ShlinkApiError } from '../../shlink-web-component/src/common/ShlinkApiError'; import type { InvalidArgumentError, ProblemDetailsError } from '../../src/api/types/errors'; import { ErrorTypeV2, ErrorTypeV3 } from '../../src/api/types/errors'; diff --git a/test/api/services/ShlinkApiClient.test.ts b/test/api/services/ShlinkApiClient.test.ts index 52437c5d..84fc3eb7 100644 --- a/test/api/services/ShlinkApiClient.test.ts +++ b/test/api/services/ShlinkApiClient.test.ts @@ -1,5 +1,5 @@ import { fromPartial } from '@total-typescript/shoehorn'; -import type { ShortUrl, ShortUrlsOrder } from '../../../shlink-web-component/short-urls/data'; +import type { ShortUrl, ShortUrlsOrder } from '../../../shlink-web-component/src/short-urls/data'; import { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import type { ShlinkDomain, ShlinkVisits, ShlinkVisitsOverview } from '../../../src/api/types'; import { ErrorTypeV2, ErrorTypeV3 } from '../../../src/api/types/errors'; diff --git a/test/common/AsideMenu.test.tsx b/test/common/AsideMenu.test.tsx index 9a20b6e2..f12129a8 100644 --- a/test/common/AsideMenu.test.tsx +++ b/test/common/AsideMenu.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; import { MemoryRouter } from 'react-router'; -import { AsideMenu } from '../../shlink-web-component/common/AsideMenu'; +import { AsideMenu } from '../../shlink-web-component/src/common/AsideMenu'; describe('', () => { const setUp = () => render( diff --git a/test/common/SimplePaginator.test.tsx b/test/common/SimplePaginator.test.tsx index fb7476b6..0f29e9d3 100644 --- a/test/common/SimplePaginator.test.tsx +++ b/test/common/SimplePaginator.test.tsx @@ -1,6 +1,6 @@ import { render, screen } from '@testing-library/react'; -import { SimplePaginator } from '../../shlink-web-component/utils/components/SimplePaginator'; -import { ELLIPSIS } from '../../shlink-web-component/utils/helpers/pagination'; +import { SimplePaginator } from '../../shlink-web-component/src/utils/components/SimplePaginator'; +import { ELLIPSIS } from '../../shlink-web-component/src/utils/helpers/pagination'; describe('', () => { const setUp = (pagesCount: number, currentPage = 1) => render( diff --git a/test/common/services/ImageDownloader.test.ts b/test/common/services/ImageDownloader.test.ts index 3ecf2529..a02b77c0 100644 --- a/test/common/services/ImageDownloader.test.ts +++ b/test/common/services/ImageDownloader.test.ts @@ -1,5 +1,5 @@ import { fromPartial } from '@total-typescript/shoehorn'; -import { ImageDownloader } from '../../../shlink-web-component/utils/services/ImageDownloader'; +import { ImageDownloader } from '../../../shlink-web-component/src/utils/services/ImageDownloader'; import type { HttpClient } from '../../../src/common/services/HttpClient'; import { windowMock } from '../../__mocks__/Window.mock'; diff --git a/test/common/services/ReportExporter.test.ts b/test/common/services/ReportExporter.test.ts index 6be3ffeb..b2222117 100644 --- a/test/common/services/ReportExporter.test.ts +++ b/test/common/services/ReportExporter.test.ts @@ -1,6 +1,6 @@ -import type { ExportableShortUrl } from '../../../shlink-web-component/short-urls/data'; -import { ReportExporter } from '../../../shlink-web-component/utils/services/ReportExporter'; -import type { NormalizedVisit } from '../../../shlink-web-component/visits/types'; +import type { ExportableShortUrl } from '../../../shlink-web-component/src/short-urls/data'; +import { ReportExporter } from '../../../shlink-web-component/src/utils/services/ReportExporter'; +import type { NormalizedVisit } from '../../../shlink-web-component/src/visits/types'; import { windowMock } from '../../__mocks__/Window.mock'; describe('ReportExporter', () => { diff --git a/test/domains/DomainRow.test.tsx b/test/domains/DomainRow.test.tsx index 0bbc4473..f66dce9e 100644 --- a/test/domains/DomainRow.test.tsx +++ b/test/domains/DomainRow.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; -import type { Domain } from '../../shlink-web-component/domains/data'; -import { DomainRow } from '../../shlink-web-component/domains/DomainRow'; +import type { Domain } from '../../shlink-web-component/src/domains/data'; +import { DomainRow } from '../../shlink-web-component/src/domains/DomainRow'; import type { ShlinkDomainRedirects } from '../../src/api/types'; describe('', () => { diff --git a/test/domains/DomainSelector.test.tsx b/test/domains/DomainSelector.test.tsx index 54aa6818..db613f29 100644 --- a/test/domains/DomainSelector.test.tsx +++ b/test/domains/DomainSelector.test.tsx @@ -1,7 +1,7 @@ import { screen, waitFor } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; -import { DomainSelector } from '../../shlink-web-component/domains/DomainSelector'; -import type { DomainsList } from '../../shlink-web-component/domains/reducers/domainsList'; +import { DomainSelector } from '../../shlink-web-component/src/domains/DomainSelector'; +import type { DomainsList } from '../../shlink-web-component/src/domains/reducers/domainsList'; import { renderWithEvents } from '../__helpers__/setUpTest'; describe('', () => { diff --git a/test/domains/ManageDomains.test.tsx b/test/domains/ManageDomains.test.tsx index bf3a9159..3d733146 100644 --- a/test/domains/ManageDomains.test.tsx +++ b/test/domains/ManageDomains.test.tsx @@ -1,7 +1,7 @@ import { screen, waitFor } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; -import { ManageDomains } from '../../shlink-web-component/domains/ManageDomains'; -import type { DomainsList } from '../../shlink-web-component/domains/reducers/domainsList'; +import { ManageDomains } from '../../shlink-web-component/src/domains/ManageDomains'; +import type { DomainsList } from '../../shlink-web-component/src/domains/reducers/domainsList'; import type { ShlinkDomain } from '../../src/api/types'; import type { ProblemDetailsError } from '../../src/api/types/errors'; import { renderWithEvents } from '../__helpers__/setUpTest'; diff --git a/test/domains/helpers/DomainDropdown.test.tsx b/test/domains/helpers/DomainDropdown.test.tsx index 7fb2751f..82667586 100644 --- a/test/domains/helpers/DomainDropdown.test.tsx +++ b/test/domains/helpers/DomainDropdown.test.tsx @@ -1,8 +1,8 @@ import { screen, waitForElementToBeRemoved } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; import { MemoryRouter } from 'react-router-dom'; -import type { Domain } from '../../../shlink-web-component/domains/data'; -import { DomainDropdown } from '../../../shlink-web-component/domains/helpers/DomainDropdown'; +import type { Domain } from '../../../shlink-web-component/src/domains/data'; +import { DomainDropdown } from '../../../shlink-web-component/src/domains/helpers/DomainDropdown'; import type { SelectedServer } from '../../../src/servers/data'; import type { SemVer } from '../../../src/utils/helpers/version'; import { renderWithEvents } from '../../__helpers__/setUpTest'; diff --git a/test/domains/helpers/DomainStatusIcon.test.tsx b/test/domains/helpers/DomainStatusIcon.test.tsx index 272e2e48..6fe7871c 100644 --- a/test/domains/helpers/DomainStatusIcon.test.tsx +++ b/test/domains/helpers/DomainStatusIcon.test.tsx @@ -1,7 +1,7 @@ import { screen } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; -import type { DomainStatus } from '../../../shlink-web-component/domains/data'; -import { DomainStatusIcon } from '../../../shlink-web-component/domains/helpers/DomainStatusIcon'; +import type { DomainStatus } from '../../../shlink-web-component/src/domains/data'; +import { DomainStatusIcon } from '../../../shlink-web-component/src/domains/helpers/DomainStatusIcon'; import { renderWithEvents } from '../../__helpers__/setUpTest'; describe('', () => { diff --git a/test/domains/helpers/EditDomainRedirectsModal.test.tsx b/test/domains/helpers/EditDomainRedirectsModal.test.tsx index 6e5f65c1..f03add38 100644 --- a/test/domains/helpers/EditDomainRedirectsModal.test.tsx +++ b/test/domains/helpers/EditDomainRedirectsModal.test.tsx @@ -1,6 +1,6 @@ import { fireEvent, screen, waitFor } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; -import { EditDomainRedirectsModal } from '../../../shlink-web-component/domains/helpers/EditDomainRedirectsModal'; +import { EditDomainRedirectsModal } from '../../../shlink-web-component/src/domains/helpers/EditDomainRedirectsModal'; import type { ShlinkDomain } from '../../../src/api/types'; import { renderWithEvents } from '../../__helpers__/setUpTest'; diff --git a/test/domains/reducers/domainRedirects.test.ts b/test/domains/reducers/domainRedirects.test.ts index f6e90aa4..c7f2469c 100644 --- a/test/domains/reducers/domainRedirects.test.ts +++ b/test/domains/reducers/domainRedirects.test.ts @@ -1,5 +1,5 @@ import { fromPartial } from '@total-typescript/shoehorn'; -import { editDomainRedirects } from '../../../shlink-web-component/domains/reducers/domainRedirects'; +import { editDomainRedirects } from '../../../shlink-web-component/src/domains/reducers/domainRedirects'; import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import type { ShlinkDomainRedirects } from '../../../src/api/types'; diff --git a/test/domains/reducers/domainsList.test.ts b/test/domains/reducers/domainsList.test.ts index 4eba1a81..11f80568 100644 --- a/test/domains/reducers/domainsList.test.ts +++ b/test/domains/reducers/domainsList.test.ts @@ -1,12 +1,12 @@ import { fromPartial } from '@total-typescript/shoehorn'; -import type { Domain } from '../../../shlink-web-component/domains/data'; -import type { EditDomainRedirects } from '../../../shlink-web-component/domains/reducers/domainRedirects'; -import { editDomainRedirects } from '../../../shlink-web-component/domains/reducers/domainRedirects'; +import type { Domain } from '../../../shlink-web-component/src/domains/data'; +import type { EditDomainRedirects } from '../../../shlink-web-component/src/domains/reducers/domainRedirects'; +import { editDomainRedirects } from '../../../shlink-web-component/src/domains/reducers/domainRedirects'; import { domainsListReducerCreator, replaceRedirectsOnDomain, replaceStatusOnDomain, -} from '../../../shlink-web-component/domains/reducers/domainsList'; +} from '../../../shlink-web-component/src/domains/reducers/domainsList'; import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import type { ShlinkDomainRedirects } from '../../../src/api/types'; import { parseApiError } from '../../../src/api/utils'; diff --git a/test/mercure/helpers/index.test.tsx b/test/mercure/helpers/index.test.tsx index abdfbd83..113a8bcd 100644 --- a/test/mercure/helpers/index.test.tsx +++ b/test/mercure/helpers/index.test.tsx @@ -1,8 +1,8 @@ import { fromPartial } from '@total-typescript/shoehorn'; import { EventSourcePolyfill } from 'event-source-polyfill'; import { identity } from 'ramda'; -import { bindToMercureTopic } from '../../../shlink-web-component/mercure/helpers'; -import type { MercureInfo } from '../../../shlink-web-component/mercure/reducers/mercureInfo'; +import { bindToMercureTopic } from '../../../shlink-web-component/src/mercure/helpers'; +import type { MercureInfo } from '../../../shlink-web-component/src/mercure/reducers/mercureInfo'; vi.mock('event-source-polyfill'); diff --git a/test/mercure/reducers/mercureInfo.test.ts b/test/mercure/reducers/mercureInfo.test.ts index 8e6532af..bff9b048 100644 --- a/test/mercure/reducers/mercureInfo.test.ts +++ b/test/mercure/reducers/mercureInfo.test.ts @@ -1,5 +1,5 @@ import { fromPartial } from '@total-typescript/shoehorn'; -import { mercureInfoReducerCreator } from '../../../shlink-web-component/mercure/reducers/mercureInfo'; +import { mercureInfoReducerCreator } from '../../../shlink-web-component/src/mercure/reducers/mercureInfo'; import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import type { GetState } from '../../../src/container/types'; diff --git a/test/servers/Overview.test.tsx b/test/servers/Overview.test.tsx index e9dd442e..7241d124 100644 --- a/test/servers/Overview.test.tsx +++ b/test/servers/Overview.test.tsx @@ -1,9 +1,9 @@ import { screen, waitFor } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; import { MemoryRouter } from 'react-router-dom'; -import type { MercureInfo } from '../../shlink-web-component/mercure/reducers/mercureInfo'; -import { Overview as overviewCreator } from '../../shlink-web-component/overview/Overview'; -import { prettify } from '../../shlink-web-component/utils/helpers/numbers'; +import type { MercureInfo } from '../../shlink-web-component/src/mercure/reducers/mercureInfo'; +import { Overview as overviewCreator } from '../../shlink-web-component/src/overview/Overview'; +import { prettify } from '../../shlink-web-component/src/utils/helpers/numbers'; import { renderWithEvents } from '../__helpers__/setUpTest'; describe('', () => { diff --git a/test/servers/helpers/HighlightCard.test.tsx b/test/servers/helpers/HighlightCard.test.tsx index c41469f4..ae5d5045 100644 --- a/test/servers/helpers/HighlightCard.test.tsx +++ b/test/servers/helpers/HighlightCard.test.tsx @@ -1,8 +1,8 @@ import { screen, waitFor } from '@testing-library/react'; import type { ReactNode } from 'react'; import { MemoryRouter } from 'react-router-dom'; -import type { HighlightCardProps } from '../../../shlink-web-component/overview/helpers/HighlightCard'; -import { HighlightCard } from '../../../shlink-web-component/overview/helpers/HighlightCard'; +import type { HighlightCardProps } from '../../../shlink-web-component/src/overview/helpers/HighlightCard'; +import { HighlightCard } from '../../../shlink-web-component/src/overview/helpers/HighlightCard'; import { renderWithEvents } from '../../__helpers__/setUpTest'; describe('', () => { diff --git a/test/servers/helpers/VisitsHighlightCard.test.tsx b/test/servers/helpers/VisitsHighlightCard.test.tsx index 9bb32d88..96947d52 100644 --- a/test/servers/helpers/VisitsHighlightCard.test.tsx +++ b/test/servers/helpers/VisitsHighlightCard.test.tsx @@ -1,6 +1,6 @@ import { screen, waitFor } from '@testing-library/react'; -import type { VisitsHighlightCardProps } from '../../../shlink-web-component/overview/helpers/VisitsHighlightCard'; -import { VisitsHighlightCard } from '../../../shlink-web-component/overview/helpers/VisitsHighlightCard'; +import type { VisitsHighlightCardProps } from '../../../shlink-web-component/src/overview/helpers/VisitsHighlightCard'; +import { VisitsHighlightCard } from '../../../shlink-web-component/src/overview/helpers/VisitsHighlightCard'; import { renderWithEvents } from '../../__helpers__/setUpTest'; describe('', () => { diff --git a/test/settings/ShortUrlsListSettings.test.tsx b/test/settings/ShortUrlsListSettings.test.tsx index b1ec4597..e48bb200 100644 --- a/test/settings/ShortUrlsListSettings.test.tsx +++ b/test/settings/ShortUrlsListSettings.test.tsx @@ -1,6 +1,6 @@ import { screen } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; -import type { ShortUrlsOrder } from '../../shlink-web-component/short-urls/data'; +import type { ShortUrlsOrder } from '../../shlink-web-component/src/short-urls/data'; import type { ShortUrlsListSettings as ShortUrlsSettings } from '../../src/settings/reducers/settings'; import { ShortUrlsListSettings } from '../../src/settings/ShortUrlsListSettings'; import { renderWithEvents } from '../__helpers__/setUpTest'; diff --git a/test/settings/TagsSettings.test.tsx b/test/settings/TagsSettings.test.tsx index a6b8d06d..de6935b8 100644 --- a/test/settings/TagsSettings.test.tsx +++ b/test/settings/TagsSettings.test.tsx @@ -1,6 +1,6 @@ import { screen } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; -import type { TagsOrder } from '../../shlink-web-component/tags/data/TagsListChildrenProps'; +import type { TagsOrder } from '../../shlink-web-component/src/tags/data/TagsListChildrenProps'; import type { TagsSettings as TagsSettingsOptions } from '../../src/settings/reducers/settings'; import { TagsSettings } from '../../src/settings/TagsSettings'; import { renderWithEvents } from '../__helpers__/setUpTest'; diff --git a/test/short-urls/CreateShortUrl.test.tsx b/test/short-urls/CreateShortUrl.test.tsx index 70e982ea..178b12d6 100644 --- a/test/short-urls/CreateShortUrl.test.tsx +++ b/test/short-urls/CreateShortUrl.test.tsx @@ -1,7 +1,7 @@ import { render, screen } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; -import { CreateShortUrl as createShortUrlsCreator } from '../../shlink-web-component/short-urls/CreateShortUrl'; -import type { ShortUrlCreation } from '../../shlink-web-component/short-urls/reducers/shortUrlCreation'; +import { CreateShortUrl as createShortUrlsCreator } from '../../shlink-web-component/src/short-urls/CreateShortUrl'; +import type { ShortUrlCreation } from '../../shlink-web-component/src/short-urls/reducers/shortUrlCreation'; describe('', () => { const ShortUrlForm = () => ShortUrlForm; diff --git a/test/short-urls/EditShortUrl.test.tsx b/test/short-urls/EditShortUrl.test.tsx index 15a7d7d2..ffda9d90 100644 --- a/test/short-urls/EditShortUrl.test.tsx +++ b/test/short-urls/EditShortUrl.test.tsx @@ -1,9 +1,9 @@ import { render, screen } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; import { MemoryRouter } from 'react-router-dom'; -import { EditShortUrl as createEditShortUrl } from '../../shlink-web-component/short-urls/EditShortUrl'; -import type { ShortUrlDetail } from '../../shlink-web-component/short-urls/reducers/shortUrlDetail'; -import type { ShortUrlEdition } from '../../shlink-web-component/short-urls/reducers/shortUrlEdition'; +import { EditShortUrl as createEditShortUrl } from '../../shlink-web-component/src/short-urls/EditShortUrl'; +import type { ShortUrlDetail } from '../../shlink-web-component/src/short-urls/reducers/shortUrlDetail'; +import type { ShortUrlEdition } from '../../shlink-web-component/src/short-urls/reducers/shortUrlEdition'; describe('', () => { const shortUrlCreation = { validateUrls: true }; diff --git a/test/short-urls/Paginator.test.tsx b/test/short-urls/Paginator.test.tsx index f4bf824f..a392752d 100644 --- a/test/short-urls/Paginator.test.tsx +++ b/test/short-urls/Paginator.test.tsx @@ -1,8 +1,8 @@ import { render, screen } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; import { MemoryRouter } from 'react-router-dom'; -import { Paginator } from '../../shlink-web-component/short-urls/Paginator'; -import { ELLIPSIS } from '../../shlink-web-component/utils/helpers/pagination'; +import { Paginator } from '../../shlink-web-component/src/short-urls/Paginator'; +import { ELLIPSIS } from '../../shlink-web-component/src/utils/helpers/pagination'; import type { ShlinkPaginator } from '../../src/api/types'; describe('', () => { diff --git a/test/short-urls/ShortUrlForm.test.tsx b/test/short-urls/ShortUrlForm.test.tsx index 403a7ec2..92a858bc 100644 --- a/test/short-urls/ShortUrlForm.test.tsx +++ b/test/short-urls/ShortUrlForm.test.tsx @@ -2,9 +2,9 @@ import { screen } from '@testing-library/react'; import type { UserEvent } from '@testing-library/user-event/setup/setup'; import { fromPartial } from '@total-typescript/shoehorn'; import { formatISO } from 'date-fns'; -import type { Mode } from '../../shlink-web-component/short-urls/ShortUrlForm'; -import { ShortUrlForm as createShortUrlForm } from '../../shlink-web-component/short-urls/ShortUrlForm'; -import { parseDate } from '../../shlink-web-component/utils/dates/helpers/date'; +import type { Mode } from '../../shlink-web-component/src/short-urls/ShortUrlForm'; +import { ShortUrlForm as createShortUrlForm } from '../../shlink-web-component/src/short-urls/ShortUrlForm'; +import { parseDate } from '../../shlink-web-component/src/utils/dates/helpers/date'; import type { ReachableServer, SelectedServer } from '../../src/servers/data'; import type { OptionalString } from '../../src/utils/utils'; import { renderWithEvents } from '../__helpers__/setUpTest'; diff --git a/test/short-urls/ShortUrlsFilteringBar.test.tsx b/test/short-urls/ShortUrlsFilteringBar.test.tsx index 766bd227..82a0b7e3 100644 --- a/test/short-urls/ShortUrlsFilteringBar.test.tsx +++ b/test/short-urls/ShortUrlsFilteringBar.test.tsx @@ -2,9 +2,9 @@ import { screen, waitFor } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; import { endOfDay, formatISO, startOfDay } from 'date-fns'; import { MemoryRouter, useLocation, useNavigate } from 'react-router-dom'; -import { ShortUrlsFilteringBar as filteringBarCreator } from '../../shlink-web-component/short-urls/ShortUrlsFilteringBar'; -import { formatDate } from '../../shlink-web-component/utils/dates/helpers/date'; -import type { DateRange } from '../../shlink-web-component/utils/dates/helpers/dateIntervals'; +import { ShortUrlsFilteringBar as filteringBarCreator } from '../../shlink-web-component/src/short-urls/ShortUrlsFilteringBar'; +import { formatDate } from '../../shlink-web-component/src/utils/dates/helpers/date'; +import type { DateRange } from '../../shlink-web-component/src/utils/dates/helpers/dateIntervals'; import type { ReachableServer, SelectedServer } from '../../src/servers/data'; import { renderWithEvents } from '../__helpers__/setUpTest'; diff --git a/test/short-urls/ShortUrlsList.test.tsx b/test/short-urls/ShortUrlsList.test.tsx index a0f28e05..be47ca97 100644 --- a/test/short-urls/ShortUrlsList.test.tsx +++ b/test/short-urls/ShortUrlsList.test.tsx @@ -1,11 +1,11 @@ import { screen } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; import { MemoryRouter, useNavigate } from 'react-router-dom'; -import type { MercureBoundProps } from '../../shlink-web-component/mercure/helpers/boundToMercureHub'; -import type { ShortUrlsOrder } from '../../shlink-web-component/short-urls/data'; -import type { ShortUrlsList as ShortUrlsListModel } from '../../shlink-web-component/short-urls/reducers/shortUrlsList'; -import { ShortUrlsList as createShortUrlsList } from '../../shlink-web-component/short-urls/ShortUrlsList'; -import type { ShortUrlsTableType } from '../../shlink-web-component/short-urls/ShortUrlsTable'; +import type { MercureBoundProps } from '../../shlink-web-component/src/mercure/helpers/boundToMercureHub'; +import type { ShortUrlsOrder } from '../../shlink-web-component/src/short-urls/data'; +import type { ShortUrlsList as ShortUrlsListModel } from '../../shlink-web-component/src/short-urls/reducers/shortUrlsList'; +import { ShortUrlsList as createShortUrlsList } from '../../shlink-web-component/src/short-urls/ShortUrlsList'; +import type { ShortUrlsTableType } from '../../shlink-web-component/src/short-urls/ShortUrlsTable'; import type { Settings } from '../../src/settings/reducers/settings'; import type { SemVer } from '../../src/utils/helpers/version'; import { renderWithEvents } from '../__helpers__/setUpTest'; diff --git a/test/short-urls/ShortUrlsTable.test.tsx b/test/short-urls/ShortUrlsTable.test.tsx index 9c53d89a..4f2426e2 100644 --- a/test/short-urls/ShortUrlsTable.test.tsx +++ b/test/short-urls/ShortUrlsTable.test.tsx @@ -1,9 +1,9 @@ import { fireEvent, screen } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; -import type { ShortUrlsOrderableFields } from '../../shlink-web-component/short-urls/data'; -import { SHORT_URLS_ORDERABLE_FIELDS } from '../../shlink-web-component/short-urls/data'; -import type { ShortUrlsList } from '../../shlink-web-component/short-urls/reducers/shortUrlsList'; -import { ShortUrlsTable as shortUrlsTableCreator } from '../../shlink-web-component/short-urls/ShortUrlsTable'; +import type { ShortUrlsOrderableFields } from '../../shlink-web-component/src/short-urls/data'; +import { SHORT_URLS_ORDERABLE_FIELDS } from '../../shlink-web-component/src/short-urls/data'; +import type { ShortUrlsList } from '../../shlink-web-component/src/short-urls/reducers/shortUrlsList'; +import { ShortUrlsTable as shortUrlsTableCreator } from '../../shlink-web-component/src/short-urls/ShortUrlsTable'; import type { SelectedServer } from '../../src/servers/data'; import { renderWithEvents } from '../__helpers__/setUpTest'; diff --git a/test/short-urls/UseExistingIfFoundInfoIcon.test.tsx b/test/short-urls/UseExistingIfFoundInfoIcon.test.tsx index 95c6452d..2651d18c 100644 --- a/test/short-urls/UseExistingIfFoundInfoIcon.test.tsx +++ b/test/short-urls/UseExistingIfFoundInfoIcon.test.tsx @@ -1,5 +1,5 @@ import { screen } from '@testing-library/react'; -import { UseExistingIfFoundInfoIcon } from '../../shlink-web-component/short-urls/UseExistingIfFoundInfoIcon'; +import { UseExistingIfFoundInfoIcon } from '../../shlink-web-component/src/short-urls/UseExistingIfFoundInfoIcon'; import { renderWithEvents } from '../__helpers__/setUpTest'; describe('', () => { diff --git a/test/short-urls/helpers/CreateShortUrlResult.test.tsx b/test/short-urls/helpers/CreateShortUrlResult.test.tsx index d51fc7d0..d4b17615 100644 --- a/test/short-urls/helpers/CreateShortUrlResult.test.tsx +++ b/test/short-urls/helpers/CreateShortUrlResult.test.tsx @@ -1,7 +1,7 @@ import { screen } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; -import { CreateShortUrlResult as createResult } from '../../../shlink-web-component/short-urls/helpers/CreateShortUrlResult'; -import type { ShortUrlCreation } from '../../../shlink-web-component/short-urls/reducers/shortUrlCreation'; +import { CreateShortUrlResult as createResult } from '../../../shlink-web-component/src/short-urls/helpers/CreateShortUrlResult'; +import type { ShortUrlCreation } from '../../../shlink-web-component/src/short-urls/reducers/shortUrlCreation'; import type { TimeoutToggle } from '../../../src/utils/helpers/hooks'; import { renderWithEvents } from '../../__helpers__/setUpTest'; diff --git a/test/short-urls/helpers/DeleteShortUrlModal.test.tsx b/test/short-urls/helpers/DeleteShortUrlModal.test.tsx index 20f26062..fd698a10 100644 --- a/test/short-urls/helpers/DeleteShortUrlModal.test.tsx +++ b/test/short-urls/helpers/DeleteShortUrlModal.test.tsx @@ -1,8 +1,8 @@ import { screen, waitFor } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; -import type { ShortUrl } from '../../../shlink-web-component/short-urls/data'; -import { DeleteShortUrlModal } from '../../../shlink-web-component/short-urls/helpers/DeleteShortUrlModal'; -import type { ShortUrlDeletion } from '../../../shlink-web-component/short-urls/reducers/shortUrlDeletion'; +import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data'; +import { DeleteShortUrlModal } from '../../../shlink-web-component/src/short-urls/helpers/DeleteShortUrlModal'; +import type { ShortUrlDeletion } from '../../../shlink-web-component/src/short-urls/reducers/shortUrlDeletion'; import type { InvalidShortUrlDeletion } from '../../../src/api/types/errors'; import { ErrorTypeV2, ErrorTypeV3 } from '../../../src/api/types/errors'; import { renderWithEvents } from '../../__helpers__/setUpTest'; diff --git a/test/short-urls/helpers/ExportShortUrlsBtn.test.tsx b/test/short-urls/helpers/ExportShortUrlsBtn.test.tsx index adf74767..262289b2 100644 --- a/test/short-urls/helpers/ExportShortUrlsBtn.test.tsx +++ b/test/short-urls/helpers/ExportShortUrlsBtn.test.tsx @@ -1,9 +1,9 @@ import { screen } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; import { MemoryRouter } from 'react-router-dom'; -import type { ShortUrl } from '../../../shlink-web-component/short-urls/data'; -import { ExportShortUrlsBtn as createExportShortUrlsBtn } from '../../../shlink-web-component/short-urls/helpers/ExportShortUrlsBtn'; -import type { ReportExporter } from '../../../shlink-web-component/utils/services/ReportExporter'; +import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data'; +import { ExportShortUrlsBtn as createExportShortUrlsBtn } from '../../../shlink-web-component/src/short-urls/helpers/ExportShortUrlsBtn'; +import type { ReportExporter } from '../../../shlink-web-component/src/utils/services/ReportExporter'; import type { NotFoundServer, SelectedServer } from '../../../src/servers/data'; import { renderWithEvents } from '../../__helpers__/setUpTest'; diff --git a/test/short-urls/helpers/QrCodeModal.test.tsx b/test/short-urls/helpers/QrCodeModal.test.tsx index 4cfae4b2..a473ec86 100644 --- a/test/short-urls/helpers/QrCodeModal.test.tsx +++ b/test/short-urls/helpers/QrCodeModal.test.tsx @@ -1,6 +1,6 @@ import { fireEvent, screen } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; -import { QrCodeModal as createQrCodeModal } from '../../../shlink-web-component/short-urls/helpers/QrCodeModal'; +import { QrCodeModal as createQrCodeModal } from '../../../shlink-web-component/src/short-urls/helpers/QrCodeModal'; import type { SemVer } from '../../../src/utils/helpers/version'; import { renderWithEvents } from '../../__helpers__/setUpTest'; diff --git a/test/short-urls/helpers/ShortUrlDetailLink.test.tsx b/test/short-urls/helpers/ShortUrlDetailLink.test.tsx index c50e1ad0..673aa0c5 100644 --- a/test/short-urls/helpers/ShortUrlDetailLink.test.tsx +++ b/test/short-urls/helpers/ShortUrlDetailLink.test.tsx @@ -1,9 +1,9 @@ import { render, screen } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; import { MemoryRouter } from 'react-router-dom'; -import type { ShortUrl } from '../../../shlink-web-component/short-urls/data'; -import type { LinkSuffix } from '../../../shlink-web-component/short-urls/helpers/ShortUrlDetailLink'; -import { ShortUrlDetailLink } from '../../../shlink-web-component/short-urls/helpers/ShortUrlDetailLink'; +import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data'; +import type { LinkSuffix } from '../../../shlink-web-component/src/short-urls/helpers/ShortUrlDetailLink'; +import { ShortUrlDetailLink } from '../../../shlink-web-component/src/short-urls/helpers/ShortUrlDetailLink'; import type { NotFoundServer, ReachableServer } from '../../../src/servers/data'; describe('', () => { diff --git a/test/short-urls/helpers/ShortUrlFormCheckboxGroup.test.tsx b/test/short-urls/helpers/ShortUrlFormCheckboxGroup.test.tsx index f013b3ad..fcd7fc77 100644 --- a/test/short-urls/helpers/ShortUrlFormCheckboxGroup.test.tsx +++ b/test/short-urls/helpers/ShortUrlFormCheckboxGroup.test.tsx @@ -1,5 +1,5 @@ import { render, screen } from '@testing-library/react'; -import { ShortUrlFormCheckboxGroup } from '../../../shlink-web-component/short-urls/helpers/ShortUrlFormCheckboxGroup'; +import { ShortUrlFormCheckboxGroup } from '../../../shlink-web-component/src/short-urls/helpers/ShortUrlFormCheckboxGroup'; describe('', () => { it.each([ diff --git a/test/short-urls/helpers/ShortUrlStatus.test.tsx b/test/short-urls/helpers/ShortUrlStatus.test.tsx index 0afef506..15fbfef2 100644 --- a/test/short-urls/helpers/ShortUrlStatus.test.tsx +++ b/test/short-urls/helpers/ShortUrlStatus.test.tsx @@ -1,8 +1,8 @@ import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { fromPartial } from '@total-typescript/shoehorn'; -import type { ShortUrl, ShortUrlMeta } from '../../../shlink-web-component/short-urls/data'; -import { ShortUrlStatus } from '../../../shlink-web-component/short-urls/helpers/ShortUrlStatus'; +import type { ShortUrl, ShortUrlMeta } from '../../../shlink-web-component/src/short-urls/data'; +import { ShortUrlStatus } from '../../../shlink-web-component/src/short-urls/helpers/ShortUrlStatus'; import type { ShlinkVisitsSummary } from '../../../src/api/types'; describe('', () => { diff --git a/test/short-urls/helpers/ShortUrlVisitsCount.test.tsx b/test/short-urls/helpers/ShortUrlVisitsCount.test.tsx index 8ce9d72e..9dd5fd1b 100644 --- a/test/short-urls/helpers/ShortUrlVisitsCount.test.tsx +++ b/test/short-urls/helpers/ShortUrlVisitsCount.test.tsx @@ -1,8 +1,8 @@ import { render, screen, waitFor } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import { fromPartial } from '@total-typescript/shoehorn'; -import type { ShortUrl } from '../../../shlink-web-component/short-urls/data'; -import { ShortUrlVisitsCount } from '../../../shlink-web-component/short-urls/helpers/ShortUrlVisitsCount'; +import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data'; +import { ShortUrlVisitsCount } from '../../../shlink-web-component/src/short-urls/helpers/ShortUrlVisitsCount'; describe('', () => { const setUp = (visitsCount: number, shortUrl: ShortUrl) => ({ diff --git a/test/short-urls/helpers/ShortUrlsFilterDropdown.test.tsx b/test/short-urls/helpers/ShortUrlsFilterDropdown.test.tsx index 16da4417..fbf3eb60 100644 --- a/test/short-urls/helpers/ShortUrlsFilterDropdown.test.tsx +++ b/test/short-urls/helpers/ShortUrlsFilterDropdown.test.tsx @@ -1,5 +1,5 @@ import { screen, waitFor } from '@testing-library/react'; -import { ShortUrlsFilterDropdown } from '../../../shlink-web-component/short-urls/helpers/ShortUrlsFilterDropdown'; +import { ShortUrlsFilterDropdown } from '../../../shlink-web-component/src/short-urls/helpers/ShortUrlsFilterDropdown'; import { renderWithEvents } from '../../__helpers__/setUpTest'; describe('', () => { diff --git a/test/short-urls/helpers/ShortUrlsRow.test.tsx b/test/short-urls/helpers/ShortUrlsRow.test.tsx index bb08c4a3..abc7ac6f 100644 --- a/test/short-urls/helpers/ShortUrlsRow.test.tsx +++ b/test/short-urls/helpers/ShortUrlsRow.test.tsx @@ -3,9 +3,9 @@ import { fromPartial } from '@total-typescript/shoehorn'; import { addDays, formatISO, subDays } from 'date-fns'; import { last } from 'ramda'; import { MemoryRouter, useLocation } from 'react-router-dom'; -import type { ShortUrl, ShortUrlMeta } from '../../../shlink-web-component/short-urls/data'; -import { ShortUrlsRow as createShortUrlsRow } from '../../../shlink-web-component/short-urls/helpers/ShortUrlsRow'; -import { now, parseDate } from '../../../shlink-web-component/utils/dates/helpers/date'; +import type { ShortUrl, ShortUrlMeta } from '../../../shlink-web-component/src/short-urls/data'; +import { ShortUrlsRow as createShortUrlsRow } from '../../../shlink-web-component/src/short-urls/helpers/ShortUrlsRow'; +import { now, parseDate } from '../../../shlink-web-component/src/utils/dates/helpers/date'; import type { ReachableServer } from '../../../src/servers/data'; import type { Settings } from '../../../src/settings/reducers/settings'; import type { TimeoutToggle } from '../../../src/utils/helpers/hooks'; diff --git a/test/short-urls/helpers/ShortUrlsRowMenu.test.tsx b/test/short-urls/helpers/ShortUrlsRowMenu.test.tsx index cf921049..63fccb29 100644 --- a/test/short-urls/helpers/ShortUrlsRowMenu.test.tsx +++ b/test/short-urls/helpers/ShortUrlsRowMenu.test.tsx @@ -1,8 +1,8 @@ import { screen } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; import { MemoryRouter } from 'react-router-dom'; -import type { ShortUrl } from '../../../shlink-web-component/short-urls/data'; -import { ShortUrlsRowMenu as createShortUrlsRowMenu } from '../../../shlink-web-component/short-urls/helpers/ShortUrlsRowMenu'; +import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data'; +import { ShortUrlsRowMenu as createShortUrlsRowMenu } from '../../../shlink-web-component/src/short-urls/helpers/ShortUrlsRowMenu'; import type { ReachableServer } from '../../../src/servers/data'; import { renderWithEvents } from '../../__helpers__/setUpTest'; diff --git a/test/short-urls/helpers/Tags.test.tsx b/test/short-urls/helpers/Tags.test.tsx index 5c623f21..922c01ee 100644 --- a/test/short-urls/helpers/Tags.test.tsx +++ b/test/short-urls/helpers/Tags.test.tsx @@ -1,5 +1,5 @@ import { render, screen } from '@testing-library/react'; -import { Tags } from '../../../shlink-web-component/short-urls/helpers/Tags'; +import { Tags } from '../../../shlink-web-component/src/short-urls/helpers/Tags'; import { colorGeneratorMock } from '../../utils/services/__mocks__/ColorGenerator.mock'; describe('', () => { diff --git a/test/short-urls/helpers/index.test.ts b/test/short-urls/helpers/index.test.ts index 7fb37d63..3c7a34d0 100644 --- a/test/short-urls/helpers/index.test.ts +++ b/test/short-urls/helpers/index.test.ts @@ -1,6 +1,6 @@ import { fromPartial } from '@total-typescript/shoehorn'; -import type { ShortUrl } from '../../../shlink-web-component/short-urls/data'; -import { shortUrlDataFromShortUrl, urlDecodeShortCode, urlEncodeShortCode } from '../../../shlink-web-component/short-urls/helpers'; +import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data'; +import { shortUrlDataFromShortUrl, urlDecodeShortCode, urlEncodeShortCode } from '../../../shlink-web-component/src/short-urls/helpers'; describe('helpers', () => { describe('shortUrlDataFromShortUrl', () => { diff --git a/test/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown.test.tsx b/test/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown.test.tsx index 29fc18f5..e95cfa3d 100644 --- a/test/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown.test.tsx +++ b/test/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown.test.tsx @@ -1,6 +1,6 @@ import { screen } from '@testing-library/react'; -import { QrErrorCorrectionDropdown } from '../../../../shlink-web-component/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown'; -import type { QrErrorCorrection } from '../../../../shlink-web-component/utils/helpers/qrCodes'; +import { QrErrorCorrectionDropdown } from '../../../../shlink-web-component/src/short-urls/helpers/qr-codes/QrErrorCorrectionDropdown'; +import type { QrErrorCorrection } from '../../../../shlink-web-component/src/utils/helpers/qrCodes'; import { renderWithEvents } from '../../../__helpers__/setUpTest'; describe('', () => { diff --git a/test/short-urls/helpers/qr-codes/QrFormatDropdown.test.tsx b/test/short-urls/helpers/qr-codes/QrFormatDropdown.test.tsx index 29133dac..d90082ee 100644 --- a/test/short-urls/helpers/qr-codes/QrFormatDropdown.test.tsx +++ b/test/short-urls/helpers/qr-codes/QrFormatDropdown.test.tsx @@ -1,6 +1,6 @@ import { screen } from '@testing-library/react'; -import { QrFormatDropdown } from '../../../../shlink-web-component/short-urls/helpers/qr-codes/QrFormatDropdown'; -import type { QrCodeFormat } from '../../../../shlink-web-component/utils/helpers/qrCodes'; +import { QrFormatDropdown } from '../../../../shlink-web-component/src/short-urls/helpers/qr-codes/QrFormatDropdown'; +import type { QrCodeFormat } from '../../../../shlink-web-component/src/utils/helpers/qrCodes'; import { renderWithEvents } from '../../../__helpers__/setUpTest'; describe('', () => { diff --git a/test/short-urls/reducers/shortUrlCreation.test.ts b/test/short-urls/reducers/shortUrlCreation.test.ts index 8af7941d..7358f8cf 100644 --- a/test/short-urls/reducers/shortUrlCreation.test.ts +++ b/test/short-urls/reducers/shortUrlCreation.test.ts @@ -1,9 +1,9 @@ import { fromPartial } from '@total-typescript/shoehorn'; -import type { ShortUrl } from '../../../shlink-web-component/short-urls/data'; +import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data'; import { createShortUrl as createShortUrlCreator, shortUrlCreationReducerCreator, -} from '../../../shlink-web-component/short-urls/reducers/shortUrlCreation'; +} from '../../../shlink-web-component/src/short-urls/reducers/shortUrlCreation'; import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import type { ShlinkState } from '../../../src/container/types'; diff --git a/test/short-urls/reducers/shortUrlDeletion.test.ts b/test/short-urls/reducers/shortUrlDeletion.test.ts index c6c43121..478892e7 100644 --- a/test/short-urls/reducers/shortUrlDeletion.test.ts +++ b/test/short-urls/reducers/shortUrlDeletion.test.ts @@ -2,7 +2,7 @@ import { fromPartial } from '@total-typescript/shoehorn'; import { deleteShortUrl as deleteShortUrlCreator, shortUrlDeletionReducerCreator, -} from '../../../shlink-web-component/short-urls/reducers/shortUrlDeletion'; +} from '../../../shlink-web-component/src/short-urls/reducers/shortUrlDeletion'; import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import type { ProblemDetailsError } from '../../../src/api/types/errors'; diff --git a/test/short-urls/reducers/shortUrlDetail.test.ts b/test/short-urls/reducers/shortUrlDetail.test.ts index daf96cd9..db750565 100644 --- a/test/short-urls/reducers/shortUrlDetail.test.ts +++ b/test/short-urls/reducers/shortUrlDetail.test.ts @@ -1,7 +1,7 @@ import { fromPartial } from '@total-typescript/shoehorn'; -import type { ShortUrl } from '../../../shlink-web-component/short-urls/data'; -import { shortUrlDetailReducerCreator } from '../../../shlink-web-component/short-urls/reducers/shortUrlDetail'; -import type { ShortUrlsList } from '../../../shlink-web-component/short-urls/reducers/shortUrlsList'; +import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data'; +import { shortUrlDetailReducerCreator } from '../../../shlink-web-component/src/short-urls/reducers/shortUrlDetail'; +import type { ShortUrlsList } from '../../../shlink-web-component/src/short-urls/reducers/shortUrlsList'; import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import type { ShlinkState } from '../../../src/container/types'; diff --git a/test/short-urls/reducers/shortUrlEdition.test.ts b/test/short-urls/reducers/shortUrlEdition.test.ts index 2b334c05..ad4b7151 100644 --- a/test/short-urls/reducers/shortUrlEdition.test.ts +++ b/test/short-urls/reducers/shortUrlEdition.test.ts @@ -1,9 +1,9 @@ import { fromPartial } from '@total-typescript/shoehorn'; -import type { ShortUrl } from '../../../shlink-web-component/short-urls/data'; +import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data'; import { editShortUrl as editShortUrlCreator, shortUrlEditionReducerCreator, -} from '../../../shlink-web-component/short-urls/reducers/shortUrlEdition'; +} from '../../../shlink-web-component/src/short-urls/reducers/shortUrlEdition'; import type { ShlinkState } from '../../../src/container/types'; import type { SelectedServer } from '../../../src/servers/data'; diff --git a/test/short-urls/reducers/shortUrlsList.test.ts b/test/short-urls/reducers/shortUrlsList.test.ts index 2f67021d..ecfa637b 100644 --- a/test/short-urls/reducers/shortUrlsList.test.ts +++ b/test/short-urls/reducers/shortUrlsList.test.ts @@ -1,14 +1,14 @@ import { fromPartial } from '@total-typescript/shoehorn'; -import type { ShortUrl } from '../../../shlink-web-component/short-urls/data'; -import { createShortUrl as createShortUrlCreator } from '../../../shlink-web-component/short-urls/reducers/shortUrlCreation'; -import { shortUrlDeleted } from '../../../shlink-web-component/short-urls/reducers/shortUrlDeletion'; -import { editShortUrl as editShortUrlCreator } from '../../../shlink-web-component/short-urls/reducers/shortUrlEdition'; +import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data'; +import { createShortUrl as createShortUrlCreator } from '../../../shlink-web-component/src/short-urls/reducers/shortUrlCreation'; +import { shortUrlDeleted } from '../../../shlink-web-component/src/short-urls/reducers/shortUrlDeletion'; +import { editShortUrl as editShortUrlCreator } from '../../../shlink-web-component/src/short-urls/reducers/shortUrlEdition'; import { listShortUrls as listShortUrlsCreator, shortUrlsListReducerCreator, -} from '../../../shlink-web-component/short-urls/reducers/shortUrlsList'; -import { createNewVisits } from '../../../shlink-web-component/visits/reducers/visitCreation'; -import type { CreateVisit } from '../../../shlink-web-component/visits/types'; +} from '../../../shlink-web-component/src/short-urls/reducers/shortUrlsList'; +import { createNewVisits } from '../../../shlink-web-component/src/visits/reducers/visitCreation'; +import type { CreateVisit } from '../../../shlink-web-component/src/visits/types'; import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import type { ShlinkShortUrlsResponse } from '../../../src/api/types'; diff --git a/test/tags/TagsList.test.tsx b/test/tags/TagsList.test.tsx index ff2428db..47815ece 100644 --- a/test/tags/TagsList.test.tsx +++ b/test/tags/TagsList.test.tsx @@ -1,10 +1,10 @@ import { screen, waitFor } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; import { identity } from 'ramda'; -import type { MercureBoundProps } from '../../shlink-web-component/mercure/helpers/boundToMercureHub'; -import type { TagsList } from '../../shlink-web-component/tags/reducers/tagsList'; -import type { TagsListProps } from '../../shlink-web-component/tags/TagsList'; -import { TagsList as createTagsList } from '../../shlink-web-component/tags/TagsList'; +import type { MercureBoundProps } from '../../shlink-web-component/src/mercure/helpers/boundToMercureHub'; +import type { TagsList } from '../../shlink-web-component/src/tags/reducers/tagsList'; +import type { TagsListProps } from '../../shlink-web-component/src/tags/TagsList'; +import { TagsList as createTagsList } from '../../shlink-web-component/src/tags/TagsList'; import { renderWithEvents } from '../__helpers__/setUpTest'; describe('', () => { diff --git a/test/tags/TagsTable.test.tsx b/test/tags/TagsTable.test.tsx index e5891112..090edfa3 100644 --- a/test/tags/TagsTable.test.tsx +++ b/test/tags/TagsTable.test.tsx @@ -1,7 +1,7 @@ import { screen } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; import { useLocation } from 'react-router-dom'; -import { TagsTable as createTagsTable } from '../../shlink-web-component/tags/TagsTable'; +import { TagsTable as createTagsTable } from '../../shlink-web-component/src/tags/TagsTable'; import { rangeOf } from '../../src/utils/utils'; import { renderWithEvents } from '../__helpers__/setUpTest'; diff --git a/test/tags/TagsTableRow.test.tsx b/test/tags/TagsTableRow.test.tsx index 94850105..e45ddc56 100644 --- a/test/tags/TagsTableRow.test.tsx +++ b/test/tags/TagsTableRow.test.tsx @@ -1,7 +1,7 @@ import { screen } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; import { MemoryRouter } from 'react-router-dom'; -import { TagsTableRow as createTagsTableRow } from '../../shlink-web-component/tags/TagsTableRow'; +import { TagsTableRow as createTagsTableRow } from '../../shlink-web-component/src/tags/TagsTableRow'; import { renderWithEvents } from '../__helpers__/setUpTest'; import { colorGeneratorMock } from '../utils/services/__mocks__/ColorGenerator.mock'; diff --git a/test/tags/helpers/DeleteTagConfirmModal.test.tsx b/test/tags/helpers/DeleteTagConfirmModal.test.tsx index 8ddfb1b7..55f87936 100644 --- a/test/tags/helpers/DeleteTagConfirmModal.test.tsx +++ b/test/tags/helpers/DeleteTagConfirmModal.test.tsx @@ -1,6 +1,6 @@ import { screen } from '@testing-library/react'; -import { DeleteTagConfirmModal } from '../../../shlink-web-component/tags/helpers/DeleteTagConfirmModal'; -import type { TagDeletion } from '../../../shlink-web-component/tags/reducers/tagDelete'; +import { DeleteTagConfirmModal } from '../../../shlink-web-component/src/tags/helpers/DeleteTagConfirmModal'; +import type { TagDeletion } from '../../../shlink-web-component/src/tags/reducers/tagDelete'; import { renderWithEvents } from '../../__helpers__/setUpTest'; describe('', () => { diff --git a/test/tags/helpers/EditTagModal.test.tsx b/test/tags/helpers/EditTagModal.test.tsx index b1fd3dc4..067760f8 100644 --- a/test/tags/helpers/EditTagModal.test.tsx +++ b/test/tags/helpers/EditTagModal.test.tsx @@ -1,7 +1,7 @@ import { screen, waitFor } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; -import { EditTagModal as createEditTagModal } from '../../../shlink-web-component/tags/helpers/EditTagModal'; -import type { TagEdition } from '../../../shlink-web-component/tags/reducers/tagEdit'; +import { EditTagModal as createEditTagModal } from '../../../shlink-web-component/src/tags/helpers/EditTagModal'; +import type { TagEdition } from '../../../shlink-web-component/src/tags/reducers/tagEdit'; import { renderWithEvents } from '../../__helpers__/setUpTest'; describe('', () => { diff --git a/test/tags/helpers/Tag.test.tsx b/test/tags/helpers/Tag.test.tsx index 232aecc1..73cdd5ae 100644 --- a/test/tags/helpers/Tag.test.tsx +++ b/test/tags/helpers/Tag.test.tsx @@ -1,8 +1,8 @@ import { screen } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; import type { ReactNode } from 'react'; -import { Tag } from '../../../shlink-web-component/tags/helpers/Tag'; -import type { ColorGenerator } from '../../../shlink-web-component/utils/services/ColorGenerator'; +import { Tag } from '../../../shlink-web-component/src/tags/helpers/Tag'; +import type { ColorGenerator } from '../../../shlink-web-component/src/utils/services/ColorGenerator'; import { MAIN_COLOR } from '../../../src/utils/theme'; import { renderWithEvents } from '../../__helpers__/setUpTest'; diff --git a/test/tags/helpers/TagsSelector.test.tsx b/test/tags/helpers/TagsSelector.test.tsx index a74be29b..7916d905 100644 --- a/test/tags/helpers/TagsSelector.test.tsx +++ b/test/tags/helpers/TagsSelector.test.tsx @@ -1,7 +1,7 @@ import { screen } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; -import { TagsSelector as createTagsSelector } from '../../../shlink-web-component/tags/helpers/TagsSelector'; -import type { TagsList } from '../../../shlink-web-component/tags/reducers/tagsList'; +import { TagsSelector as createTagsSelector } from '../../../shlink-web-component/src/tags/helpers/TagsSelector'; +import type { TagsList } from '../../../shlink-web-component/src/tags/reducers/tagsList'; import { renderWithEvents } from '../../__helpers__/setUpTest'; import { colorGeneratorMock } from '../../utils/services/__mocks__/ColorGenerator.mock'; diff --git a/test/tags/reducers/tagDelete.test.ts b/test/tags/reducers/tagDelete.test.ts index a9fac07f..a68d8cad 100644 --- a/test/tags/reducers/tagDelete.test.ts +++ b/test/tags/reducers/tagDelete.test.ts @@ -1,5 +1,5 @@ import { fromPartial } from '@total-typescript/shoehorn'; -import { tagDeleted, tagDeleteReducerCreator } from '../../../shlink-web-component/tags/reducers/tagDelete'; +import { tagDeleted, tagDeleteReducerCreator } from '../../../shlink-web-component/src/tags/reducers/tagDelete'; import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import type { ShlinkState } from '../../../src/container/types'; diff --git a/test/tags/reducers/tagEdit.test.ts b/test/tags/reducers/tagEdit.test.ts index c31c9a78..1fd9259c 100644 --- a/test/tags/reducers/tagEdit.test.ts +++ b/test/tags/reducers/tagEdit.test.ts @@ -1,6 +1,6 @@ import { fromPartial } from '@total-typescript/shoehorn'; -import { editTag as editTagCreator, tagEdited, tagEditReducerCreator } from '../../../shlink-web-component/tags/reducers/tagEdit'; -import type { ColorGenerator } from '../../../shlink-web-component/utils/services/ColorGenerator'; +import { editTag as editTagCreator, tagEdited, tagEditReducerCreator } from '../../../shlink-web-component/src/tags/reducers/tagEdit'; +import type { ColorGenerator } from '../../../shlink-web-component/src/utils/services/ColorGenerator'; import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient'; import type { ShlinkState } from '../../../src/container/types'; diff --git a/test/tags/reducers/tagsList.test.ts b/test/tags/reducers/tagsList.test.ts index 7a9b7767..54dbb6a2 100644 --- a/test/tags/reducers/tagsList.test.ts +++ b/test/tags/reducers/tagsList.test.ts @@ -1,17 +1,17 @@ import { fromPartial } from '@total-typescript/shoehorn'; -import type { ShortUrl } from '../../../shlink-web-component/short-urls/data'; -import { createShortUrl as createShortUrlCreator } from '../../../shlink-web-component/short-urls/reducers/shortUrlCreation'; -import { tagDeleted } from '../../../shlink-web-component/tags/reducers/tagDelete'; -import { tagEdited } from '../../../shlink-web-component/tags/reducers/tagEdit'; +import type { ShortUrl } from '../../../shlink-web-component/src/short-urls/data'; +import { createShortUrl as createShortUrlCreator } from '../../../shlink-web-component/src/short-urls/reducers/shortUrlCreation'; +import { tagDeleted } from '../../../shlink-web-component/src/tags/reducers/tagDelete'; +import { tagEdited } from '../../../shlink-web-component/src/tags/reducers/tagEdit'; import type { - TagsList } from '../../../shlink-web-component/tags/reducers/tagsList'; + TagsList } from '../../../shlink-web-component/src/tags/reducers/tagsList'; import { filterTags, listTags as listTagsCreator, tagsListReducerCreator, -} from '../../../shlink-web-component/tags/reducers/tagsList'; -import { createNewVisits } from '../../../shlink-web-component/visits/reducers/visitCreation'; -import type { CreateVisit } from '../../../shlink-web-component/visits/types'; +} from '../../../shlink-web-component/src/tags/reducers/tagsList'; +import { createNewVisits } from '../../../shlink-web-component/src/visits/reducers/visitCreation'; +import type { CreateVisit } from '../../../shlink-web-component/src/visits/types'; import type { ShlinkState } from '../../../src/container/types'; describe('tagsListReducer', () => { diff --git a/test/utils/CopyToClipboardIcon.test.tsx b/test/utils/CopyToClipboardIcon.test.tsx index 108bd86b..4c5370ac 100644 --- a/test/utils/CopyToClipboardIcon.test.tsx +++ b/test/utils/CopyToClipboardIcon.test.tsx @@ -1,4 +1,4 @@ -import { CopyToClipboardIcon } from '../../shlink-web-component/utils/components/CopyToClipboardIcon'; +import { CopyToClipboardIcon } from '../../shlink-web-component/src/utils/components/CopyToClipboardIcon'; import { renderWithEvents } from '../__helpers__/setUpTest'; describe('', () => { diff --git a/test/utils/ExportBtn.test.tsx b/test/utils/ExportBtn.test.tsx index 99cca497..fbdbcf02 100644 --- a/test/utils/ExportBtn.test.tsx +++ b/test/utils/ExportBtn.test.tsx @@ -1,5 +1,5 @@ import { render, screen } from '@testing-library/react'; -import { ExportBtn } from '../../shlink-web-component/utils/components/ExportBtn'; +import { ExportBtn } from '../../shlink-web-component/src/utils/components/ExportBtn'; describe('', () => { const setUp = (amount?: number, loading = false) => render(); diff --git a/test/utils/IconInput.test.tsx b/test/utils/IconInput.test.tsx index 5c1e1e6a..9e241b12 100644 --- a/test/utils/IconInput.test.tsx +++ b/test/utils/IconInput.test.tsx @@ -1,7 +1,7 @@ import type { IconProp } from '@fortawesome/fontawesome-svg-core'; import { faAppleAlt, faCalendar, faTable } from '@fortawesome/free-solid-svg-icons'; import { screen } from '@testing-library/react'; -import { IconInput } from '../../shlink-web-component/utils/components/IconInput'; +import { IconInput } from '../../shlink-web-component/src/utils/components/IconInput'; import { renderWithEvents } from '../__helpers__/setUpTest'; describe('', () => { diff --git a/test/utils/InfoTooltip.test.tsx b/test/utils/InfoTooltip.test.tsx index 68072df4..40e46ce8 100644 --- a/test/utils/InfoTooltip.test.tsx +++ b/test/utils/InfoTooltip.test.tsx @@ -1,7 +1,7 @@ import type { Placement } from '@popperjs/core'; import { screen, waitFor } from '@testing-library/react'; -import type { InfoTooltipProps } from '../../shlink-web-component/utils/components/InfoTooltip'; -import { InfoTooltip } from '../../shlink-web-component/utils/components/InfoTooltip'; +import type { InfoTooltipProps } from '../../shlink-web-component/src/utils/components/InfoTooltip'; +import { InfoTooltip } from '../../shlink-web-component/src/utils/components/InfoTooltip'; import { renderWithEvents } from '../__helpers__/setUpTest'; describe('', () => { diff --git a/test/utils/PaginationDropdown.test.tsx b/test/utils/PaginationDropdown.test.tsx index a2246d11..8ce50a7f 100644 --- a/test/utils/PaginationDropdown.test.tsx +++ b/test/utils/PaginationDropdown.test.tsx @@ -1,5 +1,5 @@ import { screen } from '@testing-library/react'; -import { PaginationDropdown } from '../../shlink-web-component/utils/components/PaginationDropdown'; +import { PaginationDropdown } from '../../shlink-web-component/src/utils/components/PaginationDropdown'; import { renderWithEvents } from '../__helpers__/setUpTest'; describe('', () => { diff --git a/test/utils/dates/DateInput.test.tsx b/test/utils/dates/DateInput.test.tsx index ec4f7084..95d56619 100644 --- a/test/utils/dates/DateInput.test.tsx +++ b/test/utils/dates/DateInput.test.tsx @@ -1,8 +1,8 @@ import { screen, waitFor } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; import { parseISO } from 'date-fns'; -import type { DateInputProps } from '../../../shlink-web-component/utils/dates/DateInput'; -import { DateInput } from '../../../shlink-web-component/utils/dates/DateInput'; +import type { DateInputProps } from '../../../shlink-web-component/src/utils/dates/DateInput'; +import { DateInput } from '../../../shlink-web-component/src/utils/dates/DateInput'; import { renderWithEvents } from '../../__helpers__/setUpTest'; describe('', () => { diff --git a/test/utils/dates/DateIntervalDropdownItems.test.tsx b/test/utils/dates/DateIntervalDropdownItems.test.tsx index e06b7930..2e43ed47 100644 --- a/test/utils/dates/DateIntervalDropdownItems.test.tsx +++ b/test/utils/dates/DateIntervalDropdownItems.test.tsx @@ -1,7 +1,7 @@ import { screen, waitFor } from '@testing-library/react'; import { DropdownBtn } from '../../../shlink-frontend-kit/src/navigation/DropdownBtn'; -import type { DateInterval } from '../../../shlink-web-component/utils/dates/helpers/dateIntervals'; -import { DATE_INTERVALS, rangeOrIntervalToString } from '../../../shlink-web-component/utils/dates/helpers/dateIntervals'; +import type { DateInterval } from '../../../shlink-web-component/src/utils/dates/helpers/dateIntervals'; +import { DATE_INTERVALS, rangeOrIntervalToString } from '../../../shlink-web-component/src/utils/dates/helpers/dateIntervals'; import { DateIntervalDropdownItems } from '../../../src/utils/dates/DateIntervalDropdownItems'; import { renderWithEvents } from '../../__helpers__/setUpTest'; diff --git a/test/utils/dates/DateIntervalSelector.test.tsx b/test/utils/dates/DateIntervalSelector.test.tsx index ffc4d68d..fab73edb 100644 --- a/test/utils/dates/DateIntervalSelector.test.tsx +++ b/test/utils/dates/DateIntervalSelector.test.tsx @@ -1,6 +1,6 @@ import { screen, waitFor } from '@testing-library/react'; -import type { DateInterval } from '../../../shlink-web-component/utils/dates/helpers/dateIntervals'; -import { rangeOrIntervalToString } from '../../../shlink-web-component/utils/dates/helpers/dateIntervals'; +import type { DateInterval } from '../../../shlink-web-component/src/utils/dates/helpers/dateIntervals'; +import { rangeOrIntervalToString } from '../../../shlink-web-component/src/utils/dates/helpers/dateIntervals'; import { DateIntervalSelector } from '../../../src/utils/dates/DateIntervalSelector'; import { renderWithEvents } from '../../__helpers__/setUpTest'; diff --git a/test/utils/dates/DateRangeRow.test.tsx b/test/utils/dates/DateRangeRow.test.tsx index 3b0a13a5..388ebfae 100644 --- a/test/utils/dates/DateRangeRow.test.tsx +++ b/test/utils/dates/DateRangeRow.test.tsx @@ -1,5 +1,5 @@ import { screen } from '@testing-library/react'; -import { DateRangeRow } from '../../../shlink-web-component/utils/dates/DateRangeRow'; +import { DateRangeRow } from '../../../shlink-web-component/src/utils/dates/DateRangeRow'; import { renderWithEvents } from '../../__helpers__/setUpTest'; describe('', () => { diff --git a/test/utils/dates/DateRangeSelector.test.tsx b/test/utils/dates/DateRangeSelector.test.tsx index a0b9806b..54d4b595 100644 --- a/test/utils/dates/DateRangeSelector.test.tsx +++ b/test/utils/dates/DateRangeSelector.test.tsx @@ -1,8 +1,8 @@ import { screen, waitFor } from '@testing-library/react'; import { fromPartial } from '@total-typescript/shoehorn'; -import type { DateRangeSelectorProps } from '../../../shlink-web-component/utils/dates/DateRangeSelector'; -import { DateRangeSelector } from '../../../shlink-web-component/utils/dates/DateRangeSelector'; -import type { DateInterval } from '../../../shlink-web-component/utils/dates/helpers/dateIntervals'; +import type { DateRangeSelectorProps } from '../../../shlink-web-component/src/utils/dates/DateRangeSelector'; +import { DateRangeSelector } from '../../../shlink-web-component/src/utils/dates/DateRangeSelector'; +import type { DateInterval } from '../../../shlink-web-component/src/utils/dates/helpers/dateIntervals'; import { renderWithEvents } from '../../__helpers__/setUpTest'; describe('', () => { diff --git a/test/utils/dates/Time.test.tsx b/test/utils/dates/Time.test.tsx index a0fb692d..367e5d2f 100644 --- a/test/utils/dates/Time.test.tsx +++ b/test/utils/dates/Time.test.tsx @@ -1,7 +1,7 @@ import { render } from '@testing-library/react'; -import { parseDate } from '../../../shlink-web-component/utils/dates/helpers/date'; -import type { TimeProps } from '../../../shlink-web-component/utils/dates/Time'; -import { Time } from '../../../shlink-web-component/utils/dates/Time'; +import { parseDate } from '../../../shlink-web-component/src/utils/dates/helpers/date'; +import type { TimeProps } from '../../../shlink-web-component/src/utils/dates/Time'; +import { Time } from '../../../shlink-web-component/src/utils/dates/Time'; describe('