refactor: path-references refactoring and using 'import' instead of 'require' (#1752)

* refactor references to 'userData' and 'appData' directories to move hardcoding into single location
* convert to es6 for lower memory usage as per https://codesource.io/the-difference-between-import-and-require-in-javascript/

2 files changed, 2 insertions, 11 deletions

diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index 4edbde5e2..3b499a5db 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { observer } from 'mobx-react';
 import { observable, reaction } from 'mobx';
 import ElectronWebView from 'react-electron-web-view';
-import path from 'path';
+import { join } from 'path';
 
 import ServiceModel from '../../../models/Service';
 
@@ -59,7 +59,7 @@ class ServiceWebview extends Component {
       isSpellcheckerEnabled,
     } = this.props;
 
-    const preloadScript = path.join(__dirname, '../../../', 'webview', 'recipe.js');
+    const preloadScript = join(__dirname, '..', '..', '..', 'webview', 'recipe.js');
 
     return (
       <ElectronWebView
diff --git a/src/components/services/tabs/TabBarSortableList.js b/src/components/services/tabs/TabBarSortableList.js
index f12d90602..117d799d7 100644
--- a/src/components/services/tabs/TabBarSortableList.js
+++ b/src/components/services/tabs/TabBarSortableList.js
@@ -64,15 +64,6 @@ class TabBarSortableList extends Component {
             showMessageBadgesEvenWhenMuted={showMessageBadgesEvenWhenMuted}
           />
         ))}
-        {/* <li>
-          <button
-            className="sidebar__add-service"
-            onClick={() => openSettings({ path: 'recipes' })}
-            data-tip={`${intl.formatMessage(messages.addNewService)} (${ctrlKey}+N)`}
-          >
-            <span className="mdi mdi-plus" />
-          </button>
-        </li> */}
       </ul>
     );
   }