From eece63bf38e8aafe8cf2a55ca86e0a78967a982d Mon Sep 17 00:00:00 2001
From: bsilkyn <brent.silkyn@ugent.be>
Date: Thu, 23 May 2024 16:58:52 +0200
Subject: [PATCH 1/7] chore: refactor the conversion of structureChecks to
 TreeNodes to the Project.ts file

---
 .../projects/ProjectStructureEditor.vue       | 69 ++----------------
 frontend/src/types/Project.ts                 | 70 +++++++++++++++++++
 2 files changed, 74 insertions(+), 65 deletions(-)

diff --git a/frontend/src/components/projects/ProjectStructureEditor.vue b/frontend/src/components/projects/ProjectStructureEditor.vue
index c1ee1f5e..8810c48b 100644
--- a/frontend/src/components/projects/ProjectStructureEditor.vue
+++ b/frontend/src/components/projects/ProjectStructureEditor.vue
@@ -3,11 +3,12 @@ import Tree from 'primevue/tree';
 import Button from 'primevue/button';
 import Chips from 'primevue/chips';
 import InputText from 'primevue/inputtext';
-import { StructureCheck } from '@/types/StructureCheck.ts';
-import { computed, ref } from 'vue';
+import { ref } from 'vue';
 import { type TreeNode } from 'primevue/treenode';
 import { PrimeIcons } from 'primevue/api';
 import { useI18n } from 'vue-i18n';
+import { Project } from "@/types/Project.ts";
+import { StructureCheck } from '@/types/StructureCheck.ts';
 
 /* Models */
 const structureChecks = defineModel<StructureCheck[]>();
@@ -21,30 +22,6 @@ const editingStructureCheck = ref<StructureCheck | null>(null);
 const selectedKeys = ref<string[]>([]);
 const expandedKeys = ref<string[]>([]);
 
-/* Computed */
-const nodes = computed<TreeNode[]>(() => {
-    const nodes: TreeNode[] = [];
-
-    if (structureChecks.value !== undefined) {
-        for (const [i, check] of structureChecks.value.entries()) {
-            const hierarchy = check.getDirectoryHierarchy();
-            let currentNodes = nodes;
-
-            for (const [j, part] of hierarchy.entries()) {
-                let node = currentNodes.find((node) => node.label === part);
-
-                if (node === undefined) {
-                    node = newTreeNode(check, `${i}${j}`, part, j === hierarchy.length - 1);
-                    currentNodes.push(node);
-                }
-
-                currentNodes = node.children ?? [];
-            }
-        }
-    }
-
-    return nodes;
-});
 
 /**
  * Delete a structure check from the list.
@@ -119,44 +96,6 @@ function selectStructureCheck(node: TreeNode): void {
         selectedStructureCheck.value = node.data;
     }
 }
-
-/**
- * Construct a tree node from a structure check folder path.
- *
- * @param check
- * @param key
- * @param label
- * @param leaf
- */
-function newTreeNode(check: StructureCheck, key: string, label: string, leaf: boolean = false): TreeNode {
-    const node: TreeNode = {
-        key,
-        label,
-        data: check,
-        icon: PrimeIcons.FOLDER,
-        check: leaf,
-        children: [],
-    };
-
-    if (leaf) {
-        node.children = [
-            {
-                key: key + '-obligated',
-                icon: PrimeIcons.CHECK_CIRCLE,
-                data: check,
-                obligated: true,
-            },
-            {
-                key: key + '-blocked',
-                icon: PrimeIcons.TIMES_CIRCLE,
-                data: check,
-                blocked: true,
-            },
-        ];
-    }
-
-    return node;
-}
 </script>
 
 <template>
