From e13cc61c3a1dabff7fc890b196da9c9c621ceca4 Mon Sep 17 00:00:00 2001
From: tyboro2002 <verslypetybo@hotmail.com>
Date: Mon, 8 Apr 2024 19:13:32 +0200
Subject: [PATCH 1/5] chore: add make teacher script

---
 backend/api/management/commands/makeAdmin.py  |  4 ++--
 .../api/management/commands/makeTeacher.py    | 21 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 backend/api/management/commands/makeTeacher.py

diff --git a/backend/api/management/commands/makeAdmin.py b/backend/api/management/commands/makeAdmin.py
index fc24c7fb..c99b7053 100644
--- a/backend/api/management/commands/makeAdmin.py
+++ b/backend/api/management/commands/makeAdmin.py
@@ -4,7 +4,7 @@
 
 class Command(BaseCommand):
 
-    help = 'seed the db with data'
+    help = 'make yourself admin'
 
     def add_arguments(self, parser):
         parser.add_argument('username', type=str, help='The username of the student user to make admin')
@@ -18,4 +18,4 @@ def handle(self, *args, **options):
         student = student.get()
         student.is_staff = True
         student.save()
-        self.stdout.write(self.style.SUCCESS('Successfully made yourself admin!'))
+        self.stdout.write(self.style.SUCCESS('Successfully made the user admin!'))
diff --git a/backend/api/management/commands/makeTeacher.py b/backend/api/management/commands/makeTeacher.py
new file mode 100644
index 00000000..31417606
--- /dev/null
+++ b/backend/api/management/commands/makeTeacher.py
@@ -0,0 +1,21 @@
+from django.core.management.base import BaseCommand
+from api.models.student import Student
+from api.models.teacher import Teacher
+
+
+class Command(BaseCommand):
+
+    help = 'make yourself teacher'
+
+    def add_arguments(self, parser):
+        parser.add_argument('username', type=str, help='The username of the student user to make teacher')
+
+    def handle(self, *args, **options):
+        username = options['username']
+        student = Student.objects.filter(username=username)
+        if student.count() == 0:
+            self.stdout.write(self.style.ERROR('User not found, first log in !'))
+            return
+        student = student.get()
+        Teacher.objects.create(id=student.id, create_time=student.create_time)
+        self.stdout.write(self.style.SUCCESS('Successfully made the user teacher!'))

From 0cb4bc466891283f53d99ddbc2616c400a831122 Mon Sep 17 00:00:00 2001
From: EwoutV <ewoutverlinde@hotmail.com>
Date: Mon, 8 Apr 2024 21:57:17 +0200
Subject: [PATCH 2/5] fix: added psychology faculty icon

---
 .../Psychologie_PedagogischeWetenschappen.png     | Bin 0 -> 844 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 frontend/src/assets/img/faculties/Psychologie_PedagogischeWetenschappen.png

diff --git a/frontend/src/assets/img/faculties/Psychologie_PedagogischeWetenschappen.png b/frontend/src/assets/img/faculties/Psychologie_PedagogischeWetenschappen.png
new file mode 100644
index 0000000000000000000000000000000000000000..11bd1f3057a5fe9a0b160ce3124683e2b295bea0
GIT binary patch
literal 844
zcmV-S1GD^zP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00009a7bBm000XT
z000XT0n*)m`~Uy~{z*hZRA_<iS-W!6KomVZTC0Hulp5rc#x)Q3ko1XDrNT9yP(VY*
zJxLF^k0-rDLxqMOe?X!Sus;B1nX_=w%GSOdYdk(Po?Y!~r9FG@-FsKQ_3Pb}N7w+|
z-UJfZ5@{f|M4E<;A#&Gf2}c587eE(4r}VTrfE>Vtzgeu8#*8D1K##wc(Q87H`V8Qs
z(c^(winIX?0c4_W%2od^h_<OzMzXJYy&tMh3`NxBMnVN;Is*XL#-0D5Ozy29J`E)k
z>g)-X&?HVcp=+-6kR(T?af<9q0ApTf756wHlt^E!>IrRLDRcqgj80#6c!@!YOy9V}
z5+OuV00*pJ3KAnht^n{wOtuOGnwCP3D&HuPLs9?0QkvN*fM@JGH%9*tJ-$U1oe@H$
z%kq*wu~#xPmu)o{s&tKB3xp7P$a2C`uVg_pbA^7+GM`!qUn25lSEaT(Gg^e7p5y*t
z6}gu0gn|O%Du}d=7I*Bqj_@Ti74;pKIZH2R<@kd2p3z$aUm`Q{QtcbsSu>v%CG<|0
zxjKD_Y02FxVbIg$ju|k0o;hdz(CA%)5F(#M{g^7f;dP6_(G@eXb-!>~j63h2KDcMJ
z+F?%rX!EE1=9|i>X%;E#x#jazHhjcq-Dg`OlwXR_G+w>vD-}@0o^w?%M3jGJxh4Oo
zIFJ=gb7~Q~{mz*5fs;66eIRUoXpsmeg2b44+NsFFY7ygvIAMl+K$Gf<Gx;u+NoxY0
zJXxMQnB!l>3W(Y%^~Z%o#FN~@w01<@nFJyc>2QYucbr-21B6W$tQVp%dMpuxh(6Wn
zuOf+v%(>+X>)>}~^jIR)M>=8>T8+Mi8p8z#sHxFni5O>gII58@Afd1pMSRsrxwTfo
zD)?0)gov+iEbH?|$O*BmhU-q%2qH0ds;KZG(l|BXNu+UVz=KF5)qn?)vKpySW4tak
z;7FuO4V$=eBXA+2)hL7-Izo?Y{tsC>Tms^L=~^lB*tly=*#14;G;E194O=3O0)XGz
Wq^_uQT2QV40000<MNUMnLSTaF(R|MU

literal 0
HcmV?d00001


From 00a9254757c00067206dd164564c1d9670d77766 Mon Sep 17 00:00:00 2001
From: Ewout Verlinde <ewoutverlinde@hotmail.com>
Date: Tue, 9 Apr 2024 10:34:40 +0200
Subject: [PATCH 3/5] Calendar view improvements (#257)

* chore: add make teacher script

* fix: added psychology faculty icon

---------

Co-authored-by: tyboro2002 <verslypetybo@hotmail.com>
---
 backend/api/management/commands/makeAdmin.py  |   4 ++--
 .../api/management/commands/makeTeacher.py    |  21 ++++++++++++++++++
 .../Psychologie_PedagogischeWetenschappen.png | Bin 0 -> 844 bytes
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 backend/api/management/commands/makeTeacher.py
 create mode 100644 frontend/src/assets/img/faculties/Psychologie_PedagogischeWetenschappen.png

diff --git a/backend/api/management/commands/makeAdmin.py b/backend/api/management/commands/makeAdmin.py
index fc24c7fb..c99b7053 100644
--- a/backend/api/management/commands/makeAdmin.py
+++ b/backend/api/management/commands/makeAdmin.py
@@ -4,7 +4,7 @@
 
 class Command(BaseCommand):
 
-    help = 'seed the db with data'
+    help = 'make yourself admin'
 
     def add_arguments(self, parser):
         parser.add_argument('username', type=str, help='The username of the student user to make admin')
@@ -18,4 +18,4 @@ def handle(self, *args, **options):
         student = student.get()
         student.is_staff = True
         student.save()
-        self.stdout.write(self.style.SUCCESS('Successfully made yourself admin!'))
+        self.stdout.write(self.style.SUCCESS('Successfully made the user admin!'))
diff --git a/backend/api/management/commands/makeTeacher.py b/backend/api/management/commands/makeTeacher.py
new file mode 100644
index 00000000..31417606
--- /dev/null
+++ b/backend/api/management/commands/makeTeacher.py
@@ -0,0 +1,21 @@
+from django.core.management.base import BaseCommand
+from api.models.student import Student
+from api.models.teacher import Teacher
+
+
+class Command(BaseCommand):
+
+    help = 'make yourself teacher'
+
+    def add_arguments(self, parser):
+        parser.add_argument('username', type=str, help='The username of the student user to make teacher')
+
+    def handle(self, *args, **options):
+        username = options['username']
+        student = Student.objects.filter(username=username)
+        if student.count() == 0:
+            self.stdout.write(self.style.ERROR('User not found, first log in !'))
+            return
+        student = student.get()
+        Teacher.objects.create(id=student.id, create_time=student.create_time)
+        self.stdout.write(self.style.SUCCESS('Successfully made the user teacher!'))
diff --git a/frontend/src/assets/img/faculties/Psychologie_PedagogischeWetenschappen.png b/frontend/src/assets/img/faculties/Psychologie_PedagogischeWetenschappen.png
new file mode 100644
index 0000000000000000000000000000000000000000..11bd1f3057a5fe9a0b160ce3124683e2b295bea0
GIT binary patch
literal 844
zcmV-S1GD^zP)<h;3K|Lk000e1NJLTq001%o001%w1^@s69zTe&00009a7bBm000XT
z000XT0n*)m`~Uy~{z*hZRA_<iS-W!6KomVZTC0Hulp5rc#x)Q3ko1XDrNT9yP(VY*
zJxLF^k0-rDLxqMOe?X!Sus;B1nX_=w%GSOdYdk(Po?Y!~r9FG@-FsKQ_3Pb}N7w+|
z-UJfZ5@{f|M4E<;A#&Gf2}c587eE(4r}VTrfE>Vtzgeu8#*8D1K##wc(Q87H`V8Qs
z(c^(winIX?0c4_W%2od^h_<OzMzXJYy&tMh3`NxBMnVN;Is*XL#-0D5Ozy29J`E)k
z>g)-X&?HVcp=+-6kR(T?af<9q0ApTf756wHlt^E!>IrRLDRcqgj80#6c!@!YOy9V}
z5+OuV00*pJ3KAnht^n{wOtuOGnwCP3D&HuPLs9?0QkvN*fM@JGH%9*tJ-$U1oe@H$
z%kq*wu~#xPmu)o{s&tKB3xp7P$a2C`uVg_pbA^7+GM`!qUn25lSEaT(Gg^e7p5y*t
z6}gu0gn|O%Du}d=7I*Bqj_@Ti74;pKIZH2R<@kd2p3z$aUm`Q{QtcbsSu>v%CG<|0
zxjKD_Y02FxVbIg$ju|k0o;hdz(CA%)5F(#M{g^7f;dP6_(G@eXb-!>~j63h2KDcMJ
z+F?%rX!EE1=9|i>X%;E#x#jazHhjcq-Dg`OlwXR_G+w>vD-}@0o^w?%M3jGJxh4Oo
zIFJ=gb7~Q~{mz*5fs;66eIRUoXpsmeg2b44+NsFFY7ygvIAMl+K$Gf<Gx;u+NoxY0
zJXxMQnB!l>3W(Y%^~Z%o#FN~@w01<@nFJyc>2QYucbr-21B6W$tQVp%dMpuxh(6Wn
zuOf+v%(>+X>)>}~^jIR)M>=8>T8+Mi8p8z#sHxFni5O>gII58@Afd1pMSRsrxwTfo
zD)?0)gov+iEbH?|$O*BmhU-q%2qH0ds;KZG(l|BXNu+UVz=KF5)qn?)vKpySW4tak
z;7FuO4V$=eBXA+2)hL7-Izo?Y{tsC>Tms^L=~^lB*tly=*#14;G;E194O=3O0)XGz
Wq^_uQT2QV40000<MNUMnLSTaF(R|MU

literal 0
HcmV?d00001


From f4f3d717c30fc47accd6a04d96ad07662b3147f6 Mon Sep 17 00:00:00 2001
From: EwoutV <ewoutverlinde@hotmail.com>
Date: Tue, 9 Apr 2024 10:23:05 +0200
Subject: [PATCH 4/5] feat: better calendar view

---
 frontend/package-lock.json                    | 465 +++++++++---------
 frontend/package.json                         |   2 +-
 frontend/src/assets/lang/nl.json              |   4 +-
 frontend/src/components/layout/Header.vue     |  12 +-
 frontend/src/composables/filters/filter.ts    |  29 +-
 frontend/src/composables/filters/paginator.ts |  17 +-
 frontend/src/types/filter/Filter.ts           |  51 +-
 frontend/src/types/users/User.ts              |  18 +
 frontend/src/views/calendar/CalendarView.vue  | 180 ++++++-
 .../src/views/courses/SearchCourseView.vue    |  29 +-
 10 files changed, 520 insertions(+), 287 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 1e9209bf..fe4ecfea 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -17,7 +17,7 @@
                 "msw": "^2.2.13",
                 "pinia": "^2.1.7",
                 "primeflex": "^3.3.1",
-                "primeicons": "^6.0.1",
+                "primeicons": "^7.0.0",
                 "primevue": "^3.50.0",
                 "vue": "^3.4.18",
                 "vue-i18n": "^9.10.2",
@@ -56,9 +56,9 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.24.1",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.1.tgz",
-            "integrity": "sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg==",
+            "version": "7.24.4",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz",
+            "integrity": "sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==",
             "bin": {
                 "parser": "bin/babel-parser.js"
             },
@@ -650,17 +650,17 @@
             }
         },
         "node_modules/@humanwhocodes/object-schema": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz",
