tdpeuter/2025SELab2-project-Dwengo
tdpeuter/2025SELab2-project-Dwengo
Archived
1
Fork 0
Code Issues Releases 4 Packages 2 Wiki Activity

Merge branch 'dev' into extra/discussions

Browse source
This commit is contained in:
Timo De Meyst 2025-05-19 21:43:30 +02:00 • committed by GitHub
commit d4dc519a59
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

42
frontend/src/components/DiscussionSideBarElement.vue
View file

@ -1,12 +1,12 @@
<script setup lang="ts"> <script setup lang="ts">
import type { LearningObject } from '@/data-objects/learning-objects/learning-object'; import type { LearningObject } from '@/data-objects/learning-objects/learning-object';
import type { LearningPath } from '@/data-objects/learning-paths/learning-path'; import type { LearningPath } from '@/data-objects/learning-paths/learning-path';
import { useLearningObjectListForPathQuery } from '@/queries/learning-objects'; import { useLearningObjectListForPathQuery } from '@/queries/learning-objects';
import { useRoute } from 'vue-router'; import { useRoute } from 'vue-router';
import UsingQueryResult from '@/components/UsingQueryResult.vue'; import UsingQueryResult from '@/components/UsingQueryResult.vue';
import QuestionNotification from "@/components/QuestionNotification.vue"; import QuestionNotification from "@/components/QuestionNotification.vue";
const route = useRoute(); const route = useRoute();
const props = defineProps<{ const props = defineProps<{
path: LearningPath; path: LearningPath;
@ -20,21 +20,21 @@ const route = useRoute();
{{ path.title }} {{ path.title }}
</v-expansion-panel-title> </v-expansion-panel-title>
<v-expansion-panel-text> <v-expansion-panel-text>
<v-lazy> <v-lazy>
<using-query-result <using-query-result
:query-result="useLearningObjectListForPathQuery(props.path)" :query-result="useLearningObjectListForPathQuery(props.path)"
v-slot="learningObjects: { data: LearningObject[] }" v-slot="learningObjects: { data: LearningObject[] }"
>
<template
v-for="node in learningObjects.data"
:key="node.key"
> >
<v-list-item <template
link v-for="node in learningObjects.data"
:to="{ :key="node.key"
path: `/discussion-reload/${props.path.hruid}/${node.language}/${node.key}`, >
query: route.query, <v-list-item
}" link
:to="{
path: `/discussion-reload/${props.path.hruid}/${node.language}/${node.key}`,
query: route.query,
}"
:title="node.title" :title="node.title"
:active="node.key === props.activeObjectId" :active="node.key === props.activeObjectId"
> >

30
frontend/src/views/discussions/SingleDiscussion.vue
View file

@ -1,20 +1,20 @@
<script setup lang="ts"> <script setup lang="ts">
import { Language } from '@/data-objects/language.ts'; import { Language } from "@/data-objects/language.ts";
import { computed, type ComputedRef, watch } from 'vue'; import { computed, type ComputedRef, watch } from "vue";
import { useRoute } from 'vue-router'; import { useRoute } from "vue-router";
import { useGetLearningPathQuery } from '@/queries/learning-paths.ts'; import { useGetLearningPathQuery } from "@/queries/learning-paths.ts";
import UsingQueryResult from '@/components/UsingQueryResult.vue'; import UsingQueryResult from "@/components/UsingQueryResult.vue";
import { LearningPathNode } from '@/data-objects/learning-paths/learning-path-node.ts'; import { LearningPathNode } from "@/data-objects/learning-paths/learning-path-node.ts";
import { useQuestionsQuery } from '@/queries/questions'; import { useQuestionsQuery } from "@/queries/questions";
import type { QuestionsResponse } from '@/controllers/questions'; import type { QuestionsResponse } from "@/controllers/questions";
import type { LearningObjectIdentifierDTO } from '@dwengo-1/common/interfaces/learning-content'; import type { LearningObjectIdentifierDTO } from "@dwengo-1/common/interfaces/learning-content";
import QandA from '@/components/QandA.vue'; import QandA from "@/components/QandA.vue";
import type { QuestionDTO } from '@dwengo-1/common/interfaces/question'; import type { QuestionDTO } from "@dwengo-1/common/interfaces/question";
import DiscussionsSideBar from '@/components/DiscussionsSideBar.vue'; import DiscussionsSideBar from "@/components/DiscussionsSideBar.vue";
import QuestionBox from '@/components/QuestionBox.vue'; import QuestionBox from "@/components/QuestionBox.vue";
import { useI18n } from 'vue-i18n'; import { useI18n } from "vue-i18n";
const { t } = useI18n(); const { t } = useI18n();
const route = useRoute(); const route = useRoute();