diff options
-rw-r--r-- | .eslintignore | 2 | ||||
-rw-r--r-- | .gitmodules | 4 | ||||
-rw-r--r-- | src/electron/ipc-api/localServer.js | 9 | ||||
-rw-r--r-- | src/features/appearance/index.js | 4 | ||||
m--------- | src/internal-server (renamed from src/server) | 0 |
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 @@ | |||
1 | build/ | 1 | build/ |
2 | out/ | 2 | out/ |
3 | packages/*/lib | 3 | packages/*/lib |
4 | src/server | 4 | src/internal-server |
5 | recipes/ \ No newline at end of file | 5 | 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 @@ | |||
3 | url = https://github.com/getferdi/recipes.git | 3 | url = https://github.com/getferdi/recipes.git |
4 | ignore = all | 4 | ignore = all |
5 | branch = master | 5 | branch = master |
6 | [submodule "src/server"] | 6 | [submodule "src/internal-server"] |
7 | path = src/server | 7 | path = src/internal-server |
8 | url = https://github.com/getferdi/internal-server.git | 8 | url = https://github.com/getferdi/internal-server.git |
9 | ignore = all | 9 | ignore = all |
10 | branch = master | 10 | 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 @@ | |||
1 | import { ipcMain, app } from 'electron'; | 1 | import { ipcMain, app } from 'electron'; |
2 | import net from 'net'; | 2 | import net from 'net'; |
3 | import startServer from '../../server/start'; | 3 | import startServer from '../../internal-server/start'; |
4 | 4 | ||
5 | const DEFAULT_PORT = 45569; | 5 | const DEFAULT_PORT = 45569; |
6 | 6 | ||
@@ -31,15 +31,12 @@ export default (params) => { | |||
31 | let port = DEFAULT_PORT; | 31 | let port = DEFAULT_PORT; |
32 | (async () => { | 32 | (async () => { |
33 | // eslint-disable-next-line no-await-in-loop | 33 | // eslint-disable-next-line no-await-in-loop |
34 | while (await portInUse(port) && port < DEFAULT_PORT + 10) { | 34 | while ((await portInUse(port)) && port < DEFAULT_PORT + 10) { |
35 | port += 1; | 35 | port += 1; |
36 | } | 36 | } |
37 | console.log('Starting local server on port', port); | 37 | console.log('Starting local server on port', port); |
38 | 38 | ||
39 | startServer( | 39 | startServer(app.getPath('userData'), port); |
40 | app.getPath('userData'), | ||
41 | port, | ||
42 | ); | ||
43 | 40 | ||
44 | params.mainWindow.webContents.send('localServerPort', { | 41 | params.mainWindow.webContents.send('localServerPort', { |
45 | port, | 42 | 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) { | |||
54 | .tab-item .tab-item__icon { | 54 | .tab-item .tab-item__icon { |
55 | width: ${width / 2}px !important; | 55 | width: ${width / 2}px !important; |
56 | } | 56 | } |
57 | ` | 57 | `; |
58 | } | 58 | } |
59 | 59 | ||
60 | function generateStyle(settings) { | 60 | function generateStyle(settings) { |
@@ -62,7 +62,7 @@ function generateStyle(settings) { | |||
62 | 62 | ||
63 | const { | 63 | const { |
64 | accentColor, | 64 | accentColor, |
65 | serviceRibbonWidth | 65 | serviceRibbonWidth, |
66 | } = settings; | 66 | } = settings; |
67 | 67 | ||
68 | if (accentColor !== DEFAULT_APP_SETTINGS.accentColor) { | 68 | if (accentColor !== DEFAULT_APP_SETTINGS.accentColor) { |
diff --git a/src/server b/src/internal-server | |||
Subproject cca6cd984caf729722153e58f44c01319c4bd63 | Subproject cca6cd984caf729722153e58f44c01319c4bd63 | ||