diff --git a/apps/client/src/features/app-settings/panel/feature-panel/FeaturePanel.tsx b/apps/client/src/features/app-settings/panel/feature-panel/FeaturePanel.tsx index abc3d87fd..d75148fcb 100644 --- a/apps/client/src/features/app-settings/panel/feature-panel/FeaturePanel.tsx +++ b/apps/client/src/features/app-settings/panel/feature-panel/FeaturePanel.tsx @@ -1,10 +1,10 @@ import useScrollIntoView from '../../../../common/hooks/useScrollIntoView'; import { isOntimeCloud } from '../../../../externals'; +import GenerateLinkFormExport from '../../../sharing/GenerateLinkFormExport'; import type { PanelBaseProps } from '../../panel-list/PanelList'; import * as Panel from '../../panel-utils/PanelUtils'; import InfoNif from '../network-panel/NetworkInterfaces'; -import GenerateLinkFormExport from './GenerateLinkFormExport'; import ReportSettings from './ReportSettings'; import URLPresets from './URLPresets'; diff --git a/apps/client/src/features/app-settings/panel/feature-panel/composite/URLPresetForm.tsx b/apps/client/src/features/app-settings/panel/feature-panel/composite/URLPresetForm.tsx index 5d7ac1369..f242a5183 100644 --- a/apps/client/src/features/app-settings/panel/feature-panel/composite/URLPresetForm.tsx +++ b/apps/client/src/features/app-settings/panel/feature-panel/composite/URLPresetForm.tsx @@ -5,6 +5,7 @@ import { OntimeView, OntimeViewPresettable, URLPreset } from 'ontime-types'; import { maybeAxiosError, unwrapError } from '../../../../../common/api/utils'; import Button from '../../../../../common/components/buttons/Button'; import Input from '../../../../../common/components/input/input/Input'; +import Textarea from '../../../../../common/components/input/textarea/Textarea'; import Select, { SelectOption } from '../../../../../common/components/select/Select'; import { useUpdateUrlPreset } from '../../../../../common/hooks-query/useUrlPresets'; import { preventEscape } from '../../../../../common/utils/keyEvent'; @@ -12,7 +13,6 @@ import { generateUrlPresetOptions } from '../../../../../common/utils/urlPresets import * as Panel from '../../../panel-utils/PanelUtils'; import style from './URLPresetForm.module.scss'; -import Textarea from '../../../../../common/components/input/textarea/Textarea'; const targetOptions: SelectOption[] = [ { value: OntimeView.Cuesheet, label: 'Cuesheet' }, diff --git a/apps/client/src/features/app-settings/panel/feature-panel/GenerateLinkForm.module.scss b/apps/client/src/features/sharing/GenerateLinkForm.module.scss similarity index 100% rename from apps/client/src/features/app-settings/panel/feature-panel/GenerateLinkForm.module.scss rename to apps/client/src/features/sharing/GenerateLinkForm.module.scss diff --git a/apps/client/src/features/app-settings/panel/feature-panel/GenerateLinkForm.tsx b/apps/client/src/features/sharing/GenerateLinkForm.tsx similarity index 86% rename from apps/client/src/features/app-settings/panel/feature-panel/GenerateLinkForm.tsx rename to apps/client/src/features/sharing/GenerateLinkForm.tsx index 527becff6..d255e5615 100644 --- a/apps/client/src/features/app-settings/panel/feature-panel/GenerateLinkForm.tsx +++ b/apps/client/src/features/sharing/GenerateLinkForm.tsx @@ -2,17 +2,17 @@ import { useState } from 'react'; import { useForm } from 'react-hook-form'; import QRCode from 'react-qr-code'; -import { generateUrl } from '../../../../common/api/session'; -import { maybeAxiosError } from '../../../../common/api/utils'; -import Button from '../../../../common/components/buttons/Button'; -import Info from '../../../../common/components/info/Info'; -import Select from '../../../../common/components/select/Select'; -import Switch from '../../../../common/components/switch/Switch'; -import copyToClipboard from '../../../../common/utils/copyToClipboard'; -import { preventEscape } from '../../../../common/utils/keyEvent'; -import { linkToOtherHost } from '../../../../common/utils/linkUtils'; -import { currentHostName, isOntimeCloud, serverURL } from '../../../../externals'; -import * as Panel from '../../panel-utils/PanelUtils'; +import { generateUrl } from '../../common/api/session'; +import { maybeAxiosError } from '../../common/api/utils'; +import Button from '../../common/components/buttons/Button'; +import Info from '../../common/components/info/Info'; +import Select from '../../common/components/select/Select'; +import Switch from '../../common/components/switch/Switch'; +import copyToClipboard from '../../common/utils/copyToClipboard'; +import { preventEscape } from '../../common/utils/keyEvent'; +import { linkToOtherHost } from '../../common/utils/linkUtils'; +import { currentHostName, isOntimeCloud, serverURL } from '../../externals'; +import * as Panel from '../app-settings/panel-utils/PanelUtils'; import style from './GenerateLinkForm.module.scss'; diff --git a/apps/client/src/features/app-settings/panel/feature-panel/GenerateLinkFormExport.tsx b/apps/client/src/features/sharing/GenerateLinkFormExport.tsx similarity index 90% rename from apps/client/src/features/app-settings/panel/feature-panel/GenerateLinkFormExport.tsx rename to apps/client/src/features/sharing/GenerateLinkFormExport.tsx index 0296aa499..556645bed 100644 --- a/apps/client/src/features/app-settings/panel/feature-panel/GenerateLinkFormExport.tsx +++ b/apps/client/src/features/sharing/GenerateLinkFormExport.tsx @@ -1,7 +1,7 @@ import { useMemo } from 'react'; -import useInfo from '../../../../common/hooks-query/useInfo'; -import useUrlPresets from '../../../../common/hooks-query/useUrlPresets'; +import useInfo from '../../common/hooks-query/useInfo'; +import useUrlPresets from '../../common/hooks-query/useUrlPresets'; import GenerateLinkForm from './GenerateLinkForm'; diff --git a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetShareModal.tsx b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetShareModal.tsx index 481127f4c..2a19c74c3 100644 --- a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetShareModal.tsx +++ b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-settings/CuesheetShareModal.tsx @@ -6,7 +6,7 @@ import RotatedLink from '../../../../common/components/icons/RotatedLink'; import Modal from '../../../../common/components/modal/Modal'; import useInfo from '../../../../common/hooks-query/useInfo'; import useUrlPresets from '../../../../common/hooks-query/useUrlPresets'; -import GenerateLinkFormExport from '../../../../features/app-settings/panel/feature-panel/GenerateLinkFormExport'; +import GenerateLinkFormExport from '../../../../features/sharing/GenerateLinkFormExport'; function CuesheetShareModal() { const { data: infoData } = useInfo(); @@ -26,6 +26,7 @@ function CuesheetShareModal() { isOpen={isOpen} onClose={handler.close} title='Share cuesheet view' + showBackdrop showCloseButton bodyElements={ showModalContent ? : null diff --git a/apps/client/src/views/project-info/ProjectInfo.tsx b/apps/client/src/views/project-info/ProjectInfo.tsx index f3b4b67f9..bdedb7429 100644 --- a/apps/client/src/views/project-info/ProjectInfo.tsx +++ b/apps/client/src/views/project-info/ProjectInfo.tsx @@ -1,4 +1,5 @@ import { IoOpenOutline } from 'react-icons/io5'; +import { OntimeView } from 'ontime-types'; import ViewNavigationMenu from '../../common/components/navigation-menu/ViewNavigationMenu'; import EmptyPage from '../../common/components/state/EmptyPage'; @@ -10,7 +11,6 @@ import { useViewOptionsStore } from '../../common/stores/viewOptions'; import { useTranslation } from '../../translation/TranslationProvider'; import './ProjectInfo.scss'; -import { OntimeView } from 'ontime-types'; export default function ProjectInfo() { // persisted app state