Merge pull request #201 from SELab-2/package-fixes

Fix cypress types
SELab-2 · Mar 29, 2024 · b1f511e · b1f511e
2 parents 37d7f3c + 73ffadf
commit b1f511e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/...s/login page -- routes to dashboard when pressing dashboard button (failed).png b/...s/login page -- routes to dashboard when pressing dashboard button (failed).png
diff --git a/frontend/src/components/LanguageSelector.vue b/frontend/src/components/LanguageSelector.vue
@@ -45,7 +45,7 @@ onMounted(() => {
 </script>
 
 <template>
-    <Dropdown id="language" v-model="locale" class="w-auto" :options="availableLocales" @change="updateLocale" variant="outlined">
+    <Dropdown id="language" v-model="locale" class="w-auto" :options="availableLocales" @change="updateLocale($event.value)" variant="outlined">
         <template #option="{ option }">
             <div class="flex align-items-center">
                 <img :alt="t('layout.header.language.' + option)" :src="getFlag(option)" class="h-1rem mr-2"/>

diff --git a/frontend/src/components/projects/GroupCard.vue b/frontend/src/components/projects/GroupCard.vue
@@ -16,7 +16,7 @@ const props = defineProps<{
 }>();
 
 onMounted(async () => {
-  await getStudentsByGroup(props.groupId, t);
+  await getStudentsByGroup(props.groupId);
 });
 
 </script>

diff --git a/frontend/src/composables/services/admins.service.ts b/frontend/src/composables/services/admins.service.ts
@@ -1,36 +1,36 @@
-import {Admin} from '@/types/Admin.ts';
 import {ref} from 'vue';
 import {endpoints} from '@/config/endpoints.ts';
 import { get, getList, create, delete_id } from '@/composables/services/helpers.ts';
+import {User} from '@/types/User.ts';
 
 export function useAdmin() {
-    const admins = ref<Admin[]|null>(null);
-    const admin = ref<Admin|null>(null);
+    const admins = ref<User[]|null>(null);
+    const admin = ref<User|null>(null);
 
     async function getAdminByID(id: string) {
         const endpoint = endpoints.admins.retrieve.replace('{id}', id);
-        await get<Admin>(endpoint, admin, Admin.fromJSON);
+        await get<User>(endpoint, admin, User.fromJSON);
     }
 
     async function getAdmins() {
         const endpoint = endpoints.admins.index;
-        await getList<Admin>(endpoint, admins, Admin.fromJSON);
+        await getList<User>(endpoint, admins, User.fromJSON);
     }
 
-    async function createAdmin(admin_data: Admin) {
+    async function createAdmin(admin_data: User) {
         const endpoint = endpoints.admins.index;
-        await create<Admin>(endpoint, 
+        await create<User>(endpoint,
             {
                 email:admin_data.email,
                 first_name:admin_data.first_name,
                 last_name: admin_data.last_name
             },
-         admin, Admin.fromJSON);
+         admin, User.fromJSON);
     }
 
     async function deleteAdmin(id: string) {
         const endpoint = endpoints.admins.retrieve.replace('{id}', id);
-        await delete_id<Admin>(endpoint, admin, Admin.fromJSON);
+        await delete_id<User>(endpoint, admin, User.fromJSON);
     }
 
     return {

diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
@@ -5,6 +5,7 @@
     "module": "ESNext",
     "lib": ["ES2020", "DOM", "DOM.Iterable"],
     "skipLibCheck": true,
+    "types": ["cypress"],
 
     /* Bundler mode */
     "moduleResolution": "bundler",