-            "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
+            "version": "2.0.3",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
+            "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
             "dev": true
         },
         "node_modules/@inquirer/confirm": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.1.1.tgz",
-            "integrity": "sha512-epf2RVHJJxX5qF85U41PBq9qq2KTJW9sKNLx6+bb2/i2rjXgeoHVGUm8kJxZHavrESgXgBLKCABcfOJYIso8cQ==",
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.1.2.tgz",
+            "integrity": "sha512-xQeRxRpVOQdBinIyOHX9+/nTrvt84NnaP8hym5ARdLr6a5T1ckowx70sEaItgULBHlxSIJL970BoRfFxlzO2IA==",
             "dependencies": {
-                "@inquirer/core": "^7.1.1",
+                "@inquirer/core": "^7.1.2",
                 "@inquirer/type": "^1.2.1"
             },
             "engines": {
@@ -668,13 +668,13 @@
             }
         },
         "node_modules/@inquirer/core": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-7.1.1.tgz",
-            "integrity": "sha512-rD1UI3eARN9qJBcLRXPOaZu++Bg+xsk0Tuz1EUOXEW+UbYif1sGjr0Tw7lKejHzKD9IbXE1CEtZ+xR/DrNlQGQ==",
+            "version": "7.1.2",
+            "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-7.1.2.tgz",
+            "integrity": "sha512-ne5VhDqruYYzx8mmjDZ9F58ymrLJGxmSHJUcJGiW3tifzvl3goAm6gNX11w6+zUnGE54vgQ6ALDXL3IOSezMRw==",
             "dependencies": {
                 "@inquirer/type": "^1.2.1",
                 "@types/mute-stream": "^0.0.4",
-                "@types/node": "^20.11.30",
+                "@types/node": "^20.12.4",
                 "@types/wrap-ansi": "^3.0.0",
                 "ansi-escapes": "^4.3.2",
                 "chalk": "^4.1.2",
@@ -723,12 +723,12 @@
             }
         },
         "node_modules/@intlify/core-base": {
-            "version": "9.10.2",
-            "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.10.2.tgz",
-            "integrity": "sha512-HGStVnKobsJL0DoYIyRCGXBH63DMQqEZxDUGrkNI05FuTcruYUtOAxyL3zoAZu/uDGO6mcUvm3VXBaHG2GdZCg==",
+            "version": "9.11.0",
+            "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.11.0.tgz",
+            "integrity": "sha512-cveOqAstjLZIiyatcP/HrzrQ87cZI8ScPQna3yvoM8zjcjcIRK1MRvmxUNlPdg0rTNJMZw7rixPVM58O5aHVPA==",
             "dependencies": {
-                "@intlify/message-compiler": "9.10.2",
-                "@intlify/shared": "9.10.2"
+                "@intlify/message-compiler": "9.11.0",
+                "@intlify/shared": "9.11.0"
             },
             "engines": {
                 "node": ">= 16"
@@ -738,11 +738,11 @@
             }
         },
         "node_modules/@intlify/message-compiler": {
-            "version": "9.10.2",
-            "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.10.2.tgz",
-            "integrity": "sha512-ntY/kfBwQRtX5Zh6wL8cSATujPzWW2ZQd1QwKyWwAy5fMqJyyixHMeovN4fmEyCqSu+hFfYOE63nU94evsy4YA==",
+            "version": "9.11.0",
+            "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.11.0.tgz",
+            "integrity": "sha512-x31Gl7cscnoI4UUY1yaIy8e7vVMVW1VVlTXZz4SIHKqoSEUkfmgqK8NAx1e7RcoHEbICR7uyCbud0ZL1s4OGXQ==",
             "dependencies": {
-                "@intlify/shared": "9.10.2",
+                "@intlify/shared": "9.11.0",
                 "source-map-js": "^1.0.2"
             },
             "engines": {
@@ -753,9 +753,9 @@
             }
         },
         "node_modules/@intlify/shared": {
-            "version": "9.10.2",
-            "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.10.2.tgz",
-            "integrity": "sha512-ttHCAJkRy7R5W2S9RVnN9KYQYPIpV2+GiS79T4EE37nrPyH6/1SrOh3bmdCRC1T3ocL8qCDx7x2lBJ0xaITU7Q==",
+            "version": "9.11.0",
+            "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-9.11.0.tgz",
+            "integrity": "sha512-KHSNgi7sRjmSm7aD8QH8WFt9VfKaekJuJ473opbJlkGY3EDnDUU8ikIhG8PbasQbgNvbY3m3tWNGqk2omIdwMA==",
             "engines": {
                 "node": ">= 16"
             },
@@ -871,9 +871,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.13.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.2.tgz",
-            "integrity": "sha512-3XFIDKWMFZrMnao1mJhnOT1h2g0169Os848NhhmGweEcfJ4rCi+3yMCOLG4zA61rbJdkcrM/DjVZm9Hg5p5w7g==",
+            "version": "4.14.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.14.1.tgz",
+            "integrity": "sha512-fH8/o8nSUek8ceQnT7K4EQbSiV7jgkHq81m9lWZFIXjJ7lJzpWXbQFpT/Zh6OZYnpFykvzC3fbEvEAFZu03dPA==",
             "cpu": [
                 "arm"
             ],
@@ -884,9 +884,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.13.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.2.tgz",
-            "integrity": "sha512-GdxxXbAuM7Y/YQM9/TwwP+L0omeE/lJAR1J+olu36c3LqqZEBdsIWeQ91KBe6nxwOnb06Xh7JS2U5ooWU5/LgQ==",
+            "version": "4.14.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.14.1.tgz",
+            "integrity": "sha512-Y/9OHLjzkunF+KGEoJr3heiD5X9OLa8sbT1lm0NYeKyaM3oMhhQFvPB0bNZYJwlq93j8Z6wSxh9+cyKQaxS7PQ==",
             "cpu": [
                 "arm64"
             ],
@@ -897,9 +897,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.13.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.2.tgz",
-            "integrity": "sha512-mCMlpzlBgOTdaFs83I4XRr8wNPveJiJX1RLfv4hggyIVhfB5mJfN4P8Z6yKh+oE4Luz+qq1P3kVdWrCKcMYrrA==",
+            "version": "4.14.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.14.1.tgz",
+            "integrity": "sha512-+kecg3FY84WadgcuSVm6llrABOdQAEbNdnpi5X3UwWiFVhZIZvKgGrF7kmLguvxHNQy+UuRV66cLVl3S+Rkt+Q==",
             "cpu": [
                 "arm64"
             ],
@@ -910,9 +910,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.13.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.2.tgz",
-            "integrity": "sha512-yUoEvnH0FBef/NbB1u6d3HNGyruAKnN74LrPAfDQL3O32e3k3OSfLrPgSJmgb3PJrBZWfPyt6m4ZhAFa2nZp2A==",
+            "version": "4.14.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.14.1.tgz",
+            "integrity": "sha512-2pYRzEjVqq2TB/UNv47BV/8vQiXkFGVmPFwJb+1E0IFFZbIX8/jo1olxqqMbo6xCXf8kabANhp5bzCij2tFLUA==",
             "cpu": [
                 "x64"
             ],
@@ -923,9 +923,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.13.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.2.tgz",
-            "integrity": "sha512-GYbLs5ErswU/Xs7aGXqzc3RrdEjKdmoCrgzhJWyFL0r5fL3qd1NPcDKDowDnmcoSiGJeU68/Vy+OMUluRxPiLQ==",
+            "version": "4.14.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.14.1.tgz",
+            "integrity": "sha512-mS6wQ6Do6/wmrF9aTFVpIJ3/IDXhg1EZcQFYHZLHqw6AzMBjTHWnCG35HxSqUNphh0EHqSM6wRTT8HsL1C0x5g==",
             "cpu": [
                 "arm"
             ],
@@ -936,9 +936,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.13.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.2.tgz",
-            "integrity": "sha512-L1+D8/wqGnKQIlh4Zre9i4R4b4noxzH5DDciyahX4oOz62CphY7WDWqJoQ66zNR4oScLNOqQJfNSIAe/6TPUmQ==",
+            "version": "4.14.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.14.1.tgz",
+            "integrity": "sha512-p9rGKYkHdFMzhckOTFubfxgyIO1vw//7IIjBBRVzyZebWlzRLeNhqxuSaZ7kCEKVkm/kuC9fVRW9HkC/zNRG2w==",
             "cpu": [
                 "arm64"
             ],
@@ -949,9 +949,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.13.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.2.tgz",
-            "integrity": "sha512-tK5eoKFkXdz6vjfkSTCupUzCo40xueTOiOO6PeEIadlNBkadH1wNOH8ILCPIl8by/Gmb5AGAeQOFeLev7iZDOA==",
+            "version": "4.14.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.14.1.tgz",
+            "integrity": "sha512-nDY6Yz5xS/Y4M2i9JLQd3Rofh5OR8Bn8qe3Mv/qCVpHFlwtZSBYSPaU4mrGazWkXrdQ98GB//H0BirGR/SKFSw==",
             "cpu": [
                 "arm64"
             ],
@@ -962,9 +962,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.13.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.13.2.tgz",
-            "integrity": "sha512-zvXvAUGGEYi6tYhcDmb9wlOckVbuD+7z3mzInCSTACJ4DQrdSLPNUeDIcAQW39M3q6PDquqLWu7pnO39uSMRzQ==",
+            "version": "4.14.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.14.1.tgz",
+            "integrity": "sha512-im7HE4VBL+aDswvcmfx88Mp1soqL9OBsdDBU8NqDEYtkri0qV0THhQsvZtZeNNlLeCUQ16PZyv7cqutjDF35qw==",
             "cpu": [
                 "ppc64le"
             ],
@@ -975,9 +975,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.13.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.2.tgz",
-            "integrity": "sha512-C3GSKvMtdudHCN5HdmAMSRYR2kkhgdOfye4w0xzyii7lebVr4riCgmM6lRiSCnJn2w1Xz7ZZzHKuLrjx5620kw==",
+            "version": "4.14.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.14.1.tgz",
+            "integrity": "sha512-RWdiHuAxWmzPJgaHJdpvUUlDz8sdQz4P2uv367T2JocdDa98iRw2UjIJ4QxSyt077mXZT2X6pKfT2iYtVEvOFw==",
             "cpu": [
                 "riscv64"
             ],
@@ -988,9 +988,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.13.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.13.2.tgz",
-            "integrity": "sha512-l4U0KDFwzD36j7HdfJ5/TveEQ1fUTjFFQP5qIt9gBqBgu1G8/kCaq5Ok05kd5TG9F8Lltf3MoYsUMw3rNlJ0Yg==",
+            "version": "4.14.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.14.1.tgz",
+            "integrity": "sha512-VMgaGQ5zRX6ZqV/fas65/sUGc9cPmsntq2FiGmayW9KMNfWVG/j0BAqImvU4KTeOOgYSf1F+k6at1UfNONuNjA==",
             "cpu": [
                 "s390x"
             ],
@@ -1001,9 +1001,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.13.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.2.tgz",
-            "integrity": "sha512-xXMLUAMzrtsvh3cZ448vbXqlUa7ZL8z0MwHp63K2IIID2+DeP5iWIT6g1SN7hg1VxPzqx0xZdiDM9l4n9LRU1A==",
+            "version": "4.14.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.14.1.tgz",
+            "integrity": "sha512-9Q7DGjZN+hTdJomaQ3Iub4m6VPu1r94bmK2z3UeWP3dGUecRC54tmVu9vKHTm1bOt3ASoYtEz6JSRLFzrysKlA==",
             "cpu": [
                 "x64"
             ],
@@ -1014,9 +1014,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.13.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.2.tgz",
-            "integrity": "sha512-M/JYAWickafUijWPai4ehrjzVPKRCyDb1SLuO+ZyPfoXgeCEAlgPkNXewFZx0zcnoIe3ay4UjXIMdXQXOZXWqA==",
+            "version": "4.14.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.14.1.tgz",
+            "integrity": "sha512-JNEG/Ti55413SsreTguSx0LOVKX902OfXIKVg+TCXO6Gjans/k9O6ww9q3oLGjNDaTLxM+IHFMeXy/0RXL5R/g==",
             "cpu": [
                 "x64"
             ],
@@ -1027,9 +1027,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.13.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.2.tgz",
-            "integrity": "sha512-2YWwoVg9KRkIKaXSh0mz3NmfurpmYoBBTAXA9qt7VXk0Xy12PoOP40EFuau+ajgALbbhi4uTj3tSG3tVseCjuA==",
+            "version": "4.14.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.14.1.tgz",
+            "integrity": "sha512-ryS22I9y0mumlLNwDFYZRDFLwWh3aKaC72CWjFcFvxK0U6v/mOkM5Up1bTbCRAhv3kEIwW2ajROegCIQViUCeA==",
             "cpu": [
                 "arm64"
             ],
@@ -1040,9 +1040,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.13.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.2.tgz",
-            "integrity": "sha512-2FSsE9aQ6OWD20E498NYKEQLneShWes0NGMPQwxWOdws35qQXH+FplabOSP5zEe1pVjurSDOGEVCE2agFwSEsw==",
+            "version": "4.14.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.14.1.tgz",
+            "integrity": "sha512-TdloItiGk+T0mTxKx7Hp279xy30LspMso+GzQvV2maYePMAWdmrzqSNZhUpPj3CGw12aGj57I026PgLCTu8CGg==",
             "cpu": [
                 "ia32"
             ],
@@ -1053,9 +1053,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.13.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.2.tgz",
-            "integrity": "sha512-7h7J2nokcdPePdKykd8wtc8QqqkqxIrUz7MHj6aNr8waBRU//NLDVnNjQnqQO6fqtjrtCdftpbTuOKAyrAQETQ==",
+            "version": "4.14.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.14.1.tgz",
+            "integrity": "sha512-wQGI+LY/Py20zdUPq+XCem7JcPOyzIJBm3dli+56DJsQOHbnXZFEwgmnC6el1TPAfC8lBT3m+z69RmLykNUbew==",
             "cpu": [
                 "x64"
             ],
@@ -1109,9 +1109,9 @@
             }
         },
         "node_modules/@types/node": {
-            "version": "20.11.30",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz",
-            "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==",
+            "version": "20.12.5",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.5.tgz",
+            "integrity": "sha512-BD+BjQ9LS/D8ST9p5uqBxghlN+S42iuNxjsUGjeZobe/ciXzk2qb1B6IXc6AnRLS+yFJRpN2IPEHMzwspfDJNw==",
             "dependencies": {
                 "undici-types": "~5.26.4"
             }
@@ -1307,21 +1307,6 @@
                 }
             }
         },
