diff --git a/apps/client/src/common/components/app-link/AppLink.module.scss b/apps/client/src/common/components/link/app-link/AppLink.module.scss similarity index 82% rename from apps/client/src/common/components/app-link/AppLink.module.scss rename to apps/client/src/common/components/link/app-link/AppLink.module.scss index 45b497edb..453f39722 100644 --- a/apps/client/src/common/components/app-link/AppLink.module.scss +++ b/apps/client/src/common/components/link/app-link/AppLink.module.scss @@ -1,4 +1,4 @@ -@use "../../../theme/mixins" as *; +@use "../../../../theme/mixins" as *; .link { @include action-link; diff --git a/apps/client/src/common/components/app-link/AppLink.tsx b/apps/client/src/common/components/link/app-link/AppLink.tsx similarity index 92% rename from apps/client/src/common/components/app-link/AppLink.tsx rename to apps/client/src/common/components/link/app-link/AppLink.tsx index 3137d0774..da4535840 100644 --- a/apps/client/src/common/components/app-link/AppLink.tsx +++ b/apps/client/src/common/components/link/app-link/AppLink.tsx @@ -1,7 +1,7 @@ import { MouseEvent, ReactNode } from 'react'; import { IoArrowUp } from '@react-icons/all-files/io5/IoArrowUp'; -import { openLink } from '../../utils/linkUtils'; +import { openLink } from '../../../utils/linkUtils'; import style from './AppLink.module.scss'; diff --git a/apps/client/src/common/components/external-link/ExternalLink.module.scss b/apps/client/src/common/components/link/external-link/ExternalLink.module.scss similarity index 100% rename from apps/client/src/common/components/external-link/ExternalLink.module.scss rename to apps/client/src/common/components/link/external-link/ExternalLink.module.scss diff --git a/apps/client/src/common/components/external-link/ExternalLink.tsx b/apps/client/src/common/components/link/external-link/ExternalLink.tsx similarity index 87% rename from apps/client/src/common/components/external-link/ExternalLink.tsx rename to apps/client/src/common/components/link/external-link/ExternalLink.tsx index ab043c555..84d52e9a8 100644 --- a/apps/client/src/common/components/external-link/ExternalLink.tsx +++ b/apps/client/src/common/components/link/external-link/ExternalLink.tsx @@ -1,8 +1,8 @@ import { MouseEvent, ReactNode } from 'react'; import { IoOpenOutline } from '@react-icons/all-files/io5/IoOpenOutline'; -import { openLink } from '../../utils/linkUtils'; -import { cx } from '../../utils/styleUtils'; +import { openLink } from '../../../utils/linkUtils'; +import { cx } from '../../../utils/styleUtils'; import style from './ExternalLink.module.scss'; diff --git a/apps/client/src/common/utils/linkUtils.ts b/apps/client/src/common/utils/linkUtils.ts index d54ee75c3..98f0aec32 100644 --- a/apps/client/src/common/utils/linkUtils.ts +++ b/apps/client/src/common/utils/linkUtils.ts @@ -6,7 +6,6 @@ import { baseURI, serverURL } from '../../externals'; * Open an external URLs: specifically for a electron / browser case * If electron: ask main process to call a new browser window * If browser: open in new tab - * @param url */ export function openLink(url: string) { if (window.process?.type === 'renderer') { diff --git a/apps/client/src/features/app-settings/panel/about-panel/AboutPanel.tsx b/apps/client/src/features/app-settings/panel/about-panel/AboutPanel.tsx index 3462c234c..515fe07b2 100644 --- a/apps/client/src/features/app-settings/panel/about-panel/AboutPanel.tsx +++ b/apps/client/src/features/app-settings/panel/about-panel/AboutPanel.tsx @@ -1,4 +1,4 @@ -import ExternalLink from '../../../../common/components/external-link/ExternalLink'; +import ExternalLink from '../../../../common/components/link/external-link/ExternalLink'; import { buyMeACoffeeUrl, discordUrl, diff --git a/apps/client/src/features/app-settings/panel/about-panel/AppVersion.tsx b/apps/client/src/features/app-settings/panel/about-panel/AppVersion.tsx index 6096a7b1f..f9a73b036 100644 --- a/apps/client/src/features/app-settings/panel/about-panel/AppVersion.tsx +++ b/apps/client/src/features/app-settings/panel/about-panel/AppVersion.tsx @@ -1,4 +1,4 @@ -import ExternalLink from '../../../../common/components/external-link/ExternalLink'; +import ExternalLink from '../../../../common/components/link/external-link/ExternalLink'; import useAppVersion from '../../../../common/hooks-query/useAppVersion'; import { appVersion } from '../../../../externals'; import * as Panel from '../../panel-utils/PanelUtils'; diff --git a/apps/client/src/features/app-settings/panel/automations-panel/AutomationForm.tsx b/apps/client/src/features/app-settings/panel/automations-panel/AutomationForm.tsx index a09df5931..cb56597e1 100644 --- a/apps/client/src/features/app-settings/panel/automations-panel/AutomationForm.tsx +++ b/apps/client/src/features/app-settings/panel/automations-panel/AutomationForm.tsx @@ -16,8 +16,8 @@ import { import { addAutomation, editAutomation, testOutput } from '../../../../common/api/automation'; import { maybeAxiosError } from '../../../../common/api/utils'; -import ExternalLink from '../../../../common/components/external-link/ExternalLink'; import Info from '../../../../common/components/info/Info'; +import ExternalLink from '../../../../common/components/link/external-link/ExternalLink'; import Tag from '../../../../common/components/tag/Tag'; import useAutomationSettings from '../../../../common/hooks-query/useAutomationSettings'; import useCustomFields from '../../../../common/hooks-query/useCustomFields'; diff --git a/apps/client/src/features/app-settings/panel/automations-panel/AutomationSettingsForm.tsx b/apps/client/src/features/app-settings/panel/automations-panel/AutomationSettingsForm.tsx index 2ffcfd0d5..c71b7f761 100644 --- a/apps/client/src/features/app-settings/panel/automations-panel/AutomationSettingsForm.tsx +++ b/apps/client/src/features/app-settings/panel/automations-panel/AutomationSettingsForm.tsx @@ -3,8 +3,8 @@ import { Button, Input, Switch } from '@chakra-ui/react'; import { editAutomationSettings } from '../../../../common/api/automation'; import { maybeAxiosError } from '../../../../common/api/utils'; -import ExternalLink from '../../../../common/components/external-link/ExternalLink'; import Info from '../../../../common/components/info/Info'; +import ExternalLink from '../../../../common/components/link/external-link/ExternalLink'; import { preventEscape } from '../../../../common/utils/keyEvent'; import { isOnlyNumbers } from '../../../../common/utils/regex'; import { isOntimeCloud } from '../../../../externals'; diff --git a/apps/client/src/features/app-settings/panel/feature-settings-panel/UrlPresetsForm.tsx b/apps/client/src/features/app-settings/panel/feature-settings-panel/UrlPresetsForm.tsx index 9b03d6636..2b6ce13cf 100644 --- a/apps/client/src/features/app-settings/panel/feature-settings-panel/UrlPresetsForm.tsx +++ b/apps/client/src/features/app-settings/panel/feature-settings-panel/UrlPresetsForm.tsx @@ -9,8 +9,8 @@ import { URLPreset } from 'ontime-types'; import { postUrlPresets } from '../../../../common/api/urlPresets'; import { maybeAxiosError } from '../../../../common/api/utils'; import TooltipActionBtn from '../../../../common/components/buttons/TooltipActionBtn'; -import ExternalLink from '../../../../common/components/external-link/ExternalLink'; import Info from '../../../../common/components/info/Info'; +import ExternalLink from '../../../../common/components/link/external-link/ExternalLink'; import useUrlPresets from '../../../../common/hooks-query/useUrlPresets'; import { preventEscape } from '../../../../common/utils/keyEvent'; import { handleLinks } from '../../../../common/utils/linkUtils'; diff --git a/apps/client/src/features/app-settings/panel/feature-settings-panel/custom-fields/CustomFields.tsx b/apps/client/src/features/app-settings/panel/feature-settings-panel/custom-fields/CustomFields.tsx index 5f9aa3be6..60b2edfc7 100644 --- a/apps/client/src/features/app-settings/panel/feature-settings-panel/custom-fields/CustomFields.tsx +++ b/apps/client/src/features/app-settings/panel/feature-settings-panel/custom-fields/CustomFields.tsx @@ -4,8 +4,8 @@ import { IoAdd } from '@react-icons/all-files/io5/IoAdd'; import { CustomField, CustomFieldLabel } from 'ontime-types'; import { deleteCustomField, editCustomField, postCustomField } from '../../../../../common/api/customFields'; -import ExternalLink from '../../../../../common/components/external-link/ExternalLink'; import Info from '../../../../../common/components/info/Info'; +import ExternalLink from '../../../../../common/components/link/external-link/ExternalLink'; import useCustomFields from '../../../../../common/hooks-query/useCustomFields'; import { customFieldsDocsUrl } from '../../../../../externals'; import * as Panel from '../../../panel-utils/PanelUtils'; diff --git a/apps/client/src/features/app-settings/panel/general-panel/ViewSettingsForm.tsx b/apps/client/src/features/app-settings/panel/general-panel/ViewSettingsForm.tsx index 5ef39c2f1..5709807b0 100644 --- a/apps/client/src/features/app-settings/panel/general-panel/ViewSettingsForm.tsx +++ b/apps/client/src/features/app-settings/panel/general-panel/ViewSettingsForm.tsx @@ -5,9 +5,9 @@ import { ViewSettings } from 'ontime-types'; import { maybeAxiosError } from '../../../../common/api/utils'; import { postViewSettings } from '../../../../common/api/viewSettings'; -import ExternalLink from '../../../../common/components/external-link/ExternalLink'; import Info from '../../../../common/components/info/Info'; import { SwatchPickerRHF } from '../../../../common/components/input/colour-input/SwatchPicker'; +import ExternalLink from '../../../../common/components/link/external-link/ExternalLink'; import useInfo from '../../../../common/hooks-query/useInfo'; import useViewSettings from '../../../../common/hooks-query/useViewSettings'; import { preventEscape } from '../../../../common/utils/keyEvent'; diff --git a/apps/client/src/features/app-settings/panel/network-panel/GenerateLinkForm.tsx b/apps/client/src/features/app-settings/panel/network-panel/GenerateLinkForm.tsx index 876ef3d33..9eeeb410e 100644 --- a/apps/client/src/features/app-settings/panel/network-panel/GenerateLinkForm.tsx +++ b/apps/client/src/features/app-settings/panel/network-panel/GenerateLinkForm.tsx @@ -5,8 +5,8 @@ import { Button, Select, Switch } from '@chakra-ui/react'; import { generateUrl } from '../../../../common/api/session'; import { maybeAxiosError } from '../../../../common/api/utils'; -import ExternalLink from '../../../../common/components/external-link/ExternalLink'; import Info from '../../../../common/components/info/Info'; +import ExternalLink from '../../../../common/components/link/external-link/ExternalLink'; import useInfo from '../../../../common/hooks-query/useInfo'; import useUrlPresets from '../../../../common/hooks-query/useUrlPresets'; import copyToClipboard from '../../../../common/utils/copyToClipboard'; diff --git a/apps/client/src/features/app-settings/panel/sources-panel/GSheetInfo.tsx b/apps/client/src/features/app-settings/panel/sources-panel/GSheetInfo.tsx index 86e1a0e0c..adf8d0cf5 100644 --- a/apps/client/src/features/app-settings/panel/sources-panel/GSheetInfo.tsx +++ b/apps/client/src/features/app-settings/panel/sources-panel/GSheetInfo.tsx @@ -1,5 +1,6 @@ -import ExternalLink from '../../../../common/components/external-link/ExternalLink'; import Info from '../../../../common/components/info/Info'; +import ExternalLink from '../../../../common/components/link/external-link/ExternalLink'; + const googleSheetDocsUrl = 'https://docs.getontime.no/features/import-spreadsheet-gsheet/'; export default function GSheetInfo() { diff --git a/apps/client/src/features/editors/welcome/Welcome.tsx b/apps/client/src/features/editors/welcome/Welcome.tsx index 264a29207..8692c72cb 100644 --- a/apps/client/src/features/editors/welcome/Welcome.tsx +++ b/apps/client/src/features/editors/welcome/Welcome.tsx @@ -4,7 +4,7 @@ import { Button, Checkbox, Modal, ModalBody, ModalCloseButton, ModalContent, Mod import { loadDemo, loadProject } from '../../../common/api/db'; import { postShowWelcomeDialog } from '../../../common/api/settings'; import { invalidateAllCaches } from '../../../common/api/utils'; -import ExternalLink from '../../../common/components/external-link/ExternalLink'; +import ExternalLink from '../../../common/components/link/external-link/ExternalLink'; import { appVersion, discordUrl, documentationUrl, websiteUrl } from '../../../externals'; import * as Editor from '../editor-utils/EditorUtils';