tdpeuter/2025SELab2-project-Dwengo
tdpeuter/2025SELab2-project-Dwengo
1
Fork 0
Code Issues Releases 4 Packages 2 Wiki Activity

Merge remote-tracking branch 'origin/dev' into feature/own-learning-objects

Browse source 
# Conflicts:
#	backend/package.json
#	backend/src/config.ts
#	backend/src/controllers/learningObjects.ts
#	backend/src/controllers/learningPaths.ts
#	backend/src/data/content/attachment-repository.ts
#	backend/src/data/content/learning-object-repository.ts
#	backend/src/data/content/learning-path-repository.ts
#	backend/src/data/repositories.ts
#	backend/src/entities/content/learning-path.entity.ts
#	backend/src/exceptions.ts
#	backend/src/routes/learning-objects.ts
#	backend/src/services/learningObjects.ts
#	backend/src/services/learningPaths.ts
#	backend/src/util/apiHelper.ts
#	backend/src/util/envvars.ts
#	package-lock.json
This commit is contained in:
Gerald Schmittinger 2025-03-11 03:01:18 +01:00
commit cd0a3a8a7b
119 changed files with 8837 additions and 1697 deletions
Download patch file Download diff file Expand all files Collapse all files

20
backend/package.json
View file

@ -5,9 +5,9 @@
"private": true,
"type": "module",
"scripts": {
"build": "tsc --project tsconfig.json",
"dev": "tsx watch --env-file=.env.development.local src/app.ts",
"start": "node --env-file=.env dist/app.js",
"build": "NODE_ENV=production tsc --project tsconfig.json",
"dev": "NODE_ENV=development tsx watch --env-file=.env.development.local src/app.ts",
"start": "NODE_ENV=production node --env-file=.env dist/app.js",
"format": "prettier --write src/",
"format-check": "prettier --check src/",
"lint": "eslint . --fix",
@ -19,19 +19,29 @@
"@mikro-orm/reflection": "^6.4.6",
"@mikro-orm/sqlite": "6.4.6",
"@types/js-yaml": "^4.0.9",
"axios": "^1.8.1",
"axios": "^1.8.2",
"dotenv": "^16.4.7",
"express": "^5.0.1",
"gift-pegjs": "^1.0.2",
"isomorphic-dompurify": "^2.22.0",
"express-jwt": "^8.5.1",
"jwks-rsa": "^3.1.0",
"uuid": "^11.1.0",
"js-yaml": "^4.1.0",
"marked": "^15.0.7",
"uuid": "^11.1.0"
"uuid": "^11.1.0",
"loki-logger-ts": "^1.0.2",
"response-time": "^2.3.3",
"winston": "^3.17.0",
"winston-loki": "^6.1.3",
"cors": "^2.8.5",
"@types/cors": "^2.8.17"
},
"devDependencies": {
"@mikro-orm/cli": "^6.4.6",
"@types/express": "^5.0.0",
"@types/node": "^22.13.4",
"@types/response-time": "^2.3.8",
"globals": "^15.15.0",
"ts-node": "^10.9.2",
"tsx": "^4.19.3",