Merge remote-tracking branch 'origin/develop' into release

7 files changed, 58 insertions, 19 deletions

diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index d5e1deb39..00d7a759b 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -7,7 +7,6 @@ import injectSheet from 'react-jss';
 
 import InfoBar from '../ui/InfoBar';
 import { Component as BasicAuth } from '../../features/basicAuth';
-import { Component as ShareFranz } from '../../features/shareFranz';
 import { Component as QuickSwitch } from '../../features/quickSwitch';
 import { Component as NightlyBuilds } from '../../features/nightlyBuilds';
 import { Component as PublishDebugInfo } from '../../features/publishDebugInfo';
@@ -204,7 +203,6 @@ class AppLayout extends Component {
                 />
               )}
               <BasicAuth />
-              <ShareFranz />
               <QuickSwitch />
               <NightlyBuilds />
               <PublishDebugInfo />
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index daa5642c3..a9fb73f33 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -216,8 +216,7 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
           className="sidebar__button sidebar__button--settings"
           data-tip={`${intl.formatMessage(messages.settings)} (${settingsShortcutKey(false)})`}
         >
-          {/* TODO: Because of https://github.com/Templarian/MaterialDesign-Webfont/issues/81 bug in @mdi/font in 5.9.55, added `mdi-memory` as a fallback */}
-          <i className="mdi mdi-settings mdi-memory" />
+          <i className="mdi mdi-cog" />
           { (this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.AVAILABLE
             || this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.DOWNLOADED) && (
             <span className="update-available">
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 3b499a5db..c0f48793a 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -24,7 +24,9 @@ class ServiceWebview extends Component {
     super(props);
 
     reaction(
-      () => this.webview,
+      () => (
+        this.webview
+      ),
       () => {
         if (this.webview && this.webview.view) {
           this.webview.view.addEventListener('console-message', (e) => {
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js
index 6a6d2c8c5..6ad925670 100644
--- a/src/components/services/tabs/TabItem.js
+++ b/src/components/services/tabs/TabItem.js
@@ -10,7 +10,7 @@ import ms from 'ms';
 
 import { observable, autorun } from 'mobx';
 import ServiceModel from '../../../models/Service';
-import { shortcutKey } from '../../../environment';
+import { cmdOrCtrlShortcutKey } from '../../../environment';
 
 const IS_SERVICE_DEBUGGING_ENABLED = (
   localStorage.getItem('debug') || ''
@@ -201,7 +201,7 @@ class TabItem extends Component {
       {
         label: intl.formatMessage(messages.reload),
         click: reload,
-        accelerator: `${shortcutKey()}+R`,
+        accelerator: `${cmdOrCtrlShortcutKey()}+R`,
       },
       {
         label: intl.formatMessage(messages.edit),
@@ -307,7 +307,7 @@ class TabItem extends Component {
         onClick={clickHandler}
         onContextMenu={() => menu.popup(getCurrentWindow())}
         data-tip={`${service.name} ${
-          shortcutIndex <= 9 ? `(${shortcutKey(false)}+${shortcutIndex})` : ''
+          shortcutIndex <= 9 ? `(${cmdOrCtrlShortcutKey(false)}+${shortcutIndex})` : ''
         }`}
       >
         <img src={service.icon} className="tab-item__icon" alt="" />
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 87a4ada27..41580ca78 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -1,4 +1,4 @@
-import { app, systemPreferences } from '@electron/remote';
+import { systemPreferences } from '@electron/remote';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
@@ -12,11 +12,9 @@ import ToggleRaw from '../../ui/ToggleRaw';
 import Select from '../../ui/Select';
 import Input from '../../ui/Input';
 
-import {
-  FRANZ_TRANSLATION,
-  GITHUB_FRANZ_URL,
-} from '../../../config';
-import { DEFAULT_APP_SETTINGS, isMac, isWindows, lockFerdiShortcutKey } from '../../../environment';
+import { FRANZ_TRANSLATION, GITHUB_FRANZ_URL } from '../../../config';
+import { DEFAULT_APP_SETTINGS, ferdiVersion, isMac, isWindows, lockFerdiShortcutKey, userDataPath, userDataRecipesPath } from '../../../environment';
+import { openPath } from '../../../helpers/url-helpers';
 import globalMessages from '../../../i18n/globalMessages';
 
 const messages = defineMessages({
@@ -116,6 +114,18 @@ const messages = defineMessages({
     id: 'settings.app.buttonClearAllCache',
     defaultMessage: '!!!Clear cache',
   },
+  subheadlineFerdiProfile: {
+    id: 'settings.app.subheadlineFerdiProfile',
+    defaultMessage: '!!!Ferdi Profile',
+  },
+  buttonOpenFerdiProfileFolder: {
+    id: 'settings.app.buttonOpenFerdiProfileFolder',
+    defaultMessage: '!!!Open Profile folder',
+  },
+  buttonOpenFerdiServiceRecipesFolder: {
+    id: 'settings.app.buttonOpenFerdiServiceRecipesFolder',
+    defaultMessage: '!!!Open Service Recipes folder',
+  },
   buttonSearchForUpdate: {
     id: 'settings.app.buttonSearchForUpdate',
     defaultMessage: '!!!Check for updates',
@@ -259,6 +269,9 @@ export default @observer class EditSettingsForm extends Component {
       }
     }
 
+    const profileFolder = userDataPath();
+    const recipeFolder = userDataRecipesPath();
+
     return (
       <div className="settings__main">
         <div className="settings__header">
@@ -631,6 +644,30 @@ export default @observer class EditSettingsForm extends Component {
                     />
                   </p>
                 </div>
+
+                <Hr />
+
+                <div className="settings__settings-group">
+                  <h3>
+                    {intl.formatMessage(messages.subheadlineFerdiProfile)}
+                  </h3>
+                  <p>
+                    <div className="settings__open-settings-file-container">
+                      <Button
+                        buttonType="secondary"
+                        label={intl.formatMessage(messages.buttonOpenFerdiProfileFolder)}
+                        className="settings__open-settings-file-button"
+                        onClick={() => openPath(profileFolder)}
+                      />
+                      <Button
+                        buttonType="secondary"
+                        label={intl.formatMessage(messages.buttonOpenFerdiServiceRecipesFolder)}
+                        className="settings__open-settings-file-button"
+                        onClick={() => openPath(recipeFolder)}
+                      />
+                    </div>
+                  </p>
+                </div>
               </div>
             )}
 
@@ -669,7 +706,7 @@ export default @observer class EditSettingsForm extends Component {
               )}
               {intl.formatMessage(messages.currentVersion)}
               {' '}
-              {app.getVersion()}
+              {ferdiVersion}
               {noUpdateAvailable && (
               <>
                 <br />
diff --git a/src/components/ui/AppLoader/index.js b/src/components/ui/AppLoader/index.js
index 31d7ca249..bbfd5de28 100644
--- a/src/components/ui/AppLoader/index.js
+++ b/src/components/ui/AppLoader/index.js
@@ -8,6 +8,7 @@ import { shuffleArray } from '../../../helpers/array-helpers';
 
 import styles from './styles';
 
+// TODO: Need to externalize for i18n
 const textList = shuffleArray([
   'Adding free features',
   'Making application usable',
diff --git a/src/components/ui/Link.js b/src/components/ui/Link.js
index fd14b7018..003211e5c 100644
--- a/src/components/ui/Link.js
+++ b/src/components/ui/Link.js
@@ -1,4 +1,3 @@
-import { shell } from 'electron';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { inject, observer } from 'mobx-react';
@@ -7,15 +6,18 @@ import classnames from 'classnames';
 
 import { oneOrManyChildElements } from '../../prop-types';
 import { matchRoute } from '../../helpers/routing-helpers';
+import { openExternalUrl } from '../../helpers/url-helpers';
 
 // TODO: create container component for this component
 export default @inject('stores') @observer class Link extends Component {
   onClick(e) {
-    if (this.props.disabled) e.preventDefault();
-    else if (this.props.target === '_blank') {
+    if (this.props.disabled) {
       e.preventDefault();
-      shell.openExternal(this.props.to);
+    } else if (this.props.target === '_blank') {
+      e.preventDefault();
+      openExternalUrl(this.props.to, true);
     }
+    // Note: if neither of the above, then let the other onClick handlers process it
   }
 
   render() {