chore: improved project progressbar, linting

SELab-2 · Apr 16, 2024 · e7f319b · e7f319b
1 parent 748f69d
commit e7f319b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/frontend/src/components/forms/Editor.vue b/frontend/src/components/forms/Editor.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import Editor from 'primevue/editor';
-import Button from 'primevue/button';
 
 const model = defineModel();
 </script>

diff --git a/frontend/src/components/projects/ProjectCard.vue b/frontend/src/components/projects/ProjectCard.vue
@@ -52,7 +52,7 @@ const { t } = useI18n();
         >
             <div class="p-5 surface-300 border-round">
                 <div class="flex align-items-center gap-5">
-                    <i class="pi pi-clock text-6xl" />
+                    <i class="pi pi-clock text-6xl text-primary" />
                     <div class="w-full">
                         <h3 class="m-0">{{ project.name }}</h3>
                         <div class="flex justify-content-between align-items-center mt-2">
@@ -96,7 +96,15 @@ const { t } = useI18n();
                     <b>{{ t('views.projects.submissionStatus') }}</b
                     >: ok
                 </div>
-                <ProgressBar class="mt-3" :value="project.getProgress()" />
+                <ProgressBar class="mt-3" :value="project.getProgress()">
+                    {{
+                        t(
+                            'views.projects.days',
+                            { hour: moment(project.deadline).format('H:m') },
+                            moment(project.deadline).diff(moment(), 'day'),
+                        )
+                    }}
+                </ProgressBar>
             </template>
             <template #footer>
                 <RouterLink

diff --git a/frontend/src/components/projects/ProjectList.vue b/frontend/src/components/projects/ProjectList.vue
@@ -63,7 +63,7 @@ const incomingProjects = computed<Project[] | null>(() => {
                 <div class="grid">
                     <template v-if="incomingProjects !== null">
                         <template v-if="incomingProjects.length > 0">
-                            <div class="col-12" v-for="project in incomingProjects">
+                            <div class="col-12" v-for="project in incomingProjects" :key="project.id">
                                 <ProjectCard
                                     type="small"
                                     :project="project"

diff --git a/frontend/src/test/unit/services/setup/get_handlers.ts b/frontend/src/test/unit/services/setup/get_handlers.ts
@@ -13,7 +13,6 @@ import {
     structureChecks,
     submissions,
 } from './data';
-import { json } from 'stream/consumers';
 
 const baseUrl = 'http://localhost';
 

diff --git a/frontend/src/test/unit/types/course.test.ts b/frontend/src/test/unit/types/course.test.ts
@@ -24,7 +24,7 @@ describe('course type', () => {
 
     it('create a course instance from JSON data', () => {
         const courseJSON = { ...courseData };
-        const course = Course.fromJSON(courseJSON as any);
+        const course = Course.fromJSON(courseJSON);
 
         expect(course).toBeInstanceOf(Course);
         expect(course.id).toBe(courseData.id);

diff --git a/frontend/src/types/Course.ts b/frontend/src/types/Course.ts
@@ -41,7 +41,7 @@ export class Course {
      *
      * @param course
      */
-    static fromJSON(course: Course|any): Course {
+    static fromJSON(course: Course): Course {
         const faculty =
             course.faculty !== undefined && course.faculty !== null ? Faculty.fromJSON(course.faculty) : null;
 

diff --git a/frontend/src/types/Project.ts b/frontend/src/types/Project.ts
@@ -42,7 +42,7 @@ export class Project {
      *
      * @param project
      */
-    static fromJSON(project: Project|any): Project {
+    static fromJSON(project: Project): Project {
         let course = null;
 
         if (project.course !== null && project.course !== undefined) {