diff --git a/services/web/frontend/js/features/ide-react/components/layout/ide-page.tsx b/services/web/frontend/js/features/ide-react/components/layout/ide-page.tsx index 8a49f6d216..21c90aa16a 100644 --- a/services/web/frontend/js/features/ide-react/components/layout/ide-page.tsx +++ b/services/web/frontend/js/features/ide-react/components/layout/ide-page.tsx @@ -13,7 +13,7 @@ import { useStatusFavicon } from '@/features/ide-react/hooks/use-status-favicon' import useThemedPage from '@/shared/hooks/use-themed-page' import MainLayout from '@/features/ide-react/components/layout/main-layout' -import SettingsModalNew from '@/features/ide-redesign/components/settings/settings-modal' +import SettingsModalNew from '@/features/settings/components/settings-modal' export default function IdePage() { useLayoutEventTracking() // sent event when the layout changes diff --git a/services/web/frontend/js/features/ide-react/components/rail/rail-modals.tsx b/services/web/frontend/js/features/ide-react/components/rail/rail-modals.tsx index 9864b80da2..0c870bc0c1 100644 --- a/services/web/frontend/js/features/ide-react/components/rail/rail-modals.tsx +++ b/services/web/frontend/js/features/ide-react/components/rail/rail-modals.tsx @@ -5,7 +5,7 @@ import { } from '@/features/ide-react/context/rail-context' import { RailHelpContactUsModal } from '@/features/ide-redesign/components/help/contact-us' import { RailHelpShowHotkeysModal } from '@/features/ide-redesign/components/help/keyboard-shortcuts' -import DictionarySettingsModal from '@/features/ide-redesign/components/settings/editor-settings/dictionary-settings-modal' +import DictionarySettingsModal from '@/features/settings/components/editor-settings/dictionary-settings-modal' const RAIL_MODALS: { key: RailModalKey diff --git a/services/web/frontend/js/features/ide-redesign/contexts/settings-modal-context.tsx b/services/web/frontend/js/features/ide-redesign/contexts/settings-modal-context.tsx index acb062f30b..9b6b3a480e 100644 --- a/services/web/frontend/js/features/ide-redesign/contexts/settings-modal-context.tsx +++ b/services/web/frontend/js/features/ide-redesign/contexts/settings-modal-context.tsx @@ -1,33 +1,34 @@ import { createContext, FC, useContext, useMemo, useState } from 'react' import { useLayoutContext } from '@/shared/context/layout-context' -import AutoCloseBracketsSetting from '../components/settings/editor-settings/auto-close-brackets-setting' -import AutoCompleteSetting from '../components/settings/editor-settings/auto-complete-setting' -import CodeCheckSetting from '../components/settings/editor-settings/code-check-setting' -import KeybindingSetting from '../components/settings/editor-settings/keybinding-setting' -import PDFViewerSetting from '../components/settings/editor-settings/pdf-viewer-setting' +import AutoCloseBracketsSetting from '@/features/settings/components/editor-settings/auto-close-brackets-setting' +import AutoCompleteSetting from '@/features/settings/components/editor-settings/auto-complete-setting' +import CodeCheckSetting from '@/features/settings/components/editor-settings/code-check-setting' +import KeybindingSetting from '@/features/settings/components/editor-settings/keybinding-setting' +import PDFViewerSetting from '@/features/settings/components/editor-settings/pdf-viewer-setting' import importOverleafModules from '../../../../macros/import-overleaf-module.macro' -import SpellCheckSetting from '../components/settings/editor-settings/spell-check-setting' -import DictionarySetting from '../components/settings/editor-settings/dictionary-setting' +import SpellCheckSetting from '@/features/settings/components/editor-settings/spell-check-setting' +import DictionarySetting from '@/features/settings/components/editor-settings/dictionary-setting' import { useTranslation } from 'react-i18next' -import BreadcrumbsSetting from '../components/settings/editor-settings/breadcrumbs-setting' -import MathPreviewSetting from '../components/settings/editor-settings/math-preview-setting' -import RootDocumentSetting from '../components/settings/compiler-settings/root-document-setting' -import CompilerSetting from '../components/settings/compiler-settings/compiler-setting' -import ImageNameSetting from '../components/settings/compiler-settings/image-name-setting' -import DraftSetting from '../components/settings/compiler-settings/draft-setting' -import StopOnFirstErrorSetting from '../components/settings/compiler-settings/stop-on-first-error-setting' -import AutoCompileSetting from '../components/settings/compiler-settings/auto-compile-setting' -import OverallThemeSetting from '../components/settings/appearance-settings/overall-theme-setting' -import EditorThemeSetting from '../components/settings/appearance-settings/editor-theme-setting' -import FontSizeSetting from '../components/settings/appearance-settings/font-size-setting' -import LineHeightSetting from '../components/settings/appearance-settings/line-height-setting' -import FontFamilySetting from '../components/settings/appearance-settings/font-family-setting' +import BreadcrumbsSetting from '@/features/settings/components/editor-settings/breadcrumbs-setting' +import MathPreviewSetting from '@/features/settings/components/editor-settings/math-preview-setting' +import RootDocumentSetting from '@/features/settings/components/compiler-settings/root-document-setting' +import CompilerSetting from '@/features/settings/components/compiler-settings/compiler-setting' +import ImageNameSetting from '@/features/settings/components/compiler-settings/image-name-setting' +import DraftSetting from '@/features/settings/components/compiler-settings/draft-setting' +import StopOnFirstErrorSetting from '@/features/settings/components/compiler-settings/stop-on-first-error-setting' +import AutoCompileSetting from '@/features/settings/components/compiler-settings/auto-compile-setting' +import OverallThemeSetting from '@/features/settings/components/appearance-settings/overall-theme-setting' +import EditorThemeSetting from '@/features/settings/components/appearance-settings/editor-theme-setting' +import FontSizeSetting from '@/features/settings/components/appearance-settings/font-size-setting' +import LineHeightSetting from '@/features/settings/components/appearance-settings/line-height-setting' +import FontFamilySetting from '@/features/settings/components/appearance-settings/font-family-setting' import { AvailableUnfilledIcon } from '@/shared/components/material-icon' import { EditorLeftMenuProvider } from '@/features/editor-left-menu/components/editor-left-menu-context' -import DarkModePdfSetting from '../components/settings/appearance-settings/dark-mode-pdf-setting' +import DarkModePdfSetting from '@/features/settings/components/appearance-settings/dark-mode-pdf-setting' + import { useProjectSettingsContext } from '@/features/editor-left-menu/context/project-settings-context' import { useFeatureFlag } from '@/shared/context/split-test-context' -import ProjectNotificationsSetting from '../components/settings/editor-settings/project-notifications-setting' +import ProjectNotificationsSetting from '@/features/settings/components/editor-settings/project-notifications-setting' import getMeta from '@/utils/meta' const [referenceSearchSettingModule] = importOverleafModules( diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/dark-mode-pdf-setting.tsx b/services/web/frontend/js/features/settings/components/appearance-settings/dark-mode-pdf-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/dark-mode-pdf-setting.tsx rename to services/web/frontend/js/features/settings/components/appearance-settings/dark-mode-pdf-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/editor-theme-setting.tsx b/services/web/frontend/js/features/settings/components/appearance-settings/editor-theme-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/editor-theme-setting.tsx rename to services/web/frontend/js/features/settings/components/appearance-settings/editor-theme-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/font-family-setting.tsx b/services/web/frontend/js/features/settings/components/appearance-settings/font-family-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/font-family-setting.tsx rename to services/web/frontend/js/features/settings/components/appearance-settings/font-family-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/font-size-setting.tsx b/services/web/frontend/js/features/settings/components/appearance-settings/font-size-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/font-size-setting.tsx rename to services/web/frontend/js/features/settings/components/appearance-settings/font-size-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/line-height-setting.tsx b/services/web/frontend/js/features/settings/components/appearance-settings/line-height-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/line-height-setting.tsx rename to services/web/frontend/js/features/settings/components/appearance-settings/line-height-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/overall-theme-setting.tsx b/services/web/frontend/js/features/settings/components/appearance-settings/overall-theme-setting.tsx similarity index 94% rename from services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/overall-theme-setting.tsx rename to services/web/frontend/js/features/settings/components/appearance-settings/overall-theme-setting.tsx index 670cc1af62..d6847e585d 100644 --- a/services/web/frontend/js/features/ide-redesign/components/settings/appearance-settings/overall-theme-setting.tsx +++ b/services/web/frontend/js/features/settings/components/appearance-settings/overall-theme-setting.tsx @@ -4,7 +4,7 @@ import getMeta from '@/utils/meta' import { useMemo } from 'react' import type { Option } from '../dropdown-setting' import { useTranslation } from 'react-i18next' -import { OverallThemeMeta } from '../../../../../../../types/project-settings' +import { OverallThemeMeta } from '@ol-types/project-settings' import { isIEEEBranded } from '@/utils/is-ieee-branded' import { useLayoutContext } from '@/shared/context/layout-context' import { OverallTheme } from '@/shared/utils/styles' diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/button-setting.tsx b/services/web/frontend/js/features/settings/components/button-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/button-setting.tsx rename to services/web/frontend/js/features/settings/components/button-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/auto-compile-setting.tsx b/services/web/frontend/js/features/settings/components/compiler-settings/auto-compile-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/auto-compile-setting.tsx rename to services/web/frontend/js/features/settings/components/compiler-settings/auto-compile-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/compiler-setting.tsx b/services/web/frontend/js/features/settings/components/compiler-settings/compiler-setting.tsx similarity index 94% rename from services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/compiler-setting.tsx rename to services/web/frontend/js/features/settings/components/compiler-settings/compiler-setting.tsx index fad10a9ec2..fb512b306f 100644 --- a/services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/compiler-setting.tsx +++ b/services/web/frontend/js/features/settings/components/compiler-settings/compiler-setting.tsx @@ -3,7 +3,7 @@ import DropdownSetting from '../dropdown-setting' import type { Option } from '../dropdown-setting' import { useTranslation } from 'react-i18next' import { usePermissionsContext } from '@/features/ide-react/context/permissions-context' -import { ProjectCompiler } from '../../../../../../../types/project-settings' +import { ProjectCompiler } from '@ol-types/project-settings' import { useSetCompilationSettingWithEvent } from '@/features/editor-left-menu/hooks/use-set-compilation-setting' const OPTIONS: Option[] = [ diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/draft-setting.tsx b/services/web/frontend/js/features/settings/components/compiler-settings/draft-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/draft-setting.tsx rename to services/web/frontend/js/features/settings/components/compiler-settings/draft-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/image-name-setting.tsx b/services/web/frontend/js/features/settings/components/compiler-settings/image-name-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/image-name-setting.tsx rename to services/web/frontend/js/features/settings/components/compiler-settings/image-name-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/root-document-setting.tsx b/services/web/frontend/js/features/settings/components/compiler-settings/root-document-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/root-document-setting.tsx rename to services/web/frontend/js/features/settings/components/compiler-settings/root-document-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/stop-on-first-error-setting.tsx b/services/web/frontend/js/features/settings/components/compiler-settings/stop-on-first-error-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/compiler-settings/stop-on-first-error-setting.tsx rename to services/web/frontend/js/features/settings/components/compiler-settings/stop-on-first-error-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/dropdown-setting.tsx b/services/web/frontend/js/features/settings/components/dropdown-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/dropdown-setting.tsx rename to services/web/frontend/js/features/settings/components/dropdown-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/auto-close-brackets-setting.tsx b/services/web/frontend/js/features/settings/components/editor-settings/auto-close-brackets-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/auto-close-brackets-setting.tsx rename to services/web/frontend/js/features/settings/components/editor-settings/auto-close-brackets-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/auto-complete-setting.tsx b/services/web/frontend/js/features/settings/components/editor-settings/auto-complete-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/auto-complete-setting.tsx rename to services/web/frontend/js/features/settings/components/editor-settings/auto-complete-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/breadcrumbs-setting.tsx b/services/web/frontend/js/features/settings/components/editor-settings/breadcrumbs-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/breadcrumbs-setting.tsx rename to services/web/frontend/js/features/settings/components/editor-settings/breadcrumbs-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/code-check-setting.tsx b/services/web/frontend/js/features/settings/components/editor-settings/code-check-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/code-check-setting.tsx rename to services/web/frontend/js/features/settings/components/editor-settings/code-check-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/dictionary-setting.tsx b/services/web/frontend/js/features/settings/components/editor-settings/dictionary-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/dictionary-setting.tsx rename to services/web/frontend/js/features/settings/components/editor-settings/dictionary-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/dictionary-settings-modal.tsx b/services/web/frontend/js/features/settings/components/editor-settings/dictionary-settings-modal.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/dictionary-settings-modal.tsx rename to services/web/frontend/js/features/settings/components/editor-settings/dictionary-settings-modal.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/keybinding-setting.tsx b/services/web/frontend/js/features/settings/components/editor-settings/keybinding-setting.tsx similarity index 91% rename from services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/keybinding-setting.tsx rename to services/web/frontend/js/features/settings/components/editor-settings/keybinding-setting.tsx index c3ec9167d2..cc2ab22496 100644 --- a/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/keybinding-setting.tsx +++ b/services/web/frontend/js/features/settings/components/editor-settings/keybinding-setting.tsx @@ -1,7 +1,7 @@ import { useProjectSettingsContext } from '@/features/editor-left-menu/context/project-settings-context' import { useTranslation } from 'react-i18next' import DropdownSetting from '../dropdown-setting' -import { Keybindings } from '../../../../../../../types/user-settings' +import { Keybindings } from '../../../../../../types/user-settings' const OPTIONS: { value: Keybindings; label: string }[] = [ { diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/math-preview-setting.tsx b/services/web/frontend/js/features/settings/components/editor-settings/math-preview-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/math-preview-setting.tsx rename to services/web/frontend/js/features/settings/components/editor-settings/math-preview-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/pdf-viewer-setting.tsx b/services/web/frontend/js/features/settings/components/editor-settings/pdf-viewer-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/pdf-viewer-setting.tsx rename to services/web/frontend/js/features/settings/components/editor-settings/pdf-viewer-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/project-notifications-setting.tsx b/services/web/frontend/js/features/settings/components/editor-settings/project-notifications-setting.tsx similarity index 95% rename from services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/project-notifications-setting.tsx rename to services/web/frontend/js/features/settings/components/editor-settings/project-notifications-setting.tsx index ef43691a80..2c747364f7 100644 --- a/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/project-notifications-setting.tsx +++ b/services/web/frontend/js/features/settings/components/editor-settings/project-notifications-setting.tsx @@ -3,7 +3,7 @@ import RadioButtonSetting, { RadioOption } from '../radio-button-setting' import { NotificationLevel, useProjectNotificationPreferences, -} from '../../../hooks/use-project-notification-preferences' +} from '../../../ide-redesign/hooks/use-project-notification-preferences' export default function ProjectNotificationsSetting() { const { t } = useTranslation() diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/spell-check-setting.tsx b/services/web/frontend/js/features/settings/components/editor-settings/spell-check-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/editor-settings/spell-check-setting.tsx rename to services/web/frontend/js/features/settings/components/editor-settings/spell-check-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/radio-button-setting.tsx b/services/web/frontend/js/features/settings/components/radio-button-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/radio-button-setting.tsx rename to services/web/frontend/js/features/settings/components/radio-button-setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/setting.tsx b/services/web/frontend/js/features/settings/components/setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/setting.tsx rename to services/web/frontend/js/features/settings/components/setting.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/settings-modal-body.tsx b/services/web/frontend/js/features/settings/components/settings-modal-body.tsx similarity index 97% rename from services/web/frontend/js/features/ide-redesign/components/settings/settings-modal-body.tsx rename to services/web/frontend/js/features/settings/components/settings-modal-body.tsx index 3530d0dbc9..5f7e5392f6 100644 --- a/services/web/frontend/js/features/ide-redesign/components/settings/settings-modal-body.tsx +++ b/services/web/frontend/js/features/settings/components/settings-modal-body.tsx @@ -1,7 +1,7 @@ import MaterialIcon from '@/shared/components/material-icon' import { Nav, NavLink, TabContainer, TabContent } from 'react-bootstrap' -import { SettingsEntry } from '../../contexts/settings-modal-context' +import { SettingsEntry } from '../../ide-redesign/contexts/settings-modal-context' import SettingsTabPane from './settings-tab-pane' import BetaBadgeIcon from '@/shared/components/beta-badge-icon' import OLTooltip from '@/shared/components/ol/ol-tooltip' diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/settings-modal.tsx b/services/web/frontend/js/features/settings/components/settings-modal.tsx similarity index 89% rename from services/web/frontend/js/features/ide-redesign/components/settings/settings-modal.tsx rename to services/web/frontend/js/features/settings/components/settings-modal.tsx index adb34a98d7..abf775eb2f 100644 --- a/services/web/frontend/js/features/ide-redesign/components/settings/settings-modal.tsx +++ b/services/web/frontend/js/features/settings/components/settings-modal.tsx @@ -9,8 +9,8 @@ import { SettingsModalBody } from './settings-modal-body' import { SettingsModalProvider, useSettingsModalContext, -} from '../../contexts/settings-modal-context' -import useFocusOnSetting from '../../hooks/use-focus-on-setting' +} from '../../ide-redesign/contexts/settings-modal-context' +import useFocusOnSetting from '../../ide-redesign/hooks/use-focus-on-setting' const SettingsModalWrapper = () => { return ( diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/settings-section.tsx b/services/web/frontend/js/features/settings/components/settings-section.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/settings-section.tsx rename to services/web/frontend/js/features/settings/components/settings-section.tsx diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/settings-tab-pane.tsx b/services/web/frontend/js/features/settings/components/settings-tab-pane.tsx similarity index 88% rename from services/web/frontend/js/features/ide-redesign/components/settings/settings-tab-pane.tsx rename to services/web/frontend/js/features/settings/components/settings-tab-pane.tsx index f83f811d90..41e0cb15b7 100644 --- a/services/web/frontend/js/features/ide-redesign/components/settings/settings-tab-pane.tsx +++ b/services/web/frontend/js/features/settings/components/settings-tab-pane.tsx @@ -1,5 +1,5 @@ import { TabPane } from 'react-bootstrap' -import { SettingsTab } from '../../contexts/settings-modal-context' +import { SettingsTab } from '../../ide-redesign/contexts/settings-modal-context' import SettingsSection from './settings-section' import { Fragment } from 'react' diff --git a/services/web/frontend/js/features/ide-redesign/components/settings/toggle-setting.tsx b/services/web/frontend/js/features/settings/components/toggle-setting.tsx similarity index 100% rename from services/web/frontend/js/features/ide-redesign/components/settings/toggle-setting.tsx rename to services/web/frontend/js/features/settings/components/toggle-setting.tsx diff --git a/services/web/test/frontend/features/settings-modal/settings-modal.test.tsx b/services/web/test/frontend/features/settings-modal/settings-modal.test.tsx index 7ea8bdb3b3..29998ccb77 100644 --- a/services/web/test/frontend/features/settings-modal/settings-modal.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings-modal.test.tsx @@ -2,7 +2,7 @@ import { screen, render } from '@testing-library/react' import { expect } from 'chai' import fetchMock from 'fetch-mock' import { EditorProviders } from '../../helpers/editor-providers' -import SettingsModal from '@/features/ide-redesign/components/settings/settings-modal' +import SettingsModal from '@/features/settings/components/settings-modal' import { Folder } from '@ol-types/folder' import { ImageName, OverallThemeMeta } from '@ol-types/project-settings' diff --git a/services/web/test/frontend/features/settings-modal/settings/auto-close-brackets-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/auto-close-brackets-setting.test.tsx index 71843fabf8..1d5ebb5823 100644 --- a/services/web/test/frontend/features/settings-modal/settings/auto-close-brackets-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/auto-close-brackets-setting.test.tsx @@ -2,7 +2,7 @@ import { screen, render } from '@testing-library/react' import { expect } from 'chai' import fetchMock from 'fetch-mock' import { EditorProviders } from '../../../helpers/editor-providers' -import AutoCloseBracketsSetting from '@/features/ide-redesign/components/settings/editor-settings/auto-close-brackets-setting' +import AutoCloseBracketsSetting from '@/features/settings/components/editor-settings/auto-close-brackets-setting' import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context' describe('', function () { diff --git a/services/web/test/frontend/features/settings-modal/settings/auto-compile-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/auto-compile-setting.test.tsx index 089d7654e7..b6ccfd9db8 100644 --- a/services/web/test/frontend/features/settings-modal/settings/auto-compile-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/auto-compile-setting.test.tsx @@ -6,7 +6,7 @@ import { EditorProviders, projectDefaults, } from '../../../helpers/editor-providers' -import AutoCompileSetting from '@/features/ide-redesign/components/settings/compiler-settings/auto-compile-setting' +import AutoCompileSetting from '@/features/settings/components/compiler-settings/auto-compile-setting' import localStorage from '@/infrastructure/local-storage' import userEvent from '@testing-library/user-event' diff --git a/services/web/test/frontend/features/settings-modal/settings/auto-complete-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/auto-complete-setting.test.tsx index 3c0f33b8a1..f1d1bf96e6 100644 --- a/services/web/test/frontend/features/settings-modal/settings/auto-complete-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/auto-complete-setting.test.tsx @@ -3,7 +3,7 @@ import { expect } from 'chai' import fetchMock from 'fetch-mock' import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context' import { EditorProviders } from '../../../helpers/editor-providers' -import AutoCompleteSetting from '@/features/ide-redesign/components/settings/editor-settings/auto-complete-setting' +import AutoCompleteSetting from '@/features/settings/components/editor-settings/auto-complete-setting' describe('', function () { afterEach(function () { diff --git a/services/web/test/frontend/features/settings-modal/settings/breadcrumbs-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/breadcrumbs-setting.test.tsx index 2129d1557d..e1a4bee8bb 100644 --- a/services/web/test/frontend/features/settings-modal/settings/breadcrumbs-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/breadcrumbs-setting.test.tsx @@ -3,7 +3,7 @@ import { expect } from 'chai' import fetchMock from 'fetch-mock' import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context' import { EditorProviders } from '../../../helpers/editor-providers' -import BreadcrumbsSetting from '@/features/ide-redesign/components/settings/editor-settings/breadcrumbs-setting' +import BreadcrumbsSetting from '@/features/settings/components/editor-settings/breadcrumbs-setting' describe('', function () { afterEach(function () { diff --git a/services/web/test/frontend/features/settings-modal/settings/code-check-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/code-check-setting.test.tsx index e135a9951a..638ae81d2d 100644 --- a/services/web/test/frontend/features/settings-modal/settings/code-check-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/code-check-setting.test.tsx @@ -3,7 +3,7 @@ import { expect } from 'chai' import fetchMock from 'fetch-mock' import { EditorProviders } from '../../../helpers/editor-providers' import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context' -import CodeCheckSetting from '@/features/ide-redesign/components/settings/editor-settings/code-check-setting' +import CodeCheckSetting from '@/features/settings/components/editor-settings/code-check-setting' describe('', function () { afterEach(function () { diff --git a/services/web/test/frontend/features/settings-modal/settings/compiler-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/compiler-setting.test.tsx index 6cf045ea9d..fae45fa213 100644 --- a/services/web/test/frontend/features/settings-modal/settings/compiler-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/compiler-setting.test.tsx @@ -6,7 +6,7 @@ import { EditorProviders, projectDefaults, } from '../../../helpers/editor-providers' -import CompilerSetting from '@/features/ide-redesign/components/settings/compiler-settings/compiler-setting' +import CompilerSetting from '@/features/settings/components/compiler-settings/compiler-setting' import userEvent from '@testing-library/user-event' const OPTIONS = [ diff --git a/services/web/test/frontend/features/settings-modal/settings/dictionary-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/dictionary-setting.test.tsx index e41868387b..1106027135 100644 --- a/services/web/test/frontend/features/settings-modal/settings/dictionary-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/dictionary-setting.test.tsx @@ -2,7 +2,7 @@ import { fireEvent, screen, within, render } from '@testing-library/react' import { expect } from 'chai' import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context' import { EditorProviders } from '../../../helpers/editor-providers' -import DictionarySetting from '@/features/ide-redesign/components/settings/editor-settings/dictionary-setting' +import DictionarySetting from '@/features/settings/components/editor-settings/dictionary-setting' import RailModals from '@/features/ide-react/components/rail/rail-modals' describe('', function () { diff --git a/services/web/test/frontend/features/settings-modal/settings/draft-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/draft-setting.test.tsx index d8d0fe3831..32440e0cdc 100644 --- a/services/web/test/frontend/features/settings-modal/settings/draft-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/draft-setting.test.tsx @@ -6,7 +6,7 @@ import { projectDefaults, } from '../../../helpers/editor-providers' import userEvent from '@testing-library/user-event' -import DraftSetting from '@/features/ide-redesign/components/settings/compiler-settings/draft-setting' +import DraftSetting from '@/features/settings/components/compiler-settings/draft-setting' const OPTIONS = [ { diff --git a/services/web/test/frontend/features/settings-modal/settings/editor-theme-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/editor-theme-setting.test.tsx index 1d95dd01f9..3df82d4bd6 100644 --- a/services/web/test/frontend/features/settings-modal/settings/editor-theme-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/editor-theme-setting.test.tsx @@ -3,7 +3,7 @@ import { expect } from 'chai' import fetchMock from 'fetch-mock' import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context' import { EditorProviders } from '../../../helpers/editor-providers' -import EditorThemeSetting from '@/features/ide-redesign/components/settings/appearance-settings/editor-theme-setting' +import EditorThemeSetting from '@/features/settings/components/appearance-settings/editor-theme-setting' import userEvent from '@testing-library/user-event' const MOCK_IEEE_BRAND_ID = 123 diff --git a/services/web/test/frontend/features/settings-modal/settings/font-family-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/font-family-setting.test.tsx index b6a1b2f67b..db0b44f923 100644 --- a/services/web/test/frontend/features/settings-modal/settings/font-family-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/font-family-setting.test.tsx @@ -3,7 +3,7 @@ import { expect } from 'chai' import fetchMock from 'fetch-mock' import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context' import { EditorProviders } from '../../../helpers/editor-providers' -import FontFamilySetting from '@/features/ide-redesign/components/settings/appearance-settings/font-family-setting' +import FontFamilySetting from '@/features/settings/components/appearance-settings/font-family-setting' import userEvent from '@testing-library/user-event' const options = [ diff --git a/services/web/test/frontend/features/settings-modal/settings/font-size-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/font-size-setting.test.tsx index d64094eaab..b72a6c45bb 100644 --- a/services/web/test/frontend/features/settings-modal/settings/font-size-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/font-size-setting.test.tsx @@ -3,7 +3,7 @@ import { expect } from 'chai' import fetchMock from 'fetch-mock' import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context' import { EditorProviders } from '../../../helpers/editor-providers' -import FontSizeSetting from '@/features/ide-redesign/components/settings/appearance-settings/font-size-setting' +import FontSizeSetting from '@/features/settings/components/appearance-settings/font-size-setting' import userEvent from '@testing-library/user-event' describe('', function () { diff --git a/services/web/test/frontend/features/settings-modal/settings/image-name-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/image-name-setting.test.tsx index 0cba0077ae..af4663a629 100644 --- a/services/web/test/frontend/features/settings-modal/settings/image-name-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/image-name-setting.test.tsx @@ -7,7 +7,7 @@ import { EditorProviders, projectDefaults, } from '../../../helpers/editor-providers' -import ImageNameSetting from '@/features/ide-redesign/components/settings/compiler-settings/image-name-setting' +import ImageNameSetting from '@/features/settings/components/compiler-settings/image-name-setting' import userEvent from '@testing-library/user-event' describe('', function () { diff --git a/services/web/test/frontend/features/settings-modal/settings/keybinding-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/keybinding-setting.test.tsx index bb309758b7..b1e687b5b3 100644 --- a/services/web/test/frontend/features/settings-modal/settings/keybinding-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/keybinding-setting.test.tsx @@ -3,7 +3,7 @@ import { expect } from 'chai' import fetchMock from 'fetch-mock' import { EditorProviders } from '../../../helpers/editor-providers' import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context' -import KeybindingSetting from '@/features/ide-redesign/components/settings/editor-settings/keybinding-setting' +import KeybindingSetting from '@/features/settings/components/editor-settings/keybinding-setting' import userEvent from '@testing-library/user-event' const OPTIONS = [ diff --git a/services/web/test/frontend/features/settings-modal/settings/line-height-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/line-height-setting.test.tsx index c311f7493a..f14d2855cf 100644 --- a/services/web/test/frontend/features/settings-modal/settings/line-height-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/line-height-setting.test.tsx @@ -3,7 +3,7 @@ import { expect } from 'chai' import fetchMock from 'fetch-mock' import { EditorProviders } from '../../../helpers/editor-providers' import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context' -import LineHeightSetting from '@/features/ide-redesign/components/settings/appearance-settings/line-height-setting' +import LineHeightSetting from '@/features/settings/components/appearance-settings/line-height-setting' import userEvent from '@testing-library/user-event' const OPTIONS = [ diff --git a/services/web/test/frontend/features/settings-modal/settings/math-preview-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/math-preview-setting.test.tsx index f96d768cf3..d37e6c7249 100644 --- a/services/web/test/frontend/features/settings-modal/settings/math-preview-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/math-preview-setting.test.tsx @@ -3,7 +3,7 @@ import { expect } from 'chai' import fetchMock from 'fetch-mock' import { EditorProviders } from '../../../helpers/editor-providers' import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context' -import MathPreviewSetting from '@/features/ide-redesign/components/settings/editor-settings/math-preview-setting' +import MathPreviewSetting from '@/features/settings/components/editor-settings/math-preview-setting' describe('', function () { afterEach(function () { diff --git a/services/web/test/frontend/features/settings-modal/settings/overall-theme-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/overall-theme-setting.test.tsx index 4d4ba436fd..7c43854e01 100644 --- a/services/web/test/frontend/features/settings-modal/settings/overall-theme-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/overall-theme-setting.test.tsx @@ -5,7 +5,8 @@ import type { OverallThemeMeta } from '../../../../../types/project-settings' import getMeta from '@/utils/meta' import { EditorProviders } from '../../../helpers/editor-providers' import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context' -import OverallThemeSetting from '@/features/ide-redesign/components/settings/appearance-settings/overall-theme-setting' +import OverallThemeSetting from '@/features/settings/components/appearance-settings/overall-theme-setting' + import userEvent from '@testing-library/user-event' const IEEE_BRAND_ID = 1234 diff --git a/services/web/test/frontend/features/settings-modal/settings/pdf-viewer-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/pdf-viewer-setting.test.tsx index 5929bf071e..32cb238eaa 100644 --- a/services/web/test/frontend/features/settings-modal/settings/pdf-viewer-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/pdf-viewer-setting.test.tsx @@ -3,7 +3,7 @@ import { expect } from 'chai' import fetchMock from 'fetch-mock' import { EditorProviders } from '../../../helpers/editor-providers' import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context' -import PDFViewerSetting from '@/features/ide-redesign/components/settings/editor-settings/pdf-viewer-setting' +import PDFViewerSetting from '@/features/settings/components/editor-settings/pdf-viewer-setting' import userEvent from '@testing-library/user-event' const OPTIONS = [ diff --git a/services/web/test/frontend/features/settings-modal/settings/root-document-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/root-document-setting.test.tsx index 8b010db51d..02d264edbb 100644 --- a/services/web/test/frontend/features/settings-modal/settings/root-document-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/root-document-setting.test.tsx @@ -7,7 +7,7 @@ import { EditorProviders, projectDefaults, } from '../../../helpers/editor-providers' -import RootDocumentSetting from '@/features/ide-redesign/components/settings/compiler-settings/root-document-setting' +import RootDocumentSetting from '@/features/settings/components/compiler-settings/root-document-setting' import userEvent from '@testing-library/user-event' const OPTIONS = [ diff --git a/services/web/test/frontend/features/settings-modal/settings/spell-check-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/spell-check-setting.test.tsx index eb2c9d4a86..32880ed004 100644 --- a/services/web/test/frontend/features/settings-modal/settings/spell-check-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/spell-check-setting.test.tsx @@ -7,7 +7,7 @@ import { projectDefaults, } from '../../../helpers/editor-providers' import { SettingsModalProvider } from '@/features/ide-redesign/contexts/settings-modal-context' -import SpellCheckSetting from '@/features/ide-redesign/components/settings/editor-settings/spell-check-setting' +import SpellCheckSetting from '@/features/settings/components/editor-settings/spell-check-setting' import userEvent from '@testing-library/user-event' describe('', function () { diff --git a/services/web/test/frontend/features/settings-modal/settings/stop-on-first-error-setting.test.tsx b/services/web/test/frontend/features/settings-modal/settings/stop-on-first-error-setting.test.tsx index a2807ff97d..08b88c0ac0 100644 --- a/services/web/test/frontend/features/settings-modal/settings/stop-on-first-error-setting.test.tsx +++ b/services/web/test/frontend/features/settings-modal/settings/stop-on-first-error-setting.test.tsx @@ -8,7 +8,7 @@ import { } from '../../../helpers/editor-providers' import localStorage from '@/infrastructure/local-storage' import userEvent from '@testing-library/user-event' -import StopOnFirstErrorSetting from '@/features/ide-redesign/components/settings/compiler-settings/stop-on-first-error-setting' +import StopOnFirstErrorSetting from '@/features/settings/components/compiler-settings/stop-on-first-error-setting' describe('', function () { afterEach(function () {