-        "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
-            "version": "9.0.3",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-            "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
-            "dev": true,
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
         "node_modules/@typescript-eslint/utils": {
             "version": "6.21.0",
             "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.21.0.tgz",
@@ -1411,6 +1396,33 @@
                 "url": "https://opencollective.com/vitest"
             }
         },
+        "node_modules/@vitest/runner/node_modules/p-limit": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-5.0.0.tgz",
+            "integrity": "sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==",
+            "dev": true,
+            "dependencies": {
+                "yocto-queue": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/@vitest/runner/node_modules/yocto-queue": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+            "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+            "dev": true,
+            "engines": {
+                "node": ">=12.20"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/@vitest/snapshot": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.4.0.tgz",
@@ -1871,6 +1883,17 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/ansi-escapes/node_modules/type-fest": {
+            "version": "0.21.3",
+            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+            "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/ansi-regex": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -2283,9 +2306,9 @@
             }
         },
         "node_modules/builtins": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
-            "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz",
+            "integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==",
             "dev": true,
             "dependencies": {
                 "semver": "^7.0.0"
@@ -2432,6 +2455,18 @@
                 "fsevents": "~2.3.2"
             }
         },
+        "node_modules/chokidar/node_modules/glob-parent": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "dev": true,
+            "dependencies": {
+                "is-glob": "^4.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
         "node_modules/ci-info": {
             "version": "3.9.0",
             "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz",
@@ -2652,9 +2687,9 @@
             "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
         },
         "node_modules/cypress": {
-            "version": "13.7.1",
-            "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.7.1.tgz",
-            "integrity": "sha512-4u/rpFNxOFCoFX/Z5h+uwlkBO4mWzAjveURi3vqdSu56HPvVdyGTxGw4XKGWt399Y1JwIn9E1L9uMXQpc0o55w==",
+            "version": "13.7.2",
+            "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.7.2.tgz",
+            "integrity": "sha512-FF5hFI5wlRIHY8urLZjJjj/YvfCBrRpglbZCLr/cYcL9MdDe0+5usa8kTIrDHthlEc9lwihbkb5dmwqBDNS2yw==",
             "dev": true,
             "hasInstallScript": true,
             "dependencies": {
@@ -3146,11 +3181,15 @@
             }
         },
         "node_modules/escape-string-regexp": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+            "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+            "dev": true,
             "engines": {
-                "node": ">=0.8.0"
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
         "node_modules/eslint": {
@@ -3525,9 +3564,9 @@
             }
         },
         "node_modules/eslint-plugin-vue": {
-            "version": "9.24.0",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.24.0.tgz",
-            "integrity": "sha512-9SkJMvF8NGMT9aQCwFc5rj8Wo1XWSMSHk36i7ZwdI614BU7sIOR28ZjuFPKp8YGymZN12BSEbiSwa7qikp+PBw==",
+            "version": "9.24.1",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.24.1.tgz",
+            "integrity": "sha512-wk3SuwmS1pZdcuJlokGYEi/buDOwD6KltvhIZyOnpJ/378dcQ4zchu9PAMbbLAaydCz1iYc5AozszcOOgZIIOg==",
             "dev": true,
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.4.0",
@@ -3543,7 +3582,7 @@
                 "node": "^14.17.0 || >=16.0.0"
             },
             "peerDependencies": {
-                "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0"
+                "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0 || ^9.0.0"
             }
         },
         "node_modules/eslint-scope": {
@@ -3584,30 +3623,6 @@
                 "concat-map": "0.0.1"
             }
         },
