From 963014fcafcb7aacaec88f87bb1b484474ef9c41 Mon Sep 17 00:00:00 2001
From: Bram Meir <bram.meir@ugent.be>
Date: Sat, 6 Apr 2024 12:01:15 +0200
Subject: [PATCH 01/10] chore: project creation faculty

---
 frontend/src/assets/lang/en.json              |  2 +-
 frontend/src/assets/lang/nl.json              |  2 +-
 .../composables/services/courses.service.ts   |  9 ++--
 .../src/views/courses/CreateCourseView.vue    | 47 +++++++++++--------
 4 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/frontend/src/assets/lang/en.json b/frontend/src/assets/lang/en.json
index 5a5da5d3..5a0889bf 100644
--- a/frontend/src/assets/lang/en.json
+++ b/frontend/src/assets/lang/en.json
@@ -55,7 +55,7 @@
             "create": "Create course",
             "name": "Course name",
             "description": "Description",
-            "year": "Academic year"
+            "faculty": "Faculty"
         }
     },
     "composables": {
diff --git a/frontend/src/assets/lang/nl.json b/frontend/src/assets/lang/nl.json
index 38c5579c..b20bfff3 100644
--- a/frontend/src/assets/lang/nl.json
+++ b/frontend/src/assets/lang/nl.json
@@ -55,7 +55,7 @@
           "create": "Creëer vak",
           "name": "Vaknaam",
           "description": "Beschrijving",
-          "year": "Academiejaar",
+          "faculty": "Faculteit",
           "search": {
               "search": "Zoeken",
               "faculty": "Faculteit",
diff --git a/frontend/src/composables/services/courses.service.ts b/frontend/src/composables/services/courses.service.ts
index 2cfe0620..a984e6d5 100644
--- a/frontend/src/composables/services/courses.service.ts
+++ b/frontend/src/composables/services/courses.service.ts
@@ -4,6 +4,7 @@ import { endpoints } from '@/config/endpoints.ts';
 import { get, getList, create, deleteId, getPaginatedList } from '@/composables/services/helpers.ts';
 import { type PaginatorResponse } from '@/types/filter/Paginator.ts';
 import { type Filter } from '@/types/filter/Filter.ts';
+import { Response } from '@/types/Response.ts';
 
 interface CoursesState {
     pagination: Ref<PaginatorResponse<Course> | null>;
@@ -24,6 +25,7 @@ export function useCourses(): CoursesState {
     const pagination = ref<PaginatorResponse<Course> | null>(null);
     const courses = ref<Course[] | null>(null);
     const course = ref<Course | null>(null);
+    const response = ref<Response | null>(null);
 
     async function getCourseByID(id: string): Promise<void> {
         const endpoint = endpoints.courses.retrieve.replace('{id}', id);
@@ -57,15 +59,16 @@ export function useCourses(): CoursesState {
 
     async function createCourse(courseData: Course): Promise<void> {
         const endpoint = endpoints.courses.index;
-        await create<Course>(
+        await create<Response>(
             endpoint,
             {
                 name: courseData.name,
                 description: courseData.description,
                 academic_startyear: courseData.academic_startyear,
+                faculty: courseData.faculty?.id,
             },
-            course,
-            Course.fromJSON,
+            response,
+            Response.fromJSON,
         );
     }
 
diff --git a/frontend/src/views/courses/CreateCourseView.vue b/frontend/src/views/courses/CreateCourseView.vue
index 50f5b7cd..d05d1e20 100644
--- a/frontend/src/views/courses/CreateCourseView.vue
+++ b/frontend/src/views/courses/CreateCourseView.vue
@@ -1,42 +1,45 @@
 <script setup lang="ts">
-import Calendar from 'primevue/calendar';
+import Dropdown from 'primevue/dropdown';
 import BaseLayout from '@/components/layout/BaseLayout.vue';
 import Title from '@/components/layout/Title.vue';
-import { reactive, computed } from 'vue';
+import { reactive, computed, onMounted } from 'vue';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useAuthStore } from '@/store/authentication.store.ts';
-import { storeToRefs } from 'pinia';
 import InputText from 'primevue/inputtext';
 import Textarea from 'primevue/textarea';
 import Button from 'primevue/button';
 import { Course } from '@/types/Course';
 import { useCourses } from '@/composables/services/courses.service';
+import { useFaculty } from '@/composables/services/faculties.service.ts';
 import { required, helpers } from '@vuelidate/validators';
 import { useVuelidate } from '@vuelidate/core';
 import ErrorMessage from '@/components/forms/ErrorMessage.vue';
-import { User } from '@/types/users/User.ts';
 
 /* Composable injections */
 const { t } = useI18n();
 const { push } = useRouter();
-const { user } = storeToRefs(useAuthStore());
+const { faculties, getFaculties } = useFaculty();
 
 /* Service injection */
 const { createCourse } = useCourses();
 
+/* Fetch the faculties */
+onMounted(async () => {
+    await getFaculties();
+});
+
 /* Form content */
 const form = reactive({
     name: '',
     description: '',
-    year: user.value !== null ? new Date(User.getAcademicYear(new Date()), 0, 1) : new Date(),
+    faculty: null,
 });
 
 // Define validation rules for each form field
 const rules = computed(() => {
     return {
         name: { required: helpers.withMessage(t('validations.required'), required) },
-        year: { required: helpers.withMessage(t('validations.required'), required) },
+        faculty: { required: helpers.withMessage(t('validations.required'), required) },
     };
 });
 
@@ -52,10 +55,12 @@ const submitCourse = async (): Promise<void> => {
         // Pass the course data to the service
         await createCourse(
             new Course(
-                '', // ID not needed for creation, will be generated by the backend
+                '',
                 form.name,
                 form.description,
-                form.year.getFullYear(),
+                currentAcademicYear(),
+                null, // No parent course
+                form.faculty,
             ),
         );
 
@@ -63,6 +68,14 @@ const submitCourse = async (): Promise<void> => {
         push({ name: 'dashboard' });
     }
 };
+
+const currentAcademicYear = () => {
+    if (new Date().getMonth() < 9) {
+        return new Date().getFullYear() - 1;
+    } else {
+        return new Date().getFullYear();
+    }
+};
 </script>
 
 <template>
@@ -87,17 +100,11 @@ const submitCourse = async (): Promise<void> => {
                         <Textarea id="courseDescription" v-model="form.description" autoResize rows="5" cols="30" />
                     </div>
 
-                    <!-- Course academic year -->
+                    <!-- Course faculty -->
                     <div class="mb-4">
-                        <label for="courseYear">{{ t('views.courses.year') }}</label>
-                        <Calendar id="courseYear" v-model="form.year" view="year" dateFormat="yy" showIcon>
-                            <template #footer>
-                                <div style="text-align: center">
-                                    {{ form.year.getFullYear() }} - {{ form.year.getFullYear() + 1 }}
-                                </div>
-                            </template>
-                        </Calendar>
-                        <ErrorMessage :field="v$.year" />
+                        <label for="courseFaculty">{{ t('views.courses.faculty') }}</label>
+                        <Dropdown id="courseFaculty" v-model="form.faculty" :options="faculties" optionLabel="name" v-if="faculties" />
+                        <ErrorMessage :field="v$.faculty" />
                     </div>
 
                     <!-- Submit button -->

From 412c9eeae53edaf45da66531059df80a7882ee96 Mon Sep 17 00:00:00 2001
From: Bram Meir <bram.meir@ugent.be>
Date: Sat, 6 Apr 2024 15:25:55 +0200
Subject: [PATCH 02/10] fix: faculty added when course created

---
 backend/api/serializers/course_serializer.py | 22 ++++++++++++++++++++
 backend/api/tests/test_course.py             | 17 +++++++++++++++
 backend/api/views/course_view.py             |  4 ++--
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/backend/api/serializers/course_serializer.py b/backend/api/serializers/course_serializer.py
index 38b4c281..94cd39e4 100644
--- a/backend/api/serializers/course_serializer.py
+++ b/backend/api/serializers/course_serializer.py
@@ -5,6 +5,7 @@
 from api.serializers.teacher_serializer import TeacherIDSerializer
 from api.serializers.faculty_serializer import FacultySerializer
 from api.models.course import Course
+from authentication.models import Faculty
 
 
 class CourseSerializer(serializers.ModelSerializer):
@@ -41,6 +42,27 @@ class Meta:
         fields = "__all__"
 
 
+class CreateCourseSerializer(CourseSerializer):
+    faculty = serializers.PrimaryKeyRelatedField(
+        queryset=Faculty.objects.all(),
+        required=False,
+        allow_null=True,
+    )
+
+    def create(self, validated_data):
+        faculty = validated_data.pop('faculty', None)
+
+        # Create the course
+        course = super().create(validated_data)
+
+        # Link the faculty, if specified
+        if faculty is not None:
+            course.faculty = faculty
+            course.save()
+
+        return course
+
+
 class CourseIDSerializer(serializers.Serializer):
     student_id = serializers.PrimaryKeyRelatedField(
         queryset=Course.objects.all()
diff --git a/backend/api/tests/test_course.py b/backend/api/tests/test_course.py
index c19abb32..e22d0153 100644
--- a/backend/api/tests/test_course.py
+++ b/backend/api/tests/test_course.py
@@ -8,6 +8,7 @@
 from api.models.assistant import Assistant
 from api.models.student import Student
 from api.models.project import Project
+from authentication.models import Faculty
 
 
 def create_project(name, description, visible, archived, days, course):
@@ -72,6 +73,16 @@ def create_teacher(id, first_name, last_name, email):
     return teacher
 
 
+def create_faculty(id, name):
+    """
+    Create a faculty with the given arguments.
+    """
+    return Faculty.objects.create(
+        id=id,
+        name=name,
+    )
+
+
 def create_course(name, academic_startyear, description=None, parent_course=None):
     """
     Create a Course with the given arguments.
@@ -853,12 +864,15 @@ def test_create_course(self):
         """
         Able to create a course.
         """
+        faculty = create_faculty(id="Engineering", name="Engineering")
+
         response = self.client.post(
             reverse("course-list"),
             data={
                 "name": "Introduction to Computer Science",
                 "academic_startyear": 2022,
                 "description": "An introductory course on computer science.",
+                "faculty": faculty.id,
             },
             follow=True,
         )
@@ -870,6 +884,9 @@ def test_create_course(self):
         course = Course.objects.get(name="Introduction to Computer Science")
         self.assertTrue(course.teachers.filter(id=self.user.id).exists())
 
+        # Make sure the course is linked to the faculty
+        self.assertEqual(course.faculty.id, faculty.id)
+
     def test_create_project(self):
         """
         Able to create a project for a course.
diff --git a/backend/api/views/course_view.py b/backend/api/views/course_view.py
index 38537f39..17141d64 100644
--- a/backend/api/views/course_view.py
+++ b/backend/api/views/course_view.py
@@ -16,7 +16,7 @@
 from api.permissions.role_permissions import IsTeacher, is_teacher
 from api.serializers.course_serializer import (
     CourseSerializer, StudentJoinSerializer, StudentLeaveSerializer, CourseCloneSerializer,
-    TeacherJoinSerializer, TeacherLeaveSerializer
+    TeacherJoinSerializer, TeacherLeaveSerializer, CreateCourseSerializer
 )
 from api.views.pagination.basic_pagination import BasicPagination
 from api.serializers.teacher_serializer import TeacherSerializer
@@ -33,7 +33,7 @@ class CourseViewSet(viewsets.ModelViewSet):
 
     def create(self, request: Request, *_):
         """Override the create method to add the teacher to the course"""
-        serializer = CourseSerializer(data=request.data, context={"request": request})
+        serializer = CreateCourseSerializer(data=request.data, context={"request": request})
 
         if serializer.is_valid(raise_exception=True):
             course = serializer.save()

From dc33b20601f3a59ba1bcecfcd5f6406ac41434b9 Mon Sep 17 00:00:00 2001
From: Bram Meir <bram.meir@ugent.be>
Date: Sat, 6 Apr 2024 18:04:52 +0200
Subject: [PATCH 03/10] chore: start docker upload project creation

---
 frontend/src/assets/lang/en.json              |  3 +-
 frontend/src/assets/lang/nl.json              |  3 +-
 .../src/views/projects/CreateProjectView.vue  | 40 +++++++++++++++----
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/frontend/src/assets/lang/en.json b/frontend/src/assets/lang/en.json
index 5a0889bf..aba6ef4e 100644
--- a/frontend/src/assets/lang/en.json
+++ b/frontend/src/assets/lang/en.json
@@ -49,7 +49,8 @@
             "group_size": "Number of students in a group (1 for an individual project)",
             "max_score": "Maximum score that can be achieved",
             "visibility": "Make project visible to students",
-            "score_visibility": "Make score, when uploaded, automatically visible to students"
+            "score_visibility": "Make score, when uploaded, automatically visible to students",
+            "docker_upload": "Upload a Dockerfile"
         },
         "courses": {
             "create": "Create course",
diff --git a/frontend/src/assets/lang/nl.json b/frontend/src/assets/lang/nl.json
index b20bfff3..1175c5ff 100644
--- a/frontend/src/assets/lang/nl.json
+++ b/frontend/src/assets/lang/nl.json
@@ -49,7 +49,8 @@
             "group_size": "Aantal studenten per groep (1 voor individueel project)",
             "max_score": "Maximale te behalen score",
             "visibility": "Project zichtbaar maken voor studenten",
-            "score_visibility": "Maak score, wanneer ingevuld, automatisch zichtbaar voor studenten"
+            "score_visibility": "Maak score, wanneer ingevuld, automatisch zichtbaar voor studenten",
+            "docker_upload": "Upload een Dockerfile"
         },
         "courses": {
           "create": "Creëer vak",
diff --git a/frontend/src/views/projects/CreateProjectView.vue b/frontend/src/views/projects/CreateProjectView.vue
index 13f83181..1d374c5e 100644
--- a/frontend/src/views/projects/CreateProjectView.vue
+++ b/frontend/src/views/projects/CreateProjectView.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import Calendar from 'primevue/calendar';
 import BaseLayout from '@/components/layout/BaseLayout.vue';
+import FileUpload from 'primevue/fileupload';
 import Title from '@/components/layout/Title.vue';
 import { reactive, computed } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
@@ -34,6 +35,7 @@ const form = reactive({
     maxScore: 10,
     visibility: true,
     scoreVisibility: false,
+    dockerScript: null,
 });
 
 // Define validation rules for each form field
@@ -50,6 +52,13 @@ const rules = computed(() => {
     };
 });
 
+// Function to handle the file upload
+const onDockerScriptUpload = (event: any) => {
+    form.dockerScript = event.files[0];
+
+    console.log(form.dockerScript);
+};
+
 // useVuelidate function to perform form validation
 const v$ = useVuelidate(rules, form);
 
@@ -85,13 +94,13 @@ const submitProject = async (): Promise<void> => {
 
 <template>
     <BaseLayout>
-        <div class="grid fadein">
-            <div class="col-12 md:col-6">
-                <!-- Create project heading -->
-                <Title class="mb-6">{{ t('views.projects.create') }}</Title>
+        <!-- Project form -->
+        <form @submit.prevent="submitProject">
+            <div class="grid fadein">
+                <div class="col-12 md:col-10">
+                    <!-- Create project heading -->
+                    <Title class="mb-6">{{ t('views.projects.create') }}</Title>
 
-                <!-- Project form -->
-                <form @submit.prevent="submitProject">
                     <!-- Project name -->
                     <div class="mb-4">
                         <label for="projectName">{{ t('views.projects.name') }}</label>
@@ -169,9 +178,17 @@ const submitProject = async (): Promise<void> => {
                             rounded
                         />
                     </div>
-                </form>
+                </div>
+
+                <div class="col-12 md:col-10">
+                    <!-- Upload field for docker script -->
+                    <div class="mt-7 mb-4">
+                        <label for="dockerScript">{{ t('views.projects.docker_upload') }}</label>
+                        <FileUpload id="dockerScript" mode="basic" accept=".sh" :multiple="false" @upload="onDockerScriptUpload"/>
+                    </div>
+                </div>
             </div>
-        </div>
+        </form>
     </BaseLayout>
 </template>
 
@@ -186,4 +203,11 @@ const submitProject = async (): Promise<void> => {
 label {
     margin-bottom: 0.5rem;
 }
+
+.grid {
+    display: grid;
+    grid-template-columns: 1fr 1fr; /* Two equally sized columns */
+    gap: 1rem; /* Space between columns */
+}
+
 </style>

From 6b5e6644b26fd0b1d1ff20f27d46df9e77f42791 Mon Sep 17 00:00:00 2001
From: Bram Meir <bram.meir@ugent.be>
Date: Sun, 7 Apr 2024 18:29:25 +0200
Subject: [PATCH 04/10] chore: init upload zip structure

---
 backend/api/serializers/project_serializer.py |  4 +++
 backend/api/views/project_view.py             | 19 ++++++++++++-
 frontend/src/assets/lang/en.json              |  3 ++-
 frontend/src/assets/lang/nl.json              |  3 ++-
 .../composables/services/project.service.ts   | 18 +++++++++++++
 frontend/src/config/endpoints.ts              |  1 +
 .../src/views/projects/CreateProjectView.vue  | 27 ++++++++++++++++---
 7 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/backend/api/serializers/project_serializer.py b/backend/api/serializers/project_serializer.py
index cde32f06..a5486a43 100644
--- a/backend/api/serializers/project_serializer.py
+++ b/backend/api/serializers/project_serializer.py
@@ -138,3 +138,7 @@ def validate(self, data):
         data["blocked_extensions"] = block_ext
 
         return data
+
+
+class ParseZipStructureSerializer(serializers.Serializer):
+    zip_file = serializers.FileField()
diff --git a/backend/api/views/project_view.py b/backend/api/views/project_view.py
index 8ec27b23..1f8488c3 100644
--- a/backend/api/views/project_view.py
+++ b/backend/api/views/project_view.py
@@ -12,11 +12,12 @@
 from api.serializers.checks_serializer import StructureCheckSerializer, ExtraCheckSerializer
 from api.serializers.project_serializer import (
     StructureCheckAddSerializer, SubmissionStatusSerializer,
-    ProjectSerializer, TeacherCreateGroupSerializer
+    ProjectSerializer, TeacherCreateGroupSerializer, ParseZipStructureSerializer
 )
 
 from api.serializers.group_serializer import GroupSerializer
 from api.serializers.submission_serializer import SubmissionSerializer
+from api.helpers.check_folder_structure import parse_zip_file
 from rest_framework.request import Request
 
 
@@ -122,6 +123,22 @@ def _add_structure_check(self, request: Request, **_):
             "message": gettext("project.success.structure_check.add")
         })
 
+    @action(detail=True, methods=["post"])
+    def parse_zip_structure(self, request, **_):
+        """Parses the zip structure for the given project"""
+        project: Project = self.get_object()
+
+        serializer = ParseZipStructureSerializer(
+            data=request.data, context={"request": request}
+        )
+
+        if serializer.is_valid(raise_exception=True):
+            parse_zip_file(project, serializer.validated_data["zip_file"])
+
+        return Response({
+            "message": gettext("project.success.structure_check.add")
+        })
+
     @action(detail=True, methods=["get"])
     def extra_checks(self, request, **_):
         """Returns the extra checks for the given project"""
diff --git a/frontend/src/assets/lang/en.json b/frontend/src/assets/lang/en.json
index aba6ef4e..3331cd7f 100644
--- a/frontend/src/assets/lang/en.json
+++ b/frontend/src/assets/lang/en.json
@@ -50,7 +50,8 @@
             "max_score": "Maximum score that can be achieved",
             "visibility": "Make project visible to students",
             "score_visibility": "Make score, when uploaded, automatically visible to students",
-            "docker_upload": "Upload a Dockerfile"
+            "docker_upload": "Upload a Dockerfile",
+            "submission_structure": "Structure of how a submission should be made"
         },
         "courses": {
             "create": "Create course",
diff --git a/frontend/src/assets/lang/nl.json b/frontend/src/assets/lang/nl.json
index 1175c5ff..58c89dc2 100644
--- a/frontend/src/assets/lang/nl.json
+++ b/frontend/src/assets/lang/nl.json
@@ -50,7 +50,8 @@
             "max_score": "Maximale te behalen score",
             "visibility": "Project zichtbaar maken voor studenten",
             "score_visibility": "Maak score, wanneer ingevuld, automatisch zichtbaar voor studenten",
-            "docker_upload": "Upload een Dockerfile"
+            "docker_upload": "Upload een Dockerfile",
+            "submission_structure": "Structuur van hoe de indiening moet gebeuren"
         },
         "courses": {
           "create": "Creëer vak",
diff --git a/frontend/src/composables/services/project.service.ts b/frontend/src/composables/services/project.service.ts
index e29d2519..d6aea9ff 100644
--- a/frontend/src/composables/services/project.service.ts
+++ b/frontend/src/composables/services/project.service.ts
@@ -3,6 +3,7 @@ import { Course } from '@/types/Course';
 import { type Ref, ref } from 'vue';
 import { endpoints } from '@/config/endpoints.ts';
 import axios from 'axios';
+import { client } from '@/config/axios.ts';
 import { get, getList, getListMerged, create, deleteId, processError } from '@/composables/services/helpers.ts';
 
 interface ProjectState {
@@ -14,6 +15,7 @@ interface ProjectState {
     getProjectsByCourseAndDeadline: (courseId: string, deadlineDate: Date) => Promise<void>;
     createProject: (projectData: Project, courseId: string) => Promise<void>;
     deleteProject: (id: string) => Promise<void>;
+    uploadSubmissionStructure: (id: string, file: File) => Promise<void>;
 }
 
 export function useProject(): ProjectState {
@@ -100,6 +102,20 @@ export function useProject(): ProjectState {
         await deleteId<Project>(endpoint, project, Project.fromJSON);
     }
 
+    async function uploadSubmissionStructure(id: string, file: File): Promise<void> {
+        const endpoint = endpoints.projects.uploadSubmissionStructure.replace('{id}', id);
+        const data = new FormData();
+        data.append('zip_file', file);
+
+        try {
+            await client.post(endpoint, data);
+        } catch (error: any) {
+            processError(error);
+            console.error(error); // Log the error for debugging
+            throw error; // Re-throw the error to the caller
+        }
+    }
+
     return {
         projects,
         project,
@@ -110,5 +126,7 @@ export function useProject(): ProjectState {
 
         createProject,
         deleteProject,
+
+        uploadSubmissionStructure,
     };
 }
diff --git a/frontend/src/config/endpoints.ts b/frontend/src/config/endpoints.ts
index e1152735..fb676071 100644
--- a/frontend/src/config/endpoints.ts
+++ b/frontend/src/config/endpoints.ts
@@ -50,6 +50,7 @@ export const endpoints = {
     projects: {
         retrieve: '/api/projects/{id}',
         byCourse: '/api/courses/{courseId}/projects/',
+        uploadSubmissionStructure: '/api/projects/{id}/parse_zip_structure/',
     },
     submissions: {
         retrieve: '/api/submissions/{id}',
diff --git a/frontend/src/views/projects/CreateProjectView.vue b/frontend/src/views/projects/CreateProjectView.vue
index 1d374c5e..2ed55be2 100644
--- a/frontend/src/views/projects/CreateProjectView.vue
+++ b/frontend/src/views/projects/CreateProjectView.vue
@@ -3,6 +3,7 @@ import Calendar from 'primevue/calendar';
 import BaseLayout from '@/components/layout/BaseLayout.vue';
 import FileUpload from 'primevue/fileupload';
 import Title from '@/components/layout/Title.vue';
+import Tree from 'primevue/tree';
 import { reactive, computed } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
@@ -23,7 +24,7 @@ const { push } = useRouter();
 const { params } = useRoute();
 
 /* Service injection */
-const { createProject } = useProject();
+const { createProject, uploadSubmissionStructure } = useProject();
 
 /* Form content */
 const form = reactive({
@@ -36,6 +37,7 @@ const form = reactive({
     visibility: true,
     scoreVisibility: false,
     dockerScript: null,
+    submissionStructure: null,
 });
 
 // Define validation rules for each form field
@@ -52,13 +54,19 @@ const rules = computed(() => {
     };
 });
 
-// Function to handle the file upload
+// Function to handle the file upload of a docker script
 const onDockerScriptUpload = (event: any) => {
     form.dockerScript = event.files[0];
-
     console.log(form.dockerScript);
 };
 
+// Function to handle the file upload of a zip file containing the submission structure
+const onZipStructureUpload = (event: any) => {
+    form.submissionStructure = event.files[0];
+    console.log(form.submissionStructure);
+};
+
+
 // useVuelidate function to perform form validation
 const v$ = useVuelidate(rules, form);
 
@@ -86,6 +94,11 @@ const submitProject = async (): Promise<void> => {
             params.courseId as string,
         );
 
+        // Upload the zip file containing the submission structure
+        if (form.submissionStructure) {
+            // TODO: Get on some way the project id
+        }
+
         // Redirect to the dashboard overview
         push({ name: 'dashboard' });
     }
@@ -184,7 +197,13 @@ const submitProject = async (): Promise<void> => {
                     <!-- Upload field for docker script -->
                     <div class="mt-7 mb-4">
                         <label for="dockerScript">{{ t('views.projects.docker_upload') }}</label>
-                        <FileUpload id="dockerScript" mode="basic" accept=".sh" :multiple="false" @upload="onDockerScriptUpload"/>
+                        <FileUpload id="dockerScript" mode="basic" accept=".sh" :multiple="false" customUpload @upload="onDockerScriptUpload"/>
+                    </div>
+
+                    <!-- Upload field for a zip file that contains the submission structure -->
+                    <div class="mb-4">
+                        <label for="submissionStructure">{{ t('views.projects.submission_structure') }}</label>
+                        <FileUpload id="submissionStructure" mode="basic" accept=".zip" :multiple="false" customUpload @upload="onZipStructureUpload"/>
                     </div>
                 </div>
             </div>

From f60df1ac72a16a4fc1ca85278808ff1e47e4757c Mon Sep 17 00:00:00 2001
From: Bram Meir <bram.meir@ugent.be>
Date: Mon, 8 Apr 2024 22:46:12 +0200
Subject: [PATCH 05/10] chore: still issues with file-upload

---
 backend/api/serializers/project_serializer.py | 18 ++++++---
 backend/api/tests/test_course.py              | 38 +++++++++++++++++++
 backend/api/views/project_view.py             | 19 +---------
 frontend/src/composables/services/helpers.ts  |  6 ++-
 .../composables/services/project.service.ts   | 19 +---------
 frontend/src/config/endpoints.ts              |  1 -
 frontend/src/types/Projects.ts                |  1 +
 .../src/views/projects/CreateProjectView.vue  | 13 +++----
 8 files changed, 64 insertions(+), 51 deletions(-)

diff --git a/backend/api/serializers/project_serializer.py b/backend/api/serializers/project_serializer.py
index a5486a43..09342f23 100644
--- a/backend/api/serializers/project_serializer.py
+++ b/backend/api/serializers/project_serializer.py
@@ -7,6 +7,7 @@
 from api.models.checks import FileExtension
 from api.serializers.submission_serializer import SubmissionSerializer
 from api.serializers.checks_serializer import StructureCheckSerializer
+from api.helpers.check_folder_structure import parse_zip_file
 
 
 class ProjectSerializer(serializers.ModelSerializer):
@@ -59,11 +60,18 @@ def validate(self, data):
 
 class CreateProjectSerializer(ProjectSerializer):
     number_groups = serializers.IntegerField(min_value=1, required=False)
+    zip_structure = serializers.FileField(write_only=True, required=False)
 
-    def create(self, validated_data):
+    def create(self, validated_data):        
         # Pop the 'number_groups' field from validated_data
         number_groups = validated_data.pop('number_groups', None)
 
+        # Get the zip structure file from the request
+        request = self.context.get('request')
+        zip_structure = request.FILES.get('zip_structure')
+
+        print(zip_structure)
+
         # Create the project object without passing 'number_groups' field
         project = super().create(validated_data)
 
@@ -81,6 +89,10 @@ def create(self, validated_data):
                 group = Group.objects.create(project=project)
                 group.students.add(student)
 
+        # If a zip_structure is provided, extract the contents
+        if zip_structure is not None:
+            parse_zip_file(project, zip_structure)
+
         return project
 
 
@@ -138,7 +150,3 @@ def validate(self, data):
         data["blocked_extensions"] = block_ext
 
         return data
-
-
-class ParseZipStructureSerializer(serializers.Serializer):
-    zip_file = serializers.FileField()
diff --git a/backend/api/tests/test_course.py b/backend/api/tests/test_course.py
index e22d0153..a58dda8f 100644
--- a/backend/api/tests/test_course.py
+++ b/backend/api/tests/test_course.py
@@ -9,6 +9,7 @@
 from api.models.student import Student
 from api.models.project import Project
 from authentication.models import Faculty
+from django.core.files.uploadedfile import SimpleUploadedFile
 
 
 def create_project(name, description, visible, archived, days, course):
@@ -916,6 +917,43 @@ def test_create_project(self):
         project = course.projects.get(name="become champions")
         self.assertEqual(project.groups.count(), 0)
 
+    def test_create_project_with_zip_file_as_structure(self):
+        """
+        Able to create a project for a course with a zip file as structure.
+        """
+        course = get_course()
+        course.teachers.add(self.user)
+
+        with open("data/testing/structures/root.zip", "rb") as zip_file:
+
+            uploaded_file = SimpleUploadedFile("root.zip", zip_file.read(), content_type="application/zip")
+
+            response = self.client.post(
+                reverse("course-projects", args=[str(course.id)]),
+                data={
+                    "name": "become champions",
+                    "description": "win the jpl",
+                    "visible": True,
+                    "archived": False,
+                    "days": 50,
+                    "deadline": timezone.now() + timezone.timedelta(days=50),
+                    "start_date": timezone.now(),
+                    "group_size": 2,
+                },
+                files={
+                    "zip_structure": uploaded_file
+                },
+                follow=True,
+            )
+
+            # Debugging print statements
+            self.assertEqual(response.status_code, 200)
+            self.assertTrue(course.projects.filter(name="become champions").exists())
+
+            # Make sure there are structure checks added to the project
+            project = course.projects.get(name="become champions")
+            self.assertTrue(project.structure_checks.exists())
+
     def test_create_project_with_number_groups(self):
         """
         Able to create a project for a course with a number of groups.
diff --git a/backend/api/views/project_view.py b/backend/api/views/project_view.py
index 1f8488c3..8ec27b23 100644
--- a/backend/api/views/project_view.py
+++ b/backend/api/views/project_view.py
@@ -12,12 +12,11 @@
 from api.serializers.checks_serializer import StructureCheckSerializer, ExtraCheckSerializer
 from api.serializers.project_serializer import (
     StructureCheckAddSerializer, SubmissionStatusSerializer,
-    ProjectSerializer, TeacherCreateGroupSerializer, ParseZipStructureSerializer
+    ProjectSerializer, TeacherCreateGroupSerializer
 )
 
 from api.serializers.group_serializer import GroupSerializer
 from api.serializers.submission_serializer import SubmissionSerializer
-from api.helpers.check_folder_structure import parse_zip_file
 from rest_framework.request import Request
 
 
@@ -123,22 +122,6 @@ def _add_structure_check(self, request: Request, **_):
             "message": gettext("project.success.structure_check.add")
         })
 
-    @action(detail=True, methods=["post"])
-    def parse_zip_structure(self, request, **_):
-        """Parses the zip structure for the given project"""
-        project: Project = self.get_object()
-
-        serializer = ParseZipStructureSerializer(
-            data=request.data, context={"request": request}
-        )
-
-        if serializer.is_valid(raise_exception=True):
-            parse_zip_file(project, serializer.validated_data["zip_file"])
-
-        return Response({
-            "message": gettext("project.success.structure_check.add")
-        })
-
     @action(detail=True, methods=["get"])
     def extra_checks(self, request, **_):
         """Returns the extra checks for the given project"""
diff --git a/frontend/src/composables/services/helpers.ts b/frontend/src/composables/services/helpers.ts
index 26e40da2..f75a0995 100644
--- a/frontend/src/composables/services/helpers.ts
+++ b/frontend/src/composables/services/helpers.ts
@@ -39,7 +39,11 @@ export async function create<T>(
     fromJson: (data: any) => T,
 ): Promise<void> {
     try {
-        const response = await client.post(endpoint, data);
+        const response = await client.post(endpoint, data, {
+            headers: {
+                'Content-Type': 'multipart/form-data',
+            },
+        });
         ref.value = fromJson(response.data);
     } catch (error: any) {
         processError(error);
diff --git a/frontend/src/composables/services/project.service.ts b/frontend/src/composables/services/project.service.ts
index d6aea9ff..2c1d5771 100644
--- a/frontend/src/composables/services/project.service.ts
+++ b/frontend/src/composables/services/project.service.ts
@@ -3,7 +3,6 @@ import { Course } from '@/types/Course';
 import { type Ref, ref } from 'vue';
 import { endpoints } from '@/config/endpoints.ts';
 import axios from 'axios';
-import { client } from '@/config/axios.ts';
 import { get, getList, getListMerged, create, deleteId, processError } from '@/composables/services/helpers.ts';
 
 interface ProjectState {
@@ -15,7 +14,6 @@ interface ProjectState {
     getProjectsByCourseAndDeadline: (courseId: string, deadlineDate: Date) => Promise<void>;
     createProject: (projectData: Project, courseId: string) => Promise<void>;
     deleteProject: (id: string) => Promise<void>;
-    uploadSubmissionStructure: (id: string, file: File) => Promise<void>;
 }
 
 export function useProject(): ProjectState {
@@ -91,6 +89,7 @@ export function useProject(): ProjectState {
                 max_score: projectData.max_score,
                 score_visible: projectData.score_visible,
                 group_size: projectData.group_size,
+                zip_structure: projectData.structure_file,
             },
             project,
             Project.fromJSON,
@@ -102,20 +101,6 @@ export function useProject(): ProjectState {
         await deleteId<Project>(endpoint, project, Project.fromJSON);
     }
 
-    async function uploadSubmissionStructure(id: string, file: File): Promise<void> {
-        const endpoint = endpoints.projects.uploadSubmissionStructure.replace('{id}', id);
-        const data = new FormData();
-        data.append('zip_file', file);
-
-        try {
-            await client.post(endpoint, data);
-        } catch (error: any) {
-            processError(error);
-            console.error(error); // Log the error for debugging
-            throw error; // Re-throw the error to the caller
-        }
-    }
-
     return {
         projects,
         project,
@@ -126,7 +111,5 @@ export function useProject(): ProjectState {
 
         createProject,
         deleteProject,
-
-        uploadSubmissionStructure,
     };
 }
diff --git a/frontend/src/config/endpoints.ts b/frontend/src/config/endpoints.ts
index fb676071..e1152735 100644
--- a/frontend/src/config/endpoints.ts
+++ b/frontend/src/config/endpoints.ts
@@ -50,7 +50,6 @@ export const endpoints = {
     projects: {
         retrieve: '/api/projects/{id}',
         byCourse: '/api/courses/{courseId}/projects/',
-        uploadSubmissionStructure: '/api/projects/{id}/parse_zip_structure/',
     },
     submissions: {
         retrieve: '/api/submissions/{id}',
diff --git a/frontend/src/types/Projects.ts b/frontend/src/types/Projects.ts
index 8fa0f2a4..f5691551 100644
--- a/frontend/src/types/Projects.ts
+++ b/frontend/src/types/Projects.ts
@@ -18,6 +18,7 @@ export class Project {
         public score_visible: boolean,
         public group_size: number,
 
+        public structure_file: File | null = null,
         public course: Course | null = null,
         public structureChecks: StructureCheck[] = [],
         public extra_checks: ExtraCheck[] = [],
diff --git a/frontend/src/views/projects/CreateProjectView.vue b/frontend/src/views/projects/CreateProjectView.vue
index 2ed55be2..339dd63b 100644
--- a/frontend/src/views/projects/CreateProjectView.vue
+++ b/frontend/src/views/projects/CreateProjectView.vue
@@ -24,7 +24,7 @@ const { push } = useRouter();
 const { params } = useRoute();
 
 /* Service injection */
-const { createProject, uploadSubmissionStructure } = useProject();
+const { createProject } = useProject();
 
 /* Form content */
 const form = reactive({
@@ -77,6 +77,7 @@ const submitProject = async (): Promise<void> => {
     // Only submit the form if the validation was successful
     if (result) {
         // Pass the project data to the service
+        console.log(form.submissionStructure);
         await createProject(
             new Project(
                 '', // ID not needed for creation, will be generated by the backend
@@ -90,15 +91,11 @@ const submitProject = async (): Promise<void> => {
                 form.maxScore,
                 form.scoreVisibility,
                 form.groupSize,
+                form.submissionStructure
             ),
             params.courseId as string,
         );
 
-        // Upload the zip file containing the submission structure
-        if (form.submissionStructure) {
-            // TODO: Get on some way the project id
-        }
-
         // Redirect to the dashboard overview
         push({ name: 'dashboard' });
     }
@@ -197,13 +194,13 @@ const submitProject = async (): Promise<void> => {
                     <!-- Upload field for docker script -->
                     <div class="mt-7 mb-4">
                         <label for="dockerScript">{{ t('views.projects.docker_upload') }}</label>
-                        <FileUpload id="dockerScript" mode="basic" accept=".sh" :multiple="false" customUpload @upload="onDockerScriptUpload"/>
+                        <FileUpload id="dockerScript" mode="basic" accept=".sh" :multiple="false" @select="onDockerScriptUpload"/>
                     </div>
 
                     <!-- Upload field for a zip file that contains the submission structure -->
                     <div class="mb-4">
                         <label for="submissionStructure">{{ t('views.projects.submission_structure') }}</label>
-                        <FileUpload id="submissionStructure" mode="basic" accept=".zip" :multiple="false" customUpload @upload="onZipStructureUpload"/>
+                        <FileUpload id="submissionStructure" mode="basic" accept=".zip" :multiple="false" @select="onZipStructureUpload"/>
                     </div>
                 </div>
             </div>

From 26f4c5d3dd4493a3a5ca29d1fe350d355c340ba3 Mon Sep 17 00:00:00 2001
From: Bram Meir <bram.meir@ugent.be>
Date: Tue, 9 Apr 2024 11:47:10 +0200
Subject: [PATCH 06/10] chore: fix uploaded zip file parsing

---
 backend/api/serializers/project_serializer.py | 21 ++++++++++++-------
 .../api/serializers/submission_serializer.py  |  2 --
 backend/api/tests/test_course.py              |  9 ++------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/backend/api/serializers/project_serializer.py b/backend/api/serializers/project_serializer.py
index 09342f23..b0473d4e 100644
--- a/backend/api/serializers/project_serializer.py
+++ b/backend/api/serializers/project_serializer.py
@@ -1,3 +1,5 @@
+from django.core.files.storage import FileSystemStorage
+from django.conf import settings
 from django.utils.translation import gettext
 from rest_framework import serializers
 from api.models.project import Project
@@ -7,7 +9,7 @@
 from api.models.checks import FileExtension
 from api.serializers.submission_serializer import SubmissionSerializer
 from api.serializers.checks_serializer import StructureCheckSerializer
-from api.helpers.check_folder_structure import parse_zip_file
+from api.logic.check_folder_structure import parse_zip_file
 
 
 class ProjectSerializer(serializers.ModelSerializer):
@@ -60,9 +62,9 @@ def validate(self, data):
 
 class CreateProjectSerializer(ProjectSerializer):
     number_groups = serializers.IntegerField(min_value=1, required=False)
-    zip_structure = serializers.FileField(write_only=True, required=False)
+    zip_structure = serializers.FileField(required=False, read_only=True)
 
-    def create(self, validated_data):        
+    def create(self, validated_data):
         # Pop the 'number_groups' field from validated_data
         number_groups = validated_data.pop('number_groups', None)
 
@@ -70,8 +72,6 @@ def create(self, validated_data):
         request = self.context.get('request')
         zip_structure = request.FILES.get('zip_structure')
 
-        print(zip_structure)
-
         # Create the project object without passing 'number_groups' field
         project = super().create(validated_data)
 
@@ -89,9 +89,16 @@ def create(self, validated_data):
                 group = Group.objects.create(project=project)
                 group.students.add(student)
 
-        # If a zip_structure is provided, extract the contents
+        # If a zip_structure is provided, parse it to create the structure checks
         if zip_structure is not None:
-            parse_zip_file(project, zip_structure)
+            # Define tje temporary storage location
+            temp_storage = FileSystemStorage(location=settings.MEDIA_ROOT)
+            # Save the file to the temporary location
+            temp_file_path = temp_storage.save(f"tmp/{zip_structure.name}", zip_structure)
+            # Pass the full path to the parse_zip_file function
+            parse_zip_file(project, temp_file_path)
+            # Delete the temporary file
+            temp_storage.delete(temp_file_path)
 
         return project
 
diff --git a/backend/api/serializers/submission_serializer.py b/backend/api/serializers/submission_serializer.py
index 29114d77..1c49596a 100644
--- a/backend/api/serializers/submission_serializer.py
+++ b/backend/api/serializers/submission_serializer.py
@@ -1,5 +1,3 @@
-from typing import Any
-
 from api.logic.check_folder_structure import check_zip_file  # , parse_zip_file
 from api.models.submission import (ErrorTemplate, ExtraChecksResult,
                                    Submission, SubmissionFile)
diff --git a/backend/api/tests/test_course.py b/backend/api/tests/test_course.py
index a58dda8f..122b1fd7 100644
--- a/backend/api/tests/test_course.py
+++ b/backend/api/tests/test_course.py
@@ -924,10 +924,7 @@ def test_create_project_with_zip_file_as_structure(self):
         course = get_course()
         course.teachers.add(self.user)
 
-        with open("data/testing/structures/root.zip", "rb") as zip_file:
-
-            uploaded_file = SimpleUploadedFile("root.zip", zip_file.read(), content_type="application/zip")
-
+        with open("data/testing/structures/zip_struct1.zip", "rb") as f:
             response = self.client.post(
                 reverse("course-projects", args=[str(course.id)]),
                 data={
@@ -939,9 +936,7 @@ def test_create_project_with_zip_file_as_structure(self):
                     "deadline": timezone.now() + timezone.timedelta(days=50),
                     "start_date": timezone.now(),
                     "group_size": 2,
-                },
-                files={
-                    "zip_structure": uploaded_file
+                    "zip_structure": SimpleUploadedFile('zip_struct1.zip', f.read(), content_type='application/zip'),
                 },
                 follow=True,
             )

From f59658af1b443bbee5b89957c689dd864d74a958 Mon Sep 17 00:00:00 2001
From: Bram Meir <bram.meir@ugent.be>
Date: Tue, 9 Apr 2024 17:49:36 +0200
Subject: [PATCH 07/10] fix: cleanup

---
 backend/api/tests/test_course.py                     | 1 -
 frontend/src/composables/services/courses.service.ts | 6 +++---
 frontend/src/views/courses/CreateCourseView.vue      | 1 +
 frontend/src/views/projects/CreateProjectView.vue    | 7 ++-----
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/backend/api/tests/test_course.py b/backend/api/tests/test_course.py
index 7cb9d8a4..e12260e5 100644
--- a/backend/api/tests/test_course.py
+++ b/backend/api/tests/test_course.py
@@ -867,7 +867,6 @@ def test_create_project_with_zip_file_as_structure(self):
                 follow=True,
             )
 
-            # Debugging print statements
             self.assertEqual(response.status_code, 200)
             self.assertTrue(course.projects.filter(name="become champions").exists())
 
diff --git a/frontend/src/composables/services/courses.service.ts b/frontend/src/composables/services/courses.service.ts
index a984e6d5..8816bf6d 100644
--- a/frontend/src/composables/services/courses.service.ts
+++ b/frontend/src/composables/services/courses.service.ts
@@ -59,7 +59,7 @@ export function useCourses(): CoursesState {
 
     async function createCourse(courseData: Course): Promise<void> {
         const endpoint = endpoints.courses.index;
-        await create<Response>(
+        await create<Course>(
             endpoint,
             {
                 name: courseData.name,
@@ -67,8 +67,8 @@ export function useCourses(): CoursesState {
                 academic_startyear: courseData.academic_startyear,
                 faculty: courseData.faculty?.id,
             },
-            response,
-            Response.fromJSON,
+            course,
+            Course.fromJSON,
         );
     }
 
diff --git a/frontend/src/views/courses/CreateCourseView.vue b/frontend/src/views/courses/CreateCourseView.vue
index d05d1e20..4938bc16 100644
--- a/frontend/src/views/courses/CreateCourseView.vue
+++ b/frontend/src/views/courses/CreateCourseView.vue
@@ -69,6 +69,7 @@ const submitCourse = async (): Promise<void> => {
     }
 };
 
+/* Get the current academic year */
 const currentAcademicYear = () => {
     if (new Date().getMonth() < 9) {
         return new Date().getFullYear() - 1;
diff --git a/frontend/src/views/projects/CreateProjectView.vue b/frontend/src/views/projects/CreateProjectView.vue
index 339dd63b..c0ccbd84 100644
--- a/frontend/src/views/projects/CreateProjectView.vue
+++ b/frontend/src/views/projects/CreateProjectView.vue
@@ -57,13 +57,11 @@ const rules = computed(() => {
 // Function to handle the file upload of a docker script
 const onDockerScriptUpload = (event: any) => {
     form.dockerScript = event.files[0];
-    console.log(form.dockerScript);
 };
 
 // Function to handle the file upload of a zip file containing the submission structure
 const onZipStructureUpload = (event: any) => {
     form.submissionStructure = event.files[0];
-    console.log(form.submissionStructure);
 };
 
 
@@ -77,7 +75,6 @@ const submitProject = async (): Promise<void> => {
     // Only submit the form if the validation was successful
     if (result) {
         // Pass the project data to the service
-        console.log(form.submissionStructure);
         await createProject(
             new Project(
                 '', // ID not needed for creation, will be generated by the backend
@@ -222,8 +219,8 @@ label {
 
 .grid {
     display: grid;
-    grid-template-columns: 1fr 1fr; /* Two equally sized columns */
-    gap: 1rem; /* Space between columns */
+    grid-template-columns: 1fr 1fr;
+    gap: 1rem;
 }
 
 </style>

From 3446d62b31d98a50ba3702f33b1b53a22d1b296a Mon Sep 17 00:00:00 2001
From: Bram Meir <bram.meir@ugent.be>
Date: Tue, 9 Apr 2024 18:13:17 +0200
Subject: [PATCH 08/10] fix: linting

---
 .../composables/services/courses.service.ts   |  2 --
 .../src/views/courses/CreateCourseView.vue    | 10 ++++++--
 .../src/views/projects/CreateProjectView.vue  | 25 +++++++++++++------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/frontend/src/composables/services/courses.service.ts b/frontend/src/composables/services/courses.service.ts
index 8816bf6d..d05f6e53 100644
--- a/frontend/src/composables/services/courses.service.ts
+++ b/frontend/src/composables/services/courses.service.ts
@@ -4,7 +4,6 @@ import { endpoints } from '@/config/endpoints.ts';
 import { get, getList, create, deleteId, getPaginatedList } from '@/composables/services/helpers.ts';
 import { type PaginatorResponse } from '@/types/filter/Paginator.ts';
 import { type Filter } from '@/types/filter/Filter.ts';
-import { Response } from '@/types/Response.ts';
 
 interface CoursesState {
     pagination: Ref<PaginatorResponse<Course> | null>;
@@ -25,7 +24,6 @@ export function useCourses(): CoursesState {
     const pagination = ref<PaginatorResponse<Course> | null>(null);
     const courses = ref<Course[] | null>(null);
     const course = ref<Course | null>(null);
-    const response = ref<Response | null>(null);
 
     async function getCourseByID(id: string): Promise<void> {
         const endpoint = endpoints.courses.retrieve.replace('{id}', id);
diff --git a/frontend/src/views/courses/CreateCourseView.vue b/frontend/src/views/courses/CreateCourseView.vue
index 4938bc16..0c5096a6 100644
--- a/frontend/src/views/courses/CreateCourseView.vue
+++ b/frontend/src/views/courses/CreateCourseView.vue
@@ -70,7 +70,7 @@ const submitCourse = async (): Promise<void> => {
 };
 
 /* Get the current academic year */
-const currentAcademicYear = () => {
+const currentAcademicYear = (): number => {
     if (new Date().getMonth() < 9) {
         return new Date().getFullYear() - 1;
     } else {
@@ -104,7 +104,13 @@ const currentAcademicYear = () => {
                     <!-- Course faculty -->
                     <div class="mb-4">
                         <label for="courseFaculty">{{ t('views.courses.faculty') }}</label>
-                        <Dropdown id="courseFaculty" v-model="form.faculty" :options="faculties" optionLabel="name" v-if="faculties" />
+                        <Dropdown
+                            id="courseFaculty"
+                            v-model="form.faculty"
+                            :options="faculties"
+                            optionLabel="name"
+                            v-if="faculties"
+                        />
                         <ErrorMessage :field="v$.faculty" />
                     </div>
 
diff --git a/frontend/src/views/projects/CreateProjectView.vue b/frontend/src/views/projects/CreateProjectView.vue
index c0ccbd84..9dc09265 100644
--- a/frontend/src/views/projects/CreateProjectView.vue
+++ b/frontend/src/views/projects/CreateProjectView.vue
@@ -3,7 +3,6 @@ import Calendar from 'primevue/calendar';
 import BaseLayout from '@/components/layout/BaseLayout.vue';
 import FileUpload from 'primevue/fileupload';
 import Title from '@/components/layout/Title.vue';
-import Tree from 'primevue/tree';
 import { reactive, computed } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
@@ -55,16 +54,15 @@ const rules = computed(() => {
 });
 
 // Function to handle the file upload of a docker script
-const onDockerScriptUpload = (event: any) => {
+const onDockerScriptUpload = (event: any): void => {
     form.dockerScript = event.files[0];
 };
 
 // Function to handle the file upload of a zip file containing the submission structure
-const onZipStructureUpload = (event: any) => {
+const onZipStructureUpload = (event: any): void => {
     form.submissionStructure = event.files[0];
 };
 
-
 // useVuelidate function to perform form validation
 const v$ = useVuelidate(rules, form);
 
@@ -88,7 +86,7 @@ const submitProject = async (): Promise<void> => {
                 form.maxScore,
                 form.scoreVisibility,
                 form.groupSize,
-                form.submissionStructure
+                form.submissionStructure,
             ),
             params.courseId as string,
         );
@@ -191,13 +189,25 @@ const submitProject = async (): Promise<void> => {
                     <!-- Upload field for docker script -->
                     <div class="mt-7 mb-4">
                         <label for="dockerScript">{{ t('views.projects.docker_upload') }}</label>
-                        <FileUpload id="dockerScript" mode="basic" accept=".sh" :multiple="false" @select="onDockerScriptUpload"/>
+                        <FileUpload
+                            id="dockerScript"
+                            mode="basic"
+                            accept=".sh"
+                            :multiple="false"
+                            @select="onDockerScriptUpload"
+                        />
                     </div>
 
                     <!-- Upload field for a zip file that contains the submission structure -->
                     <div class="mb-4">
                         <label for="submissionStructure">{{ t('views.projects.submission_structure') }}</label>
-                        <FileUpload id="submissionStructure" mode="basic" accept=".zip" :multiple="false" @select="onZipStructureUpload"/>
+                        <FileUpload
+                            id="submissionStructure"
+                            mode="basic"
+                            accept=".zip"
+                            :multiple="false"
+                            @select="onZipStructureUpload"
+                        />
                     </div>
                 </div>
             </div>
@@ -222,5 +232,4 @@ label {
     grid-template-columns: 1fr 1fr;
     gap: 1rem;
 }
-
 </style>

From 873d18b0c10a866e7e2ba1211554c7fe912873c5 Mon Sep 17 00:00:00 2001
From: Bram Meir <bram.meir@ugent.be>
Date: Tue, 9 Apr 2024 18:51:43 +0200
Subject: [PATCH 09/10] fix: tests

---
 frontend/src/composables/services/helpers.ts         | 3 ++-
 frontend/src/composables/services/project.service.ts | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/composables/services/helpers.ts b/frontend/src/composables/services/helpers.ts
index f75a0995..240a7ff0 100644
--- a/frontend/src/composables/services/helpers.ts
+++ b/frontend/src/composables/services/helpers.ts
@@ -37,11 +37,12 @@ export async function create<T>(
     data: any,
     ref: Ref<T | null>,
     fromJson: (data: any) => T,
+    content_type: string = 'application/json',
 ): Promise<void> {
     try {
         const response = await client.post(endpoint, data, {
             headers: {
-                'Content-Type': 'multipart/form-data',
+                'Content-Type': content_type,
             },
         });
         ref.value = fromJson(response.data);
diff --git a/frontend/src/composables/services/project.service.ts b/frontend/src/composables/services/project.service.ts
index 2c1d5771..ab8e9c49 100644
--- a/frontend/src/composables/services/project.service.ts
+++ b/frontend/src/composables/services/project.service.ts
@@ -93,6 +93,7 @@ export function useProject(): ProjectState {
             },
             project,
             Project.fromJSON,
+            'multipart/form-data'
         );
     }
 

From 1bfb131636aa99e361a84448cb56f6fd07047e0c Mon Sep 17 00:00:00 2001
From: Bram Meir <bram.meir@ugent.be>
Date: Tue, 9 Apr 2024 18:54:24 +0200
Subject: [PATCH 10/10] fix: hopefully last fix

---
 frontend/src/composables/services/helpers.ts         | 4 ++--
 frontend/src/composables/services/project.service.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/composables/services/helpers.ts b/frontend/src/composables/services/helpers.ts
index 240a7ff0..86ff204a 100644
--- a/frontend/src/composables/services/helpers.ts
+++ b/frontend/src/composables/services/helpers.ts
@@ -37,12 +37,12 @@ export async function create<T>(
     data: any,
     ref: Ref<T | null>,
     fromJson: (data: any) => T,
-    content_type: string = 'application/json',
+    contentType: string = 'application/json',
 ): Promise<void> {
     try {
         const response = await client.post(endpoint, data, {
             headers: {
-                'Content-Type': content_type,
+                'Content-Type': contentType,
             },
         });
         ref.value = fromJson(response.data);
diff --git a/frontend/src/composables/services/project.service.ts b/frontend/src/composables/services/project.service.ts
index ab8e9c49..f12de435 100644
--- a/frontend/src/composables/services/project.service.ts
+++ b/frontend/src/composables/services/project.service.ts
@@ -93,7 +93,7 @@ export function useProject(): ProjectState {
             },
             project,
             Project.fromJSON,
-            'multipart/form-data'
+            'multipart/form-data',
         );
     }