From 23546468bc0c7f9839387ebf06367f20d4a12652 Mon Sep 17 00:00:00 2001 From: Scott Usnick Date: Thu, 19 May 2022 19:03:31 -0400 Subject: [PATCH 1/4] change to port 5001 as 5000 conflicts on macos with ControlCenter --- app/package.json | 2 +- packages/web/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/package.json b/app/package.json index 7a3a3b19..c5ae19e7 100644 --- a/app/package.json +++ b/app/package.json @@ -94,7 +94,7 @@ }, "homepage": "./", "scripts": { - "start": "cross-env ELECTRON_START_URL=http://localhost:5000 DEVMODE=1 electron .", + "start": "cross-env ELECTRON_START_URL=http://localhost:5001 DEVMODE=1 electron .", "start:local": "cross-env electron .", "dist": "electron-builder", "build": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn dist", diff --git a/packages/web/package.json b/packages/web/package.json index 7c245d46..55bed069 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -4,7 +4,7 @@ "scripts": { "build": "rollup -c", "dev": "cross-env API_URL=http://localhost:3000 rollup -c -w", - "start": "sirv public", + "start": "sirv public --port 5001", "validate": "svelte-check", "prepublishOnly": "yarn build" }, From 07060218b1ba7bbc14b941e484aabb044b9a058a Mon Sep 17 00:00:00 2001 From: Scott Usnick Date: Thu, 19 May 2022 19:08:04 -0400 Subject: [PATCH 2/4] update readme for new port --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 155825bc..5570173b 100644 --- a/README.md +++ b/README.md @@ -126,11 +126,11 @@ yarn # install NPM packages And than run following 3 commands concurrently in 3 terminals: ``` yarn start:api # run API on port 3000 -yarn start:web # run web on port 5000 +yarn start:web # run web on port 5001 yarn lib # watch typescript libraries and plugins modifications ``` -This runs API on port 3000 and web application on port 5000 -Open http://localhost:5000 in your browser +This runs API on port 3000 and web application on port 5001 +Open http://localhost:5001 in your browser If you want to run electron app: ```sh @@ -147,7 +147,7 @@ yarn start:app # run electron app ``` ## How to run built electron app locally -This mode is very similar to production run of electron app. Electron doesn't use localhost:5000. +This mode is very similar to production run of electron app. Electron doesn't use localhost:5001. ```sh cd app From 140e05bc8560a3090f9b39690b7bab911f48373d Mon Sep 17 00:00:00 2001 From: Scott Usnick Date: Thu, 19 May 2022 19:27:26 -0400 Subject: [PATCH 3/4] allow drag on macos using the menu sidebar --- packages/web/src/Screen.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/web/src/Screen.svelte b/packages/web/src/Screen.svelte index 7db86775..8754a88f 100644 --- a/packages/web/src/Screen.svelte +++ b/packages/web/src/Screen.svelte @@ -115,6 +115,7 @@ bottom: var(--dim-statusbar-height); width: var(--dim-widget-icon-size); background: var(--theme-bg-inv-1); + -webkit-app-region: drag; } .statusbar { position: fixed; From 5a54af71a8825076d976fad319afb3b9ff4a247f Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 21 May 2022 07:51:30 +0200 Subject: [PATCH 4/4] port docs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5570173b..9e2e3f55 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ yarn # install NPM packages for electron And than run following 3 commands concurrently in 3 terminals: ``` -yarn start:web # run web on port 5000 (only static JS and HTML files) +yarn start:web # run web on port 5001 (only static JS and HTML files) yarn lib # watch typescript libraries and plugins modifications yarn start:app # run electron app ```