Merge remote-tracking branch 'origin/dev'

# Conflicts:
#	.gitignore
#	README.md
#	http/HTTPClient.js
#	index.html
#	package-lock.json
#	package.json
#	src/ActionStack.js
#	src/ResourceManager.js
#	src/jsmind/src/jsmind.js
#	src/jsmind/src/jsmind.view_provider.js
#	src/main.js

Author: iloveskittles82

.gitignore

@@ -109,6 +109,7 @@ dist
 # Build output
 dist/
 .vite/
+electron-dist/
 
 # vitepress build output
 **/.vitepress/dist
@@ -150,3 +151,6 @@ dist/
 /.idea/modules.xml
 /.idea/vcs.xml
 /JabMap/.idea/
+
+# wrapper tool for trying out jabmap
+/gg.cmd

README.md

@@ -1,38 +1,114 @@
 # JabMap
+
 Next-Generation scientific mind mapping.
 
+
 ## 📸 Screenshots
- <img width="1548" alt="JabMap mainview example" src="https://github.com/user-attachments/assets/69f5de97-3b2d-4ed7-b8f8-050a1559f93b" />
- <img width="1549" alt="JabMap opening a mindmap example" src="https://github.com/user-attachments/assets/23aa56d0-4432-4e5f-957b-8797d36a22fd" />
+
+<img width="1429" alt="JabMap-Example" src="https://github.com/user-attachments/assets/4a175c10-a0eb-438f-b5f6-1dcfb4e2520c" />
+
+
+## ⌨️ Shortcuts
+
+You can find a list of shortcuts at [shortcuts.md](shortcuts.md).
 
 ## 🌟 Try It Out!
