diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 28 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 2 |
2 files changed, 30 insertions, 0 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index 835fd394b..b4e6e08a1 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -112,6 +112,7 @@ export default @observer class EditSettingsForm extends Component { | |||
112 | isSpellcheckerIncludedInCurrentPlan: PropTypes.bool.isRequired, | 112 | isSpellcheckerIncludedInCurrentPlan: PropTypes.bool.isRequired, |
113 | isTodosEnabled: PropTypes.bool.isRequired, | 113 | isTodosEnabled: PropTypes.bool.isRequired, |
114 | isWorkspaceEnabled: PropTypes.bool.isRequired, | 114 | isWorkspaceEnabled: PropTypes.bool.isRequired, |
115 | server: PropTypes.string.isRequired, | ||
115 | }; | 116 | }; |
116 | 117 | ||
117 | static contextTypes = { | 118 | static contextTypes = { |
@@ -144,6 +145,7 @@ export default @observer class EditSettingsForm extends Component { | |||
144 | isSpellcheckerIncludedInCurrentPlan, | 145 | isSpellcheckerIncludedInCurrentPlan, |
145 | isTodosEnabled, | 146 | isTodosEnabled, |
146 | isWorkspaceEnabled, | 147 | isWorkspaceEnabled, |
148 | server, | ||
147 | } = this.props; | 149 | } = this.props; |
148 | const { intl } = this.context; | 150 | const { intl } = this.context; |
149 | 151 | ||
@@ -187,6 +189,32 @@ export default @observer class EditSettingsForm extends Component { | |||
187 | {isLoggedIn && ( | 189 | {isLoggedIn && ( |
188 | <p>{ intl.formatMessage(messages.serverInfo) }</p> | 190 | <p>{ intl.formatMessage(messages.serverInfo) }</p> |
189 | )} | 191 | )} |
192 | {server === 'https://api.franzinfra.com' && ( | ||
193 | <p | ||
194 | className="settings__message" | ||
195 | style={{ | ||
196 | borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem', | ||
197 | }} | ||
198 | > | ||
199 | <span> | ||
200 | You are using the official Franz Server for Ferdi. | ||
201 | <br /> | ||
202 | We know that Ferdi allows you to use all its features for free but you are | ||
203 | still using Franz's server resources - which Franz's creator has to pay for. | ||
204 | <br /> | ||
205 | Please still consider | ||
206 | {' '} | ||
207 | <a href="https://www.meetfranz.com/pricing" target="_blank">paying for a Franz account</a> | ||
208 | or | ||
209 | {' '} | ||
210 | <a href="https://github.com/vantezzen/ferdi-server" target="_blank">using a self-hosted ferdi-server</a> | ||
211 | {' '} | ||
212 | (if you have the knowledge and resources to do so). | ||
213 | <br /> | ||
214 | By using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development. | ||
215 | </span> | ||
216 | </p> | ||
217 | )} | ||
190 | {isWorkspaceEnabled && ( | 218 | {isWorkspaceEnabled && ( |
191 | <Toggle field={form.$('keepAllWorkspacesLoaded')} /> | 219 | <Toggle field={form.$('keepAllWorkspacesLoaded')} /> |
192 | )} | 220 | )} |
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 09e7b43ab..778b70ad9 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -289,6 +289,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
289 | cacheSize, | 289 | cacheSize, |
290 | updateStatusTypes, | 290 | updateStatusTypes, |
291 | isClearingAllCache, | 291 | isClearingAllCache, |
292 | server, | ||
292 | } = app; | 293 | } = app; |
293 | const { | 294 | const { |
294 | checkForUpdates, | 295 | checkForUpdates, |
@@ -314,6 +315,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
314 | isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan} | 315 | isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan} |
315 | isTodosEnabled={todos.isFeatureActive} | 316 | isTodosEnabled={todos.isFeatureActive} |
316 | isWorkspaceEnabled={workspaces.isFeatureActive} | 317 | isWorkspaceEnabled={workspaces.isFeatureActive} |
318 | server={server || 'https://api.franzinfra.com'} | ||
317 | /> | 319 | /> |
318 | </ErrorBoundary> | 320 | </ErrorBoundary> |
319 | ); | 321 | ); |