6 files changed, 292 insertions, 13 deletions

diff --git a/src/containers/settings/AccountScreen.js b/src/containers/settings/AccountScreen.js
index 88ecd55d5..93ab44690 100644
--- a/src/containers/settings/AccountScreen.js
+++ b/src/containers/settings/AccountScreen.js
@@ -28,7 +28,14 @@ export default @inject('stores', 'actions') @observer class AccountScreen extend
   handleWebsiteLink(route) {
     const { actions, stores } = this.props;
 
-    const url = stores.user.getAuthURL(`${WEBSITE}${route}?utm_source=app&utm_medium=account_dashboard`);
+    const api = stores.settings.all.app.server;
+
+    let url;
+    if (api === 'https://api.franzinfra.com') {
+      url = stores.user.getAuthURL(`${WEBSITE}${route}?utm_source=app&utm_medium=account_dashboard`);
+    } else {
+      url = `${api}${route}`;
+    }
 
     actions.app.openExternalUrl({ url });
   }
diff --git a/src/containers/settings/EditServiceScreen.js b/src/containers/settings/EditServiceScreen.js
index e4ff03bb3..d18d7fb9b 100644
--- a/src/containers/settings/EditServiceScreen.js
+++ b/src/containers/settings/EditServiceScreen.js
@@ -92,6 +92,10 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
     intl: intlShape,
   };
 
+  state = {
+    isOpeningDarkModeCss: false,
+  }
+
   onSubmit(data) {
     const { action } = this.props.router.params;
     const { recipes, services } = this.props.stores;
@@ -278,6 +282,28 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
     }
   }
 
+  openDarkmodeCss() {
+    const { openDarkmodeCss } = this.props.actions.service;
+    const { action } = this.props.router.params;
+
+    if (action === 'edit') {
+      this.setState({
+        isOpeningDarkModeCss: true,
+      });
+
+      const { activeSettings: service } = this.props.stores.services;
+      openDarkmodeCss({
+        recipe: service.recipe.id,
+      });
+
+      setTimeout(() => {
+        this.setState({
+          isOpeningDarkModeCss: false,
+        });
+      }, 2500);
+    }
+  }
+
   render() {
     const { recipes, services, user } = this.props.stores;
     const { action } = this.props.router.params;
@@ -329,6 +355,8 @@ export default @inject('stores', 'actions') @observer class EditServiceScreen ex
           isDeleting={services.deleteServiceRequest.isExecuting}
           onSubmit={d => this.onSubmit(d)}
           onDelete={() => this.deleteService()}
+          openDarkmodeCss={() => this.openDarkmodeCss()}
+          isOpeningDarkModeCss={this.state.isOpeningDarkModeCss}
           isProxyFeatureEnabled={proxyFeature.isEnabled}
           isServiceProxyIncludedInCurrentPlan={proxyFeature.isIncludedInCurrentPlan}
           isSpellcheckerIncludedInCurrentPlan={spellcheckerFeature.isIncludedInCurrentPlan}
@@ -356,6 +384,7 @@ EditServiceScreen.wrappedComponent.propTypes = {
       createService: PropTypes.func.isRequired,
       updateService: PropTypes.func.isRequired,
       deleteService: PropTypes.func.isRequired,
+      openDarkmodeCss: PropTypes.func.isRequired,
     }).isRequired,
     // settings: PropTypes.shape({
     //   update: PropTypes.func.isRequred,
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 698b5a3d9..ddee82e45 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -1,3 +1,4 @@
+import { ipcRenderer } from 'electron';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
@@ -9,7 +10,7 @@ import UserStore from '../../stores/UserStore';
 import TodosStore from '../../features/todos/store';
 import Form from '../../lib/Form';
 import { APP_LOCALES, SPELLCHECKER_LOCALES } from '../../i18n/languages';
-import { DEFAULT_APP_SETTINGS } from '../../config';
+import { DEFAULT_APP_SETTINGS, DEFAULT_LOCK_PASSWORD, HIBERNATION_STRATEGIES } from '../../config';
 import { config as spellcheckerConfig } from '../../features/spellchecker';
 
 import { getSelectOptions } from '../../helpers/i18n-helpers';
@@ -17,6 +18,8 @@ import { getSelectOptions } from '../../helpers/i18n-helpers';
 import EditSettingsForm from '../../components/settings/settings/EditSettingsForm';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
 
