aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/layout
diff options
context:
space:
mode:
authorLibravatar Dominik Guzei <dominik.guzei@gmail.com>2019-06-05 17:23:29 +0200
committerLibravatar Dominik Guzei <dominik.guzei@gmail.com>2019-06-05 17:23:29 +0200
commit70c4494b254688037c8b7033911d2d5f06e600a2 (patch)
tree5ef06c2b0fe08a170a1b25323f32009efc6d06bc /src/components/layout
parentFix case in menu label (diff)
downloadferdium-app-70c4494b254688037c8b7033911d2d5f06e600a2.tar.gz
ferdium-app-70c4494b254688037c8b7033911d2d5f06e600a2.tar.zst
ferdium-app-70c4494b254688037c8b7033911d2d5f06e600a2.zip
support app updates also for unauthenticated users
Diffstat (limited to 'src/components/layout')
-rw-r--r--src/components/layout/AppLayout.js34
1 files changed, 5 insertions, 29 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index b31c00f54..321eb8e3a 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -17,6 +17,7 @@ import { isWindows } from '../../environment';
17import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator'; 17import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator';
18import { workspaceStore } from '../../features/workspaces'; 18import { workspaceStore } from '../../features/workspaces';
19import { announcementActions } from '../../features/announcements/actions'; 19import { announcementActions } from '../../features/announcements/actions';
20import AppUpdateInfoBar from '../AppUpdateInfoBar';
20 21
21function createMarkup(HTMLString) { 22function createMarkup(HTMLString) {
22 return { __html: HTMLString }; 23 return { __html: HTMLString };
@@ -27,22 +28,10 @@ const messages = defineMessages({
27 id: 'infobar.servicesUpdated', 28 id: 'infobar.servicesUpdated',
28 defaultMessage: '!!!Your services have been updated.', 29 defaultMessage: '!!!Your services have been updated.',
29 }, 30 },
30 updateAvailable: {
31 id: 'infobar.updateAvailable',
32 defaultMessage: '!!!A new update for Franz is available.',
33 },
34 buttonReloadServices: { 31 buttonReloadServices: {
35 id: 'infobar.buttonReloadServices', 32 id: 'infobar.buttonReloadServices',
36 defaultMessage: '!!!Reload services', 33 defaultMessage: '!!!Reload services',
37 }, 34 },
38 changelog: {
39 id: 'infobar.buttonChangelog',
40 defaultMessage: '!!!Changelog',
41 },
42 buttonInstallUpdate: {
43 id: 'infobar.buttonInstallUpdate',
44 defaultMessage: '!!!Restart & install update',
45 },
46 requiredRequestsFailed: { 35 requiredRequestsFailed: {
47 id: 'infobar.requiredRequestsFailed', 36 id: 'infobar.requiredRequestsFailed',
48 defaultMessage: '!!!Could not load services and user information', 37 defaultMessage: '!!!Could not load services and user information',
@@ -173,23 +162,10 @@ class AppLayout extends Component {
173 </InfoBar> 162 </InfoBar>
174 )} 163 )}
175 {appUpdateIsDownloaded && ( 164 {appUpdateIsDownloaded && (
176 <InfoBar 165 <AppUpdateInfoBar
177 type="primary" 166 nextAppReleaseVersion={nextAppReleaseVersion}
178 ctaLabel={intl.formatMessage(messages.buttonInstallUpdate)} 167 onInstallUpdate={installAppUpdate}
179 onClick={installAppUpdate} 168 />
180 sticky
181 >
182 <span className="mdi mdi-information" />
183 {intl.formatMessage(messages.updateAvailable)}
184 {' '}
185 <button
186 className="info-bar__inline-button"
187 type="button"
188 onClick={() => announcementActions.show({ targetVersion: nextAppReleaseVersion })}
189 >
190 <u>{intl.formatMessage(messages.changelog)}</u>
191 </button>
192 </InfoBar>
193 )} 169 )}
194 {isDelayAppScreenVisible && (<DelayApp />)} 170 {isDelayAppScreenVisible && (<DelayApp />)}
195 <BasicAuth /> 171 <BasicAuth />