-        "node_modules/eslint/node_modules/escape-string-regexp": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-            "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/eslint/node_modules/glob-parent": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-            "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-            "dev": true,
-            "dependencies": {
-                "is-glob": "^4.0.3"
-            },
-            "engines": {
-                "node": ">=10.13.0"
-            }
-        },
         "node_modules/eslint/node_modules/minimatch": {
             "version": "3.1.2",
             "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -3792,6 +3807,18 @@
                 "node": ">=8.6.0"
             }
         },
+        "node_modules/fast-glob/node_modules/glob-parent": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "dev": true,
+            "dependencies": {
+                "is-glob": "^4.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
         "node_modules/fast-json-stable-stringify": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -3836,6 +3863,14 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/figures/node_modules/escape-string-regexp": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+            "engines": {
+                "node": ">=0.8.0"
+            }
+        },
         "node_modules/file-entry-cache": {
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -4136,15 +4171,15 @@
             }
         },
         "node_modules/glob-parent": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+            "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
             "dev": true,
             "dependencies": {
-                "is-glob": "^4.0.1"
+                "is-glob": "^4.0.3"
             },
             "engines": {
-                "node": ">= 6"
+                "node": ">=10.13.0"
             }
         },
         "node_modules/glob/node_modules/brace-expansion": {
@@ -4199,18 +4234,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/globals/node_modules/type-fest": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-            "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/globalthis": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
@@ -5277,9 +5300,9 @@
             }
         },
         "node_modules/magic-string": {
-            "version": "0.30.8",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
-            "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
+            "version": "0.30.9",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.9.tgz",
+            "integrity": "sha512-S1+hd+dIrC8EZqKyT9DstTH/0Z+f76kmmvZnkfQVmOpDEF9iVgdYif3Q/pIWHmCoo59bQVGW0kVL3e2nl+9+Sw==",
             "dependencies": {
                 "@jridgewell/sourcemap-codec": "^1.4.15"
             },
@@ -5344,9 +5367,9 @@
             }
         },
         "node_modules/minimatch": {
-            "version": "9.0.4",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
-            "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+            "version": "9.0.3",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+            "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
             "dev": true,
             "dependencies": {
                 "brace-expansion": "^2.0.1"
@@ -5436,9 +5459,9 @@
             }
         },
         "node_modules/msw/node_modules/type-fest": {
-            "version": "4.14.0",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.14.0.tgz",
-            "integrity": "sha512-on5/Cw89wwqGZQu+yWO0gGMGu8VNxsaW9SB2HE8yJjllEk7IDTwnSN1dUVldYILhYPN5HzD7WAaw2cc/jBfn0Q==",
+            "version": "4.15.0",
+            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.15.0.tgz",
+            "integrity": "sha512-tB9lu0pQpX5KJq54g+oHOLumOx+pMep4RaM6liXh2PKmVRFF+/vAtUP0ZaJ0kOySfVNjF6doBWPHhBhISKdlIA==",
             "engines": {
                 "node": ">=16"
             },
@@ -5660,15 +5683,15 @@
             "integrity": "sha512-Ou3dJ6bA/UJ5GVHxah4LnqDwZRwAmWxrG3wtrHrbGnP4RnLCtA64A4F+ae7Y8ww660JaddSoArUR5HjipWSHAQ=="
         },
         "node_modules/p-limit": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-5.0.0.tgz",
