Merge v0.2.1-1

.env.default

@@ -41,4 +41,6 @@ POSTGRES_STATEMENT_TIMEOUT=100000
 
 DELETE_AFTER_DAYS=30
 
-DEV_BUILD_CONTEXT=
+DEV_BUILD_CONTEXT=
+
+JWT_SECRET=

.github/dependabot.yml

@@ -6,13 +6,17 @@
 version: 2
 updates:
   - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/teammapper-backend" # Location of package manifests
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/teammapper-frontend" # Location of package manifests
+    directory: "/"
     schedule:
       interval: "weekly"
+    open-pull-requests-limit: 15
+    groups:
+      production-dependencies:
+        dependency-type: "production"
+        update-types: ["minor", "patch"]
+      development-dependencies:
+        dependency-type: "development"
+        update-types: ["minor", "patch"]
   - package-ecosystem: "docker" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
@@ -21,4 +25,3 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
-

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
                   username: ${{ github.repository_owner }}
                   password: ${{ secrets.GITHUB_TOKEN }}
 
-            - uses: actions/setup-node@v5
+            - uses: actions/setup-node@v6
               with:
                 node-version: '22'
 
@@ -48,7 +48,7 @@ jobs:
         steps:
             - uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v5
+            - uses: actions/setup-node@v6
               with:
                 node-version: '22'
 
@@ -64,7 +64,7 @@ jobs:
         steps:
             - uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v5
+            - uses: actions/setup-node@v6
               with:
                 node-version: '22'
 
@@ -80,7 +80,7 @@ jobs:
         steps:
             - uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v5
+            - uses: actions/setup-node@v6
               with:
                 node-version: '22'
 
@@ -97,7 +97,7 @@ jobs:
         steps:
             - uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v5
+            - uses: actions/setup-node@v6
               with:
                 node-version: '22'
 
@@ -126,7 +126,7 @@ jobs:
         steps:
             - uses: actions/checkout@v4
 
-            - uses: actions/setup-node@v5
+            - uses: actions/setup-node@v6
               with:
                 node-version: '22'
 
@@ -154,7 +154,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4
-            - uses: actions/setup-node@v5
+            - uses: actions/setup-node@v6
               with:
                 node-version: '22'
 

