Merge branch 'development' into staging

FraunhoferIOSB · Dec 5, 2024 · 9638b68 · 9638b68
2 parents dbd986d + 33d9bd1
commit 9638b68
Show file tree

Hide file tree

Showing 172 changed files with 41,191 additions and 35,238 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -32,7 +32,7 @@
                 "ENDPOINTS": "[\"file:///endpoints/samples?name=Samples\"]",
                 // "USER_STORAGE": "mongodb://aas-server:bObXJWW6e8Nh78YF@localhost:27017/aasportal-users",
                 // "TEMPLATE_STORAGE": "http://aas-server:5w0vmrkzrwDIDyZs@localhost:8080/templates",
-                // "AAS_INDEX": "mysql://aas-server:60PYRe6Vd8C99u4n@localhost:3306",
+                "AAS_INDEX": "mysql://aas-server:60PYRe6Vd8C99u4n@localhost:3306",
             }
         },
         {
@@ -57,7 +57,7 @@
             "name": "Test aas-portal",
             "type": "chrome",
             "request": "launch",
-            "preLaunchTask": "test",
+            "preLaunchTask": "test-aas-portal",
             "url": "http://localhost:9876/debug.html",
         },
         {

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -23,7 +23,7 @@
         },
         {
             "type": "shell",
-            "label": "test",
+            "label": "test-aas-portal",
             "command": "npm",
             "args": ["run", "test", "-w", "aas-portal"],
             "isBackground": true,

diff --git a/aasportal.mdx b/aasportal.mdx
diff --git a/docs/source/images/aas-portal-project.png b/docs/source/images/aas-portal-project.png
diff --git a/docs/source/images/main.png b/docs/source/images/main.png