From d764e6e29e19c50a4e285df41289774ec80a9bbb Mon Sep 17 00:00:00 2001
From: Amine Mouafik <amine@mouafik.fr>
Date: Fri, 29 Nov 2019 01:03:19 +0700
Subject: Rename server to internal-server to avoid confusion

---
 src/electron/ipc-api/localServer.js | 9 +++------
 src/features/appearance/index.js    | 4 ++--
 src/internal-server                 | 1 +
 src/server                          | 1 -
 4 files changed, 6 insertions(+), 9 deletions(-)
 create mode 160000 src/internal-server
 delete mode 160000 src/server

(limited to 'src')

diff --git a/src/electron/ipc-api/localServer.js b/src/electron/ipc-api/localServer.js
index d12fb5708..9b800fdf6 100644
--- a/src/electron/ipc-api/localServer.js
+++ b/src/electron/ipc-api/localServer.js
@@ -1,6 +1,6 @@
 import { ipcMain, app } from 'electron';
 import net from 'net';
-import startServer from '../../server/start';
+import startServer from '../../internal-server/start';
 
 const DEFAULT_PORT = 45569;
 
@@ -31,15 +31,12 @@ export default (params) => {
       let port = DEFAULT_PORT;
       (async () => {
         // eslint-disable-next-line no-await-in-loop
-        while (await portInUse(port) && port < DEFAULT_PORT + 10) {
+        while ((await portInUse(port)) && port < DEFAULT_PORT + 10) {
           port += 1;
         }
         console.log('Starting local server on port', port);
 
-        startServer(
-          app.getPath('userData'),
-          port,
-        );
+        startServer(app.getPath('userData'), port);
 
         params.mainWindow.webContents.send('localServerPort', {
           port,
diff --git a/src/features/appearance/index.js b/src/features/appearance/index.js
index cd4d60c20..8a81054df 100644
--- a/src/features/appearance/index.js
+++ b/src/features/appearance/index.js
@@ -54,7 +54,7 @@ function generateServiceRibbonWidthStyle(width) {
     .tab-item .tab-item__icon {
       width: ${width / 2}px !important;
     }
-  `
+  `;
 }
 
 function generateStyle(settings) {
@@ -62,7 +62,7 @@ function generateStyle(settings) {
 
   const {
     accentColor,
-    serviceRibbonWidth
+    serviceRibbonWidth,
   } = settings;
 
   if (accentColor !== DEFAULT_APP_SETTINGS.accentColor) {
diff --git a/src/internal-server b/src/internal-server
new file mode 160000
index 000000000..cca6cd984
--- /dev/null
+++ b/src/internal-server
@@ -0,0 +1 @@
+Subproject commit cca6cd984caf729722153e58f44c01319c4bd633
diff --git a/src/server b/src/server
deleted file mode 160000
index cca6cd984..000000000
--- a/src/server
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cca6cd984caf729722153e58f44c01319c4bd633
-- 
cgit v1.2.3-70-g09d2