diff options
author | kytwb <kytwb@pm.me> | 2021-12-18 14:38:57 +0100 |
---|---|---|
committer | kytwb <kytwb@pm.me> | 2021-12-18 14:38:57 +0100 |
commit | 67b97a09382e9afbe78f3c64add24bd3440da908 (patch) | |
tree | 53f1614e1d6e13758c7e279228be9108ae65c0ef /src/components | |
parent | Remove duplicate edit button in account settings tab (diff) | |
download | ferdium-app-67b97a09382e9afbe78f3c64add24bd3440da908.tar.gz ferdium-app-67b97a09382e9afbe78f3c64add24bd3440da908.tar.zst ferdium-app-67b97a09382e9afbe78f3c64add24bd3440da908.zip |
Move LockedScreen to AppLayout
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/layout/AppLayout.js | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index b47a6040d..eb36ea431 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -22,6 +22,8 @@ import AppUpdateInfoBar from '../AppUpdateInfoBar'; | |||
22 | import Todos from '../../features/todos/containers/TodosScreen'; | 22 | import Todos from '../../features/todos/containers/TodosScreen'; |
23 | import { Icon } from '../ui/icon'; | 23 | import { Icon } from '../ui/icon'; |
24 | 24 | ||
25 | import LockedScreen from '../../containers/auth/LockedScreen'; | ||
26 | |||
25 | const messages = defineMessages({ | 27 | const messages = defineMessages({ |
26 | servicesUpdated: { | 28 | servicesUpdated: { |
27 | id: 'infobar.servicesUpdated', | 29 | id: 'infobar.servicesUpdated', |
@@ -76,6 +78,7 @@ const toggleFullScreen = () => { | |||
76 | class AppLayout extends Component { | 78 | class AppLayout extends Component { |
77 | static propTypes = { | 79 | static propTypes = { |
78 | classes: PropTypes.object.isRequired, | 80 | classes: PropTypes.object.isRequired, |
81 | settings: PropTypes.object.isRequired, | ||
79 | isFullScreen: PropTypes.bool.isRequired, | 82 | isFullScreen: PropTypes.bool.isRequired, |
80 | sidebar: PropTypes.element.isRequired, | 83 | sidebar: PropTypes.element.isRequired, |
81 | workspacesDrawer: PropTypes.element.isRequired, | 84 | workspacesDrawer: PropTypes.element.isRequired, |
@@ -114,6 +117,7 @@ class AppLayout extends Component { | |||
114 | authRequestFailed, | 117 | authRequestFailed, |
115 | reloadServicesAfterUpdate, | 118 | reloadServicesAfterUpdate, |
116 | installAppUpdate, | 119 | installAppUpdate, |
120 | settings, | ||
117 | showRequiredRequestsError, | 121 | showRequiredRequestsError, |
118 | areRequiredRequestsSuccessful, | 122 | areRequiredRequestsSuccessful, |
119 | retryRequiredRequests, | 123 | retryRequiredRequests, |
@@ -122,6 +126,11 @@ class AppLayout extends Component { | |||
122 | 126 | ||
123 | const { intl } = this.props; | 127 | const { intl } = this.props; |
124 | 128 | ||
129 | const { locked } = settings.app; | ||
130 | if (locked) { | ||
131 | return <LockedScreen />; | ||
132 | } | ||
133 | |||
125 | return ( | 134 | return ( |
126 | <ErrorBoundary> | 135 | <ErrorBoundary> |
127 | <div className="app"> | 136 | <div className="app"> |