-            "integrity": "sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==",
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+            "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
             "dev": true,
             "dependencies": {
-                "yocto-queue": "^1.0.0"
+                "yocto-queue": "^0.1.0"
             },
             "engines": {
-                "node": ">=18"
+                "node": ">=10"
             },
             "funding": {
                 "url": "https://github.com/sponsors/sindresorhus"
@@ -5689,33 +5712,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/p-locate/node_modules/p-limit": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-            "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-            "dev": true,
-            "dependencies": {
-                "yocto-queue": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/p-locate/node_modules/yocto-queue": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-            "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/p-map": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
@@ -5795,9 +5791,9 @@
             "dev": true
         },
         "node_modules/path-to-regexp": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz",
-            "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw=="
+            "version": "6.2.2",
+            "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz",
+            "integrity": "sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw=="
         },
         "node_modules/path-type": {
             "version": "4.0.0",
@@ -6052,14 +6048,14 @@
             "integrity": "sha512-zaOq3YvcOYytbAmKv3zYc+0VNS9Wg5d37dfxZnveKBFPr7vEIwfV5ydrpiouTft8MVW6qNjfkaQphHSnvgQbpQ=="
         },
         "node_modules/primeicons": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/primeicons/-/primeicons-6.0.1.tgz",
-            "integrity": "sha512-KDeO94CbWI4pKsPnYpA1FPjo79EsY9I+M8ywoPBSf9XMXoe/0crjbUK7jcQEDHuc0ZMRIZsxH3TYLv4TUtHmAA=="
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/primeicons/-/primeicons-7.0.0.tgz",
+            "integrity": "sha512-jK3Et9UzwzTsd6tzl2RmwrVY/b8raJ3QZLzoDACj+oTJ0oX7L9Hy+XnVwgo4QVKlKpnP/Ur13SXV/pVh4LzaDw=="
         },
         "node_modules/primevue": {
-            "version": "3.50.0",
-            "resolved": "https://registry.npmjs.org/primevue/-/primevue-3.50.0.tgz",
-            "integrity": "sha512-vYpQzvIXSmF0hWUkviHEGnwbFY/G8jI2RSxoa75noJloI2rWhzOX+JarJ8iaesVOr7b2se31N/p7zOx6uh3ddQ==",
+            "version": "3.51.0",
+            "resolved": "https://registry.npmjs.org/primevue/-/primevue-3.51.0.tgz",
+            "integrity": "sha512-BdMveidLSr0fNJ5+mxuke8mMCHyiXwvfDP4iwPr6R98rl3E0Wcm1u4/RKVrL7o0Iq606SXyhPQL3LGyAfXngcA==",
             "peerDependencies": {
                 "vue": "^3.0.0"
             }
@@ -6283,9 +6279,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.13.2",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.2.tgz",
-            "integrity": "sha512-MIlLgsdMprDBXC+4hsPgzWUasLO9CE4zOkj/u6j+Z6j5A4zRY+CtiXAdJyPtgCsc42g658Aeh1DlrdVEJhsL2g==",
+            "version": "4.14.1",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.14.1.tgz",
+            "integrity": "sha512-4LnHSdd3QK2pa1J6dFbfm1HN0D7vSK/ZuZTsdyUAlA6Rr1yTouUTL13HaDOGJVgby461AhrNGBS7sCGXXtT+SA==",
             "dev": true,
             "dependencies": {
                 "@types/estree": "1.0.5"
@@ -6298,21 +6294,21 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.13.2",
-                "@rollup/rollup-android-arm64": "4.13.2",
-                "@rollup/rollup-darwin-arm64": "4.13.2",
-                "@rollup/rollup-darwin-x64": "4.13.2",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.13.2",
-                "@rollup/rollup-linux-arm64-gnu": "4.13.2",
-                "@rollup/rollup-linux-arm64-musl": "4.13.2",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.13.2",
-                "@rollup/rollup-linux-riscv64-gnu": "4.13.2",
-                "@rollup/rollup-linux-s390x-gnu": "4.13.2",
-                "@rollup/rollup-linux-x64-gnu": "4.13.2",
-                "@rollup/rollup-linux-x64-musl": "4.13.2",
-                "@rollup/rollup-win32-arm64-msvc": "4.13.2",
-                "@rollup/rollup-win32-ia32-msvc": "4.13.2",
-                "@rollup/rollup-win32-x64-msvc": "4.13.2",
+                "@rollup/rollup-android-arm-eabi": "4.14.1",
+                "@rollup/rollup-android-arm64": "4.14.1",
+                "@rollup/rollup-darwin-arm64": "4.14.1",
+                "@rollup/rollup-darwin-x64": "4.14.1",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.14.1",
+                "@rollup/rollup-linux-arm64-gnu": "4.14.1",
+                "@rollup/rollup-linux-arm64-musl": "4.14.1",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.14.1",
+                "@rollup/rollup-linux-riscv64-gnu": "4.14.1",
+                "@rollup/rollup-linux-s390x-gnu": "4.14.1",
+                "@rollup/rollup-linux-x64-gnu": "4.14.1",
+                "@rollup/rollup-linux-x64-musl": "4.14.1",
+                "@rollup/rollup-win32-arm64-msvc": "4.14.1",
+                "@rollup/rollup-win32-ia32-msvc": "4.14.1",
+                "@rollup/rollup-win32-x64-msvc": "4.14.1",
                 "fsevents": "~2.3.2"
             }
         },