@@ -166,7 +105,7 @@ function newTreeNode(check: StructureCheck, key: string, label: string, leaf: bo
             selection-mode="single"
             v-model:selection-keys="selectedKeys"
             v-model:expanded-keys="expandedKeys"
-            :value="nodes"
+            :value="Project.getNodes(structureChecks)"
             @node-select="selectStructureCheck"
         >
             <template #default="{ node }">
diff --git a/frontend/src/types/Project.ts b/frontend/src/types/Project.ts
index 84cc75d8..4758c007 100644
--- a/frontend/src/types/Project.ts
+++ b/frontend/src/types/Project.ts
@@ -1,4 +1,6 @@
 import moment from 'moment';
+import { TreeNode } from "primevue/treenode";
+import { PrimeIcons } from "primevue/api";
 import { Course, type CourseJSON } from './Course.ts';
 import { type ExtraCheck } from './ExtraCheck.ts';
 import { type Group } from './Group.ts';
@@ -117,6 +119,74 @@ export class Project {
         );
     }
 
+    /**
+     * Given a list of structureChecks (directory path), return a list of TreeNodes representing the tree hierarchy
+     * of the structure checks.
+     *
+     * @param structureChecks
+     */
+    public static getNodes(structureChecks: StructureCheck[] | undefined): TreeNode[] {
+        const nodes: TreeNode[] = [];
+
+        if (structureChecks !== undefined) {
+            for (const [i, check] of structureChecks.entries()) {
+                const hierarchy = check.getDirectoryHierarchy();
+                let currentNodes = nodes;
+
+                for (const [j, part] of hierarchy.entries()) {
+                    let node = currentNodes.find((node) => node.label === part);
+
+                    if (node === undefined) {
+                        node = Project.newTreeNode(check, `${i}${j}`, part, j === hierarchy.length - 1);
+                        currentNodes.push(node);
+                    }
+
+                    currentNodes = node.children ?? [];
+                }
+            }
+        }
+
+        return nodes;
+    }
+
+    /**
+     * Construct a tree node from a structure check folder path.
+     *
+     * @param check
+     * @param key
+     * @param label
+     * @param leaf
+     */
+    private static newTreeNode(check: StructureCheck, key: string, label: string, leaf: boolean = false): TreeNode {
+        const node: TreeNode = {
+            key,
+            label,
+            data: check,
+            icon: PrimeIcons.FOLDER,
+            check: leaf,
+            children: [],
+        };
+
+        if (leaf) {
+            node.children = [
+                {
+                    key: key + '-obligated',
+                    icon: PrimeIcons.CHECK_CIRCLE,
+                    data: check,
+                    obligated: true,
+                },
+                {
+                    key: key + '-blocked',
+                    icon: PrimeIcons.TIMES_CIRCLE,
+                    data: check,
+                    blocked: true,
+                },
+            ];
+        }
+
+        return node;
+    }
+
     /**
      * Convert a project object to a project instance.
      *

From 8dff5afa229117367301ba9a9f0f4e077c216cb5 Mon Sep 17 00:00:00 2001
From: bsilkyn <brent.silkyn@ugent.be>
Date: Thu, 23 May 2024 18:51:35 +0200
Subject: [PATCH 2/7] chore: submission structure tree in SubmissionsView.vue
 and StudentProjectView.vue #458

---
 .../components/projects/ProjectStructure.vue  | 74 +++++++++++++++++++
 .../projects/ProjectStructureEditor.vue       |  2 +
 .../projects/roles/StudentProjectView.vue     |  5 ++
 .../src/views/submissions/SubmissionsView.vue | 10 +++
 4 files changed, 91 insertions(+)
 create mode 100644 frontend/src/components/projects/ProjectStructure.vue

diff --git a/frontend/src/components/projects/ProjectStructure.vue b/frontend/src/components/projects/ProjectStructure.vue
new file mode 100644
index 00000000..f7e3d565
--- /dev/null
+++ b/frontend/src/components/projects/ProjectStructure.vue
@@ -0,0 +1,74 @@
+<script setup lang="ts">
+import Tree from 'primevue/tree';
+import Chip from 'primevue/chip';
+import { useI18n } from 'vue-i18n';
+import { StructureCheck } from '@/types/StructureCheck.ts';
+import { Project } from "@/types/Project.ts";
+
+const { t } = useI18n();
+
+const props = defineProps<{
+    structureChecks: StructureCheck[]
+}>();
+
+console.log(props.structureChecks);
+</script>
+
+<template>
+    <div>
+        <h3 class="pb-2">
+            {{ t('views.projects.structureChecks.title') }}
+        </h3>
+        <Tree
+            class="w-100"
+            selection-mode="single"
+            :value="Project.getNodes(structureChecks)"
+        >
+            <template #default="{ node }">
+                <template v-if="node.obligated">
+                    <div
+                        class="w-full"
+                        v-tooltip="t('views.projects.structureChecks.obligatedExtensions')"
+                    >
+                        <Chip
+                            class="m-1"
+                            :label="extension"
+                            v-for="extension in node.data.getObligatedExtensionList()"
+                        />
+                    </div>
+                </template>
+                <template v-else-if="node.blocked">
+                    <div
+                        class="w-full"
+                        v-tooltip="t('views.projects.structureChecks.blockedExtensions')"
+                    >
+                        <Chip
+                            class="m-1"
+                            :label="extension"
+                            v-for="extension in node.data.getBlockedExtensionList()"
+                        />
+                    </div>
+                </template>
+                <template v-else>
+                    <div class="flex align-items-center justify-content-between gap-3">
+                        <template>
+                            <span>
+                                {{ node.label }}
+                            </span>
+                        </template>
+                    </div>
+                </template>
+            </template>
+        </Tree>
+    </div>
+</template>
+
+<style scoped lang="scss">
+.p-treenode-label {
+    width: 100%;
+
+    ul {
+        width: 100%;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/frontend/src/components/projects/ProjectStructureEditor.vue b/frontend/src/components/projects/ProjectStructureEditor.vue
index 8810c48b..52494478 100644
--- a/frontend/src/components/projects/ProjectStructureEditor.vue
+++ b/frontend/src/components/projects/ProjectStructureEditor.vue
@@ -112,6 +112,7 @@ function selectStructureCheck(node: TreeNode): void {
                 <template v-if="node.obligated">
                     <Chips
                         class="w-full"
+                        separator=","
                         :model-value="node.data.getObligatedExtensionList()"
                         @update:model-value="node.data.setObligatedExtensionList($event)"
                         v-tooltip="t('views.projects.structureChecks.obligatedExtensions')"
@@ -124,6 +125,7 @@ function selectStructureCheck(node: TreeNode): void {
                 <template v-else-if="node.blocked">
                     <Chips
                         class="w-full"
+                        separator=","
                         :model-value="node.data.getBlockedExtensionList()"
                         @update:model-value="node.data.setBlockedExtensionList($event)"
                         v-tooltip="t('views.projects.structureChecks.blockedExtensions')"
diff --git a/frontend/src/views/projects/roles/StudentProjectView.vue b/frontend/src/views/projects/roles/StudentProjectView.vue
index b3ab8784..2417c0bb 100644
--- a/frontend/src/views/projects/roles/StudentProjectView.vue
+++ b/frontend/src/views/projects/roles/StudentProjectView.vue
@@ -3,6 +3,7 @@ import ChooseGroupCard from '@/components/projects/groups/GroupChooseCard.vue';
 import JoinedGroupCard from '@/components/projects/groups/GroupJoinedCard.vue';
 import SubmissionCard from '@/components/submissions/SubmissionCard.vue';
 import ProjectInfo from '@/components/projects/ProjectInfo.vue';
+import ProjectStructure from '@/components/projects/ProjectStructure.vue';
 import Title from '@/views/layout/Title.vue';
 import Loading from '@/components/Loading.vue';
 import { ref } from 'vue';
@@ -15,6 +16,7 @@ import { useSubmission } from '@/composables/services/submission.service.ts';
 import { useProject } from '@/composables/services/project.service.ts';
 import { useRoute } from 'vue-router';
 import { type Project } from '@/types/Project.ts';
+import {useStructureCheck} from "@/composables/services/structure_check.service.ts";
 
 /* Props */
 defineProps<{
@@ -25,6 +27,7 @@ defineProps<{
 const { params } = useRoute();
 const { group, groups, getGroupByStudentProject, getGroupsByProject } = useGroup();
 const { students, getStudentsByGroup, studentJoinGroup, studentLeaveGroup } = useStudents();
+const { structureChecks, getStructureCheckByProject } = useStructureCheck();
 const { project, getProjectByID } = useProject();
 const { submissions, getSubmissionByGroup } = useSubmission();
 
@@ -90,6 +93,7 @@ async function getStudentData(project: Project): Promise<void> {
  */
 async function getProjectData(project: Project): Promise<void> {
     await getGroupsByProject(project.id);
+    await getStructureCheckByProject(project.id);
 
     if (groups.value !== null) {
         project.groups = groups.value;
@@ -124,6 +128,7 @@ watchImmediate(
                 <div class="col-12 md:col-8">
                     <ProjectInfo class="mb-3" :project="project" />
                     <div v-if="project" v-html="project.description" />
+                    <ProjectStructure v-if="structureChecks" :structure-checks="structureChecks"/>
                 </div>
                 <div class="col-12 md:col-4">
                     <template v-if="!loadingGroup">
diff --git a/frontend/src/views/submissions/SubmissionsView.vue b/frontend/src/views/submissions/SubmissionsView.vue
index 64afce5a..be113b7c 100644
--- a/frontend/src/views/submissions/SubmissionsView.vue
+++ b/frontend/src/views/submissions/SubmissionsView.vue
@@ -10,8 +10,10 @@ import { useRoute } from 'vue-router';
 import FileUpload from 'primevue/fileupload';
 import { PrimeIcons } from 'primevue/api';
 import AllSubmission from '@/components/submissions/AllSubmission.vue';
+import ProjectStructure from '@/components/projects/ProjectStructure.vue';
 import { useGroup } from '@/composables/services/group.service.ts';
 import { useSubmission } from '@/composables/services/submission.service.ts';
+import { useStructureCheck } from '@/composables/services/structure_check.service.ts';
 import { useMessagesStore } from '@/store/messages.store.ts';
 
 const { t } = useI18n();
@@ -19,6 +21,7 @@ const route = useRoute();
 const { project, getProjectByID } = useProject();
 const { group, getGroupByID } = useGroup();
 const { submission, submissions, createSubmission, getSubmissionByGroup } = useSubmission();
+const { structureChecks, getStructureCheckByProject } = useStructureCheck();
 const { addSuccessMessage, addErrorMessage } = useMessagesStore();
 
 /* State */
@@ -72,6 +75,9 @@ onMounted(async () => {
     await getProjectByID(route.params.projectId as string);
     await getGroupByID(route.params.groupId as string);
     await getSubmissionByGroup(route.params.groupId as string);
+    if (project.value !== null) {
+        await getStructureCheckByProject(project.value.id);
+    }
 });
 </script>
 
@@ -83,6 +89,10 @@ onMounted(async () => {
                 <div class="col-12 md:col-6">
                     <div class="flex-column">
                         <!-- Project info column -->
+                        <!-- Submission structure -->
+                        <div v-if="structureChecks">
+                            <ProjectStructure :structure-checks="structureChecks"/>
+                        </div>
                         <!-- Submission upload -->
                         <div class="py-2">
                             <h2>{{ t('views.submissions.submit') }}</h2>

From 574904c2f444e385a5a0f4a33f0647cef11a1105 Mon Sep 17 00:00:00 2001
From: bsilkyn <brent.silkyn@ugent.be>
Date: Thu, 23 May 2024 18:55:09 +0200
Subject: [PATCH 3/7] chore: add clean dividers and restructure imports #458

---
 frontend/src/components/projects/ProjectStructure.vue  |  5 +++--
 .../src/views/projects/roles/StudentProjectView.vue    |  2 ++
 frontend/src/views/submissions/SubmissionsView.vue     | 10 ++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/projects/ProjectStructure.vue b/frontend/src/components/projects/ProjectStructure.vue
index f7e3d565..a5b263dc 100644
--- a/frontend/src/components/projects/ProjectStructure.vue
+++ b/frontend/src/components/projects/ProjectStructure.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import Tree from 'primevue/tree';
 import Chip from 'primevue/chip';
+import Divider from 'primevue/divider';
 import { useI18n } from 'vue-i18n';
 import { StructureCheck } from '@/types/StructureCheck.ts';
 import { Project } from "@/types/Project.ts";
@@ -16,9 +17,9 @@ console.log(props.structureChecks);
 
 <template>
     <div>
-        <h3 class="pb-2">
+        <label class="pb-2">
             {{ t('views.projects.structureChecks.title') }}
-        </h3>
+        </label>
         <Tree
             class="w-100"
             selection-mode="single"
diff --git a/frontend/src/views/projects/roles/StudentProjectView.vue b/frontend/src/views/projects/roles/StudentProjectView.vue
index 2417c0bb..b3592ea9 100644
--- a/frontend/src/views/projects/roles/StudentProjectView.vue
+++ b/frontend/src/views/projects/roles/StudentProjectView.vue
@@ -17,6 +17,7 @@ import { useProject } from '@/composables/services/project.service.ts';
 import { useRoute } from 'vue-router';
 import { type Project } from '@/types/Project.ts';
 import {useStructureCheck} from "@/composables/services/structure_check.service.ts";
+import Divider from "primevue/divider";
 
 /* Props */
 defineProps<{
@@ -128,6 +129,7 @@ watchImmediate(
                 <div class="col-12 md:col-8">
                     <ProjectInfo class="mb-3" :project="project" />
                     <div v-if="project" v-html="project.description" />
+                    <Divider />
                     <ProjectStructure v-if="structureChecks" :structure-checks="structureChecks"/>
                 </div>
                 <div class="col-12 md:col-4">
diff --git a/frontend/src/views/submissions/SubmissionsView.vue b/frontend/src/views/submissions/SubmissionsView.vue
index be113b7c..d158ca58 100644
--- a/frontend/src/views/submissions/SubmissionsView.vue
+++ b/frontend/src/views/submissions/SubmissionsView.vue
@@ -1,20 +1,21 @@
 <script setup lang="ts">
-import BaseLayout from '@/views/layout/base/BaseLayout.vue';
-import Title from '@/views/layout/Title.vue';
 import Button from 'primevue/button';
+import Divider from "primevue/divider";
+import FileUpload from 'primevue/fileupload';
+import { PrimeIcons } from 'primevue/api';
 import Loading from '@/components/Loading.vue';
 import { useI18n } from 'vue-i18n';
 import { onMounted, ref } from 'vue';
 import { useProject } from '@/composables/services/project.service.ts';
 import { useRoute } from 'vue-router';
-import FileUpload from 'primevue/fileupload';
-import { PrimeIcons } from 'primevue/api';
 import AllSubmission from '@/components/submissions/AllSubmission.vue';
 import ProjectStructure from '@/components/projects/ProjectStructure.vue';
 import { useGroup } from '@/composables/services/group.service.ts';
 import { useSubmission } from '@/composables/services/submission.service.ts';
 import { useStructureCheck } from '@/composables/services/structure_check.service.ts';
 import { useMessagesStore } from '@/store/messages.store.ts';
+import BaseLayout from '@/views/layout/base/BaseLayout.vue';
+import Title from '@/views/layout/Title.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -91,6 +92,7 @@ onMounted(async () => {
                         <!-- Project info column -->
                         <!-- Submission structure -->
                         <div v-if="structureChecks">
+                            <Divider />
                             <ProjectStructure :structure-checks="structureChecks"/>
                         </div>
                         <!-- Submission upload -->

From e1e9ba98ba8c53276e4f53adcef9df78cfab9789 Mon Sep 17 00:00:00 2001
From: bsilkyn <brent.silkyn@ugent.be>
Date: Thu, 23 May 2024 18:56:11 +0200
Subject: [PATCH 4/7] fix: upload of submission doesn't show success message if
 it has failed

---
 frontend/src/views/submissions/SubmissionsView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/submissions/SubmissionsView.vue b/frontend/src/views/submissions/SubmissionsView.vue
index d158ca58..ab815d7c 100644
--- a/frontend/src/views/submissions/SubmissionsView.vue
+++ b/frontend/src/views/submissions/SubmissionsView.vue
@@ -36,7 +36,7 @@ const files = ref<File[]>([]);
 const onUpload = async (callback: () => void): Promise<void> => {
     if (group.value !== null) {
         try {
-            await createSubmission(files.value as File[], group.value.id);
+            await createSubmission(files.value as File[], group.value.id, false);
             addSuccessMessage(t('toasts.messages.success'), t('toasts.messages.submissions.create.success'));
 
             if (submission.value != null) {

From 68ae9355676a2786738d6a381adf6c2555f88564 Mon Sep 17 00:00:00 2001
From: bsilkyn <brent.silkyn@ugent.be>
Date: Thu, 23 May 2024 18:58:51 +0200
Subject: [PATCH 5/7] style: lint fix #458

---
 .../components/projects/ProjectStructure.vue  | 27 +++++++------------
 .../projects/ProjectStructureEditor.vue       |  3 +--
 frontend/src/types/Project.ts                 |  4 +--
 .../projects/roles/StudentProjectView.vue     |  6 ++---
 .../src/views/submissions/SubmissionsView.vue |  4 +--
 5 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/frontend/src/components/projects/ProjectStructure.vue b/frontend/src/components/projects/ProjectStructure.vue
index a5b263dc..e60c806c 100644
--- a/frontend/src/components/projects/ProjectStructure.vue
+++ b/frontend/src/components/projects/ProjectStructure.vue
@@ -1,15 +1,14 @@
 <script setup lang="ts">
 import Tree from 'primevue/tree';
 import Chip from 'primevue/chip';
-import Divider from 'primevue/divider';
 import { useI18n } from 'vue-i18n';
-import { StructureCheck } from '@/types/StructureCheck.ts';
-import { Project } from "@/types/Project.ts";
+import { type StructureCheck } from '@/types/StructureCheck.ts';
+import { Project } from '@/types/Project.ts';
 
 const { t } = useI18n();
 
 const props = defineProps<{
-    structureChecks: StructureCheck[]
+    structureChecks: StructureCheck[];
 }>();
 
 console.log(props.structureChecks);
@@ -20,32 +19,24 @@ console.log(props.structureChecks);
         <label class="pb-2">
             {{ t('views.projects.structureChecks.title') }}
         </label>
-        <Tree
-            class="w-100"
-            selection-mode="single"
-            :value="Project.getNodes(structureChecks)"
-        >
+        <Tree class="w-100" selection-mode="single" :value="Project.getNodes(structureChecks)">
             <template #default="{ node }">
                 <template v-if="node.obligated">
-                    <div
-                        class="w-full"
-                        v-tooltip="t('views.projects.structureChecks.obligatedExtensions')"
-                    >
+                    <div class="w-full" v-tooltip="t('views.projects.structureChecks.obligatedExtensions')">
                         <Chip
                             class="m-1"
                             :label="extension"
+                            :key="extension"
                             v-for="extension in node.data.getObligatedExtensionList()"
                         />
                     </div>
                 </template>
                 <template v-else-if="node.blocked">
-                    <div
-                        class="w-full"
-                        v-tooltip="t('views.projects.structureChecks.blockedExtensions')"
-                    >
+                    <div class="w-full" v-tooltip="t('views.projects.structureChecks.blockedExtensions')">
                         <Chip
                             class="m-1"
                             :label="extension"
+                            :key="extension"
                             v-for="extension in node.data.getBlockedExtensionList()"
                         />
                     </div>
@@ -72,4 +63,4 @@ console.log(props.structureChecks);
         width: 100%;
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/frontend/src/components/projects/ProjectStructureEditor.vue b/frontend/src/components/projects/ProjectStructureEditor.vue
index 52494478..bdbcebd3 100644
--- a/frontend/src/components/projects/ProjectStructureEditor.vue
+++ b/frontend/src/components/projects/ProjectStructureEditor.vue
@@ -7,7 +7,7 @@ import { ref } from 'vue';
 import { type TreeNode } from 'primevue/treenode';
 import { PrimeIcons } from 'primevue/api';
 import { useI18n } from 'vue-i18n';
-import { Project } from "@/types/Project.ts";
+import { Project } from '@/types/Project.ts';
 import { StructureCheck } from '@/types/StructureCheck.ts';
 
 /* Models */
@@ -22,7 +22,6 @@ const editingStructureCheck = ref<StructureCheck | null>(null);
 const selectedKeys = ref<string[]>([]);
 const expandedKeys = ref<string[]>([]);
 
-
 /**
  * Delete a structure check from the list.
  *
diff --git a/frontend/src/types/Project.ts b/frontend/src/types/Project.ts
index 4758c007..a7798cff 100644
--- a/frontend/src/types/Project.ts
+++ b/frontend/src/types/Project.ts
@@ -1,6 +1,6 @@
 import moment from 'moment';
-import { TreeNode } from "primevue/treenode";
-import { PrimeIcons } from "primevue/api";
+import { type TreeNode } from 'primevue/treenode';
+import { PrimeIcons } from 'primevue/api';
 import { Course, type CourseJSON } from './Course.ts';
 import { type ExtraCheck } from './ExtraCheck.ts';
 import { type Group } from './Group.ts';
diff --git a/frontend/src/views/projects/roles/StudentProjectView.vue b/frontend/src/views/projects/roles/StudentProjectView.vue
index b3592ea9..d9f5f236 100644
--- a/frontend/src/views/projects/roles/StudentProjectView.vue
+++ b/frontend/src/views/projects/roles/StudentProjectView.vue
@@ -16,8 +16,8 @@ import { useSubmission } from '@/composables/services/submission.service.ts';
 import { useProject } from '@/composables/services/project.service.ts';
 import { useRoute } from 'vue-router';
 import { type Project } from '@/types/Project.ts';
-import {useStructureCheck} from "@/composables/services/structure_check.service.ts";
-import Divider from "primevue/divider";
+import { useStructureCheck } from '@/composables/services/structure_check.service.ts';
+import Divider from 'primevue/divider';
 
 /* Props */
 defineProps<{
@@ -130,7 +130,7 @@ watchImmediate(
                     <ProjectInfo class="mb-3" :project="project" />
                     <div v-if="project" v-html="project.description" />
                     <Divider />
-                    <ProjectStructure v-if="structureChecks" :structure-checks="structureChecks"/>
+                    <ProjectStructure v-if="structureChecks" :structure-checks="structureChecks" />
                 </div>
                 <div class="col-12 md:col-4">
                     <template v-if="!loadingGroup">
diff --git a/frontend/src/views/submissions/SubmissionsView.vue b/frontend/src/views/submissions/SubmissionsView.vue
index ab815d7c..56c5641e 100644
--- a/frontend/src/views/submissions/SubmissionsView.vue
+++ b/frontend/src/views/submissions/SubmissionsView.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import Button from 'primevue/button';
-import Divider from "primevue/divider";
+import Divider from 'primevue/divider';
 import FileUpload from 'primevue/fileupload';
 import { PrimeIcons } from 'primevue/api';
 import Loading from '@/components/Loading.vue';
@@ -93,7 +93,7 @@ onMounted(async () => {
                         <!-- Submission structure -->
                         <div v-if="structureChecks">
                             <Divider />
-                            <ProjectStructure :structure-checks="structureChecks"/>
+                            <ProjectStructure :structure-checks="structureChecks" />
                         </div>
                         <!-- Submission upload -->
                         <div class="py-2">

From f222762bf58eb585ba0935ca5aea8ef8432191c0 Mon Sep 17 00:00:00 2001
From: bsilkyn <brent.silkyn@ugent.be>
Date: Thu, 23 May 2024 21:48:25 +0200
Subject: [PATCH 6/7] chore: translations added + remove unnecessary template
 in html #458

---
 frontend/src/assets/lang/app/en.json                  | 6 ++++--
 frontend/src/assets/lang/app/nl.json                  | 4 +++-
 frontend/src/components/projects/ProjectStructure.vue | 8 +++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/frontend/src/assets/lang/app/en.json b/frontend/src/assets/lang/app/en.json
index 3fa469d6..856caeb0 100644
--- a/frontend/src/assets/lang/app/en.json
+++ b/frontend/src/assets/lang/app/en.json
@@ -80,7 +80,7 @@
             "leaveGroup": "Leave group",
             "create": "Create new project",
             "save": "Save project",
-            "edit": "Save project",
+            "edit": "Edit project",
             "name": "Project name",
             "description": "Description",
             "startDate": "Start project",
@@ -97,7 +97,9 @@
                 "title": "Structure checks",
                 "placeholder": "Give a name to this folder",
                 "cancelSelection": "Deselect {0}",
-                "newFolder": "New folder"
+                "newFolder": "New folder",
+                "obligatedExtensions": "Obligated extensions",
+                "blockedExtensions": "Blocked extensions"
             },
             "extraChecks": {
                 "title": "Automatic checks on a submission",
diff --git a/frontend/src/assets/lang/app/nl.json b/frontend/src/assets/lang/app/nl.json
index 4589c9be..f66db142 100644
--- a/frontend/src/assets/lang/app/nl.json
+++ b/frontend/src/assets/lang/app/nl.json
@@ -97,7 +97,9 @@
                 "title": "Indieningsstructuur",
                 "placeholder": "Geef deze nieuwe map een naam",
                 "cancelSelection": "Deselecteer {0}",
-                "newFolder": "Nieuwe map"
+                "newFolder": "Nieuwe map",
+                "obligatedExtensions": "Verplichte extensies",
+                "blockedExtensions": "Niet toegelaten extensies"
             },
             "extraChecks": {
                 "title": "Automatische checks op een indiening",
diff --git a/frontend/src/components/projects/ProjectStructure.vue b/frontend/src/components/projects/ProjectStructure.vue
index e60c806c..217bdf8e 100644
--- a/frontend/src/components/projects/ProjectStructure.vue
+++ b/frontend/src/components/projects/ProjectStructure.vue
@@ -43,11 +43,9 @@ console.log(props.structureChecks);
                 </template>
                 <template v-else>
                     <div class="flex align-items-center justify-content-between gap-3">
-                        <template>
-                            <span>
-                                {{ node.label }}
-                            </span>
-                        </template>
+                        <span>
+                            {{ node.label }}
+                        </span>
                     </div>
                 </template>
             </template>

From 273fc54727ddb4b96af7059a3a9b9aefa071f07f Mon Sep 17 00:00:00 2001
From: bsilkyn <brent.silkyn@ugent.be>
Date: Thu, 23 May 2024 22:15:29 +0200
Subject: [PATCH 7/7] chore: rebase + padding #458

---
 frontend/src/components/projects/ProjectStructure.vue | 4 ++--
 frontend/src/views/submissions/SubmissionsView.vue    | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/projects/ProjectStructure.vue b/frontend/src/components/projects/ProjectStructure.vue
index 217bdf8e..d8015758 100644
--- a/frontend/src/components/projects/ProjectStructure.vue
+++ b/frontend/src/components/projects/ProjectStructure.vue
@@ -16,9 +16,9 @@ console.log(props.structureChecks);
 
 <template>
     <div>
-        <label class="pb-2">
+        <div class="p-2">
             {{ t('views.projects.structureChecks.title') }}
-        </label>
+        </div>
         <Tree class="w-100" selection-mode="single" :value="Project.getNodes(structureChecks)">
             <template #default="{ node }">
                 <template v-if="node.obligated">
diff --git a/frontend/src/views/submissions/SubmissionsView.vue b/frontend/src/views/submissions/SubmissionsView.vue
index 56c5641e..74dd984c 100644
--- a/frontend/src/views/submissions/SubmissionsView.vue
+++ b/frontend/src/views/submissions/SubmissionsView.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import Button from 'primevue/button';
-import Divider from 'primevue/divider';
 import FileUpload from 'primevue/fileupload';
 import { PrimeIcons } from 'primevue/api';
 import Loading from '@/components/Loading.vue';
@@ -92,7 +91,6 @@ onMounted(async () => {
                         <!-- Project info column -->
                         <!-- Submission structure -->
                         <div v-if="structureChecks">
-                            <Divider />
                             <ProjectStructure :structure-checks="structureChecks" />
                         </div>
                         <!-- Submission upload -->