fix: linting

SELab-2 · Apr 18, 2024 · 8508b41 · 8508b41
1 parent 1ffcb1a
commit 8508b41
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 38 deletions.
diff --git a/frontend/src/types/users/Student.ts b/frontend/src/types/users/Student.ts
@@ -3,10 +3,6 @@ import { type Faculty } from '../Faculty.ts';
 import { type Group } from '../Group.ts';
 import { type Role, User } from '@/types/users/User.ts';
 
-interface StudentProps {
-    [key: string]: any;
-}
-
 export class Student extends User {
     constructor(
         public id: string,
@@ -44,7 +40,7 @@ export class Student extends User {
      *
      * @param student
      */
-    static fromJSON(student: StudentProps): Student {
+    static fromJSON(student: Student): Student {
         return new Student(
             student.id,
             student.username,

diff --git a/frontend/src/views/dashboard/roles/AssistantDashboardView.vue b/frontend/src/views/dashboard/roles/AssistantDashboardView.vue
@@ -43,18 +43,8 @@ watch(
 </script>
 
 <template>
-    <!-- Course heading -->
-    <div class="flex justify-content-between align-items-center mb-6">
-        <!-- Course list title -->
-        <Title class="m-0">{{ t('views.dashboard.courses') }}</Title>
-
-        <!-- Academic year selector -->
-        <YearSelector :years="allYears" v-model="selectedYear" />
-    </div>
-    <!-- Course list body -->
-    <CourseList :courses="filteredCourses" />
     <!-- Project heading -->
-    <div class="flex justify-content-between align-items-center my-6">
+    <div class="flex justify-content-between align-items-center mb-6">
         <!-- Project list title -->
         <Title class="m-0">{{ t('views.dashboard.projects') }}</Title>
 
@@ -63,6 +53,16 @@ watch(
     </div>
     <!-- Project list body -->
     <ProjectList :projects="projects" />
+    <!-- Course heading -->
+    <div class="flex justify-content-between align-items-center my-6">
+        <!-- Course list title -->
+        <Title class="m-0">{{ t('views.dashboard.courses') }}</Title>
+
+        <!-- Academic year selector -->
+        <YearSelector :years="allYears" v-model="selectedYear" />
+    </div>
+    <!-- Course list body -->
+    <CourseList :courses="filteredCourses" />
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/frontend/src/views/dashboard/roles/StudentDashboardView.vue b/frontend/src/views/dashboard/roles/StudentDashboardView.vue
@@ -42,9 +42,17 @@ watch(
 </script>
 
 <template>
+    <!-- Project heading -->
+    <div class="flex justify-content-between align-items-center mb-6">
+        <!-- Project list title -->
+        <Title class="m-0">{{ t('views.dashboard.projects') }}</Title>
+    </div>
+
+    <!-- Project list body -->
+    <ProjectList class="fadein" :projects="projects" />
     <!-- Course heading -->
     <div
-        class="flex gap-6 flex-column md:flex-row justify-content-between align-items-start md:align-items-center mb-6"
+        class="flex gap-6 flex-column md:flex-row justify-content-between align-items-start md:align-items-center my-6"
     >
         <!-- Course list title -->
         <Title class="m-0">{{ t('views.dashboard.courses') }}</Title>
@@ -54,14 +62,6 @@ watch(
     </div>
     <!-- Course list body -->
     <CourseList class="fadein" :courses="filteredCourses" />
-    <!-- Project heading -->
-    <div class="flex justify-content-between align-items-center my-6">
-        <!-- Project list title -->
-        <Title class="m-0">{{ t('views.dashboard.projects') }}</Title>
-    </div>
-
-    <!-- Project list body -->
-    <ProjectList class="fadein" :projects="projects" />
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/frontend/src/views/dashboard/roles/TeacherDashboardView.vue b/frontend/src/views/dashboard/roles/TeacherDashboardView.vue
@@ -46,9 +46,21 @@ watch(
 </script>
 
 <template>
+    <!-- Project heading -->
+    <div
+        class="flex gap-6 flex-column md:flex-row justify-content-between align-items-start md:align-items-center mb-5"
+    >
+        <!-- Project list title -->
+        <Title class="m-0">{{ t('views.dashboard.projects') }}</Title>
+
+        <!-- Create project button -->
+        <ProjectCreateButton :courses="filteredCourses" :label="t('components.button.createProject')" />
+    </div>
+    <!-- Project list body -->
+    <ProjectList :projects="projects" />
     <!-- Course heading -->
     <div
-        class="flex gap-6 flex-column md:flex-row justify-content-between align-items-start md:align-items-center mb-6"
+        class="flex gap-6 flex-column md:flex-row justify-content-between align-items-start md:align-items-center my-6"
     >
         <!-- Course list title -->
         <Title class="m-0">{{ t('views.dashboard.courses') }}</Title>
@@ -70,18 +82,6 @@ watch(
     </div>
     <!-- Course list body -->
     <CourseList :courses="filteredCourses" />
-    <!-- Project heading -->
-    <div
-        class="flex gap-6 flex-column md:flex-row justify-content-between align-items-start md:align-items-center mt-6 mb-5"
-    >
-        <!-- Project list title -->
-        <Title class="m-0">{{ t('views.dashboard.projects') }}</Title>
-
-        <!-- Create project button -->
-        <ProjectCreateButton :courses="filteredCourses" :label="t('components.button.createProject')" />
-    </div>
-    <!-- Project list body -->
-    <ProjectList :projects="projects" />
 </template>
 
 <style scoped lang="scss"></style>