From d6bb6aebb9f4604841fdd441e1b809d2495dbfbf Mon Sep 17 00:00:00 2001 From: vantezzen Date: Mon, 16 Sep 2019 13:53:26 +0200 Subject: Add information about donating to Franz --- .../settings/settings/EditSettingsForm.js | 28 ++++++++++++++++++++++ src/containers/settings/EditSettingsScreen.js | 2 ++ 2 files changed, 30 insertions(+) (limited to 'src') 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 { isSpellcheckerIncludedInCurrentPlan: PropTypes.bool.isRequired, isTodosEnabled: PropTypes.bool.isRequired, isWorkspaceEnabled: PropTypes.bool.isRequired, + server: PropTypes.string.isRequired, }; static contextTypes = { @@ -144,6 +145,7 @@ export default @observer class EditSettingsForm extends Component { isSpellcheckerIncludedInCurrentPlan, isTodosEnabled, isWorkspaceEnabled, + server, } = this.props; const { intl } = this.context; @@ -187,6 +189,32 @@ export default @observer class EditSettingsForm extends Component { {isLoggedIn && (

{ intl.formatMessage(messages.serverInfo) }

)} + {server === 'https://api.franzinfra.com' && ( +

+ + You are using the official Franz Server for Ferdi. +
+ We know that Ferdi allows you to use all its features for free but you are + still using Franz's server resources - which Franz's creator has to pay for. +
+ Please still consider + {' '} + paying for a Franz account + or + {' '} + using a self-hosted ferdi-server + {' '} + (if you have the knowledge and resources to do so). +
+ By using Ferdi, you still profit greatly from Franz's recipe store, server resources and its development. +
+

+ )} {isWorkspaceEnabled && ( )} 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 cacheSize, updateStatusTypes, isClearingAllCache, + server, } = app; const { checkForUpdates, @@ -314,6 +315,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan} isTodosEnabled={todos.isFeatureActive} isWorkspaceEnabled={workspaces.isFeatureActive} + server={server || 'https://api.franzinfra.com'} /> ); -- cgit v1.2.3-70-g09d2