aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/layout/AppLayout.js
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2019-01-09 12:57:11 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2019-01-09 12:57:11 +0100
commiteee1fe620473b50ac74ce41a030dee5693227be8 (patch)
treef9cb24aa00a490b0f0a6e13db6957522fba150b1 /src/components/layout/AppLayout.js
parentIgnore ERR_NETWORK_CHANGED error (diff)
parentAdd TODO (diff)
downloadferdium-app-eee1fe620473b50ac74ce41a030dee5693227be8.tar.gz
ferdium-app-eee1fe620473b50ac74ce41a030dee5693227be8.tar.zst
ferdium-app-eee1fe620473b50ac74ce41a030dee5693227be8.zip
Merge branch 'feature/basicAuth' into develop
Diffstat (limited to 'src/components/layout/AppLayout.js')
-rw-r--r--src/components/layout/AppLayout.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index dbe0bb4b6..28eaa7fdc 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -6,6 +6,7 @@ import { TitleBar } from 'electron-react-titlebar';
6 6
7import InfoBar from '../ui/InfoBar'; 7import InfoBar from '../ui/InfoBar';
8import { Component as DelayApp } from '../../features/delayApp'; 8import { Component as DelayApp } from '../../features/delayApp';
9import { Component as BasicAuth } from '../../features/basicAuth';
9import ErrorBoundary from '../util/ErrorBoundary'; 10import ErrorBoundary from '../util/ErrorBoundary';
10 11
11import globalMessages from '../../i18n/globalMessages'; 12import globalMessages from '../../i18n/globalMessages';
@@ -161,6 +162,7 @@ export default @observer class AppLayout extends Component {
161 </InfoBar> 162 </InfoBar>
162 )} 163 )}
163 {isDelayAppScreenVisible && (<DelayApp />)} 164 {isDelayAppScreenVisible && (<DelayApp />)}
165 <BasicAuth />
164 {services} 166 {services}
165 </div> 167 </div>
166 </div> 168 </div>