.github/workflows/playwright.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: actions/setup-node@v5
+    - uses: actions/setup-node@v6
       with:
         node-version: lts/*
     - run: corepack enable
@@ -53,5 +53,5 @@ jobs:
       if: ${{ !cancelled() }}
       with:
         name: playwright
-        path: playwright
+        path: teammapper-frontend/playwright
         retention-days: 7

README.md

@@ -1,5 +1,5 @@
-
 # TeamMapper
+
 ![TeamMapper Screenshot](docs/teammapper-logo.png "TeamMapper Logo")
 
 Mindmapping made simple: Host and create your own mindmaps. Share your mindmap sessions with your team and collaborate on mindmaps.
@@ -11,7 +11,7 @@ TeamMapper is based on mindmapp (https://github.com/cedoor/mindmapp , discontinu
 ## Features:
 
 -   **Creation**: Host and create your own mindmaps
--   **Customization**: Add images, pictograms*, colors, font properties and links to nodes
+-   **Customization**: Add images, pictograms\*, colors, font properties and links to nodes
 -   **Collaboration**: Share your mindmap with friends and collegues, using either a view-only or modification invite!
 -   **Interoperability**: Import and export functionality (JSON, Mermaid, SVG, PDF, PNG...)
 -   **Shareability**: Use a QR Code or URL to share your maps
@@ -128,6 +128,7 @@ For examples with a reverse proxy, see [documentation about deployment](docs/dep
     ```
 
 ### Production
+
 -   Duplicate and rename `.env.default`
 
     ```bash
@@ -162,13 +163,15 @@ For examples with a reverse proxy, see [documentation about deployment](docs/dep
     ```bash
     docker compose --file docker-compose-prod.yml --env-file .env.prod down -v
     ```
-    
+
     If you want to run prod migrations (again):
 
     ```bash
     docker compose exec app_prod pnpm --filter teammapper-backend run prod:typeorm:migrate
     ```
+
 #### Postgres and SSL
+
 If needed, you can make the connection to Postgres more secure by using a SSL connection.
 
 -   Generate self-signed ssl sertificate for the postgres server on the host machine; the generated files are mounted into the docker container
@@ -206,10 +209,32 @@ Example of running sql via typeorm:
 docker compose --file docker-compose-prod.yml --env-file .env.prod exec app_prod pnpm --filter teammapper-backend exec typeorm query "select * from mmp_node" --dataSource ./dist/data-source.js
 ```
 
-### Frontend feature flags
-See file /teammapper-frontend/src/envrionments/environment.prod.ts to configure feature flags:
-- `featureFlagPictograms`: Disables/Enables the pictogram feature (default: disabled). Note: You have to set this flag before build time!
-- `featureFlagAI`: Disables/Enables AI functionality like generating mindmaps with AI
+### Default Settings
+
+The following files contain configurations for default settings:
+
+1. `/teammapper-backend/config/settings.dev.json`
+
+    - Contains the default values for development mode
+
+2. `/teammapper-backend/config/settings.prod.json`
+
+    - Contains the default values for production mode
+    - Changes here require rebuilding the Docker image
+
+3. `/config/settings.override.json`
+    - Values defined in `settings.override.json` override the values in `settings.prod.json`
+    - Values can be adjusted at runtime
+
+The settings are conceptually divided into:
+
+-   **System Settings**: Settings provided by the application, which are not cached by the frontend and can only be adjusted in the backend
+-   **User Settings**: values configured by the user in the frontend, which persist separately and override system defaults where applicable.
+
+The settings configuration includes the following feature flags:
+
+-   `featureFlagPictograms`: Disables/Enables the pictogram feature (default: disabled). Note: You have to set this flag before build time!
+-   `featureFlagAI`: Disables/Enables AI functionality like generating mindmaps with AI
 
 ### Further details
 
@@ -242,8 +267,12 @@ The TeamMapper[logo](https://thenounproject.com/icon/188125/) in this repo – c
 
 ## Acknowledgements
 
--   *Pictograms author: Sergio Palao. Origin: ARASAAC (http://www.arasaac.org). License: CC (BY-NC-SA). Owner: Government of Aragon (Spain)
+-   \*Pictograms author: Sergio Palao. Origin: ARASAAC (http://www.arasaac.org). License: CC (BY-NC-SA). Owner: Government of Aragon (Spain)
 -   Mindmapp: https://github.com/cedoor/mindmapp (discontinued)
 -   mmp: https://github.com/cedoor/mmp (discontinued)
 -   D3: https://github.com/d3/d3
 -   DomPurify: https://github.com/cure53/DOMPurify
+
+```
+
+```

config/settings.override.json

@@ -0,0 +1,6 @@
+{
+  "systemSettings": {
+  },
+  "userSettings": {
+  }
+}

docker-compose-prod.yml

@@ -19,11 +19,14 @@ services:
       POSTGRES_QUERY_TIMEOUT: ${POSTGRES_QUERY_TIMEOUT:-100000}
       POSTGRES_STATEMENT_TIMEOUT: ${POSTGRES_STATEMENT_TIMEOUT:-100000}
       DELETE_AFTER_DAYS: ${DELETE_AFTER_DAYS:-30}
+      JWT_SECRET: ${JWT_SECRET}
     ports:
       - "${APP_PROD_PORT:-80}:3000"
     restart: always
     depends_on:
       - postgres_prod
+    volumes:
+      - ./config/settings.override.json:/home/node/app/teammapper-backend/config/settings.override.json:ro
 
   postgres_prod:
     image: postgres:15-alpine

docker-compose.dev.yml

@@ -1,10 +1,10 @@
 services:
   app:
     build:
-      context: ${DEV_BUILD_CONTEXT}
+      context: ${DEV_BUILD_CONTEXT}/teammapper
       dockerfile: Dockerfile
       target: development
     tty: true
     stdin_open: true
     volumes:
-      - ${DEV_BUILD_CONTEXT}/.claude:/home/node/app/.claude
+      - ${DEV_BUILD_CONTEXT}/teammapper/.claude:/home/node/app/.claude

docker-compose.yml

@@ -30,6 +30,7 @@ services:
       AI_LLM_RPM: ${DOCKER_COMPOSE_APP_ENV_AI_LLM_API_RPM}
       AI_LLM_TPM: ${DOCKER_COMPOSE_APP_ENV_AI_LLM_API_TPM}
       AI_LLM_TPD: ${DOCKER_COMPOSE_APP_ENV_AI_LLM_API_TPD}
+      JWT_SECRET: ${JWT_SECRET}
 
       TESTING_PLAYWRIGHT_WS_ENDPOINT: "ws://playwright:9323"
       TESTING_PLAYWRIGHT_BASE_URL: "http://app:4200"
@@ -40,8 +41,6 @@ services:
       - 9876:9876
     volumes:
       - .:/home/node/app
-      - app_backend_node_modules:/home/node/app/teammapper-backend/node_modules
-      - app_frontend_node_modules:/home/node/app/teammapper-frontend/node_modules
     depends_on:
       - postgres
 
@@ -60,7 +59,7 @@ services:
       - postgres_data:/var/lib/postgresql/data/pgdata
 
   playwright:
-    image: mcr.microsoft.com/playwright:v1.55.0-noble
+    image: mcr.microsoft.com/playwright:v1.57.0-noble
     container_name: playwright
     depends_on:
       - app

package.json

@@ -32,6 +32,6 @@
     "tsc": "pnpm --filter '*' run tsc"
   },
   "devDependencies": {
-    "concurrently": "9.1.2"
+    "concurrently": "9.2.1"
   }
 }