Merge branch 'development' of https://github.com/FraunhoferIOSB/AASPo…

…rtal into development
FraunhoferIOSB · Sep 15, 2024 · f83b5f9 · f83b5f9
2 parents e13288e + 2d0fb1b
commit f83b5f9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -29,10 +29,10 @@
  "CONTENT_ROOT": "projects/aas-server/build",
  "WEB_ROOT": "projects/aas-portal/dist",
  "ASSETS": "projects/aas-server/src/assets",
- "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",
  "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",
  }
  },
  {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "aas-portal-project",
- "version": "3.0.0-development.94",
- "description": "Web-based visualization and control of asset administration shells.",
+ "version": "3.0.0-development.95",
+ "description": "Web-based visualization and control of aaset administration shells.",
  "type": "module",
  "scripts": {
  "create-app-info": "node --no-warnings --loader ts-node/esm create-app-info.ts",