Merge branch 'develop' of github.com:SELab-2/UGent-1 into develop

backend/pigeonhole/apps/courses/migrations/0008_alter_course_banner.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2024-05-23 12:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('courses', '0007_alter_course_year'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='course',
+            name='banner',
+            field=models.FileField(blank=True, null=True, upload_to='course_banners/'),
+        ),
+    ]

backend/pigeonhole/apps/courses/models.py

@@ -3,15 +3,13 @@
 from rest_framework import serializers
 
 
-# Create your models here.
 class Course(models.Model):
     course_id = models.BigAutoField(primary_key=True)
     name = models.CharField(max_length=256)
     description = models.TextField()
     open_course = models.BooleanField(default=False)
     invite_token = models.CharField(max_length=20, blank=True, null=True)
-    banner = models.FileField(upload_to='course_banners/', blank=True, null=False,
-                              default='course_banners/ugent_banner.png')
+    banner = models.FileField(upload_to='course_banners/', blank=True, null=True)
     archived = models.BooleanField(default=False)
     year = models.IntegerField(default=2024)
 

frontend/app/[locale]/components/NavBar.tsx

@@ -115,7 +115,7 @@ const NavBar = () => {
             {user?.role === 1 ? (
                 <>
                     <Divider/>
-                    <Link href={'/admin'} style={{textDecoration: 'none', color: 'inherit'}}>
+                    <Link href={'/admin/users'} style={{textDecoration: 'none', color: 'inherit'}}>
                         <ListItemButton>
                             <ListItemIcon>
                                 <ConstructionIcon/>