-The current state of the application is hosted on [github pages](https://jabref.github.io/jabmap/) for you to try out. Note that saving and loading mind maps does not work when running the app like this. This is because both require communication with the [JabRef's HTTP server](#getting-the-server) which will be restricted by your browser for security reasons. 
 
-## 💾 Installation
-### Building the app
-Currently, there is no production build available for download so you have to build it yourself.
-To do this, you need to have `npm` and `node.js` installed. Installing them with [nvm](https://github.com/nvm-sh/nvm) is the recommended way.
+There are a couple of ways to try out JabMap. The fastest way to just get a grasp of it is on [github pages](https://jabref.github.io/jabmap/). Note that this will merely allow you to create some nodes, edit and tag them. Saving, Loading and JabRef-related features like BibTeX-Nodes and importing attached PDF-files as nodes won't work unless you are running our version of JabRef's HTTP-Server (see [below](##-🤖-getting-the-server-running) for setup) since the mentioned features rely on it.
+
+>Note: It's still possible your browser blocks access to the server due to HTTP/HTTPS issues, for the best experience follow the steps below on how to try JabMap running it locally.
+
+### Running it locally 
+
+The following commands get the code in place and start JabRef and JabMap with the help of a handy wrapper tool called [gg.cmd](https://github.com/eirikb/gg).
+A little terminal magic is required, but don't worry, we have the commands all laid out for you!
+
+#### JabRef:
+
+1. Go to your git-repositories folder and start a new terminal session
+2. `git clone --recurse-submodules https://github.com/JabRef/jabref.git`
+3. `cd jabref`
+4. `git checkout jabmap`
+5. Enable nice wrapper: `curl -L ggcmd.io > gg.cmd`
+6. `sh ./gg.cmd just run-pr 13519`
+7. Wait for JabRef to come up
+8. File > Preferences > Check "HTTP Server"
+
+#### JabMap:
+
+1. Go to your git-repositories folder and start a new terminal session
+2. Clone it: `git clone git@github.com:JabRef/jabmap.git`
+3. `cd jabmap`
+4. Fix branch: `git checkout jabmap`
+5. Enable nice wrapper: `curl -L ggcmd.io > gg.cmd`
+6. Install dependencies: `sh gg.cmd npm install`
+7. Build: `sh ./gg.cmd npm run build`
+8. Run: `sh ./gg.cmd npm run preview`
+9. Now one can open http://localhost:4173/ and open a library with the corresponding map.
+
+
+## 🤖 Getting the server running
+
+As mentioned above, several features are handled by JabRef's HTTP server. Currently you have to start it manually. Luckily, there are multiple ways to do that:
+
+### using gg.cmd
+
+If you followed the steps (**running-it-locally**) above, instead of steps 6. - 9. you can simply do the following to start the server without JabRef's GUI:
+
+```
+sh ./gg.cmd jbang .jbang/JabSrvLauncher.java
+```
+
+### Starting it from an IDE
+
+1. If you haven't already, clone our [JabRef's fork repository](https://github.com/iloveskittles82/jabref) (_Note: It is recommended to complete this step of_ [_JabRef's setup guide_](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-12-build.html)).
+2. Afterwards, open it in editor of your choice (_IDEA works well for this_) and locate the `jabsrv/src/test/rest-api.http` file.
+3. Follow the steps described at the top of the file to start the server.
+
+_Alternatively_ you can do the following:
+1. Open `ServerCLI` file located at `./jabsrv-cli/src/main/java/org.jabref.http.server.cli`
+2. Execute its `main()` method
+
+More about starting the server in [JabRef's server documentation](https://devdocs.jabref.org/code-howtos/http-server.html)
+
+
+## 💾 Install by building the application 
+
+Now that you've tried it, here is how to build and install it. We hope to provide a downloadable installer in the future, but for now you have to build the app yourself. 
+This section is more targeted towards 
+Currently, there is no production build available for download so you have to build it yourself :3
+
+### Basic Setup
+Firstly ensure you have `nvm` (_Node version manager_) and `Node.js` installed:
 
-Installation Guide for Windows and Linux / OS X is available [here](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm).
+1. Open terminal (_you may have to run it with administrator permissions_)
+2. Install `nvm` or update your version by running one of following install scripts in your terminal (more information about these in [nvm documentation](https://github.com/nvm-sh/nvm?tab=readme-ov-file#install--update-script)):
+   - `curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash`
+  
+     or
 
-Then, clone this repository onto your machine and open a terminal session at the project root.
+   - `wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash`
+3. Install `npm` and `node.js` by running `nvm install v24.0.1` (or newer)
+4. At the end, ensure installation was successful by running `npm -v` and `node -v` (_you may need to reboot your system before this step_)
 
-Then, run the following commands:
-1. ```npm install```  - this will install all necessary packages in a `./node_modules` directory. You may run this command to update existing packages.
-2. ```npm run build``` - this will bundle the app and dependencies into a `./dist` directory.
-3. ```npm run preview``` - this will run the preview of the build-output in your browser (_click on the link in the terminal_).
+After you ensured the basic setup is complete, clone this repository onto your machine and open a terminal session at the project root.
 
-Alternatively, you can simply open the `index.html` file (_using IDEA_) in the `./dist` directory after building and choose a browser (_in the top right corner_) to run the application.
+### Building
+Now you should be able to run the following commands:
+1. `npm install`  - this will install / update all necessary packages in a `./node_modules` directory.
+2. `npm run bundle` - this will bundle the project into the `./electron-dist` directory.
 
-### Getting the server
-As mentioned above, saving and loading of mind maps are handled by JabRef's HTTP server. Currently you have to start it manually:
+If bundling fails with `ERROR: Cannot create symbolic link`, you have to do the following:
 
-First clone our [JabRef's fork repository](https://github.com/iloveskittles82/jabref) (_Note: It is recommended to complete this step of_ [_JabRef's setup guide_](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-12-build.html)).
+3. Download the `winCodeSign` package using [this link](https://github.com/electron-userland/electron-builder-binaries/releases/download/winCodeSign-2.6.0/winCodeSign-2.6.0.7z).
+4. Extract downloaded archive into `C:\Users\<YourUserName>\AppData\Local\electron-builder\Cache\winCodeSign\winCodeSign-2.6.0\`
+5. Retry running the `npm run bundle` command
 
-After you cloned the repository, open it in editor of your choice (_IDEA works well for this_) and locate the `jabsrv/src/test/rest-api.http` file.
+_More about this workaround in [this issue](https://github.com/electron-userland/electron-builder/issues/8149)_.
 
-Follow the steps described at the top of the file to start the server.
+On Linux and Mac, there is a bug with npm and optional dependencies (See [this issue](https://github.com/npm/cli/issues/4828). Should you encounter this bug after running `npm install`, remove the `package-lock.json` file and `node-modules` directory and run `npm i`. Then, simply continue with step 2.
 
-_Alternatively_ you can start it with the `main()` method of `org.jabref.http.server.cli.ServerCli` package located at `./jabsrv-cli.src.main.java`.
+### Starting
+After a successful build you can finally start the app located at `./electron-dist/win-unpacked/JabMap.exe`.
 
-More about starting the server in [JabRef's server documentation](https://devdocs.jabref.org/code-howtos/http-server.html)
+_Optionally you can install it by opening_ `./electron-dist/JabMap Setup 1.0.0.exe`