diff options
| author | Oliver <oliver@mohlin.dev> | 2025-09-23 06:32:42 +0200 |
|---|---|---|
| committer | Tobias Järvelöv <tobias.jarvelov@mullvad.net> | 2025-10-15 14:04:56 +0200 |
| commit | 5adfd9882c8a9ab0418da9fdfa2b70e2e823cb6a (patch) | |
| tree | 3591501c0bc6c1edeadcf1fa69bd8d876d3d9062 | |
| parent | 7877202d13b52c8b2907d22320c8607224ed66fc (diff) | |
| download | mullvadvpn-5adfd9882c8a9ab0418da9fdfa2b70e2e823cb6a.tar.xz mullvadvpn-5adfd9882c8a9ab0418da9fdfa2b70e2e823cb6a.zip | |
Move user interface settings to views folder
| -rw-r--r-- | desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx | 2 | ||||
| -rw-r--r-- | desktop/packages/mullvad-vpn/src/renderer/components/views/index.ts | 1 | ||||
| -rw-r--r-- | desktop/packages/mullvad-vpn/src/renderer/components/views/user-interface-settings/UserInterfaceSettings.tsx (renamed from desktop/packages/mullvad-vpn/src/renderer/components/UserInterfaceSettings.tsx) | 38 | ||||
| -rw-r--r-- | desktop/packages/mullvad-vpn/src/renderer/components/views/user-interface-settings/index.ts | 1 |
4 files changed, 25 insertions, 17 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx index 561ab55877..1541bdf9cf 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/AppRouter.tsx @@ -24,7 +24,6 @@ import SettingsImport from './SettingsImport'; import SettingsTextImport from './SettingsTextImport'; import StateTriggeredNavigation from './StateTriggeredNavigation'; import Support from './Support'; -import UserInterfaceSettings from './UserInterfaceSettings'; import { Account, AppInfoView, @@ -42,6 +41,7 @@ import { SplitTunnelingView, TooManyDevicesView, UdpOverTcpSettingsView, + UserInterfaceSettings, VpnSettingsView, WireguardSettingsView, } from './views'; diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/index.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/index.ts index dbd592ca0f..ac11970bfa 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/views/index.ts +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/index.ts @@ -15,4 +15,5 @@ export * from './split-tunneling'; export * from './too-many-devices'; export * from './udp-over-tcp-settings'; export * from './vpn-settings'; +export * from './user-interface-settings'; export * from './wireguard-settings'; diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/UserInterfaceSettings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/user-interface-settings/UserInterfaceSettings.tsx index 5a1e4ad39e..461aa02ad6 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/UserInterfaceSettings.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/user-interface-settings/UserInterfaceSettings.tsx @@ -1,20 +1,26 @@ import styled from 'styled-components'; -import { messages } from '../../shared/gettext'; -import { RoutePath } from '../../shared/routes'; -import { useAppContext } from '../context'; -import { Image } from '../lib/components'; -import { useHistory } from '../lib/history'; -import { useSelector } from '../redux/store'; -import { AppNavigationHeader } from './'; -import { AriaDescription, AriaInput, AriaInputGroup, AriaLabel } from './AriaGroup'; -import * as Cell from './cell'; -import { BackAction } from './KeyboardNavigation'; -import { Layout, SettingsContainer, SettingsContent, SettingsGroup, SettingsStack } from './Layout'; -import { NavigationContainer } from './NavigationContainer'; -import { NavigationScrollbars } from './NavigationScrollbars'; -import { SettingsNavigationListItem } from './settings-navigation-list-item'; -import SettingsHeader, { HeaderTitle } from './SettingsHeader'; +import { messages } from '../../../../shared/gettext'; +import { RoutePath } from '../../../../shared/routes'; +import { useAppContext } from '../../../context'; +import { Image } from '../../../lib/components'; +import { useHistory } from '../../../lib/history'; +import { useSelector } from '../../../redux/store'; +import { AppNavigationHeader } from '../..'; +import { AriaDescription, AriaInput, AriaInputGroup, AriaLabel } from '../../AriaGroup'; +import * as Cell from '../../cell'; +import { BackAction } from '../../KeyboardNavigation'; +import { + Layout, + SettingsContainer, + SettingsContent, + SettingsGroup, + SettingsStack, +} from '../../Layout'; +import { NavigationContainer } from '../../NavigationContainer'; +import { NavigationScrollbars } from '../../NavigationScrollbars'; +import { SettingsNavigationListItem } from '../../settings-navigation-list-item'; +import SettingsHeader, { HeaderTitle } from '../../SettingsHeader'; const StyledAnimateMapCellGroup = styled(SettingsGroup)({ '@media (prefers-reduced-motion: reduce)': { @@ -22,7 +28,7 @@ const StyledAnimateMapCellGroup = styled(SettingsGroup)({ }, }); -export default function UserInterfaceSettings() { +export function UserInterfaceSettings() { const { pop } = useHistory(); const unpinnedWindow = useSelector((state) => state.settings.guiSettings.unpinnedWindow); diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/user-interface-settings/index.ts b/desktop/packages/mullvad-vpn/src/renderer/components/views/user-interface-settings/index.ts new file mode 100644 index 0000000000..a502c9d74d --- /dev/null +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/user-interface-settings/index.ts @@ -0,0 +1 @@ +export * from './UserInterfaceSettings'; |
