From 790a6a7f2594d9c7bc504ab2b4e313171646055b Mon Sep 17 00:00:00 2001
From: Marieke <marieke.sinnaeve@ugent.be>
Date: Thu, 23 May 2024 00:45:18 +0200
Subject: [PATCH 1/2] finishing touches

---
 frontend/src/composables/useNavigations.ts    |  1 -
 frontend/src/router/index.ts                  |  7 +----
 frontend/src/views/ProjectsView.vue           | 23 +++++++---------
 frontend/src/views/SettingsView.vue           |  3 ---
 .../home/listcontent/DeadlineItem.spec.ts     |  6 +++--
 .../home/listcontent/SubjectItem.spec.ts      | 19 +++++--------
 .../components/navigation/NavBar.spec.ts      |  3 ---
 .../tests/components/user/SearchTable.spec.ts | 27 ++++++++++++++++++-
 frontend/tests/views/GroupsView.spec.ts       | 11 ++++++++
 9 files changed, 58 insertions(+), 42 deletions(-)
 delete mode 100644 frontend/src/views/SettingsView.vue

diff --git a/frontend/src/composables/useNavigations.ts b/frontend/src/composables/useNavigations.ts
index e699b611..c98a0a54 100644
--- a/frontend/src/composables/useNavigations.ts
+++ b/frontend/src/composables/useNavigations.ts
@@ -18,7 +18,6 @@ const main_navigations: NavigationData[] = [
     { icon: "mdi-school-outline", title: "navigation.subjects", goto: "subjects" },
     { icon: "mdi-book-check-outline", title: "navigation.projects", goto: "projects" },
     { icon: "mdi-information-outline", title: "navigation.about", goto: "about" },
-    { icon: "mdi-cog-outline", title: "navigation.settings", goto: "settings" },
 ];
 
 const admin_navigations: NavigationData[] = [
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index aaa0e90c..41a65abd 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -166,11 +166,6 @@ const router = createRouter({
             component: () => import("../views/SubjectRegisterView.vue"),
             props: (route) => ({ uuid: String(route.params.uuid) }),
         },
-        {
-            path: "/settings",
-            name: "settings",
-            component: () => import("../views/SettingsView.vue"),
-        },
         {
             path: "/admin",
             name: "admin",
@@ -205,7 +200,7 @@ router.beforeEach(async (to, from, next) => {
     }
 
     let new_next = next;
-    for (let middleware of middlewares) {
+    for (const middleware of middlewares) {
         const context: MiddlewareContext = { to, from, next: new_next, router };
         const { next: returned_next, final } = await middleware(context);
         if (final) {
diff --git a/frontend/src/views/ProjectsView.vue b/frontend/src/views/ProjectsView.vue
index 862ea6b8..84e443de 100644
--- a/frontend/src/views/ProjectsView.vue
+++ b/frontend/src/views/ProjectsView.vue
@@ -1,16 +1,15 @@
 <template>
     <div class="projects">
+        <TitleContainer :title="$t('project.myProject')" class="titlecontainer">
+            <v-btn-toggle v-model="activeButton" class="button">
+                <v-btn value="finished">{{ $t("project.finished") }}</v-btn>
+            </v-btn-toggle>
+        </TitleContainer>
         <h1 v-if="isLoading">{{ $t("default.loading.loading_page") }}</h1>
-        <h1 v-else-if="isError || noProjectsFound" class="welcome">
+        <h1 v-else-if="isError || noProjectsFound" class="projectInfo">
             {{ $t("project.not_found") }}
         </h1>
         <div v-else class="projectInfo">
-            <TitleContainer :title="$t('project.myProject')">
-                <v-btn-toggle v-model="activeButton" class="button">
-                    <v-btn value="finished">{{ $t("project.finished") }}</v-btn>
-                </v-btn-toggle>
-            </TitleContainer>
-            <v-divider class="divider" />
             <ProjectMiniCard
                 v-for="project in filteredProjects"
                 :key="project.id"
@@ -54,8 +53,10 @@ const filteredProjects = computed(() => {
 </script>
 
 <style scoped>
-.project-card {
-    margin-top: 10px;
+.titlecontainer {
+    margin-top: 40px;
+    margin-left: 40px;
+    margin-right: 40px;
 }
 
 .projectInfo {
@@ -72,8 +73,4 @@ const filteredProjects = computed(() => {
 .projects {
     margin: 15px;
 }
-
-.divider {
-    margin-bottom: 30px;
-}
 </style>
diff --git a/frontend/src/views/SettingsView.vue b/frontend/src/views/SettingsView.vue
deleted file mode 100644
index 6dfc0a88..00000000
--- a/frontend/src/views/SettingsView.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-    <h1>Settings</h1>
-</template>
diff --git a/frontend/tests/components/home/listcontent/DeadlineItem.spec.ts b/frontend/tests/components/home/listcontent/DeadlineItem.spec.ts
index 8e75da7d..37dd42c3 100644
--- a/frontend/tests/components/home/listcontent/DeadlineItem.spec.ts
+++ b/frontend/tests/components/home/listcontent/DeadlineItem.spec.ts
@@ -30,10 +30,12 @@ describe("DeadlineItem",() => {
                 deadline: new Date(2024, 10, 15),
                 id: 1
             })
+        },
+        global: {
+            stubs: ['router-link']
         }
     })
     it("render item", () => {
-        expect(wrapper.text()).toContain("testproject")
-        expect(wrapper.text()).toContain("testsubject")
+       expect(wrapper.findComponent({name: "router-link"}).exists()).toBeTruthy()
     });
 })
diff --git a/frontend/tests/components/home/listcontent/SubjectItem.spec.ts b/frontend/tests/components/home/listcontent/SubjectItem.spec.ts
index 1862a2f5..7d0e634f 100644
--- a/frontend/tests/components/home/listcontent/SubjectItem.spec.ts
+++ b/frontend/tests/components/home/listcontent/SubjectItem.spec.ts
@@ -5,10 +5,7 @@ import {ref} from "vue";
 
 const testSubjectInstructorsQuery = {
     data: ref([{given_name: "test", surname: "instructor"}]),
-    isLoading: ref(true),
-    setLoading(value){
-        this.isLoading.value = value
-    }
+    isLoading: ref(false),
 }
 
 vi.mock("@/queries/Subject", () => ({
@@ -19,16 +16,12 @@ describe("SubjectItem", () => {
     const wrapper = mount(SubjectItem, {
         props: {
             subject: ref({name: "testsubject"})
+        },
+        global: {
+            stubs: ['router-link']
         }
     })
-    it("render if loading", () => {
-        expect(wrapper.text()).toContain("testsubject")
-        expect(wrapper.findComponent({name: "VSkeletonLoader"}))
-    });
-    it("render subject item", async () => {
-        testSubjectInstructorsQuery.setLoading(false)
-        await wrapper.vm.$nextTick()
-        expect(wrapper.text()).toContain("testsubject")
-        expect(wrapper.text()).toContain("test instructor")
+    it("render", () => {
+        expect(wrapper.findComponent({name: 'router-link'}).exists()).toBeTruthy()
     });
 })
diff --git a/frontend/tests/components/navigation/NavBar.spec.ts b/frontend/tests/components/navigation/NavBar.spec.ts
index c1446809..f9f96f06 100644
--- a/frontend/tests/components/navigation/NavBar.spec.ts
+++ b/frontend/tests/components/navigation/NavBar.spec.ts
@@ -48,7 +48,6 @@ describe("NavBar", () => {
         expect(wrapper.find('[data-test="navigation.home"]').exists()).toBeTruthy();
         expect(wrapper.find('[data-test="navigation.subjects"]').exists()).toBeTruthy();
         expect(wrapper.find('[data-test="navigation.projects"]').exists()).toBeTruthy();
-        expect(wrapper.find('[data-test="navigation.settings"]').exists()).toBeTruthy();
 
         expect(wrapper.find('[data-test="navigation.admin"]').exists()).toBeFalsy();
         expect(wrapper.find('[data-test="navigation.login"]').exists()).toBeFalsy();
@@ -65,7 +64,6 @@ describe("NavBar", () => {
         expect(wrapper.find('[data-test="navigation.home"]').exists()).toBeTruthy();
         expect(wrapper.find('[data-test="navigation.subjects"]').exists()).toBeTruthy();
         expect(wrapper.find('[data-test="navigation.projects"]').exists()).toBeTruthy();
-        expect(wrapper.find('[data-test="navigation.settings"]').exists()).toBeTruthy();
         expect(wrapper.find('[data-test="navigation.admin"]').exists()).toBeTruthy();
 
         expect(wrapper.find('[data-test="navigation.login"]').exists()).toBeFalsy();
@@ -85,7 +83,6 @@ describe("NavBar", () => {
         expect(wrapper.find('[data-test="navigation.home"]').exists()).toBeFalsy();
         expect(wrapper.find('[data-test="navigation.courses"]').exists()).toBeFalsy();
         expect(wrapper.find('[data-test="navigation.projects"]').exists()).toBeFalsy();
-        expect(wrapper.find('[data-test="navigation.settings"]').exists()).toBeFalsy();
         expect(wrapper.find('[data-test="navigation.admin"]').exists()).toBeFalsy();
     });
 });
diff --git a/frontend/tests/components/user/SearchTable.spec.ts b/frontend/tests/components/user/SearchTable.spec.ts
index f6dce9ac..43b01644 100644
--- a/frontend/tests/components/user/SearchTable.spec.ts
+++ b/frontend/tests/components/user/SearchTable.spec.ts
@@ -1,6 +1,26 @@
 import { mount } from "@vue/test-utils";
 import {expect, describe, it, vi} from "vitest";
 import SearchTable from "@/components/user/SearchTable.vue"
+import {ref} from "vue";
+
+const mockRouter = {
+    push: vi.fn(),
+};
+
+vi.mock("vue-router", () => ({
+    useRouter: () => mockRouter,
+}));
+
+const testAuthStore = {
+    isLoggedIn: ref(true),
+    setLoggedIn(value) {
+        this.isLoggedIn.value = value;
+    },
+};
+
+vi.mock("@/stores/auth-store", () => ({
+    useAuthStore: vi.fn(() => testAuthStore),
+}));
 
 describe("SearchTable", async () => {
     const ResizeObserverMock = vi.fn(() => ({
@@ -9,7 +29,12 @@ describe("SearchTable", async () => {
         disconnect: vi.fn(),
     }));
     vi.stubGlobal("ResizeObserver", ResizeObserverMock);
-    const wrapper = mount(SearchTable, {});
+    const wrapper = mount(SearchTable, {
+        props: {
+            search: "test",
+            users: []
+        }
+    });
     it("sorts booleans true first", () => {
         const instance = wrapper.vm;
         const sortBoolFunction = (instance as any).sortBool;
diff --git a/frontend/tests/views/GroupsView.spec.ts b/frontend/tests/views/GroupsView.spec.ts
index 36225484..94d9ccfe 100644
--- a/frontend/tests/views/GroupsView.spec.ts
+++ b/frontend/tests/views/GroupsView.spec.ts
@@ -3,6 +3,14 @@ import {expect, describe, it, vi} from "vitest";
 import GroupsView from "@/views/GroupsView.vue"
 import {ref} from "vue";
 
+const mockRouter = {
+    push: vi.fn(),
+};
+
+vi.mock("vue-router", () => ({
+    useRouter: () => mockRouter,
+}));
+
 const mockProject = {
     name: "testproject"
 }
@@ -95,6 +103,9 @@ describe("GroupsView", () => {
     const wrapper = mount(GroupsView, {
         props: {
             projectId: 1
+        },
+        global: {
+            stubs: ['router-link']
         }
     });
 

From 58b07053a43dce2439ba6f456983db8063bbd587 Mon Sep 17 00:00:00 2001
From: Marieke <marieke.sinnaeve@ugent.be>
Date: Thu, 23 May 2024 10:21:38 +0200
Subject: [PATCH 2/2] requested change

---
 frontend/src/views/ProjectsView.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/ProjectsView.vue b/frontend/src/views/ProjectsView.vue
index 84e443de..08989df8 100644
--- a/frontend/src/views/ProjectsView.vue
+++ b/frontend/src/views/ProjectsView.vue
@@ -30,8 +30,6 @@ const { data: projects, isLoading, isError } = useProjectsQuery();
 const allProjects = computed(() =>
     isLoading.value ? [] : [...projects.value!.as_student, ...projects.value!.as_instructor]
 );
-const noProjectsFound = computed(() => allProjects.value.length === 0);
-
 const activeButton = ref("notFinished");
 
 const filteredProjects = computed(() => {
@@ -50,6 +48,8 @@ const filteredProjects = computed(() => {
             return sortedProjects.filter((project: Project) => new Date(project.deadline) > now);
     }
 });
+
+const noProjectsFound = computed(() => filteredProjects.value.length === 0);
 </script>
 
 <style scoped>