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

Merge branch 'feat/discussions' of https://github.com/SELab-2/Dwengo-1 into feat/discussions

Browse source
This commit is contained in:
Gerald Schmittinger 2025-05-18 14:56:53 +02:00
commit 5646598229
2 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
frontend/src/components/QuestionBox.vue
View file

@ -66,7 +66,9 @@
const createQuestionMutation = useCreateQuestionMutation(loID); const createQuestionMutation = useCreateQuestionMutation(loID);
const groupsQueryResult = useStudentGroupsQuery(authService.authState.user?.profile.preferred_username); const groupsQueryResult = useStudentGroupsQuery(authService.authState.user?.profile.preferred_username);
const showQuestionBox = computed(() => authService.authState.activeRole === AccountType.Student && pathIsAssignment.value); const showQuestionBox = computed(
() => authService.authState.activeRole === AccountType.Student && pathIsAssignment.value,
);
function submitQuestion(): void { function submitQuestion(): void {
const assignments = studentAssignmentsQueryResult.data.value?.assignments as AssignmentDTO[]; const assignments = studentAssignmentsQueryResult.data.value?.assignments as AssignmentDTO[];
@ -96,8 +98,11 @@
</script> </script>
<template> <template>
<h3 v-if="props.withTitle && showQuestionBox">{{ t('askAQuestion') }}:</h3> <h3 v-if="props.withTitle && showQuestionBox">{{ t("askAQuestion") }}:</h3>
<div class="question-box" v-if="showQuestionBox"> <div
class="question-box"
v-if="showQuestionBox"
>
<v-textarea <v-textarea
:label="t('question-input-placeholder')" :label="t('question-input-placeholder')"
v-model="questionInput" v-model="questionInput"
@ -105,7 +110,8 @@
density="compact" density="compact"
rows="1" rows="1"
variant="outlined" variant="outlined"
auto-grow> auto-grow
>
<template v-slot:append-inner> <template v-slot:append-inner>
<v-btn <v-btn
icon="mdi mdi-send" icon="mdi mdi-send"
@ -113,7 +119,7 @@
variant="plain" variant="plain"
class="question-button" class="question-button"
@click="submitQuestion" @click="submitQuestion"
/> />
</template> </template>
</v-textarea> </v-textarea>
</div> </div>

18
frontend/src/components/SingleQuestion.vue
View file

@ -83,16 +83,18 @@
</script> </script>
<template> <template>
<div class="space-y-4"> <div class="space-y-4">
<v-card <v-card class="question-card">
class="question-card"
>
<v-card-title class="author-title">{{ displayNameFor(question.author) }}</v-card-title> <v-card-title class="author-title">{{ displayNameFor(question.author) }}</v-card-title>
<v-card-subtitle>{{ formatDate(question.timestamp) }}</v-card-subtitle> <v-card-subtitle>{{ formatDate(question.timestamp) }}</v-card-subtitle>
<v-card-text> <v-card-text>
{{ question.content }} {{ question.content }}
</v-card-text> </v-card-text>
<template v-slot:actions <template
v-if="authService.authState.activeRole === AccountType.Teacher || answersQuery.data?.value?.answers?.length > 0" v-slot:actions
v-if="
authService.authState.activeRole === AccountType.Teacher ||
answersQuery.data?.value?.answers?.length > 0
"
> >
<div class="question-actions-container"> <div class="question-actions-container">
<v-textarea <v-textarea
@ -103,7 +105,8 @@
density="compact" density="compact"
rows="1" rows="1"
variant="outlined" variant="outlined"
auto-grow> auto-grow
>
<template v-slot:append-inner> <template v-slot:append-inner>
<v-btn <v-btn
icon="mdi mdi-send" icon="mdi mdi-send"
@ -111,7 +114,7 @@
variant="plain" variant="plain"
class="answer-button" class="answer-button"
@click="submitAnswer" @click="submitAnswer"
/> />
</template> </template>
</v-textarea> </v-textarea>
<using-query-result <using-query-result
@ -149,7 +152,6 @@
</div> </div>
</template> </template>
<style scoped> <style scoped>
.answer-field { .answer-field {
max-width: 500px; max-width: 500px;
} }