diff options
author | 2019-03-12 21:36:10 +0100 | |
---|---|---|
committer | 2019-03-12 21:37:33 +0100 | |
commit | 6fb07bcb716af76ec2e96345f37624d12d0d1af0 (patch) | |
tree | 276191a782dc1d44f78331e548e43ff71758baca /src/components/layout | |
parent | refactor server api even more (diff) | |
download | ferdium-app-6fb07bcb716af76ec2e96345f37624d12d0d1af0.tar.gz ferdium-app-6fb07bcb716af76ec2e96345f37624d12d0d1af0.tar.zst ferdium-app-6fb07bcb716af76ec2e96345f37624d12d0d1af0.zip |
implements basic release announcement feature
Diffstat (limited to 'src/components/layout')
-rw-r--r-- | src/components/layout/AppLayout.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 593149e72..2bda91f73 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -13,6 +13,7 @@ import ErrorBoundary from '../util/ErrorBoundary'; | |||
13 | // import globalMessages from '../../i18n/globalMessages'; | 13 | // import globalMessages from '../../i18n/globalMessages'; |
14 | 14 | ||
15 | import { isWindows } from '../../environment'; | 15 | import { isWindows } from '../../environment'; |
16 | import AnnouncementScreen from '../../features/announcements/Component'; | ||
16 | 17 | ||
17 | function createMarkup(HTMLString) { | 18 | function createMarkup(HTMLString) { |
18 | return { __html: HTMLString }; | 19 | return { __html: HTMLString }; |
@@ -64,6 +65,7 @@ export default @observer class AppLayout extends Component { | |||
64 | areRequiredRequestsLoading: PropTypes.bool.isRequired, | 65 | areRequiredRequestsLoading: PropTypes.bool.isRequired, |
65 | darkMode: PropTypes.bool.isRequired, | 66 | darkMode: PropTypes.bool.isRequired, |
66 | isDelayAppScreenVisible: PropTypes.bool.isRequired, | 67 | isDelayAppScreenVisible: PropTypes.bool.isRequired, |
68 | isAnnouncementVisible: PropTypes.bool.isRequired, | ||
67 | }; | 69 | }; |
68 | 70 | ||
69 | static defaultProps = { | 71 | static defaultProps = { |
@@ -93,6 +95,7 @@ export default @observer class AppLayout extends Component { | |||
93 | areRequiredRequestsLoading, | 95 | areRequiredRequestsLoading, |
94 | darkMode, | 96 | darkMode, |
95 | isDelayAppScreenVisible, | 97 | isDelayAppScreenVisible, |
98 | isAnnouncementVisible, | ||
96 | } = this.props; | 99 | } = this.props; |
97 | 100 | ||
98 | const { intl } = this.context; | 101 | const { intl } = this.context; |
@@ -166,6 +169,7 @@ export default @observer class AppLayout extends Component { | |||
166 | {isDelayAppScreenVisible && (<DelayApp />)} | 169 | {isDelayAppScreenVisible && (<DelayApp />)} |
167 | <BasicAuth /> | 170 | <BasicAuth /> |
168 | <ShareFranz /> | 171 | <ShareFranz /> |
172 | {isAnnouncementVisible && (<AnnouncementScreen />)} | ||
169 | {services} | 173 | {services} |
170 | </div> | 174 | </div> |
171 | </div> | 175 | </div> |