@@ -6416,9 +6412,9 @@
             "dev": true
         },
         "node_modules/sass": {
-            "version": "1.72.0",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.72.0.tgz",
-            "integrity": "sha512-Gpczt3WA56Ly0Mn8Sl21Vj94s1axi9hDIzDFn9Ph9x3C3p4nNyvsqJoQyVXKou6cBlfFWEgRW4rT8Tb4i3XnVA==",
+            "version": "1.74.1",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.74.1.tgz",
+            "integrity": "sha512-w0Z9p/rWZWelb88ISOLyvqTWGmtmu2QJICqDBGyNnfG4OUnPX9BBjjYIXUpXCMOOg5MQWNpqzt876la1fsTvUA==",
             "dev": true,
             "dependencies": {
                 "chokidar": ">=3.0.0 <4.0.0",
@@ -6959,9 +6955,10 @@
             }
         },
         "node_modules/type-fest": {
-            "version": "0.21.3",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-            "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+            "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+            "dev": true,
             "engines": {
                 "node": ">=10"
             },
@@ -7043,9 +7040,9 @@
             }
         },
         "node_modules/typescript": {
-            "version": "5.4.3",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.3.tgz",
-            "integrity": "sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==",
+            "version": "5.4.4",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.4.tgz",
+            "integrity": "sha512-dGE2Vv8cpVvw28v8HCPqyb08EzbBURxDpuhJvTrusShUfGnhHBafDsLdS1EhhxyL6BJQE+2cT3dDPAv+MQ6oLw==",
             "devOptional": true,
             "bin": {
                 "tsc": "bin/tsc",
@@ -7148,9 +7145,9 @@
             }
         },
         "node_modules/vite": {
-            "version": "5.2.7",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.7.tgz",
-            "integrity": "sha512-k14PWOKLI6pMaSzAuGtT+Cf0YmIx12z9YGon39onaJNy8DLBfBJrzg9FQEmkAM5lpHBZs9wksWAsyF/HkpEwJA==",
+            "version": "5.2.8",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.8.tgz",
+            "integrity": "sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==",
             "dev": true,
             "dependencies": {
                 "esbuild": "^0.20.1",
@@ -7468,12 +7465,12 @@
             }
         },
         "node_modules/vue-i18n": {
-            "version": "9.10.2",
-            "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.10.2.tgz",
-            "integrity": "sha512-ECJ8RIFd+3c1d3m1pctQ6ywG5Yj8Efy1oYoAKQ9neRdkLbuKLVeW4gaY5HPkD/9ssf1pOnUrmIFjx2/gkGxmEw==",
+            "version": "9.11.0",
+            "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.11.0.tgz",
+            "integrity": "sha512-vU4gY6lu8Pdfs9BgKGiDAJmFDf88cceR47KcSB0VW4xJzUrXR/7qwqM7A8dQ2nedhoIDxoOm5Ro4pFd2KvJqbA==",
             "dependencies": {
-                "@intlify/core-base": "9.10.2",
-                "@intlify/shared": "9.10.2",
+                "@intlify/core-base": "9.11.0",
+                "@intlify/shared": "9.11.0",
                 "@vue/devtools-api": "^6.5.0"
             },
             "engines": {
@@ -7774,12 +7771,12 @@
             }
         },
         "node_modules/yocto-queue": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-            "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+            "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
             "dev": true,
             "engines": {
-                "node": ">=12.20"
+                "node": ">=10"
             },
             "funding": {
                 "url": "https://github.com/sponsors/sindresorhus"
diff --git a/frontend/package.json b/frontend/package.json
index b0f1e460..da6f688c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -24,7 +24,7 @@
         "msw": "^2.2.13",
         "pinia": "^2.1.7",
         "primeflex": "^3.3.1",
-        "primeicons": "^6.0.1",
+        "primeicons": "^7.0.0",
         "primevue": "^3.50.0",
         "vue": "^3.4.18",
         "vue-i18n": "^9.10.2",
diff --git a/frontend/src/assets/lang/nl.json b/frontend/src/assets/lang/nl.json
index ea528cf0..7213b74e 100644
--- a/frontend/src/assets/lang/nl.json
+++ b/frontend/src/assets/lang/nl.json
@@ -4,6 +4,7 @@
             "logo": "Logo van de Universiteit Gent",
             "login": "Login",
             "view": "Bekijken als {0}",
+            "user": "Ingelogd als {0}",
             "navigation": {
                 "dashboard": "Dashboard",
                 "calendar": "Kalender",
@@ -37,7 +38,8 @@
             }
         },
         "calendar": {
-            "title": "Kalender"
+            "title": "Kalender",
+            "noProjects": "Geen projecten op geselecteerde datum."
         },
         "projects": {
             "deadline": "Deadline",
diff --git a/frontend/src/components/layout/Header.vue b/frontend/src/components/layout/Header.vue
index 86156ab2..47d0682e 100644
--- a/frontend/src/components/layout/Header.vue
+++ b/frontend/src/components/layout/Header.vue
@@ -40,7 +40,7 @@ const items = computed(() => [
         route: 'courses',
     },
     {
-        icon: 'file-plus',
+        icon: 'bookmark',
         label: t('layout.header.navigation.projects'),
         route: 'projects',
     },
@@ -59,16 +59,18 @@ const items = computed(() => [
                 </div>
                 <div class="text-right ml-auto text-sm flex flex-column align-items-end gap-3">
                     <div class="flex align-items-center gap-3">
-                        <!-- Role selector -->
-                        <RoleSelector v-if="user !== null && user.roles.length > 1" />
+                        <template v-if="user !== null && user.hasMultipleRoles()">
+                            <!-- Role selector -->
+                            <RoleSelector />
+                        </template>
                         <!-- Language selector -->
                         <LanguageSelector />
                     </div>
                     <div>
                         <!-- User information -->
-                        <template v-if="isAuthenticated && user">
+                        <template v-if="user !== null">
                             <RouterLink :to="{ name: 'logout' }" class="text-white">
-                                Ingelogd als {{ user.getFullName() }}
+                                {{ t('layout.header.user', [user.getFullName()]) }}
                             </RouterLink>
                         </template>
                         <!-- Login button -->
diff --git a/frontend/src/composables/filters/filter.ts b/frontend/src/composables/filters/filter.ts
index 92ef191e..f1231e91 100644
--- a/frontend/src/composables/filters/filter.ts
+++ b/frontend/src/composables/filters/filter.ts
@@ -1,15 +1,42 @@
 import { type Ref, ref } from 'vue';
 import { type Filter } from '@/types/filter/Filter.ts';
+import { watchDebounced } from '@vueuse/core';
+import { useRoute, useRouter } from 'vue-router';
 
 export interface FilterState {
     filter: Ref<Filter>;
+    onFilter: (callback: () => Promise<void>) => void;
 }
 
 export function useFilter(initial: Filter): FilterState {
     /* State */
     const filter = ref<Filter>(initial);
+    const { query } = useRoute();
+    const { push } = useRouter();
+
+    /**
+     * On filter callback
+     *
+     * @param callback
+     */
+    function onFilter(callback: () => Promise<void>) {
+        watchDebounced(
+            filter,
+            async () => {
+                await push({
+                    query: {
+                        ...query,
+                        ...filter.value
+                    },
+                });
+
+                await callback();
+            },
+            { debounce: 500, immediate: true, deep: true },
+        );
+    }
 
     return {
-        filter,
+        filter, onFilter
     };
 }
diff --git a/frontend/src/composables/filters/paginator.ts b/frontend/src/composables/filters/paginator.ts
index c2209677..73fc5d83 100644
--- a/frontend/src/composables/filters/paginator.ts
+++ b/frontend/src/composables/filters/paginator.ts
@@ -6,6 +6,7 @@ export interface PaginatorState {
     pageSize: Ref<number>;
     first: Ref<number>;
     paginate: (newFirst: number) => Promise<void>;
+    onPaginate: (callback: () => Promise<void>) => void;
 }
 
 export function usePaginator(initialPage: number = 1, initialPageSize: number = 20): PaginatorState {
@@ -14,8 +15,8 @@ export function usePaginator(initialPage: number = 1, initialPageSize: number =
     const { push } = useRouter();
 
     /* State */
-    const page = ref<number>(initialPage);
-    const pageSize = ref<number>(initialPageSize);
+    const page = ref<number>(parseInt(query.page as string) || initialPage);
+    const pageSize = ref<number>(parseInt(query.pageSize as string) || initialPageSize);
 
     /* Watchers */
     watch(
@@ -54,10 +55,22 @@ export function usePaginator(initialPage: number = 1, initialPageSize: number =
         });
     }
 
+    /**
+     * On paginate callback
+     *
+     * @param callback
+     */
+    async function onPaginate(callback: () => Promise<void>) {
+        watch(page, async () => {
+            await callback();
+        });
+    }
+
     return {
         page,
         pageSize,
         first,
         paginate,
+        onPaginate,
     };
 }
diff --git a/frontend/src/types/filter/Filter.ts b/frontend/src/types/filter/Filter.ts
index edd36982..6841fcc3 100644
--- a/frontend/src/types/filter/Filter.ts
+++ b/frontend/src/types/filter/Filter.ts
@@ -1,10 +1,49 @@
-export const COURSE_FILTER = {
-    search: '',
-    faculties: [],
-    years: [],
-};
+import { LocationQuery } from 'vue-router';
+
+export type CourseFilter = {
+    faculties: string[];
+    years: string[];
+} & Filter;
 
 export interface Filter {
     search: string;
-    [key: string]: any;
+    [key: string]: string|string[];
+}
+
+/**
+ * Get the course filters from the query.
+ *
+ * @param query
+ */
+export function getCourseFilters(query: LocationQuery): CourseFilter {
+    const filters: CourseFilter = {
+        search: query.search?.toString() || '',
+        faculties: [],
+        years: [],
+    };
+
+    if (query.faculties) {
+        filters.faculties = getQueryList(query.faculties as string|string[]);
+    }
+
+    if (query.years) {
+        filters.years = getQueryList(query.years as string|string[]);
+    }
+
+    return filters;
+}
+
+/**
+ * Get the query list.
+ *
+ * @param query
+ */
+function getQueryList(query: string | string[] | undefined): string[] {
+    if (query === undefined) return [];
+
+    if (Array.isArray(query)) {
+        return query;
+    }
+
+    return [query?.toString()];
 }
diff --git a/frontend/src/types/users/User.ts b/frontend/src/types/users/User.ts
index d90e1de9..9d3b0337 100644
--- a/frontend/src/types/users/User.ts
+++ b/frontend/src/types/users/User.ts
@@ -88,6 +88,24 @@ export class User {
         return this.isStudent() || this.isAssistant() || this.isTeacher();
     }
 
+    /**
+     * Check if the user has a role.
+     *
+     * @param roles
+     */
+    public hasRoles(...roles: Role[]): boolean {
+        return roles.every((role) => this.roles.includes(role));
+    }
+
+    /**
+     *  Check if the user has multiple roles.
+     *
+     *  @returns boolean
+     */
+    public hasMultipleRoles(): boolean {
+        return this.roles.length > 1;
+    }
+
     /**
      * Convert a user object to a user instance.
      *
diff --git a/frontend/src/views/calendar/CalendarView.vue b/frontend/src/views/calendar/CalendarView.vue
index 20eb4ccf..b96f0627 100644
--- a/frontend/src/views/calendar/CalendarView.vue
+++ b/frontend/src/views/calendar/CalendarView.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import moment from 'moment';
 import BaseLayout from '@/components/layout/BaseLayout.vue';
-import ProjectCard from '@/components/projects/ProjectCard.vue';
-import Calendar from 'primevue/calendar';
+import Button from 'primevue/button';
+import Calendar, { type CalendarDateSlotOptions } from 'primevue/calendar';
 import Title from '@/components/layout/Title.vue';
 import { useProject } from '@/composables/services/project.service';
 import { computed, ref, watch } from 'vue';
@@ -11,24 +11,39 @@ import { useAuthStore } from '@/store/authentication.store.ts';
 import { storeToRefs } from 'pinia';
 import { type Project } from '@/types/Projects.ts';
 import { type RoleUser } from '@/types/users/Generics.ts';
+import { useRoute, useRouter } from 'vue-router';
+import ProjectCreateButton from '@/components/projects/ProjectCreateButton.vue';
 
 /* Composable injections */
 const { t, locale } = useI18n();
+const { query } = useRoute();
+const { push } = useRouter();
 
 /* Component state */
 const allProjects = ref<Project[]>([]);
-const selectedDate = ref(new Date());
+const selectedDate = ref<Date>(getQueryDate());
 
 /* Service injection */
 const { user } = storeToRefs(useAuthStore());
 const { projects, getProjectsByCourse } = useProject();
 
+/* Formatted date */
 const formattedDate = computed(() => {
     // Format the selected date using moment.js
     return moment(selectedDate.value).locale(locale.value).format('DD MMMM YYYY');
 });
 
-const loadProjects = async (): Promise<void> => {
+/* Filter the projects on the date selected on the calendar */
+const projectsWithDeadline = computed(() => {
+    return allProjects.value?.filter((project) => {
+        return moment(project.deadline).isSame(moment(selectedDate.value), 'day');
+    });
+});
+
+/**
+ * Load the projects of the user.
+ */
+async function loadProjects(): Promise<void> {
     if (user.value !== null) {
         // Clear the old data, so that the data from another role is not displayed
         allProjects.value = [];
@@ -51,16 +66,58 @@ const loadProjects = async (): Promise<void> => {
             }
         }
     }
-};
+}
 
-/* Filter the projects on the date selected on the calendar */
-const projectsWithDeadline = computed(() => {
-    // Filter the projects with the selected date
-    return allProjects.value?.filter((project) => {
-        return moment(project.deadline).isSame(moment(selectedDate.value), 'day');
-    });
-});
+/**
+ * Get the date from the query parameters.
+ *
+ * @returns The date from the query parameters.
+ */
+function getQueryDate(): Date {
+    const queryDate = query.date as string;
+
+    if (queryDate) {
+        const date = moment(queryDate);
+
+        if (date.isValid()) {
+            return date.toDate();
+        }
+    }
+
+    return moment().toDate();
+}
+
+/**
+ * Check if the project has a deadline on the given date.
+ *
+ * @param date
+ */
+function hasDeadline(date: CalendarDateSlotOptions): boolean {
+    const dateObj = new Date(date.year, date.month, date.day);
 
+    return (
+        allProjects.value?.some((project) => {
+            return moment(project.deadline).isSame(moment(dateObj), 'day');
+        }) ?? false
+    );
+}
+
+/**
+ * Count the deadlines on the given date.
+ *
+ * @param date
+ */
+function countDeadlines(date: CalendarDateSlotOptions): number {
+    const dateObj = new Date(date.year, date.month, date.day);
+
+    return (
+        allProjects.value?.filter((project) => {
+            return moment(project.deadline).isSame(moment(dateObj), 'day');
+        }).length ?? 0
+    );
+}
+
+/* Watch the user and load the projects */
 watch(
     user,
     async () => {
@@ -68,33 +125,110 @@ watch(
     },
     { immediate: true },
 );
+
+watch(
+    selectedDate,
+    (date) => {
+        push({ query: { date: moment(date).format('YYYY-MM-DD') } });
+    }
+);
 </script>
 
 <template>
     <BaseLayout>
+        <!-- Calendar heading -->
+        <Title class="mb-6">{{ t('views.calendar.title') }}</Title>
+        <!-- Calendar body -->
         <div class="grid">
             <div class="col-12 md:col-6">
-                <!-- Calendar heading -->
-                <Title class="mb-6">{{ t('views.calendar.title') }}</Title>
-
                 <div>
                     <!-- Calendar itself -->
-                    <Calendar class="w-full" v-model="selectedDate" inline />
+                    <Calendar class="w-full" v-model="selectedDate" inline>
+                        <template #date="{ date }">
+                            <div class="relative">
+                                <div class="deadline-indicator" v-if="hasDeadline(date)">
+                                    {{ countDeadlines(date) }}
+                                </div>
+                                <span>{{ date.day }}</span>
+                            </div>
+                        </template>
+                    </Calendar>
                 </div>
             </div>
             <div class="col-12 md:col-6">
-                <!-- Selected date on the calendar -->
-                <Title class="mb-6">{{ formattedDate }}</Title>
+                <div class="surface-100 p-6">
+                    <!-- Selected date on the calendar -->
+                    <Title class="mb-6 font-extrabold">{{ formattedDate }}</Title>
 
-                <!-- Listing projects with given deadline -->
-                <div class="grid grid-cols-2 gap-4">
-                    <div v-for="project in projectsWithDeadline" :key="project.id">
-                        <ProjectCard class="h-100" :project="project" :course="project.course" />
+                    <!-- Listing projects with given deadline -->
+                    <div class="flex flex-column gap-4">
+                        <template v-if="projectsWithDeadline.length > 0">
+                            <!-- Project cards -->
+                            <div class="flex border-round-md" v-for="project in projectsWithDeadline" :key="project.id">
+                                <!-- Icon -->
+                                <div
+                                    class="bg-primary flex justify-content-center align-items-center p-4 w-3 w-8rem h-8rem"
+                                >
+                                    <span class="pi pi-book text-6xl" />
+                                </div>
+                                <!-- Details -->
+                                <div
+                                    class="flex flex-column gap-3 justify-content-center bg-white text-black-alpha-80 p-3 w-9"
+                                >
+                                    <RouterLink
+                                        :to="{
+                                            name: 'courseProject',
+                                            params: {
+                                                courseId: project.course?.id,
+                                                projectId: project.id,
+                                            },
+                                        }"
+                                    >
+                                        <h3 class="flex gap-3 align-items-center text-primary m-0 text-3xl">
+                                            {{ project.name }} <span class="pi pi-arrow-right text-xl" />
+                                        </h3>
+                                    </RouterLink>
+                                    <p class="font-bold m-0">
+                                        {{ project.course?.name }}
+                                    </p>
+                                </div>
+                            </div>
+                        </template>
+                        <template v-else>
+                            <p class="m-0">{{ t('views.calendar.noProjects') }}</p>
+                        </template>
                     </div>
+
+                    <template v-if="user?.isTeacher() || user?.isAssistant()">
+                        <!-- Add project button -->
+                        <ProjectCreateButton :courses="(user as RoleUser).courses"/>
+                    </template>
                 </div>
             </div>
         </div>
     </BaseLayout>
 </template>
 
-<style scoped lang="scss"></style>
+<style lang="scss">
+.p-calendar {
+    td > span {
+        overflow: visible;
+    }
+}
+
+.deadline-indicator {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 12px;
+    height: 0.95rem;
+    width: 0.95rem;
+    color: white;
+    position: absolute;
+    top: -0.5rem;
+    right: -1rem;
+    z-index: 2;
+    background: indianred;
+    border-radius: 50%;
+}
+</style>
diff --git a/frontend/src/views/courses/SearchCourseView.vue b/frontend/src/views/courses/SearchCourseView.vue
index 007a7a89..11aaa187 100644
--- a/frontend/src/views/courses/SearchCourseView.vue
+++ b/frontend/src/views/courses/SearchCourseView.vue
@@ -17,19 +17,21 @@ import { storeToRefs } from 'pinia';
 import { useI18n } from 'vue-i18n';
 import { useFilter } from '@/composables/filters/filter.ts';
 import { usePaginator } from '@/composables/filters/paginator.ts';
-import { watchDebounced } from '@vueuse/core';
-import { COURSE_FILTER } from '@/types/filter/Filter.ts';
+import { useRoute, useRouter } from 'vue-router';
+import { getCourseFilters } from '@/types/filter/Filter.ts';
 
 /* Composable injections */
 const { t } = useI18n();
+const { query } = useRoute();
 const { user } = storeToRefs(useAuthStore());
 const { faculties, getFaculties } = useFaculty();
 const { pagination, searchCourses } = useCourses();
-const { paginate, page, first, pageSize } = usePaginator();
-const { filter } = useFilter(COURSE_FILTER);
+const { onPaginate, paginate, page, first, pageSize } = usePaginator();
+const { filter, onFilter } = useFilter(getCourseFilters(query));
 
 /* Fetch the faculties */
 onMounted(async () => {
+    // Fetch the faculties
     await getFaculties();
 
     /* Reset current page on filter changes */
@@ -42,19 +44,18 @@ onMounted(async () => {
         { deep: true },
     );
 
-    /* Search courses on page change */
-    watch(page, async () => {
+    /**
+     * Fetch the courses based on the filter.
+     */
+    async function fetchCourses(): Promise<void> {
         await searchCourses(filter.value, page.value, pageSize.value);
-    });
+    }
+
+    /* Search courses on page change */
+    onPaginate(fetchCourses);
 
     /* Search courses on filter change */
-    watchDebounced(
-        filter,
-        async () => {
-            await searchCourses(filter.value, page.value, pageSize.value);
-        },
-        { debounce: 500, immediate: true, deep: true },
-    );
+    onFilter(fetchCourses);
 });
 </script>
 

From b488a1d0b9ae6bd666ae8deea5ee95392b2c3e01 Mon Sep 17 00:00:00 2001
From: EwoutV <ewoutverlinde@hotmail.com>
Date: Tue, 9 Apr 2024 12:24:49 +0200
Subject: [PATCH 5/5] chore: linting

---
 frontend/src/composables/filters/filter.ts      |  7 ++++---
 frontend/src/composables/filters/paginator.ts   |  6 +++---
 frontend/src/types/filter/Filter.ts             | 14 +++++++-------
 frontend/src/views/calendar/CalendarView.vue    | 14 +++++---------
 frontend/src/views/courses/SearchCourseView.vue |  2 +-
 5 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/frontend/src/composables/filters/filter.ts b/frontend/src/composables/filters/filter.ts
index f1231e91..c41b1cb4 100644
--- a/frontend/src/composables/filters/filter.ts
+++ b/frontend/src/composables/filters/filter.ts
@@ -19,14 +19,14 @@ export function useFilter(initial: Filter): FilterState {
      *
      * @param callback
      */
-    function onFilter(callback: () => Promise<void>) {
+    function onFilter(callback: () => Promise<void>): void {
         watchDebounced(
             filter,
             async () => {
                 await push({
                     query: {
                         ...query,
-                        ...filter.value
+                        ...filter.value,
                     },
                 });
 
@@ -37,6 +37,7 @@ export function useFilter(initial: Filter): FilterState {
     }
 
     return {
-        filter, onFilter
+        filter,
+        onFilter,
     };
 }
diff --git a/frontend/src/composables/filters/paginator.ts b/frontend/src/composables/filters/paginator.ts
index 73fc5d83..3ed9da01 100644
--- a/frontend/src/composables/filters/paginator.ts
+++ b/frontend/src/composables/filters/paginator.ts
@@ -15,8 +15,8 @@ export function usePaginator(initialPage: number = 1, initialPageSize: number =
     const { push } = useRouter();
 
     /* State */
-    const page = ref<number>(parseInt(query.page as string) || initialPage);
-    const pageSize = ref<number>(parseInt(query.pageSize as string) || initialPageSize);
+    const page = ref<number>(initialPage);
+    const pageSize = ref<number>(initialPageSize);
 
     /* Watchers */
     watch(
@@ -60,7 +60,7 @@ export function usePaginator(initialPage: number = 1, initialPageSize: number =
      *
      * @param callback
      */
-    async function onPaginate(callback: () => Promise<void>) {
+    function onPaginate(callback: () => Promise<void>): void {
         watch(page, async () => {
             await callback();
         });
diff --git a/frontend/src/types/filter/Filter.ts b/frontend/src/types/filter/Filter.ts
index 6841fcc3..7d7a5d05 100644
--- a/frontend/src/types/filter/Filter.ts
+++ b/frontend/src/types/filter/Filter.ts
@@ -1,4 +1,4 @@
-import { LocationQuery } from 'vue-router';
+import { type LocationQuery } from 'vue-router';
 
 export type CourseFilter = {
     faculties: string[];
@@ -7,7 +7,7 @@ export type CourseFilter = {
 
 export interface Filter {
     search: string;
-    [key: string]: string|string[];
+    [key: string]: string | string[];
 }
 
 /**
@@ -17,17 +17,17 @@ export interface Filter {
  */
 export function getCourseFilters(query: LocationQuery): CourseFilter {
     const filters: CourseFilter = {
-        search: query.search?.toString() || '',
+        search: query.search?.toString() ?? '',
         faculties: [],
         years: [],
     };
 
-    if (query.faculties) {
-        filters.faculties = getQueryList(query.faculties as string|string[]);
+    if (query.faculties !== undefined) {
+        filters.faculties = getQueryList(query.faculties as string | string[]);
     }
 
-    if (query.years) {
-        filters.years = getQueryList(query.years as string|string[]);
+    if (query.years !== undefined) {
+        filters.years = getQueryList(query.years as string | string[]);
     }
 
     return filters;
diff --git a/frontend/src/views/calendar/CalendarView.vue b/frontend/src/views/calendar/CalendarView.vue
index b96f0627..2a376f4c 100644
--- a/frontend/src/views/calendar/CalendarView.vue
+++ b/frontend/src/views/calendar/CalendarView.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import moment from 'moment';
 import BaseLayout from '@/components/layout/BaseLayout.vue';
-import Button from 'primevue/button';
 import Calendar, { type CalendarDateSlotOptions } from 'primevue/calendar';
 import Title from '@/components/layout/Title.vue';
 import { useProject } from '@/composables/services/project.service';
@@ -76,7 +75,7 @@ async function loadProjects(): Promise<void> {
 function getQueryDate(): Date {
     const queryDate = query.date as string;
 
-    if (queryDate) {
+    if (queryDate != null) {
         const date = moment(queryDate);
 
         if (date.isValid()) {
@@ -126,12 +125,9 @@ watch(
     { immediate: true },
 );
 
-watch(
-    selectedDate,
-    (date) => {
-        push({ query: { date: moment(date).format('YYYY-MM-DD') } });
-    }
-);
+watch(selectedDate, (date) => {
+    push({ query: { date: moment(date).format('YYYY-MM-DD') } });
+});
 </script>
 
 <template>
@@ -201,7 +197,7 @@ watch(
 
                     <template v-if="user?.isTeacher() || user?.isAssistant()">
                         <!-- Add project button -->
-                        <ProjectCreateButton :courses="(user as RoleUser).courses"/>
+                        <ProjectCreateButton :courses="(user as RoleUser).courses" />
                     </template>
                 </div>
             </div>
diff --git a/frontend/src/views/courses/SearchCourseView.vue b/frontend/src/views/courses/SearchCourseView.vue
index 11aaa187..bc93be20 100644
--- a/frontend/src/views/courses/SearchCourseView.vue
+++ b/frontend/src/views/courses/SearchCourseView.vue
@@ -17,7 +17,7 @@ import { storeToRefs } from 'pinia';
 import { useI18n } from 'vue-i18n';
 import { useFilter } from '@/composables/filters/filter.ts';
 import { usePaginator } from '@/composables/filters/paginator.ts';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { getCourseFilters } from '@/types/filter/Filter.ts';
 
 /* Composable injections */