diff options
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/auth/AuthLayout.js | 6 | ||||
-rw-r--r-- | src/components/layout/AppLayout.js | 126 |
2 files changed, 63 insertions, 69 deletions
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js index 3d43d4e5c..75a8cfc61 100644 --- a/src/components/auth/AuthLayout.js +++ b/src/components/auth/AuthLayout.js | |||
@@ -22,7 +22,6 @@ export default @observer class AuthLayout extends Component { | |||
22 | retryHealthCheck: PropTypes.func.isRequired, | 22 | retryHealthCheck: PropTypes.func.isRequired, |
23 | isHealthCheckLoading: PropTypes.bool.isRequired, | 23 | isHealthCheckLoading: PropTypes.bool.isRequired, |
24 | isFullScreen: PropTypes.bool.isRequired, | 24 | isFullScreen: PropTypes.bool.isRequired, |
25 | darkMode: PropTypes.bool.isRequired, | ||
26 | nextAppReleaseVersion: PropTypes.string, | 25 | nextAppReleaseVersion: PropTypes.string, |
27 | installAppUpdate: PropTypes.func.isRequired, | 26 | installAppUpdate: PropTypes.func.isRequired, |
28 | appUpdateIsDownloaded: PropTypes.bool.isRequired, | 27 | appUpdateIsDownloaded: PropTypes.bool.isRequired, |
@@ -45,7 +44,6 @@ export default @observer class AuthLayout extends Component { | |||
45 | retryHealthCheck, | 44 | retryHealthCheck, |
46 | isHealthCheckLoading, | 45 | isHealthCheckLoading, |
47 | isFullScreen, | 46 | isFullScreen, |
48 | darkMode, | ||
49 | nextAppReleaseVersion, | 47 | nextAppReleaseVersion, |
50 | installAppUpdate, | 48 | installAppUpdate, |
51 | appUpdateIsDownloaded, | 49 | appUpdateIsDownloaded, |
@@ -53,7 +51,7 @@ export default @observer class AuthLayout extends Component { | |||
53 | const { intl } = this.context; | 51 | const { intl } = this.context; |
54 | 52 | ||
55 | return ( | 53 | return ( |
56 | <div className={darkMode ? 'theme__dark' : ''}> | 54 | <> |
57 | {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon="assets/images/logo.svg" />} | 55 | {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon="assets/images/logo.svg" />} |
58 | <div className="auth"> | 56 | <div className="auth"> |
59 | {!isOnline && ( | 57 | {!isOnline && ( |
@@ -93,7 +91,7 @@ export default @observer class AuthLayout extends Component { | |||
93 | <img src="./assets/images/adlk.svg" alt="" /> | 91 | <img src="./assets/images/adlk.svg" alt="" /> |
94 | </Link> | 92 | </Link> |
95 | </div> | 93 | </div> |
96 | </div> | 94 | </> |
97 | ); | 95 | ); |
98 | } | 96 | } |
99 | } | 97 | } |
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 499bc097a..ebb9849ea 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -68,7 +68,6 @@ class AppLayout extends Component { | |||
68 | areRequiredRequestsSuccessful: PropTypes.bool.isRequired, | 68 | areRequiredRequestsSuccessful: PropTypes.bool.isRequired, |
69 | retryRequiredRequests: PropTypes.func.isRequired, | 69 | retryRequiredRequests: PropTypes.func.isRequired, |
70 | areRequiredRequestsLoading: PropTypes.bool.isRequired, | 70 | areRequiredRequestsLoading: PropTypes.bool.isRequired, |
71 | darkMode: PropTypes.bool.isRequired, | ||
72 | isDelayAppScreenVisible: PropTypes.bool.isRequired, | 71 | isDelayAppScreenVisible: PropTypes.bool.isRequired, |
73 | }; | 72 | }; |
74 | 73 | ||
@@ -101,7 +100,6 @@ class AppLayout extends Component { | |||
101 | areRequiredRequestsSuccessful, | 100 | areRequiredRequestsSuccessful, |
102 | retryRequiredRequests, | 101 | retryRequiredRequests, |
103 | areRequiredRequestsLoading, | 102 | areRequiredRequestsLoading, |
104 | darkMode, | ||
105 | isDelayAppScreenVisible, | 103 | isDelayAppScreenVisible, |
106 | } = this.props; | 104 | } = this.props; |
107 | 105 | ||
@@ -109,69 +107,67 @@ class AppLayout extends Component { | |||
109 | 107 | ||
110 | return ( | 108 | return ( |
111 | <ErrorBoundary> | 109 | <ErrorBoundary> |
112 | <div className={(darkMode ? 'theme__dark' : '')}> | 110 | <div className="app"> |
113 | <div className="app"> | 111 | {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon="assets/images/logo.svg" />} |
114 | {isWindows && !isFullScreen && <TitleBar menu={window.franz.menu.template} icon="assets/images/logo.svg" />} | 112 | <div className={`app__content ${classes.appContent}`}> |
115 | <div className={`app__content ${classes.appContent}`}> | 113 | {workspacesDrawer} |
116 | {workspacesDrawer} | 114 | {sidebar} |
117 | {sidebar} | 115 | <div className="app__service"> |
118 | <div className="app__service"> | 116 | <WorkspaceSwitchingIndicator /> |
119 | <WorkspaceSwitchingIndicator /> | 117 | {news.length > 0 && news.map(item => ( |
120 | {news.length > 0 && news.map(item => ( | 118 | <InfoBar |
121 | <InfoBar | 119 | key={item.id} |
122 | key={item.id} | 120 | position="top" |
123 | position="top" | 121 | type={item.type} |
124 | type={item.type} | 122 | sticky={item.sticky} |
125 | sticky={item.sticky} | 123 | onHide={() => removeNewsItem({ newsId: item.id })} |
126 | onHide={() => removeNewsItem({ newsId: item.id })} | 124 | > |
127 | > | 125 | <span dangerouslySetInnerHTML={createMarkup(item.message)} /> |
128 | <span dangerouslySetInnerHTML={createMarkup(item.message)} /> | 126 | </InfoBar> |
129 | </InfoBar> | 127 | ))} |
130 | ))} | 128 | {/* {!isOnline && ( |
131 | {/* {!isOnline && ( | 129 | <InfoBar |
132 | <InfoBar | 130 | type="danger" |
133 | type="danger" | 131 | sticky |
134 | sticky | 132 | > |
135 | > | 133 | <span className="mdi mdi-flash" /> |
136 | <span className="mdi mdi-flash" /> | 134 | {intl.formatMessage(globalMessages.notConnectedToTheInternet)} |
137 | {intl.formatMessage(globalMessages.notConnectedToTheInternet)} | 135 | </InfoBar> |
138 | </InfoBar> | 136 | )} */} |
139 | )} */} | 137 | {!areRequiredRequestsSuccessful && showRequiredRequestsError && ( |
140 | {!areRequiredRequestsSuccessful && showRequiredRequestsError && ( | 138 | <InfoBar |
141 | <InfoBar | 139 | type="danger" |
142 | type="danger" | 140 | ctaLabel="Try again" |
143 | ctaLabel="Try again" | 141 | ctaLoading={areRequiredRequestsLoading} |
144 | ctaLoading={areRequiredRequestsLoading} | 142 | sticky |
145 | sticky | 143 | onClick={retryRequiredRequests} |
146 | onClick={retryRequiredRequests} | 144 | > |
147 | > | 145 | <span className="mdi mdi-flash" /> |
148 | <span className="mdi mdi-flash" /> | 146 | {intl.formatMessage(messages.requiredRequestsFailed)} |
149 | {intl.formatMessage(messages.requiredRequestsFailed)} | 147 | </InfoBar> |
150 | </InfoBar> | 148 | )} |
151 | )} | 149 | {showServicesUpdatedInfoBar && ( |
152 | {showServicesUpdatedInfoBar && ( | 150 | <InfoBar |
153 | <InfoBar | 151 | type="primary" |
154 | type="primary" | 152 | ctaLabel={intl.formatMessage(messages.buttonReloadServices)} |
155 | ctaLabel={intl.formatMessage(messages.buttonReloadServices)} | 153 | onClick={reloadServicesAfterUpdate} |
156 | onClick={reloadServicesAfterUpdate} | 154 | sticky |
157 | sticky | 155 | > |
158 | > | 156 | <span className="mdi mdi-power-plug" /> |
159 | <span className="mdi mdi-power-plug" /> | 157 | {intl.formatMessage(messages.servicesUpdated)} |
160 | {intl.formatMessage(messages.servicesUpdated)} | 158 | </InfoBar> |
161 | </InfoBar> | 159 | )} |
162 | )} | 160 | {appUpdateIsDownloaded && ( |
163 | {appUpdateIsDownloaded && ( | 161 | <AppUpdateInfoBar |
164 | <AppUpdateInfoBar | 162 | nextAppReleaseVersion={nextAppReleaseVersion} |
165 | nextAppReleaseVersion={nextAppReleaseVersion} | 163 | onInstallUpdate={installAppUpdate} |
166 | onInstallUpdate={installAppUpdate} | 164 | /> |
167 | /> | 165 | )} |
168 | )} | 166 | {isDelayAppScreenVisible && (<DelayApp />)} |
169 | {isDelayAppScreenVisible && (<DelayApp />)} | 167 | <BasicAuth /> |
170 | <BasicAuth /> | 168 | <ShareFranz /> |
171 | <ShareFranz /> | 169 | {services} |
172 | {services} | 170 | {children} |
173 | {children} | ||
174 | </div> | ||
175 | </div> | 171 | </div> |
176 | </div> | 172 | </div> |
177 | </div> | 173 | </div> |