From 5893fd4fe7a97448d4edd38761aa10f17014d04c Mon Sep 17 00:00:00 2001
From: Marouane Rassili <mrassili@aol.com>
Date: Sun, 29 Mar 2020 12:20:44 +0100
Subject: Remove server setting from settings screen

---
 .../settings/settings/EditSettingsForm.js          | 64 ----------------------
 1 file changed, 64 deletions(-)

(limited to 'src/components')

diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 9564d837b..5478ce8bf 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -18,15 +18,6 @@ const {
   systemPreferences,
 } = remote;
 
-function escapeHtml(unsafe) {
-  return unsafe
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&#039;');
-}
-
 const messages = defineMessages({
   headline: {
     id: 'settings.app.headline',
@@ -48,14 +39,6 @@ const messages = defineMessages({
     id: 'settings.app.inactivityLockInfo',
     defaultMessage: '!!!Minutes of inactivity, after which Ferdi should automatically lock. Use 0 to disable',
   },
-  serverInfo: {
-    id: 'settings.app.serverInfo',
-    defaultMessage: '!!!We advice you to logout after changing your server as your settings might not be saved otherwise.',
-  },
-  serverMoneyInfo: {
-    id: 'settings.app.serverMoneyInfo',
-    defaultMessage: '!!!You are using the official Franz Server for Ferdi.\nWe 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.\nPlease still consider [Link 1]paying for a Franz account[/Link] or [Link 2]using a self-hosted ferdi-server[/Link] (if you have the knowledge and resources to do so). \nBy using Ferdi, you still profit greatly from Franz\'s recipe store, server resources and its development.',
-  },
   todoServerInfo: {
     id: 'settings.app.todoServerInfo',
     defaultMessage: '!!!This server will be used for the "Franz Todo" feature. (default: https://app.franztodos.com)',
@@ -174,7 +157,6 @@ export default @observer class EditSettingsForm extends Component {
     isSpellcheckerIncludedInCurrentPlan: PropTypes.bool.isRequired,
     isTodosEnabled: PropTypes.bool.isRequired,
     isWorkspaceEnabled: PropTypes.bool.isRequired,
-    server: PropTypes.string.isRequired,
     noUpdates: PropTypes.bool.isRequired,
     hibernationEnabled: PropTypes.bool.isRequired,
     isDarkmodeEnabled: PropTypes.bool.isRequired,
@@ -214,7 +196,6 @@ export default @observer class EditSettingsForm extends Component {
       isSpellcheckerIncludedInCurrentPlan,
       isTodosEnabled,
       isWorkspaceEnabled,
-      server,
       noUpdates,
       hibernationEnabled,
       isDarkmodeEnabled,
@@ -232,8 +213,6 @@ export default @observer class EditSettingsForm extends Component {
       updateButtonLabelMessage = messages.buttonSearchForUpdate;
     }
 
-    const isLoggedIn = Boolean(localStorage.getItem('authToken'));
-
     const {
       lockingFeatureEnabled,
       scheduledDNDEnabled,
@@ -287,53 +266,10 @@ export default @observer class EditSettingsForm extends Component {
 
             <Hr />
 
-            <Input
-              placeholder="Server"
-              onChange={e => this.submit(e)}
-              field={form.$('server')}
-              autoFocus
-            />
-            {isLoggedIn && (
-              <p
-                className="settings__message"
-                style={{
-                  borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
-                }}
-              >
-                { intl.formatMessage(messages.serverInfo) }
-              </p>
-            )}
-            {server === 'https://api.franzinfra.com' && (
-              <p
-                className="settings__message"
-                style={{
-                  borderTop: 0, marginTop: 0, paddingTop: 0, marginBottom: '2rem',
-                }}
-              >
-                <span
-                  dangerouslySetInnerHTML={{
-                    __html:
-                  // Needed to make links work
-                  escapeHtml(
-                    intl.formatMessage(messages.serverMoneyInfo),
-                  ).replace('[Link 1]', '<a href="https://www.meetfranz.com/pricing" target="_blank">')
-                    .replace('[Link 2]', '<a href="https://github.com/getferdi/server" target="_blank">')
-                    .replace(/\[\/Link]/g, '</a>'),
-                  }}
-                  style={{
-                    whiteSpace: 'pre-wrap',
-                  }}
-                />
-              </p>
-            )}
-
-            <Hr />
-
             {isWorkspaceEnabled && (
               <Toggle field={form.$('keepAllWorkspacesLoaded')} />
             )}
 
-
             <Hr />
 
             {isTodosEnabled && (
-- 
cgit v1.2.3-54-g00ecf