Merge branch 'master' into develop

This commit is contained in:
Jan Prochazka 2022-05-21 08:05:39 +02:00
commit ddf186ee6b
4 changed files with 8 additions and 7 deletions

View File

@ -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
@ -141,13 +141,13 @@ 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
```
## 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

View File

@ -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",

View File

@ -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"
},

View File

@ -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;