+import { API, TODOS_FRONTEND } from '../../environment';
+
 import globalMessages from '../../i18n/globalMessages';
 import { DEFAULT_IS_FEATURE_ENABLED_BY_USER } from '../../features/todos';
 import WorkspacesStore from '../../features/workspaces/store';
@@ -25,7 +28,7 @@ import { DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED } from '../../features/works
 const messages = defineMessages({
   autoLaunchOnStart: {
     id: 'settings.app.form.autoLaunchOnStart',
-    defaultMessage: '!!!Launch Franz on start',
+    defaultMessage: '!!!Launch Ferdi on start',
   },
   autoLaunchInBackground: {
     id: 'settings.app.form.autoLaunchInBackground',
@@ -33,15 +36,59 @@ const messages = defineMessages({
   },
   runInBackground: {
     id: 'settings.app.form.runInBackground',
-    defaultMessage: '!!!Keep Franz in background when closing the window',
+    defaultMessage: '!!!Keep Ferdi in background when closing the window',
   },
   enableSystemTray: {
     id: 'settings.app.form.enableSystemTray',
-    defaultMessage: '!!!Show Franz in system tray',
+    defaultMessage: '!!!Show Ferdi in system tray',
   },
   minimizeToSystemTray: {
     id: 'settings.app.form.minimizeToSystemTray',
-    defaultMessage: '!!!Minimize Franz to system tray',
+    defaultMessage: '!!!Minimize Ferdi to system tray',
+  },
+  privateNotifications: {
+    id: 'settings.app.form.privateNotifications',
+    defaultMessage: '!!!Don\'t show message content in notifications',
+  },
+  showServiceNavigationBar: {
+    id: 'settings.app.form.showServiceNavigationBar',
+    defaultMessage: '!!!Always show service navigation bar',
+  },
+  hibernate: {
+    id: 'settings.app.form.hibernate',
+    defaultMessage: '!!!Enable service hibernation',
+  },
+  hibernationStrategy: {
+    id: 'settings.app.form.hibernationStrategy',
+    defaultMessage: '!!!Hibernation strategy',
+  },
+  server: {
+    id: 'settings.app.form.server',
+    defaultMessage: '!!!Server',
+  },
+  todoServer: {
+    id: 'settings.app.form.todoServer',
+    defaultMessage: '!!!Todo Server',
+  },
+  enableLock: {
+    id: 'settings.app.form.enableLock',
+    defaultMessage: '!!!Enable Ferdi password lock',
+  },
+  lockPassword: {
+    id: 'settings.app.form.lockPassword',
+    defaultMessage: '!!!Ferdi Lock password',
+  },
+  scheduledDNDEnabled: {
+    id: 'settings.app.form.scheduledDNDEnabled',
+    defaultMessage: '!!!Enable scheduled Do-not-Disturb',
+  },
+  scheduledDNDStart: {
+    id: 'settings.app.form.scheduledDNDStart',
+    defaultMessage: '!!!From',
+  },
+  scheduledDNDEnd: {
+    id: 'settings.app.form.scheduledDNDEnd',
+    defaultMessage: '!!!To',
   },
   language: {
     id: 'settings.app.form.language',
@@ -51,6 +98,14 @@ const messages = defineMessages({
     id: 'settings.app.form.darkMode',
     defaultMessage: '!!!Dark Mode',
   },
+  universalDarkMode: {
+    id: 'settings.app.form.universalDarkMode',
+    defaultMessage: '!!!Enable universal Dark Mode',
+  },
+  accentColor: {
+    id: 'settings.app.form.accentColor',
+    defaultMessage: '!!!Accent color',
+  },
   showDisabledServices: {
     id: 'settings.app.form.showDisabledServices',
     defaultMessage: '!!!Display disabled services tabs',
@@ -71,6 +126,10 @@ const messages = defineMessages({
     id: 'settings.app.form.beta',
     defaultMessage: '!!!Include beta versions',
   },
+  noUpdates: {
+    id: 'settings.app.form.noUpdates',
+    defaultMessage: '!!!Disable updates',
+  },
   enableTodos: {
     id: 'settings.app.form.enableTodos',
     defaultMessage: '!!!Enable Franz Todos',
@@ -107,19 +166,34 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
         runInBackground: settingsData.runInBackground,
         enableSystemTray: settingsData.enableSystemTray,
         minimizeToSystemTray: settingsData.minimizeToSystemTray,
+        privateNotifications: settingsData.privateNotifications,
+        showServiceNavigationBar: settingsData.showServiceNavigationBar,
+        hibernate: settingsData.hibernate,
+        hibernationStrategy: settingsData.hibernationStrategy,
+        server: settingsData.server,
+        todoServer: settingsData.todoServer,
+        lockingFeatureEnabled: settingsData.lockingFeatureEnabled,
+        lockedPassword: settingsData.lockedPassword,
+        scheduledDNDEnabled: settingsData.scheduledDNDEnabled,
+        scheduledDNDStart: settingsData.scheduledDNDStart,
+        scheduledDNDEnd: settingsData.scheduledDNDEnd,
         enableGPUAcceleration: settingsData.enableGPUAcceleration,
         showDisabledServices: settingsData.showDisabledServices,
         darkMode: settingsData.darkMode,
+        universalDarkMode: settingsData.universalDarkMode,
+        accentColor: settingsData.accentColor,
         showMessageBadgeWhenMuted: settingsData.showMessageBadgeWhenMuted,
         enableSpellchecking: settingsData.enableSpellchecking,
         spellcheckerLanguage: settingsData.spellcheckerLanguage,
         beta: settingsData.beta, // we need this info in the main process as well
+        noUpdates: settingsData.noUpdates, // we need this info in the main process as well
         locale: settingsData.locale, // we need this info in the main process as well
       },
     });
 
     user.update({
       userData: {
+        noUpdates: settingsData.noUpdates,
         beta: settingsData.beta,
         locale: settingsData.locale,
       },
@@ -140,6 +214,10 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
     }
   }
 
+  openProcessManager() {
+    ipcRenderer.send('openProcessManager');
+  }
+
   prepareForm() {
     const {
       app, settings, user, todos, workspaces,
@@ -150,6 +228,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
       locales: APP_LOCALES,
     });
 
+    const hibernationStrategies = getSelectOptions({
+      locales: HIBERNATION_STRATEGIES,
+      sort: false,
+    });
+
     const spellcheckingLanguages = getSelectOptions({
       locales: SPELLCHECKER_LOCALES,
       automaticDetectionText: this.context.intl.formatMessage(globalMessages.spellcheckerAutomaticDetection),
@@ -182,6 +265,65 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: settings.all.app.minimizeToSystemTray,
           default: DEFAULT_APP_SETTINGS.minimizeToSystemTray,
         },
+        privateNotifications: {
+          label: intl.formatMessage(messages.privateNotifications),
+          value: settings.all.app.privateNotifications,
+          default: DEFAULT_APP_SETTINGS.privateNotifications,
+        },
+        showServiceNavigationBar: {
+          label: intl.formatMessage(messages.showServiceNavigationBar),
+          value: settings.all.app.showServiceNavigationBar,
+          default: DEFAULT_APP_SETTINGS.showServiceNavigationBar,
+        },
+        hibernate: {
+          label: intl.formatMessage(messages.hibernate),
+          value: settings.all.app.hibernate,
+          default: DEFAULT_APP_SETTINGS.hibernate,
+        },
+        hibernationStrategy: {
+          label: intl.formatMessage(messages.hibernationStrategy),
+          value: settings.all.app.hibernationStrategy,
+          options: hibernationStrategies,
+          default: DEFAULT_APP_SETTINGS.hibernationStrategy,
+        },
+        server: {
+          label: intl.formatMessage(messages.server),
+          value: settings.all.app.server || API,
+          default: API,
+        },
+        todoServer: {
+          label: intl.formatMessage(messages.todoServer),
+          value: settings.all.app.todoServer,
+          default: TODOS_FRONTEND,
+        },
+        lockingFeatureEnabled: {
+          label: intl.formatMessage(messages.enableLock),
+          value: settings.all.app.lockingFeatureEnabled || false,
+          default: false,
+        },
+        lockedPassword: {
+          label: intl.formatMessage(messages.lockPassword),
+          value: settings.all.app.lockedPassword,
+          default: DEFAULT_LOCK_PASSWORD,
+          type: 'password',
+        },
+        scheduledDNDEnabled: {
+          label: intl.formatMessage(messages.scheduledDNDEnabled),
+          value: settings.all.app.scheduledDNDEnabled || false,
+          default: false,
+        },
+        scheduledDNDStart: {
+          label: intl.formatMessage(messages.scheduledDNDStart),
+          value: settings.all.app.scheduledDNDStart,
+          default: '17:00',
+          type: 'time',
+        },
+        scheduledDNDEnd: {
+          label: intl.formatMessage(messages.scheduledDNDEnd),
+          value: settings.all.app.scheduledDNDEnd,
+          default: '09:00',
+          type: 'time',
+        },
         showDisabledServices: {
           label: intl.formatMessage(messages.showDisabledServices),
           value: settings.all.app.showDisabledServices,
@@ -208,6 +350,16 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: settings.all.app.darkMode,
           default: DEFAULT_APP_SETTINGS.darkMode,
         },
+        universalDarkMode: {
+          label: intl.formatMessage(messages.universalDarkMode),
+          value: settings.all.app.universalDarkMode,
+          default: DEFAULT_APP_SETTINGS.universalDarkMode,
+        },
+        accentColor: {
+          label: intl.formatMessage(messages.accentColor),
+          value: settings.all.app.accentColor,
+          default: DEFAULT_APP_SETTINGS.accentColor,
+        },
         enableGPUAcceleration: {
           label: intl.formatMessage(messages.enableGPUAcceleration),
           value: settings.all.app.enableGPUAcceleration,
@@ -224,6 +376,11 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           value: user.data.beta,
           default: DEFAULT_APP_SETTINGS.beta,
         },
+        noUpdates: {
+          label: intl.formatMessage(messages.noUpdates),
+          value: settings.app.noUpdates,
+          default: DEFAULT_APP_SETTINGS.noUpdates,
+        },
       },
     };
 
@@ -257,6 +414,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
       cacheSize,
       updateStatusTypes,
       isClearingAllCache,
+      lockingFeatureEnabled,
     } = app;
     const {
       checkForUpdates,
@@ -282,6 +440,12 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan}
           isTodosEnabled={todos.isFeatureActive}
           isWorkspaceEnabled={workspaces.isFeatureActive}
+          server={this.props.stores.settings.app.server}
+          lockingFeatureEnabled={lockingFeatureEnabled}
+          noUpdates={this.props.stores.settings.app.noUpdates}
+          hibernationEnabled={this.props.stores.settings.app.hibernate}
+          isDarkmodeEnabled={this.props.stores.settings.app.darkMode}
+          openProcessManager={() => this.openProcessManager()}
         />
       </ErrorBoundary>
     );
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js
index 132820b6f..70b599d9c 100644
--- a/src/containers/settings/RecipesScreen.js
+++ b/src/containers/settings/RecipesScreen.js
@@ -1,4 +1,5 @@
 import { remote, shell } from 'electron';
+import fs from 'fs-extra';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { autorun } from 'mobx';
@@ -12,9 +13,9 @@ import UserStore from '../../stores/UserStore';
 
 import RecipesDashboard from '../../components/settings/recipes/RecipesDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
-import { FRANZ_DEV_DOCS } from '../../config';
-import { gaEvent } from '../../lib/analytics';
+import { FRANZ_DEV_DOCS, RECIPES_PATH } from '../../config';
 import { communityRecipesStore } from '../../features/communityRecipes';
+import RecipePreview from '../../models/RecipePreview';
 
 const { app } = remote;
 
@@ -38,6 +39,14 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
 
   autorunDisposer = null;
 
+  customRecipes = [];
+
+  constructor(props) {
+    super(props);
+
+    this.customRecipes = fs.readJsonSync(path.join(RECIPES_PATH, 'all.json'));
+  }
+
   componentDidMount() {
     this.autorunDisposer = autorun(() => {
       const { filter } = this.props.params;
@@ -68,6 +77,27 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
     }
   }
 
+
+  prepareRecipes(recipes) {
+    return recipes
+    // Filter out duplicate recipes
+      .filter((recipe, index, self) => {
+        const ids = self.map(rec => rec.id);
+        return ids.indexOf(recipe.id) === index;
+
+        // Sort alphabetically
+      }).sort((a, b) => {
+        if (a.id < b.id) { return -1; }
+        if (a.id > b.id) { return 1; }
+        return 0;
+      });
+  }
+
+  // Create an array of RecipePreviews from an array of recipe objects
+  createPreviews(recipes) {
+    return recipes.map(recipe => new RecipePreview(recipe));
+  }
+
   resetSearch() {
     this.setState({ needle: null });
   }
@@ -89,14 +119,25 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
     let recipeFilter;
 
     if (filter === 'all') {
-      recipeFilter = recipePreviews.all;
+      recipeFilter = this.prepareRecipes([
+        ...recipePreviews.all,
+        ...this.createPreviews(this.customRecipes),
+      ]);
     } else if (filter === 'dev') {
       recipeFilter = communityRecipesStore.communityRecipes;
     } else {
       recipeFilter = recipePreviews.featured;
     }
 
-    const allRecipes = this.state.needle ? recipePreviews.searchResults : recipeFilter;
+    const allRecipes = this.state.needle ? this.prepareRecipes([
+      // All search recipes from server
+      ...recipePreviews.searchResults,
+      // All search recipes from local recipes
+      ...this.createPreviews(
+        this.customRecipes
+          .filter(service => service.name.toLowerCase().includes(this.state.needle.toLowerCase())),
+      ),
+    ]) : recipeFilter;
 
     const isLoading = recipePreviews.featuredRecipePreviewsRequest.isExecuting
       || recipePreviews.allRecipePreviewsRequest.isExecuting
@@ -122,11 +163,9 @@ export default @inject('stores', 'actions') @observer class RecipesScreen extend
           recipeDirectory={recipeDirectory}
           openRecipeDirectory={() => {
             shell.openItem(recipeDirectory);
-            gaEvent('Recipe', 'open-recipe-folder', 'Open Folder');
           }}
           openDevDocs={() => {
             appActions.openExternalUrl({ url: FRANZ_DEV_DOCS });
-            gaEvent('Recipe', 'open-dev-docs', 'Developer Documentation');
           }}
           isCommunityRecipesIncludedInCurrentPlan={communityRecipesStore.isCommunityRecipesIncludedInCurrentPlan}
           isUserPremiumUser={user.isPremium}
diff --git a/src/containers/settings/SupportScreen.js b/src/containers/settings/SupportScreen.js
new file mode 100644
index 000000000..34dce1dae
--- /dev/null
+++ b/src/containers/settings/SupportScreen.js
@@ -0,0 +1,36 @@
+import React, { Component } from 'react';
+import { inject } from 'mobx-react';
+import PropTypes from 'prop-types';
+
+import SupportFerdi from '../../components/settings/supportFerdi/SupportFerdiDashboard';
+import ErrorBoundary from '../../components/util/ErrorBoundary';
+
+export default @inject('actions') class SupportScreen extends Component {
+  constructor(props) {
+    super(props);
+
+    this.openLink = this.openLink.bind(this);
+  }
+
+  openLink(url) {
+    this.props.actions.app.openExternalUrl({ url });
+  }
+
+  render() {
+    return (
+      <ErrorBoundary>
+        <SupportFerdi
+          openLink={this.openLink}
+        />
+      </ErrorBoundary>
+    );
+  }
+}
+
+SupportScreen.wrappedComponent.propTypes = {
+  actions: PropTypes.shape({
+    app: PropTypes.shape({
+      openExternalUrl: PropTypes.func.isRequired,
+    }).isRequired,
+  }).isRequired,
+};
diff --git a/src/containers/settings/TeamScreen.js b/src/containers/settings/TeamScreen.js
index f600c9947..d0196923a 100644
--- a/src/containers/settings/TeamScreen.js
+++ b/src/containers/settings/TeamScreen.js
@@ -4,6 +4,7 @@ import { inject, observer } from 'mobx-react';
 
 import UserStore from '../../stores/UserStore';
 import AppStore from '../../stores/AppStore';
+import SettingsStore from '../../stores/SettingsStore';
 
 import TeamDashboard from '../../components/settings/team/TeamDashboard';
 import ErrorBoundary from '../../components/util/ErrorBoundary';
@@ -19,9 +20,10 @@ export default @inject('stores', 'actions') @observer class TeamScreen extends C
   }
 
   render() {
-    const { user } = this.props.stores;
+    const { user, settings } = this.props.stores;
 
     const isLoadingUserInfo = user.getUserInfoRequest.isExecuting;
+    const { server } = settings.app;
 
     return (
       <ErrorBoundary>
@@ -31,6 +33,7 @@ export default @inject('stores', 'actions') @observer class TeamScreen extends C
           retryUserInfoRequest={() => this.reloadData()}
           openTeamManagement={() => this.handleWebsiteLink('/user/team')}
           isProUser={user.isPro}
+          server={server}
         />
       </ErrorBoundary>
     );
@@ -41,6 +44,7 @@ TeamScreen.wrappedComponent.propTypes = {
   stores: PropTypes.shape({
     user: PropTypes.instanceOf(UserStore).isRequired,
     app: PropTypes.instanceOf(AppStore).isRequired,
+    settings: PropTypes.instanceOf(SettingsStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
     payment: PropTypes.shape({