diff options
Diffstat (limited to 'packages/renderer/src/components/App.tsx')
-rw-r--r-- | packages/renderer/src/components/App.tsx | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/packages/renderer/src/components/App.tsx b/packages/renderer/src/components/App.tsx index d381abf..2f728e7 100644 --- a/packages/renderer/src/components/App.tsx +++ b/packages/renderer/src/components/App.tsx | |||
@@ -23,12 +23,8 @@ import { observer } from 'mobx-react-lite'; | |||
23 | import React, { useCallback, useEffect } from 'react'; | 23 | import React, { useCallback, useEffect } from 'react'; |
24 | import { useTranslation } from 'react-i18next'; | 24 | import { useTranslation } from 'react-i18next'; |
25 | 25 | ||
26 | import BrowserViewPlaceholder from './BrowserViewPlaceholder'; | 26 | import ServicePanel from './ServicePanel'; |
27 | import { useStore } from './StoreProvider'; | 27 | import { useStore } from './StoreProvider'; |
28 | import InsecureConnectionBanner from './banner/InsecureConnectionBanner'; | ||
29 | import NewWindowBanner from './banner/NewWindowBanner'; | ||
30 | import ErrorPage from './errorPage/ErrorPage'; | ||
31 | import LocationBar from './locationBar/LocationBar'; | ||
32 | import Sidebar from './sidebar/Sidebar'; | 28 | import Sidebar from './sidebar/Sidebar'; |
33 | 29 | ||
34 | function App({ devMode }: { devMode: boolean }): JSX.Element { | 30 | function App({ devMode }: { devMode: boolean }): JSX.Element { |
@@ -37,6 +33,7 @@ function App({ devMode }: { devMode: boolean }): JSX.Element { | |||
37 | }); | 33 | }); |
38 | const { | 34 | const { |
39 | settings: { selectedService }, | 35 | settings: { selectedService }, |
36 | shared: { services }, | ||
40 | } = useStore(); | 37 | } = useStore(); |
41 | const { | 38 | const { |
42 | settings: { name: serviceName }, | 39 | settings: { name: serviceName }, |
@@ -95,20 +92,13 @@ function App({ devMode }: { devMode: boolean }): JSX.Element { | |||
95 | <Box | 92 | <Box |
96 | sx={{ | 93 | sx={{ |
97 | flex: 1, | 94 | flex: 1, |
98 | display: 'flex', | ||
99 | overflow: 'hidden', | ||
100 | flexDirection: 'column', | ||
101 | alignItems: 'stretch', | ||
102 | height: '100%', | 95 | height: '100%', |
103 | zIndex: 100, | 96 | position: 'relative', |
104 | }} | 97 | }} |
105 | > | 98 | > |
106 | <LocationBar /> | 99 | {services.map((service) => ( |
107 | <InsecureConnectionBanner service={selectedService} /> | 100 | <ServicePanel key={service.id} service={service} /> |
108 | <NewWindowBanner service={selectedService} /> | 101 | ))} |
109 | <BrowserViewPlaceholder> | ||
110 | <ErrorPage service={selectedService} /> | ||
111 | </BrowserViewPlaceholder> | ||
112 | </Box> | 102 | </Box> |
113 | </Box> | 103 | </Box> |
114 | ); | 104 | ); |