style: fix linting issues met Prettier
This commit is contained in:
Lint Action
parent
2f5bb333db
commit
fc92570282
16 changed files with 498 additions and 505 deletions
|
|
@ -1,19 +1,19 @@
|
|||
<script setup lang="ts">
|
||||
import type { LearningObject } from '@/data-objects/learning-objects/learning-object';
|
||||
import type { LearningPath } from '@/data-objects/learning-paths/learning-path';
|
||||
import { useLearningObjectListForPathQuery } from '@/queries/learning-objects';
|
||||
import { useRoute } from 'vue-router';
|
||||
import UsingQueryResult from "@/components/UsingQueryResult.vue";
|
||||
import { ref, watchEffect } from 'vue';
|
||||
import type { LearningObject } from "@/data-objects/learning-objects/learning-object";
|
||||
import type { LearningPath } from "@/data-objects/learning-paths/learning-path";
|
||||
import { useLearningObjectListForPathQuery } from "@/queries/learning-objects";
|
||||
import { useRoute } from "vue-router";
|
||||
import UsingQueryResult from "@/components/UsingQueryResult.vue";
|
||||
import { ref, watchEffect } from "vue";
|
||||
|
||||
const route = useRoute();
|
||||
|
||||
const props = defineProps<{
|
||||
path: LearningPath;
|
||||
activeObjectId: string
|
||||
activeObjectId: string;
|
||||
}>();
|
||||
|
||||
const currentPath = ref(props.path)
|
||||
const currentPath = ref(props.path);
|
||||
|
||||
const learningObjectListQueryResult = useLearningObjectListForPathQuery(currentPath);
|
||||
|
||||
|
|
@ -33,21 +33,34 @@ import { ref, watchEffect } from 'vue';
|
|||
function toggleDropdown(): void {
|
||||
dropdownEnabled.value = !dropdownEnabled.value;
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<main>
|
||||
<div class="dropdown-toggle" @click="toggleDropdown()">▼{{path.title}}</div>
|
||||
<div class="dropdown" v-if="dropdownEnabled">
|
||||
<div
|
||||
class="dropdown-toggle"
|
||||
@click="toggleDropdown()"
|
||||
>
|
||||
▼{{ path.title }}
|
||||
</div>
|
||||
<div
|
||||
class="dropdown"
|
||||
v-if="dropdownEnabled"
|
||||
>
|
||||
<using-query-result
|
||||
:query-result="learningObjectListQueryResult"
|
||||
v-slot="learningObjects: { data: LearningObject[] }"
|
||||
>
|
||||
<template v-for="node in learningObjects.data" :key="node.key">
|
||||
<template
|
||||
v-for="node in learningObjects.data"
|
||||
:key="node.key"
|
||||
>
|
||||
<v-list-item
|
||||
link
|
||||
:to="{ path: `/discussion-reload/${currentPath.hruid}/${node.language}/${node.key}`, query: route.query }"
|
||||
:to="{
|
||||
path: `/discussion-reload/${currentPath.hruid}/${node.language}/${node.key}`,
|
||||
query: route.query,
|
||||
}"
|
||||
:title="node.title"
|
||||
:active="node.key === props.activeObjectId"
|
||||
>
|
||||
|
|
@ -59,31 +72,31 @@ import { ref, watchEffect } from 'vue';
|
|||
</template>
|
||||
|
||||
<style scoped>
|
||||
.dropdown {
|
||||
margin-left: 0.5rem;
|
||||
padding-left: 1rem;
|
||||
border-left: 2px solid #e0e0e0;
|
||||
background-color: #f9f9f9;
|
||||
border-radius: 4px;
|
||||
padding-top: 0.5rem;
|
||||
padding-bottom: 0.5rem;
|
||||
}
|
||||
.dropdown-toggle {
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
font-weight: 600;
|
||||
user-select: none;
|
||||
padding: 0.5rem;
|
||||
transition: color 0.2s;
|
||||
}
|
||||
.dropdown {
|
||||
margin-left: 0.5rem;
|
||||
padding-left: 1rem;
|
||||
border-left: 2px solid #e0e0e0;
|
||||
background-color: #f9f9f9;
|
||||
border-radius: 4px;
|
||||
padding-top: 0.5rem;
|
||||
padding-bottom: 0.5rem;
|
||||
}
|
||||
.dropdown-toggle {
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
font-weight: 600;
|
||||
user-select: none;
|
||||
padding: 0.5rem;
|
||||
transition: color 0.2s;
|
||||
}
|
||||
|
||||
.dropdown-toggle:hover {
|
||||
color: #27c53f;
|
||||
}
|
||||
.dropdown-toggle:hover {
|
||||
color: #27c53f;
|
||||
}
|
||||
|
||||
.dropdown-icon {
|
||||
margin-right: 0.5rem;
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
.dropdown-icon {
|
||||
margin-right: 0.5rem;
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -1,18 +1,16 @@
|
|||
<script setup lang="ts">
|
||||
import type { LearningPath } from "@/data-objects/learning-paths/learning-path.ts";
|
||||
import UsingQueryResult from "@/components/UsingQueryResult.vue";
|
||||
import DiscussionSideBarElement from "@/components/DiscussionSideBarElement.vue";
|
||||
import { useI18n } from "vue-i18n";
|
||||
import { useGetAllLearningPaths } from "@/queries/learning-paths.ts";
|
||||
import { ref } from "vue";
|
||||
|
||||
import type { LearningPath } from '@/data-objects/learning-paths/learning-path.ts';
|
||||
import UsingQueryResult from '@/components/UsingQueryResult.vue';
|
||||
import DiscussionSideBarElement from '@/components/DiscussionSideBarElement.vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useGetAllLearningPaths } from '@/queries/learning-paths.ts';
|
||||
import { ref } from 'vue';
|
||||
const { t, locale } = useI18n();
|
||||
|
||||
const { t, locale } = useI18n();
|
||||
|
||||
const navigationDrawerShown = ref(true);
|
||||
|
||||
const allLearningPathsResult = useGetAllLearningPaths(locale.value);
|
||||
const navigationDrawerShown = ref(true);
|
||||
|
||||
const allLearningPathsResult = useGetAllLearningPaths(locale.value);
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
|
@ -24,14 +22,15 @@ const allLearningPathsResult = useGetAllLearningPaths(locale.value);
|
|||
<div class="d-flex flex-column h-100">
|
||||
<v-list-item>
|
||||
<template v-slot:title>
|
||||
<div class="title">{{ t('discussions') }}</div>
|
||||
<div class="title">{{ t("discussions") }}</div>
|
||||
</template>
|
||||
</v-list-item>
|
||||
<v-divider></v-divider>
|
||||
<div>
|
||||
<using-query-result
|
||||
:query-result="allLearningPathsResult"
|
||||
v-slot="learningPaths: {data: LearningPath[]}">
|
||||
v-slot="learningPaths: { data: LearningPath[] }"
|
||||
>
|
||||
<DiscussionSideBarElement
|
||||
v-for="learningPath in learningPaths.data"
|
||||
:path="learningPath"
|
||||
|
|
@ -54,13 +53,11 @@ const allLearningPathsResult = useGetAllLearningPaths(locale.value);
|
|||
</template>
|
||||
|
||||
<style scoped>
|
||||
.title {
|
||||
color: #0e6942;
|
||||
text-transform: uppercase;
|
||||
font-weight: bolder;
|
||||
padding-top: 2%;
|
||||
font-size: 36px;
|
||||
}
|
||||
|
||||
|
||||
.title {
|
||||
color: #0e6942;
|
||||
text-transform: uppercase;
|
||||
font-weight: bolder;
|
||||
padding-top: 2%;
|
||||
font-size: 36px;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<script setup lang="ts">
|
||||
import type { QuestionDTO } from "@dwengo-1/common/interfaces/question";
|
||||
import SingleQuestion from "./SingleQuestion.vue";
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useI18n } from "vue-i18n";
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
|
|
@ -21,19 +21,19 @@
|
|||
</div>
|
||||
</div>
|
||||
<div v-else>
|
||||
<p class="no-questions">{{t("no-questions")}}</p>
|
||||
<p class="no-questions">{{ t("no-questions") }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<style scoped>
|
||||
.no-questions {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
height: 40vh;
|
||||
text-align: center;
|
||||
font-size: 18px;
|
||||
color: #666;
|
||||
padding: 0 20px;
|
||||
}
|
||||
.no-questions {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
height: 40vh;
|
||||
text-align: center;
|
||||
font-size: 18px;
|
||||
color: #666;
|
||||
padding: 0 20px;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -1,97 +1,95 @@
|
|||
<script setup lang="ts">
|
||||
import authService from "@/services/auth/auth-service.ts";
|
||||
import { Language } from "@/data-objects/language.ts";
|
||||
import { computed, type ComputedRef, ref } from "vue";
|
||||
import type { AssignmentDTO } from "@dwengo-1/common/interfaces/assignment";
|
||||
import { useStudentAssignmentsQuery, useStudentGroupsQuery } from "@/queries/students.ts";
|
||||
import type { GroupDTO, GroupDTOId } from "@dwengo-1/common/interfaces/group";
|
||||
import type { QuestionData } from "@dwengo-1/common/interfaces/question";
|
||||
import type { LearningObjectIdentifierDTO } from "@dwengo-1/interfaces/learning-content";
|
||||
import { useCreateQuestionMutation, useQuestionsQuery } from "@/queries/questions.ts";
|
||||
import { LearningPathNode } from "@/data-objects/learning-paths/learning-path-node.ts";
|
||||
import { useGetLearningPathQuery } from "@/queries/learning-paths.ts";
|
||||
import { useLearningObjectListForPathQuery } from "@/queries/learning-objects.ts";
|
||||
import { useI18n } from "vue-i18n";
|
||||
import { AccountType } from "@dwengo-1/common/src/util/account-types.ts";
|
||||
|
||||
import authService from '@/services/auth/auth-service.ts';
|
||||
import { Language } from '@/data-objects/language.ts';
|
||||
import { computed, type ComputedRef, ref } from 'vue';
|
||||
import type { AssignmentDTO } from '@dwengo-1/common/interfaces/assignment';
|
||||
import { useStudentAssignmentsQuery, useStudentGroupsQuery } from '@/queries/students.ts';
|
||||
import type { GroupDTO, GroupDTOId } from '@dwengo-1/common/interfaces/group';
|
||||
import type { QuestionData } from '@dwengo-1/common/interfaces/question';
|
||||
import type { LearningObjectIdentifierDTO } from '@dwengo-1/interfaces/learning-content';
|
||||
import { useCreateQuestionMutation, useQuestionsQuery } from '@/queries/questions.ts';
|
||||
import { LearningPathNode } from '@/data-objects/learning-paths/learning-path-node.ts';
|
||||
import { useGetLearningPathQuery } from '@/queries/learning-paths.ts';
|
||||
import { useLearningObjectListForPathQuery } from '@/queries/learning-objects.ts';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { AccountType } from '@dwengo-1/common/src/util/account-types.ts';
|
||||
const props = defineProps<{
|
||||
hruid: string;
|
||||
language: Language;
|
||||
learningObjectHruid?: string;
|
||||
forGroup?: GroupDTOId | undefined;
|
||||
}>();
|
||||
|
||||
const props = defineProps<{
|
||||
hruid: string;
|
||||
language: Language;
|
||||
learningObjectHruid?: string;
|
||||
forGroup?: GroupDTOId | undefined
|
||||
}>();
|
||||
const { t } = useI18n();
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
const studentAssignmentsQueryResult = useStudentAssignmentsQuery(
|
||||
authService.authState.user?.profile.preferred_username,
|
||||
);
|
||||
const learningPathQueryResult = useGetLearningPathQuery(props.hruid, props.language, props.forGroup);
|
||||
const learningObjectListQueryResult = useLearningObjectListForPathQuery(learningPathQueryResult.data);
|
||||
|
||||
const pathIsAssignment = computed(() => {
|
||||
const assignments = (studentAssignmentsQueryResult.data.value?.assignments as AssignmentDTO[]) || [];
|
||||
return assignments.some(
|
||||
(assignment) => assignment.learningPath === props.hruid && assignment.language === props.language,
|
||||
const studentAssignmentsQueryResult = useStudentAssignmentsQuery(
|
||||
authService.authState.user?.profile.preferred_username,
|
||||
);
|
||||
});
|
||||
const learningPathQueryResult = useGetLearningPathQuery(props.hruid, props.language, props.forGroup);
|
||||
const learningObjectListQueryResult = useLearningObjectListForPathQuery(learningPathQueryResult.data);
|
||||
|
||||
const nodesList: ComputedRef<LearningPathNode[] | null> = computed(
|
||||
() => learningPathQueryResult.data.value?.nodesAsList ?? null,
|
||||
);
|
||||
const pathIsAssignment = computed(() => {
|
||||
const assignments = (studentAssignmentsQueryResult.data.value?.assignments as AssignmentDTO[]) || [];
|
||||
return assignments.some(
|
||||
(assignment) => assignment.learningPath === props.hruid && assignment.language === props.language,
|
||||
);
|
||||
});
|
||||
|
||||
|
||||
const currentNode = computed(() => {
|
||||
const currentHruid = props.learningObjectHruid;
|
||||
return nodesList.value?.find((it) => it.learningobjectHruid === currentHruid);
|
||||
});
|
||||
|
||||
const getQuestionsQuery = useQuestionsQuery(
|
||||
computed(
|
||||
() =>
|
||||
({
|
||||
language: currentNode.value?.language,
|
||||
hruid: currentNode.value?.learningobjectHruid,
|
||||
version: currentNode.value?.version,
|
||||
}) as LearningObjectIdentifierDTO,
|
||||
),
|
||||
);
|
||||
|
||||
const questionInput = ref('');
|
||||
|
||||
const loID: LearningObjectIdentifierDTO = {
|
||||
hruid: props.learningObjectHruid as string,
|
||||
language: props.language,
|
||||
};
|
||||
const createQuestionMutation = useCreateQuestionMutation(loID);
|
||||
const groupsQueryResult = useStudentGroupsQuery(authService.authState.user?.profile.preferred_username);
|
||||
|
||||
function submitQuestion(): void {
|
||||
const assignments = studentAssignmentsQueryResult.data.value?.assignments as AssignmentDTO[];
|
||||
const assignment = assignments.find(
|
||||
(assignment) => assignment.learningPath === props.hruid && assignment.language === props.language,
|
||||
const nodesList: ComputedRef<LearningPathNode[] | null> = computed(
|
||||
() => learningPathQueryResult.data.value?.nodesAsList ?? null,
|
||||
);
|
||||
const groups = groupsQueryResult.data.value?.groups as GroupDTO[];
|
||||
const group = groups?.find((group) => group.assignment === assignment?.id) as GroupDTO;
|
||||
const questionData: QuestionData = {
|
||||
author: authService.authState.user?.profile.preferred_username,
|
||||
content: questionInput.value,
|
||||
inGroup: group,
|
||||
|
||||
const currentNode = computed(() => {
|
||||
const currentHruid = props.learningObjectHruid;
|
||||
return nodesList.value?.find((it) => it.learningobjectHruid === currentHruid);
|
||||
});
|
||||
|
||||
const getQuestionsQuery = useQuestionsQuery(
|
||||
computed(
|
||||
() =>
|
||||
({
|
||||
language: currentNode.value?.language,
|
||||
hruid: currentNode.value?.learningobjectHruid,
|
||||
version: currentNode.value?.version,
|
||||
}) as LearningObjectIdentifierDTO,
|
||||
),
|
||||
);
|
||||
|
||||
const questionInput = ref("");
|
||||
|
||||
const loID: LearningObjectIdentifierDTO = {
|
||||
hruid: props.learningObjectHruid as string,
|
||||
language: props.language,
|
||||
};
|
||||
if (questionInput.value !== '') {
|
||||
createQuestionMutation.mutate(questionData, {
|
||||
onSuccess: async () => {
|
||||
questionInput.value = ''; // Clear the input field after submission
|
||||
await getQuestionsQuery.refetch(); // Reload the questions
|
||||
},
|
||||
onError: (_) => {
|
||||
// TODO Handle error
|
||||
// - console.error(e);
|
||||
},
|
||||
});
|
||||
const createQuestionMutation = useCreateQuestionMutation(loID);
|
||||
const groupsQueryResult = useStudentGroupsQuery(authService.authState.user?.profile.preferred_username);
|
||||
|
||||
function submitQuestion(): void {
|
||||
const assignments = studentAssignmentsQueryResult.data.value?.assignments as AssignmentDTO[];
|
||||
const assignment = assignments.find(
|
||||
(assignment) => assignment.learningPath === props.hruid && assignment.language === props.language,
|
||||
);
|
||||
const groups = groupsQueryResult.data.value?.groups as GroupDTO[];
|
||||
const group = groups?.find((group) => group.assignment === assignment?.id) as GroupDTO;
|
||||
const questionData: QuestionData = {
|
||||
author: authService.authState.user?.profile.preferred_username,
|
||||
content: questionInput.value,
|
||||
inGroup: group,
|
||||
};
|
||||
if (questionInput.value !== "") {
|
||||
createQuestionMutation.mutate(questionData, {
|
||||
onSuccess: async () => {
|
||||
questionInput.value = ""; // Clear the input field after submission
|
||||
await getQuestionsQuery.refetch(); // Reload the questions
|
||||
},
|
||||
onError: (_) => {
|
||||
// TODO Handle error
|
||||
// - console.error(e);
|
||||
},
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
|
@ -114,48 +112,47 @@ function submitQuestion(): void {
|
|||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.question-box {
|
||||
width: 100%;
|
||||
max-width: 400px;
|
||||
margin: 20px auto;
|
||||
font-family: sans-serif;
|
||||
}
|
||||
.question-box {
|
||||
width: 100%;
|
||||
max-width: 400px;
|
||||
margin: 20px auto;
|
||||
font-family: sans-serif;
|
||||
}
|
||||
|
||||
.input-wrapper {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 999px;
|
||||
padding: 8px 12px;
|
||||
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
.input-wrapper {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 999px;
|
||||
padding: 8px 12px;
|
||||
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.question-input {
|
||||
flex: 1;
|
||||
border: none;
|
||||
outline: none;
|
||||
font-size: 14px;
|
||||
background-color: transparent;
|
||||
}
|
||||
.question-input {
|
||||
flex: 1;
|
||||
border: none;
|
||||
outline: none;
|
||||
font-size: 14px;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
.question-input::placeholder {
|
||||
color: #999;
|
||||
}
|
||||
.question-input::placeholder {
|
||||
color: #999;
|
||||
}
|
||||
|
||||
.send-button {
|
||||
background: none;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
font-size: 16px;
|
||||
color: #555;
|
||||
transition: color 0.2s ease;
|
||||
}
|
||||
.send-button {
|
||||
background: none;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
font-size: 16px;
|
||||
color: #555;
|
||||
transition: color 0.2s ease;
|
||||
}
|
||||
|
||||
.send-button:hover {
|
||||
color: #000;
|
||||
}
|
||||
.send-button:hover {
|
||||
color: #000;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
import authService from "@/services/auth/auth-service";
|
||||
import { useI18n } from "vue-i18n";
|
||||
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
const props = defineProps<{
|
||||
|
|
@ -135,7 +134,7 @@
|
|||
:key="answerIndex"
|
||||
class="text-gray-600"
|
||||
>
|
||||
<v-divider :thickness=2 />
|
||||
<v-divider :thickness="2" />
|
||||
<div
|
||||
class="flex justify-between items-center mb-2"
|
||||
style="
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue