Merge remote-tracking branch 'origin/dev' into chore/login

# Conflicts:
#	backend/.env.example
#	backend/package.json
#	backend/src/app.ts
#	backend/src/routes/login.ts
#	backend/src/routes/student.ts
#	docker-compose.yml
#	frontend/src/App.vue
#	frontend/src/views/HomePage.vue
#	frontend/src/views/LoginPage.vue
#	package-lock.json
This commit is contained in:
Gerald Schmittinger 2025-03-09 23:42:38 +01:00
commit de0199de96
109 changed files with 3789 additions and 1727 deletions

View file

@ -5,26 +5,31 @@
"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",
"test:unit": "vitest"
},
"dependencies": {
"@mikro-orm/core": "6.4.6",
"@mikro-orm/postgresql": "6.4.6",
"@mikro-orm/core": "^6.4.6",
"@mikro-orm/postgresql": "^6.4.6",
"@mikro-orm/reflection": "^6.4.6",
"@mikro-orm/sqlite": "6.4.6",
"@mikro-orm/reflection": "6.4.6",
"@types/js-yaml": "^4.0.9",
"axios": "^1.8.1",
"dotenv": "^16.4.7",
"express": "^5.0.1",
"express-jwt": "^8.5.1",
"jwks-rsa": "^3.1.0",
"uuid": "^11.1.0",
"js-yaml": "^4.1.0",
"@types/js-yaml": "^4.0.9",
"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"
},
@ -32,6 +37,7 @@
"@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",