diff --git a/Frontend/components/AdminHeader/AdminHeader.vue b/Frontend/components/AdminHeader/AdminHeader.vue index 2e1de32c..82a7efe1 100644 --- a/Frontend/components/AdminHeader/AdminHeader.vue +++ b/Frontend/components/AdminHeader/AdminHeader.vue @@ -6,6 +6,8 @@ import { useColorMode } from "#imports"; const router = useRouter(); const colorMode = useColorMode(); +const { t } = useI18n(); + interface Props { variant?: "default" | "upload" | "download" | "delete" | "text" | "warning"; headerText: string; @@ -60,7 +62,7 @@ const emit = defineEmits([ 'right-button-click' ]); /> -
+ + diff --git a/Frontend/i18n/locales/de-DE.json b/Frontend/i18n/locales/de-DE.json index e23883df..49aaa7ab 100644 --- a/Frontend/i18n/locales/de-DE.json +++ b/Frontend/i18n/locales/de-DE.json @@ -137,6 +137,14 @@ } } }, + "aria": { + "matching": { + "supervisor": { + "generalCard": "Diese Person hat folgendes Kurzprofil: {bio}. Ihre Tags sind: {tags}. Deine Kompatibilität beträgt {compatability}. Aktuell sind {availableSpots} von {totalSpots} Betreuungsplätzen verfügbar. Momentan warten {pending} Studierende auf eine Rückmeldung." + } + }, + "pageHeader": "Du bist auf der folgenden Seite: {pageName}" + }, "confirmation": { "acceptedOn": "Akzeptiert am: {date}", "details": "Bestätigungsdetails", @@ -227,6 +235,7 @@ "manageRequest": "Anfrage verwalten", "addStudent": "Als Betreute*r hinzufügen", "noVideoSupport": "Dein Browser unterstützt kein HTML-Video... ich denke, es ist Zeit für ein Upgrade deines Geräts!", + "nothing": "Nichts", "pendingRequestTo": "Ausstehende Anfrage an", "profile": "Profil", "profilePictureAlt": "Profil Bild von {firstName} {lastName}", @@ -254,6 +263,10 @@ "acceptRequest": "Betreuungsanfrage annehmen", "acceptRequestButton": "Anfrage annehmen", "acceptRequestDescription": "Möchten Sie die Betreuungsanfrage von {firstName} {lastName} annehmen? Nach Annahme seid ihr offiziell ein Betreuer-Studenten-Paar.", + "aria": { + "matchWith": "Betreuungsanfrage an {name} senden", + "reject": "Entferne {name}" + }, "confirmationToast": "Sie haben die Betreuungsanfrage {type}", "existingSupervision": { "actionButton": "Zurück zum Dashboard", @@ -399,6 +412,7 @@ "name": "Namen" }, "noResults": "Keine Suchergebnisse...", + "placeholderForAdmins": "Benutzer suchen...", "placeholderForStudents": "Betreuer suchen...", "placeholderForSupervisors": "Studenten suchen...", "placeholderForAdmins": "Benutzer suchen..." @@ -480,6 +494,12 @@ "title": "Studierenden entfernen" } }, + "swipe": { + "announcement": { + "left": "Karte nach links gewischt.", + "right": "Karte nach links gewischt." + } + }, "tagPriority": { "arrangeByPriority": "Tags nach Priorität ordnen", "unknownTag": "Unbekannter Tag '{tagNumber}'" @@ -499,4 +519,4 @@ "somethingWentWrong": "Etwas ist schief gelaufen, bitte versuchen Sie es später noch einmal", "addedStudentAsSupervisee": "Student wurde als Betreuer hinzugefügt" } -} \ No newline at end of file +} diff --git a/Frontend/i18n/locales/en-GB.json b/Frontend/i18n/locales/en-GB.json index 8b3b486a..b097042f 100644 --- a/Frontend/i18n/locales/en-GB.json +++ b/Frontend/i18n/locales/en-GB.json @@ -137,6 +137,14 @@ } } }, + "aria": { + "matching": { + "supervisor": { + "generalCard": "They have the following bio: {bio}. Their tags are: {tags}. Your compatabilty is {compatability}. They currently have {availableSpots} out of {totalSpots} slots available for supervision. Currently there are {pending} students pending." + } + }, + "pageHeader": "You are on the following page: {pageName}" + }, "confirmation": { "acceptedOn": "Accepted on: {date}", "details": "Confirmation Details", @@ -227,6 +235,7 @@ "manageRequest": "Manage Request", "addStudent": "Add as supervisee", "noVideoSupport": "Your browser does not support HTML video... i think its time to upgrade your device!", + "nothing": "Nothing", "pendingRequestTo": "Pending request to", "profile": "Profile", "profilePictureAlt": "Profile picture of {firstName} {lastName}", @@ -254,6 +263,10 @@ "acceptRequest": "Accept Supervision Request", "acceptRequestButton": "Accept Request", "acceptRequestDescription": "Would you like to accept the supervision request from {firstName} {lastName}? Once accepted You will officially be a supervisor-student pair", + "aria": { + "matchWith": "Match with {name}", + "reject": "Dismiss {name}" + }, "confirmationToast": "You {type} the supervision request", "existingSupervision": { "actionButton": "Go back to dashboard", @@ -399,6 +412,7 @@ "name": "Name" }, "noResults": "No search results...", + "placeholderForAdmins": "Search users...", "placeholderForStudents": "Search supervisor...", "placeholderForSupervisors": "Search student...", "placeholderForAdmins": "Search users..." @@ -480,6 +494,12 @@ "title": "Remove Student" } }, + "swipe": { + "announcement": { + "left": "Card has been swiped left.", + "right": "Card has been swiped right." + } + }, "tagPriority": { "arrangeByPriority": "Arrange tags by priority", "unknownTag": "Unbekannter Tag '{tagNumber}'" diff --git a/Frontend/pages/student/matching.vue b/Frontend/pages/student/matching.vue index 05939c97..f832bf9a 100644 --- a/Frontend/pages/student/matching.vue +++ b/Frontend/pages/student/matching.vue @@ -2,56 +2,64 @@
@@ -92,10 +100,7 @@ import { useSupervisorStore } from "~/stores/useSupervisorStore"; import { useSettingsStore } from "~/stores/useSettingsStore"; import { computed, nextTick, ref } from "vue"; import type { SupervisorData } from "~/shared/types/supervisorInterfaces"; -import type { - ConfirmationDialogData, - SupervisionRequestResponseData, -} from "~/shared/types/userInterfaces"; +import type { ConfirmationDialogData, SupervisionRequestResponseData, } from "~/shared/types/userInterfaces"; import { HttpMethods, supervisionRequestType } from "~/shared/enums/enums"; import type { SwipeContainer } from "#components"; import type { SupervisionRequestsData } from "#shared/types/supervisorInterfaces"; @@ -113,11 +118,11 @@ if (!userStore.user) { } const swipeContainerRefs = ref< - Record | null> + Record | null> >({}); const modalInformation = ref(null); const supervisionRequestReturnData = ref( - null + null ); const removedSupervisor = ref(null); const toast = ref({ @@ -135,7 +140,7 @@ onMounted(async () => { await studentStore.fetchSupervisionRequests(); } acceptedSupervisionRequests.value = - studentStore.acceptedSupervisionRequests[0]; + studentStore.acceptedSupervisionRequests[0]; }); onUnmounted(async () => { @@ -145,7 +150,7 @@ onUnmounted(async () => { }); if (!supervisorStore.supervisors || supervisorStore.supervisors.length === 0) { - const { data, error } = await useFetch(`/api/match/${userStore.user?.id}`, { + const { data, error } = await useFetch(`/api/match/${ userStore.user?.id }`, { method: HttpMethods.GET, }); if (error.value) { @@ -157,7 +162,7 @@ if (!supervisorStore.supervisors || supervisorStore.supervisors.length === 0) { } const recommendedSupervisors = computed(() => { - return [...supervisorStore.supervisors].sort((a, b) => { + return [ ...supervisorStore.supervisors ].sort((a, b) => { return b.compatibilityScore - a.compatibilityScore; }); }); @@ -170,7 +175,7 @@ const handleSwipeRight = async (supervisor: SupervisorData) => { removedSupervisor.value = supervisor; modalInformation.value = { type: supervisionRequestType.CONFIRM, - headline: `Request ${supervisor.firstName} ${supervisor.lastName}`, + headline: `Request ${ supervisor.firstName } ${ supervisor.lastName }`, icon: "", warning: "", description: t("modal.supervisionInfo"), @@ -239,17 +244,17 @@ const handleToastClosed = () => { const handleActionConfirmation = async (supervisor: SupervisorData) => { if (modalInformation.value?.type === supervisionRequestType.CONFIRM) { const { data } = await useFetch( - `/api/supervision-requests`, - { - method: HttpMethods.POST, - body: { - supervisor_id: supervisor.supervisorId, - }, - } + `/api/supervision-requests`, + { + method: HttpMethods.POST, + body: { + supervisor_id: supervisor.supervisorId, + }, + } ); supervisionRequestReturnData.value = data.value; } else if (modalInformation.value?.type === supervisionRequestType.DISMISS) { - await useFetch(`/api/users/${userStore.user?.id}/blocks`, { + await useFetch(`/api/users/${ userStore.user?.id }/blocks`, { method: HttpMethods.POST, body: { blocked_id: supervisor.supervisor_userId, @@ -286,7 +291,7 @@ const handleModalDontShowAgain = (type: supervisionRequestType) => { const openModal = async () => { await nextTick(); const modal = document.getElementById( - "confirmationModal" + "confirmationModal" ) as HTMLDialogElement; modal?.showModal(); }; @@ -294,7 +299,7 @@ const openModal = async () => { const showToastInformation = (type: string) => { if (modalInformation.value?.supervisor?.supervisor_userId) { supervisorStore.removeSupervisor( - modalInformation.value?.supervisor?.supervisor_userId + modalInformation.value?.supervisor?.supervisor_userId ); } if (type === supervisionRequestType.CONFIRM) { @@ -313,8 +318,8 @@ const showToastInformation = (type: string) => { }; const setItemRef = ( - el: InstanceType | null, - id: string + el: InstanceType | null, + id: string ) => { if (el) { swipeContainerRefs.value[id] = el;