Skip to content

TagSpaces is an offline, open source, document manager with tagging support

chore: refactoring dialogs

Ilian Sapundshiev3dafd3f67ee0
diff --git a/src/renderer/components/dialogs/CreateEditLocationDialog.tsx b/src/renderer/components/dialogs/CreateEditLocationDialog.tsx
index 2d77b5b62..56e01af92 100644
--- a/src/renderer/components/dialogs/CreateEditLocationDialog.tsx
+++ b/src/renderer/components/dialogs/CreateEditLocationDialog.tsx
@@ -24,7 +24,6 @@ import TsButton from '-/components/TsButton';
import TsSelect from '-/components/TsSelect';
import TsDialogActions from '-/components/dialogs/components/TsDialogActions';
import DialogContent from '@mui/material/DialogContent';
-import DialogTitle from '@mui/material/DialogTitle';
import Switch from '@mui/material/Switch';
import FormControl from '@mui/material/FormControl';
import FormControlLabel from '@mui/material/FormControlLabel';
@@ -53,20 +52,18 @@ import {
AccordionSummary,
MenuItem,
FormLabel,
- Select,
} from '@mui/material';
import { Pro } from '-/pro';
import DraggablePaper from '-/components/DraggablePaper';
-import ObjectStoreForm from './ObjectStoreForm';
-import LocalForm from './LocalForm';
+import ObjectStoreForm from '-/components/dialogs/components/ObjectStoreForm';
+import LocalForm from './components/LocalForm';
import useFirstRender from '-/utils/useFirstRender';
import { TS } from '-/tagspaces.namespace';
-import DialogCloseButton from '-/components/dialogs/DialogCloseButton';
import InfoIcon from '-/components/InfoIcon';
import { ProLabel, BetaLabel, ProTooltip } from '-/components/HelperComponents';
import { getPersistTagsInSidecarFile, isDevMode } from '-/reducers/settings';
import ConfirmDialog from '-/components/dialogs/ConfirmDialog';
-import WebdavForm from '-/components/dialogs/WebdavForm';
+import WebdavForm from '-/components/dialogs/components/WebdavForm';
import { useTheme } from '@mui/material/styles';
import useMediaQuery from '@mui/material/useMediaQuery';
import { getUuid } from '@tagspaces/tagspaces-common/utils-io';
diff --git a/src/renderer/components/dialogs/settings/MapTileServerDialog.tsx b/src/renderer/components/dialogs/MapTileServerDialog.tsx
similarity index 100%
rename from src/renderer/components/dialogs/settings/MapTileServerDialog.tsx
rename to src/renderer/components/dialogs/MapTileServerDialog.tsx
diff --git a/src/renderer/components/dialogs/settings/SettingsDialog.tsx b/src/renderer/components/dialogs/SettingsDialog.tsx
similarity index 94%
rename from src/renderer/components/dialogs/settings/SettingsDialog.tsx
rename to src/renderer/components/dialogs/SettingsDialog.tsx
index 0bb5fe518..64aa3a2a5 100644
--- a/src/renderer/components/dialogs/settings/SettingsDialog.tsx
+++ b/src/renderer/components/dialogs/SettingsDialog.tsx
@@ -29,13 +29,13 @@ import TsDialogActions from '-/components/dialogs/components/TsDialogActions';
import DialogContent from '@mui/material/DialogContent';
import { isDesktopMode } from '-/reducers/settings';
import ConfirmDialog from '-/components/dialogs/ConfirmDialog';
-import SettingsGeneral from '-/components/dialogs/settings/SettingsGeneral';
-import SettingsKeyBindings from '-/components/dialogs/settings/SettingsKeyBindings';
-import SettingsFileTypes from '-/components/dialogs/settings/SettingsFileTypes';
+import SettingsGeneral from '-/components/dialogs/components/SettingsGeneral';
+import SettingsKeyBindings from '-/components/dialogs/components/SettingsKeyBindings';
+import SettingsFileTypes from '-/components/dialogs/components/SettingsFileTypes';
import { clearAllURLParams } from '-/utils/dom';
-import SettingsAdvanced from '-/components/dialogs/settings/SettingsAdvanced';
+import SettingsAdvanced from '-/components/dialogs/components/SettingsAdvanced';
import Links from 'assets/links';
-import SettingsExtensions from '-/components/dialogs/settings/SettingsExtensions';
+import SettingsExtensions from '-/components/dialogs/components/SettingsExtensions';
import { openURLExternally } from '-/services/utils-io';
import { useTranslation } from 'react-i18next';
import AppConfig from '-/AppConfig';
diff --git a/src/renderer/components/dialogs/LocalForm.tsx b/src/renderer/components/dialogs/components/LocalForm.tsx
similarity index 100%
rename from src/renderer/components/dialogs/LocalForm.tsx
rename to src/renderer/components/dialogs/components/LocalForm.tsx
diff --git a/src/renderer/components/dialogs/ObjectStoreForm.tsx b/src/renderer/components/dialogs/components/ObjectStoreForm.tsx
similarity index 100%
rename from src/renderer/components/dialogs/ObjectStoreForm.tsx
rename to src/renderer/components/dialogs/components/ObjectStoreForm.tsx
diff --git a/src/renderer/components/dialogs/settings/SettingsAdvanced.tsx b/src/renderer/components/dialogs/components/SettingsAdvanced.tsx
similarity index 99%
rename from src/renderer/components/dialogs/settings/SettingsAdvanced.tsx
rename to src/renderer/components/dialogs/components/SettingsAdvanced.tsx
index 27a63b136..94f96e00f 100644
--- a/src/renderer/components/dialogs/settings/SettingsAdvanced.tsx
+++ b/src/renderer/components/dialogs/components/SettingsAdvanced.tsx
@@ -36,7 +36,7 @@ import {
isDevMode,
} from '-/reducers/settings';
import { TS } from '-/tagspaces.namespace';
-import MapTileServerDialog from '-/components/dialogs/settings/MapTileServerDialog';
+import MapTileServerDialog from '-/components/dialogs/MapTileServerDialog';
import TsTextField from '-/components/TsTextField';
import TsSelect from '-/components/TsSelect';
import { Pro } from '-/pro';
diff --git a/src/renderer/components/dialogs/settings/SettingsExtensions.tsx b/src/renderer/components/dialogs/components/SettingsExtensions.tsx
similarity index 100%
rename from src/renderer/components/dialogs/settings/SettingsExtensions.tsx
rename to src/renderer/components/dialogs/components/SettingsExtensions.tsx
diff --git a/src/renderer/components/dialogs/settings/SettingsFileTypes.tsx b/src/renderer/components/dialogs/components/SettingsFileTypes.tsx
similarity index 100%
rename from src/renderer/components/dialogs/settings/SettingsFileTypes.tsx
rename to src/renderer/components/dialogs/components/SettingsFileTypes.tsx
diff --git a/src/renderer/components/dialogs/settings/SettingsGeneral.tsx b/src/renderer/components/dialogs/components/SettingsGeneral.tsx
similarity index 100%
rename from src/renderer/components/dialogs/settings/SettingsGeneral.tsx
rename to src/renderer/components/dialogs/components/SettingsGeneral.tsx
diff --git a/src/renderer/components/dialogs/settings/SettingsKeyBindings.tsx b/src/renderer/components/dialogs/components/SettingsKeyBindings.tsx
similarity index 100%
rename from src/renderer/components/dialogs/settings/SettingsKeyBindings.tsx
rename to src/renderer/components/dialogs/components/SettingsKeyBindings.tsx
diff --git a/src/renderer/components/dialogs/WebdavForm.tsx b/src/renderer/components/dialogs/components/WebdavForm.tsx
similarity index 100%
rename from src/renderer/components/dialogs/WebdavForm.tsx
rename to src/renderer/components/dialogs/components/WebdavForm.tsx
diff --git a/src/renderer/components/dialogs/hooks/SettingsDialogContextProvider.tsx b/src/renderer/components/dialogs/hooks/SettingsDialogContextProvider.tsx
index 151978988..768ec916f 100644
--- a/src/renderer/components/dialogs/hooks/SettingsDialogContextProvider.tsx
+++ b/src/renderer/components/dialogs/hooks/SettingsDialogContextProvider.tsx
@@ -41,10 +41,7 @@ export type SettingsDialogContextProviderProps = {
};
const SettingsDialog = React.lazy(
- () =>
- import(
- /* webpackChunkName: "SettingsDialog" */ '../settings/SettingsDialog'
- ),
+ () => import(/* webpackChunkName: "SettingsDialog" */ '../SettingsDialog'),
);
export const SettingsDialogContextProvider = ({