diff options
Diffstat (limited to 'src/components/layout/AppLayout.js')
-rw-r--r-- | src/components/layout/AppLayout.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 746775a7f..3ababe54a 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -5,6 +5,7 @@ import { defineMessages, intlShape } from 'react-intl'; | |||
5 | import { TitleBar } from 'electron-react-titlebar'; | 5 | import { TitleBar } from 'electron-react-titlebar'; |
6 | 6 | ||
7 | import InfoBar from '../ui/InfoBar'; | 7 | import InfoBar from '../ui/InfoBar'; |
8 | import { Component as DelayApp } from '../../features/delayApp'; | ||
8 | import globalMessages from '../../i18n/globalMessages'; | 9 | import globalMessages from '../../i18n/globalMessages'; |
9 | 10 | ||
10 | import { isWindows } from '../../environment'; | 11 | import { isWindows } from '../../environment'; |
@@ -40,8 +41,7 @@ const messages = defineMessages({ | |||
40 | }, | 41 | }, |
41 | }); | 42 | }); |
42 | 43 | ||
43 | @observer | 44 | export default @observer class AppLayout extends Component { |
44 | export default class AppLayout extends Component { | ||
45 | static propTypes = { | 45 | static propTypes = { |
46 | isFullScreen: PropTypes.bool.isRequired, | 46 | isFullScreen: PropTypes.bool.isRequired, |
47 | sidebar: PropTypes.element.isRequired, | 47 | sidebar: PropTypes.element.isRequired, |
@@ -58,6 +58,8 @@ export default class AppLayout extends Component { | |||
58 | areRequiredRequestsSuccessful: PropTypes.bool.isRequired, | 58 | areRequiredRequestsSuccessful: PropTypes.bool.isRequired, |
59 | retryRequiredRequests: PropTypes.func.isRequired, | 59 | retryRequiredRequests: PropTypes.func.isRequired, |
60 | areRequiredRequestsLoading: PropTypes.bool.isRequired, | 60 | areRequiredRequestsLoading: PropTypes.bool.isRequired, |
61 | darkMode: PropTypes.bool.isRequired, | ||
62 | isDelayAppScreenVisible: PropTypes.bool.isRequired, | ||
61 | }; | 63 | }; |
62 | 64 | ||
63 | static defaultProps = { | 65 | static defaultProps = { |
@@ -85,12 +87,14 @@ export default class AppLayout extends Component { | |||
85 | areRequiredRequestsSuccessful, | 87 | areRequiredRequestsSuccessful, |
86 | retryRequiredRequests, | 88 | retryRequiredRequests, |
87 | areRequiredRequestsLoading, | 89 | areRequiredRequestsLoading, |
90 | darkMode, | ||
91 | isDelayAppScreenVisible, | ||
88 | } = this.props; | 92 | } = this.props; |
89 | 93 | ||
90 | const { intl } = this.context; | 94 | const { intl } = this.context; |
91 | 95 | ||
92 | return ( | 96 | return ( |
93 | <div> | 97 | <div className={(darkMode ? 'theme__dark' : '')}> |
94 | <div className="app"> | 98 | <div className="app"> |
95 | {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />} | 99 | {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />} |
96 | <div className="app__content"> | 100 | <div className="app__content"> |
@@ -151,6 +155,7 @@ export default class AppLayout extends Component { | |||
151 | </a> | 155 | </a> |
152 | </InfoBar> | 156 | </InfoBar> |
153 | )} | 157 | )} |
158 | {isDelayAppScreenVisible && (<DelayApp />)} | ||
154 | {services} | 159 | {services} |
155 | </div> | 160 | </div> |
156 | </div> | 161 | </div> |