diff options
Diffstat (limited to 'src/components/layout/AppLayout.js')
-rw-r--r-- | src/components/layout/AppLayout.js | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index dbe0bb4b6..bce792e56 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -6,9 +6,10 @@ 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 { Component as DelayApp } from '../../features/delayApp'; |
9 | import { Component as BasicAuth } from '../../features/basicAuth'; | ||
9 | import ErrorBoundary from '../util/ErrorBoundary'; | 10 | import ErrorBoundary from '../util/ErrorBoundary'; |
10 | 11 | ||
11 | import globalMessages from '../../i18n/globalMessages'; | 12 | // import globalMessages from '../../i18n/globalMessages'; |
12 | 13 | ||
13 | import { isWindows } from '../../environment'; | 14 | import { isWindows } from '../../environment'; |
14 | 15 | ||
@@ -50,7 +51,7 @@ export default @observer class AppLayout extends Component { | |||
50 | services: PropTypes.element.isRequired, | 51 | services: PropTypes.element.isRequired, |
51 | children: PropTypes.element, | 52 | children: PropTypes.element, |
52 | news: MobxPropTypes.arrayOrObservableArray.isRequired, | 53 | news: MobxPropTypes.arrayOrObservableArray.isRequired, |
53 | isOnline: PropTypes.bool.isRequired, | 54 | // isOnline: PropTypes.bool.isRequired, |
54 | showServicesUpdatedInfoBar: PropTypes.bool.isRequired, | 55 | showServicesUpdatedInfoBar: PropTypes.bool.isRequired, |
55 | appUpdateIsDownloaded: PropTypes.bool.isRequired, | 56 | appUpdateIsDownloaded: PropTypes.bool.isRequired, |
56 | removeNewsItem: PropTypes.func.isRequired, | 57 | removeNewsItem: PropTypes.func.isRequired, |
@@ -78,7 +79,7 @@ export default @observer class AppLayout extends Component { | |||
78 | sidebar, | 79 | sidebar, |
79 | services, | 80 | services, |
80 | children, | 81 | children, |
81 | isOnline, | 82 | // isOnline, |
82 | news, | 83 | news, |
83 | showServicesUpdatedInfoBar, | 84 | showServicesUpdatedInfoBar, |
84 | appUpdateIsDownloaded, | 85 | appUpdateIsDownloaded, |
@@ -114,14 +115,15 @@ export default @observer class AppLayout extends Component { | |||
114 | <span dangerouslySetInnerHTML={createMarkup(item.message)} /> | 115 | <span dangerouslySetInnerHTML={createMarkup(item.message)} /> |
115 | </InfoBar> | 116 | </InfoBar> |
116 | ))} | 117 | ))} |
117 | {!isOnline && ( | 118 | {/* {!isOnline && ( |
118 | <InfoBar | 119 | <InfoBar |
119 | type="danger" | 120 | type="danger" |
121 | sticky | ||
120 | > | 122 | > |
121 | <span className="mdi mdi-flash" /> | 123 | <span className="mdi mdi-flash" /> |
122 | {intl.formatMessage(globalMessages.notConnectedToTheInternet)} | 124 | {intl.formatMessage(globalMessages.notConnectedToTheInternet)} |
123 | </InfoBar> | 125 | </InfoBar> |
124 | )} | 126 | )} */} |
125 | {!areRequiredRequestsSuccessful && showRequiredRequestsError && ( | 127 | {!areRequiredRequestsSuccessful && showRequiredRequestsError && ( |
126 | <InfoBar | 128 | <InfoBar |
127 | type="danger" | 129 | type="danger" |
@@ -161,6 +163,7 @@ export default @observer class AppLayout extends Component { | |||
161 | </InfoBar> | 163 | </InfoBar> |
162 | )} | 164 | )} |
163 | {isDelayAppScreenVisible && (<DelayApp />)} | 165 | {isDelayAppScreenVisible && (<DelayApp />)} |
166 | <BasicAuth /> | ||
164 | {services} | 167 | {services} |
165 | </div> | 168 | </div> |
166 | </div> | 169 | </div> |