Skip to content

Commit

Permalink
Merge branch 'develop' into feature/admin-config-page
Browse files Browse the repository at this point in the history
  • Loading branch information
GODrums committed Oct 27, 2024
2 parents 67550ab + 6b59dc6 commit 5cc9c86
Show file tree
Hide file tree
Showing 194 changed files with 5,065 additions and 5,878 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -166,4 +166,6 @@ cython_debug/

node_modules/

application-local.yml
application-local.yml

server/application-server/postgres-data/
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
],
"scripts": {
"generate:api:clean": "rimraf webapp/src/app/core/modules/openapi",
"generate:api:application-server-specs": "cd server/application-server && mvn verify -DskipTests=true && node ../../scripts/clean-openapi-specs.js",
"generate:api:application-server-specs": "cd server/application-server && mvn verify -DskipTests=true -Dapp.profiles=specs",
"generate:api:application-server-client": "npx openapi-generator-cli generate -i server/application-server/openapi.yaml -g typescript-angular -o webapp/src/app/core/modules/openapi --additional-properties fileNaming=kebab-case,withInterfaces=true --generate-alias-as-model",
"generate:api": "npm run generate:api:application-server-specs && npm run generate:api:clean && npm run generate:api:application-server-client"
},
Expand Down
25 changes: 0 additions & 25 deletions scripts/clean-openapi-specs.js

This file was deleted.

24 changes: 24 additions & 0 deletions server/application-server/.vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "java",
"name": "Current File",
"request": "launch",
"mainClass": "${file}"
},
{
"type": "java",
"name": "Application",
"request": "launch",
"mainClass": "de.tum.in.www1.hephaestus.Application",
"projectName": "hephaestus",
"env": {
"SPRING_PROFILES_ACTIVE": "local"
},
}
]
}
2 changes: 2 additions & 0 deletions server/application-server/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ services:
- '5432:5432'
networks:
- app-network
volumes:
- ./postgres-data:/var/lib/postgresql/data

keycloak:
image: quay.io/keycloak/keycloak:26.0.0
Expand Down
Loading

0 comments on commit 5cc9c86

Please sign in to comment.