Commit graph

506 commits

Author SHA1 Message Date
Adriaan J.
d76fed57ca
Merge pull request #155 from SELab-2/feat/frontend-controllers-adriaan
feat: frontend controllers (Adriaan)
2025-04-07 17:21:25 +02:00
dbc8659b8d
fix(backend): Juiste Docker .env 2025-04-07 09:42:04 +02:00
Adriaan J.
9f975977e0
Merge branch 'dev' into feat/frontend-controllers-adriaan 2025-04-03 11:38:31 +02:00
Gabriellvl
7374511e31 Merge remote-tracking branch 'origin/feat/user-routes' into feat/user-routes 2025-04-03 11:00:56 +02:00
Gabriellvl
1940be31fb Merge remote-tracking branch 'origin/refactor/common' into feat/user-routes 2025-04-03 11:00:25 +02:00
782fc2be19
fix: Cleanup
Co-authored-by: Adriaan Jacquet <adriaanjacquet@gmail.com>
2025-04-03 10:53:45 +02:00
Lint Action
80939cd93c style: fix linting issues met Prettier 2025-04-03 08:12:51 +00:00
Gabriellvl
01b40992e2 Merge remote-tracking branch 'origin/refactor/common' into feat/user-routes
# Conflicts:
#	backend/src/controllers/learning-objects.ts
2025-04-03 10:10:47 +02:00
Gabriellvl
2f595e615f fix: import in test 2025-04-03 09:59:25 +02:00
Gabriellvl
084f4fcdbd Merge remote-tracking branch 'origin/dev' into feat/user-routes
# Conflicts:
#	backend/src/controllers/learning-objects.ts
#	frontend/src/controllers/controllers.ts
#	frontend/src/queries/themes.ts
2025-04-03 09:48:57 +02:00
86b3e0e4c4
docs: Omgevingsbestanden 2025-04-03 08:52:23 +02:00
8a0b4b62a7
test(backend): Verhoog vitest timeout 2025-04-03 08:32:32 +02:00
6097be3c79
test(backend): Omgevingsvariabelen files 2025-04-03 08:31:25 +02:00
ced27c148b
fixup! fix(backend): Restore sort 2025-04-03 07:53:05 +02:00
6d7d29ce3c
fix(backend): Restore sort 2025-04-03 07:44:22 +02:00
Lint Action
9f60c43522 style: fix linting issues met Prettier 2025-04-03 05:35:57 +00:00
52bc02a9f9
Merge branch 'dev' into refactor/common 2025-04-03 07:34:47 +02:00
Gabriellvl
3ec08599e5 fix: imports 2025-04-02 23:03:23 +02:00
Gabriellvl
073dc8df47 Merge remote-tracking branch 'origin/refactor/common' into feat/user-routes 2025-04-02 22:58:24 +02:00
Lint Action
0bdee56dc3 style: fix linting issues met Prettier 2025-04-02 18:32:29 +00:00
7e46ce9c5f
fix: Linting op Actions 2025-04-02 20:31:40 +02:00
Gabriellvl
3c1eb82ce3 fix: merge + fixes 2025-04-02 19:48:42 +02:00
c549f51c49
fix: Actions 2025-04-02 19:38:36 +02:00
Gabriellvl
7d8a0fcbb2 Merge remote-tracking branch 'origin/refactor/common' into feat/user-routes
# Conflicts:
#	backend/src/controllers/students.ts
#	backend/src/controllers/teachers.ts
#	backend/src/interfaces/question.ts
#	backend/src/services/classes.ts
#	backend/src/services/students.ts
#	backend/src/services/teachers.ts
2025-04-02 19:20:20 +02:00
2dbadc7eab
refactor(backend): Linting 2025-04-02 18:20:09 +02:00
f537830b15
fix(backend): Zet Docker terug 2025-04-02 18:19:41 +02:00
e55b96bc08
fix: npm commandos 2025-04-02 18:14:10 +02:00
5d312d8c29
fix(backend): Missende import 2025-04-02 17:38:37 +02:00
f07a1ec867
refactor(backend): ClassJoinRequestStatus -> common 2025-04-02 17:35:46 +02:00
9470a4ddf9
fix: Shared pkgs importeren 2025-04-02 17:32:14 +02:00
Lint Action
899af4dec5 style: fix linting issues met Prettier 2025-04-02 12:56:03 +00:00
Gabriellvl
87366b2821 Merge remote-tracking branch 'origin/feat/user-routes' into feat/user-routes
# Conflicts:
#	backend/src/interfaces/answer.ts
#	backend/src/services/questions.ts
#	frontend/src/controllers/students.ts
#	frontend/src/controllers/teachers.ts
#	frontend/src/queries/students.ts
#	frontend/src/queries/teachers.ts
2025-04-02 14:54:42 +02:00
Gabriellvl
30c253c43c refactor: theme type 2025-04-02 14:29:07 +02:00
Gabriellvl
8ceed7f779 fix: merge + types frontend controller 2025-04-02 12:21:04 +02:00
Gabriellvl
4ca568e738 Merge remote-tracking branch 'origin/refactor/common' into feat/user-routes-test-interface-refactor
# Conflicts:
#	backend/src/controllers/students.ts
#	backend/src/controllers/teachers.ts
#	backend/src/interfaces/answer.ts
#	backend/src/interfaces/question.ts
#	backend/src/interfaces/student.ts
#	backend/src/services/classes.ts
#	backend/src/services/questions.ts
#	backend/src/services/students.ts
#	backend/src/services/teachers.ts
2025-04-02 10:16:10 +02:00
Lint Action
b6e07d28df style: fix linting issues met Prettier 2025-04-01 22:40:33 +00:00
04b35a61f9
fix: tsconfig 2025-04-02 00:29:38 +02:00
61f3afd9ae
Revert "refactor(common): Language"
This reverts commit bef6c6f75b.
2025-04-02 00:22:05 +02:00
d24eb9832b
Revert "fix(backend): Missende Language import"
This reverts commit 358dcb07e0.
2025-04-02 00:16:42 +02:00
a4408b5bc0
Merge branch 'dev' into refactor/common 2025-04-01 21:38:50 +02:00
2866894707
fix: Missing modules (?) 2025-04-01 21:09:19 +02:00
Lint Action
b9681926f8 style: fix linting issues met Prettier 2025-04-01 16:39:31 +00:00
Gabriellvl
b556516359 fix: merge + lint fixes 2025-04-01 18:38:36 +02:00
Gabriellvl
7f189188e8 Merge remote-tracking branch 'origin/dev' into feat/user-routes
# Conflicts:
#	backend/src/controllers/students.ts
#	backend/src/controllers/teachers.ts
#	backend/src/data/classes/class-join-request-repository.ts
#	backend/src/routes/students.ts
#	backend/src/services/students.ts
#	backend/src/services/teachers.ts
#	backend/tests/test_assets/users/students.testdata.ts
#	frontend/src/controllers/controllers.ts
#	frontend/src/queries/themes.ts
2025-04-01 18:12:15 +02:00
Gabriellvl
e99df80ba0 fix: questionId map in teacher 2025-04-01 17:56:33 +02:00
Lint Action
ea5cf7abf9 style: fix linting issues met Prettier 2025-04-01 15:09:28 +00:00
Gabriellvl
912369f87e fix: student join req by class route + teacher return post put delete + status 2025-04-01 14:24:06 +02:00
Gabriellvl
c0995d3933 fix: student res code + json returns bij post, delete 2025-04-01 11:48:14 +02:00
Gerald Schmittinger
99dc346dc1 Merge remote-tracking branch 'origin/dev' into feat/pagina-om-leerpaden-te-bekijken-#41
# Conflicts:
#	backend/src/controllers/learning-objects.ts
#	frontend/src/controllers/base-controller.ts
2025-04-01 09:00:28 +02:00
358dcb07e0
fix(backend): Missende Language import 2025-03-31 22:42:20 +02:00