Rename server to internal-server to avoid confusion

5 files changed, 8 insertions, 11 deletions

diff --git a/.eslintignore b/.eslintignore
index 00ae892aa..52fde4c3e 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,5 @@
 build/
 out/
 packages/*/lib
-src/server
+src/internal-server
 recipes/
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 78e0c5221..81b6b6246 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,8 +3,8 @@
         url = https://github.com/getferdi/recipes.git
         ignore = all
         branch = master
-[submodule "src/server"]
-        path = src/server
+[submodule "src/internal-server"]
+        path = src/internal-server
         url = https://github.com/getferdi/internal-server.git
         ignore = all
         branch = master
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/server b/src/internal-server
-Subproject cca6cd984caf729722153e58f44c01319c4bd63
+Subproject cca6cd984caf729722153e58f44c01319c4bd63