diff options
Diffstat (limited to 'src/components/layout')
-rw-r--r-- | src/components/layout/AppLayout.tsx | 27 | ||||
-rw-r--r-- | src/components/layout/Sidebar.tsx | 22 |
2 files changed, 29 insertions, 20 deletions
diff --git a/src/components/layout/AppLayout.tsx b/src/components/layout/AppLayout.tsx index 97795212a..160664c20 100644 --- a/src/components/layout/AppLayout.tsx +++ b/src/components/layout/AppLayout.tsx | |||
@@ -1,28 +1,33 @@ | |||
1 | import React, { Component, PropsWithChildren } from 'react'; | ||
2 | import { observer } from 'mobx-react'; | ||
3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | ||
4 | import { TitleBar } from 'electron-react-titlebar/renderer'; | ||
5 | import injectSheet, { WithStylesProps } from 'react-jss'; | ||
6 | import { ipcRenderer } from 'electron'; | 1 | import { ipcRenderer } from 'electron'; |
2 | import { TitleBar } from 'electron-react-titlebar/renderer'; | ||
3 | import { observer } from 'mobx-react'; | ||
4 | import type React from 'react'; | ||
5 | import { Component, type PropsWithChildren } from 'react'; | ||
6 | import { | ||
7 | type WrappedComponentProps, | ||
8 | defineMessages, | ||
9 | injectIntl, | ||
10 | } from 'react-intl'; | ||
11 | import injectSheet, { type WithStylesProps } from 'react-jss'; | ||
7 | 12 | ||
8 | import { mdiFlash, mdiPowerPlug } from '@mdi/js'; | 13 | import { mdiFlash, mdiPowerPlug } from '@mdi/js'; |
9 | import { Outlet } from 'react-router-dom'; | 14 | import { Outlet } from 'react-router-dom'; |
10 | import InfoBar from '../ui/InfoBar'; | ||
11 | import { Component as BasicAuth } from '../../features/basicAuth'; | 15 | import { Component as BasicAuth } from '../../features/basicAuth'; |
12 | import { Component as QuickSwitch } from '../../features/quickSwitch'; | ||
13 | import { Component as PublishDebugInfo } from '../../features/publishDebugInfo'; | 16 | import { Component as PublishDebugInfo } from '../../features/publishDebugInfo'; |
14 | import ErrorBoundary from '../util/ErrorBoundary'; | 17 | import { Component as QuickSwitch } from '../../features/quickSwitch'; |
15 | import { updateVersionParse } from '../../helpers/update-helpers'; | 18 | import { updateVersionParse } from '../../helpers/update-helpers'; |
19 | import InfoBar from '../ui/InfoBar'; | ||
20 | import ErrorBoundary from '../util/ErrorBoundary'; | ||
16 | 21 | ||
17 | import { isMac, isWindows } from '../../environment'; | 22 | import { isMac, isWindows } from '../../environment'; |
18 | import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator'; | 23 | import Todos from '../../features/todos/containers/TodosScreen'; |
19 | import { workspaceStore } from '../../features/workspaces'; | 24 | import { workspaceStore } from '../../features/workspaces'; |
25 | import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator'; | ||
20 | import AppUpdateInfoBar from '../AppUpdateInfoBar'; | 26 | import AppUpdateInfoBar from '../AppUpdateInfoBar'; |
21 | import Todos from '../../features/todos/containers/TodosScreen'; | ||
22 | import Icon from '../ui/icon'; | 27 | import Icon from '../ui/icon'; |
23 | 28 | ||
24 | import LockedScreen from '../../containers/auth/LockedScreen'; | 29 | import LockedScreen from '../../containers/auth/LockedScreen'; |
25 | import SettingsStore from '../../stores/SettingsStore'; | 30 | import type SettingsStore from '../../stores/SettingsStore'; |
26 | 31 | ||
27 | const messages = defineMessages({ | 32 | const messages = defineMessages({ |
28 | servicesUpdated: { | 33 | servicesUpdated: { |
diff --git a/src/components/layout/Sidebar.tsx b/src/components/layout/Sidebar.tsx index 1106113f0..a927d5745 100644 --- a/src/components/layout/Sidebar.tsx +++ b/src/components/layout/Sidebar.tsx | |||
@@ -1,7 +1,3 @@ | |||
1 | import { Component } from 'react'; | ||
2 | import { Tooltip as ReactTooltip } from 'react-tooltip'; | ||
3 | import { defineMessages, injectIntl, WrappedComponentProps } from 'react-intl'; | ||
4 | import { inject, observer } from 'mobx-react'; | ||
5 | import { | 1 | import { |
6 | mdiBell, | 2 | mdiBell, |
7 | mdiBellOff, | 3 | mdiBellOff, |
@@ -9,14 +5,22 @@ import { | |||
9 | mdiChevronDown, | 5 | mdiChevronDown, |
10 | mdiChevronRight, | 6 | mdiChevronRight, |
11 | mdiCog, | 7 | mdiCog, |
8 | mdiDownload, | ||
12 | mdiLock, | 9 | mdiLock, |
13 | mdiMenu, | 10 | mdiMenu, |
14 | mdiPlusBox, | 11 | mdiPlusBox, |
15 | mdiViewGrid, | 12 | mdiViewGrid, |
16 | mdiViewSplitVertical, | 13 | mdiViewSplitVertical, |
17 | mdiDownload, | ||
18 | } from '@mdi/js'; | 14 | } from '@mdi/js'; |
19 | import Tabbar from '../services/tabs/Tabbar'; | 15 | import { inject, observer } from 'mobx-react'; |
16 | import { Component } from 'react'; | ||
17 | import { | ||
18 | type WrappedComponentProps, | ||
19 | defineMessages, | ||
20 | injectIntl, | ||
21 | } from 'react-intl'; | ||
22 | import { Tooltip as ReactTooltip } from 'react-tooltip'; | ||
23 | import type { Actions } from '../../actions/lib/actions'; | ||
20 | import { | 24 | import { |
21 | addNewServiceShortcutKey, | 25 | addNewServiceShortcutKey, |
22 | downloadsShortcutKey, | 26 | downloadsShortcutKey, |
@@ -30,10 +34,10 @@ import { | |||
30 | import { todosStore } from '../../features/todos'; | 34 | import { todosStore } from '../../features/todos'; |
31 | import { todoActions } from '../../features/todos/actions'; | 35 | import { todoActions } from '../../features/todos/actions'; |
32 | import globalMessages from '../../i18n/globalMessages'; | 36 | import globalMessages from '../../i18n/globalMessages'; |
37 | import type Service from '../../models/Service'; | ||
38 | import type { RealStores } from '../../stores'; | ||
39 | import Tabbar from '../services/tabs/Tabbar'; | ||
33 | import Icon from '../ui/icon'; | 40 | import Icon from '../ui/icon'; |
34 | import { Actions } from '../../actions/lib/actions'; | ||
35 | import { RealStores } from '../../stores'; | ||
36 | import Service from '../../models/Service'; | ||
37 | 41 | ||
38 | const messages = defineMessages({ | 42 | const messages = defineMessages({ |
39 | addNewService: { | 43 | addNewService: { |