detleph/server
1
0
Fork 0
mirror of https://github.com/detleph/server.git synced 2026-09-04 00:26:03 +02:00
Code Issues 9 Packages Projects Releases Wiki Activity

[PR #78] [MERGED] Dev #89

New Issue
Closed
opened 2026-09-04 00:22:04 +02:00 by Stone_Red · 0 comments
Stone_Red commented 2026-09-04 00:22:04 +02:00
Owner
Copy Link
Copy Source

📋 Pull Request Information

Original PR: https://github.com/detleph/server/pull/78
Author: @Stefan-5422
Created: 6/7/2022
Status: ✅ Merged
Merged: 6/7/2022
Merged by: @Stefan-5422

Base: main ← Head: dev

📝 Commits (10+)

  • 4555d46 modified event responses and updated discipline briefDescription + fullDescription
  • 4e77d3c Event zod add pid/id; rm comented MediaRouter
  • cc57c51 Added updateDiscipline
  • 197d1a5 Add basic controllers and helper for roles
  • a9c182c Add teamleader authentication
  • 2a33b70 Add methods for requiring more specific levels of teamleader auth
  • 4f94bf0 created Role controller/routes
  • 55eab70 add deleteRolesFromTeam
  • 93d77ee Added user_auth system
  • da154f2 Merge branch 'feature-roles' of github.com:detleph/server into feature-roles

📊 Changes

34 files changed (+1528 additions, -410 deletions)

View changed files

📝 README.md (+1 -0)
📝 dev.sh (+1 -0)
📝 package-lock.json (+33 -0)
📝 prisma/schema.prisma (+12 -6)
📝 src/Controllers/admin.controller.ts (+5 -1)
📝 src/Controllers/admin_auth.controller.ts (+5 -1)
📝 src/Controllers/common.ts (+14 -1)
📝 src/Controllers/discipline.controller.ts (+84 -69)
📝 src/Controllers/event.controller.ts (+73 -145)
📝 src/Controllers/group.controllers.ts (+80 -4)
📝 src/Controllers/media.controller.ts (+74 -4)
📝 src/Controllers/organisation.controller.ts (+9 -10)
➕ src/Controllers/participant.controller.ts (+186 -0)
➕ src/Controllers/role.controller.ts (+134 -0)
📝 src/Controllers/role_schema.controller.ts (+43 -41)
➕ src/Controllers/team.controller.ts (+160 -0)
📝 src/Controllers/user_auth.controller.ts (+179 -19)
📝 src/Middleware/auth/auth.ts (+163 -56)
➕ src/Middleware/auth/teamleaderAuth.ts (+108 -0)
➕ src/Middleware/error/AuthError.ts (+13 -0)

...and 14 more files

📄 Description

Merge dev to main, as stuff is stable

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/detleph/server/pull/78 **Author:** [@Stefan-5422](https://github.com/Stefan-5422) **Created:** 6/7/2022 **Status:** ✅ Merged **Merged:** 6/7/2022 **Merged by:** [@Stefan-5422](https://github.com/Stefan-5422) **Base:** `main` ← **Head:** `dev` --- ### 📝 Commits (10+) - [`4555d46`](https://github.com/detleph/server/commit/4555d46902a05bf355befb8cbfedfbbc2276ffaf) modified event responses and updated discipline briefDescription + fullDescription - [`4e77d3c`](https://github.com/detleph/server/commit/4e77d3c66dafa09b90ea47a2eced981831ae2795) Event zod add pid/id; rm comented MediaRouter - [`cc57c51`](https://github.com/detleph/server/commit/cc57c513899684fb97178eb6c2453084b432f09b) Added updateDiscipline - [`197d1a5`](https://github.com/detleph/server/commit/197d1a52a337b7a309e8d614dc6d44436a964ba1) Add basic controllers and helper for roles - [`a9c182c`](https://github.com/detleph/server/commit/a9c182cf646e9a18f9c82267c6a4d2de83542b58) Add teamleader authentication - [`2a33b70`](https://github.com/detleph/server/commit/2a33b703bc27e35e8196e3b92528ed4b3fdd1a13) Add methods for requiring more specific levels of teamleader auth - [`4f94bf0`](https://github.com/detleph/server/commit/4f94bf074c8cc5b21e3c2bfd9d936e12535ddf84) created Role controller/routes - [`55eab70`](https://github.com/detleph/server/commit/55eab7000a1d50cdf6a70a43e3eb82ee647c5d51) add deleteRolesFromTeam - [`93d77ee`](https://github.com/detleph/server/commit/93d77eeefa22548944a84b0da92bbfd2b5f9ed41) Added user_auth system - [`da154f2`](https://github.com/detleph/server/commit/da154f2f8305c9b4a570aecf43e86083e81231ad) Merge branch 'feature-roles' of github.com:detleph/server into feature-roles ### 📊 Changes **34 files changed** (+1528 additions, -410 deletions) <details> <summary>View changed files</summary> 📝 `README.md` (+1 -0) 📝 `dev.sh` (+1 -0) 📝 `package-lock.json` (+33 -0) 📝 `prisma/schema.prisma` (+12 -6) 📝 `src/Controllers/admin.controller.ts` (+5 -1) 📝 `src/Controllers/admin_auth.controller.ts` (+5 -1) 📝 `src/Controllers/common.ts` (+14 -1) 📝 `src/Controllers/discipline.controller.ts` (+84 -69) 📝 `src/Controllers/event.controller.ts` (+73 -145) 📝 `src/Controllers/group.controllers.ts` (+80 -4) 📝 `src/Controllers/media.controller.ts` (+74 -4) 📝 `src/Controllers/organisation.controller.ts` (+9 -10) ➕ `src/Controllers/participant.controller.ts` (+186 -0) ➕ `src/Controllers/role.controller.ts` (+134 -0) 📝 `src/Controllers/role_schema.controller.ts` (+43 -41) ➕ `src/Controllers/team.controller.ts` (+160 -0) 📝 `src/Controllers/user_auth.controller.ts` (+179 -19) 📝 `src/Middleware/auth/auth.ts` (+163 -56) ➕ `src/Middleware/auth/teamleaderAuth.ts` (+108 -0) ➕ `src/Middleware/error/AuthError.ts` (+13 -0) _...and 14 more files_ </details> ### 📄 Description Merge dev to main, as stuff is stable --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
Stone_Red added the pull-request label 2026-09-04 00:22:04 +02:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
bug
documentation
enhancement
feature
good first issue
help wanted
pull-request
Mirrored from GitHub Pull Request
 question
release
urgent
No labels pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
Stone_Red
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: detleph/server#89