LobotomyLabs/classquiz-ai
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ Added Moderation ratings

Browse Source
This commit is contained in:
Mawoka
2023-08-01 17:44:30 +02:00
parent b5d5dab2f4
commit 6a277cdf9f
14 changed files with 353 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classquiz/__init__.py
+2
View File
@@ -33,6 +33,7 @@ from classquiz.routers import (
box_controller, box_controller,
quiztivity, quiztivity,
pixabay, pixabay,
moderation,
) )
from classquiz.socket_server import sio from classquiz.socket_server import sio
from classquiz.helpers import meilisearch_init, telemetry_ping from classquiz.helpers import meilisearch_init, telemetry_ping
@@ -77,6 +78,7 @@ async def auth_middleware_wrapper(request: Request, call_next):
return await rememberme_middleware(request, call_next) return await rememberme_middleware(request, call_next)
app.include_router(moderation.router, tags=["moderation"], prefix="/api/v1/moderation", include_in_schema=True)
app.include_router(pixabay.router, tags=["pixabay"], prefix="/api/v1/pixabay", include_in_schema=True) app.include_router(pixabay.router, tags=["pixabay"], prefix="/api/v1/pixabay", include_in_schema=True)
app.include_router(quiztivity.router, tags=["quiztivity"], prefix="/api/v1/quiztivity", include_in_schema=True) app.include_router(quiztivity.router, tags=["quiztivity"], prefix="/api/v1/quiztivity", include_in_schema=True)
classquiz/auth.py
+17
View File
@@ -128,6 +128,23 @@ async def get_current_user(token: str = Depends(oauth2_scheme)):
return user return user
async def get_current_moderator(token: str = Depends(oauth2_scheme)):
try:
payload = jwt.decode(token, settings.secret_key, algorithms=[ALGORITHM])
email: str = payload.get("sub")
if email is None:
raise credentials_exception
token_data = TokenData(email=email)
except JWTError:
raise credentials_exception
user = await get_user_from_mail(email=token_data.email)
if user is None:
raise credentials_exception
if user.username not in settings.mods:
raise credentials_exception
return user
async def get_admin_user(token: str = Depends(oauth2_scheme)) -> User: async def get_admin_user(token: str = Depends(oauth2_scheme)) -> User:
user = await get_current_user(token) user = await get_current_user(token)
admin_user = await User.objects.order_by(User.created_at.asc()).get() admin_user = await User.objects.order_by(User.created_at.asc()).get()
classquiz/config.py
+1
View File
@@ -53,6 +53,7 @@ class Settings(BaseSettings):
telemetry_enabled: bool = True telemetry_enabled: bool = True
free_storage_limit: int = 1074000000 free_storage_limit: int = 1074000000
pixabay_api_key: str | None = None pixabay_api_key: str | None = None
mods: list[str] = []
# storage_backend # storage_backend
storage_backend: str | None = "local" storage_backend: str | None = "local"
classquiz/db/models.py
+1
View File
@@ -184,6 +184,7 @@ class Quiz(ormar.Model):
dislikes: int = ormar.Integer(nullable=False, default=0, server_default="0") dislikes: int = ormar.Integer(nullable=False, default=0, server_default="0")
plays: int = ormar.Integer(nullable=False, default=0, server_default="0") plays: int = ormar.Integer(nullable=False, default=0, server_default="0")
views: int = ormar.Integer(nullable=False, default=0, server_default="0") views: int = ormar.Integer(nullable=False, default=0, server_default="0")
mod_rating: int | None = ormar.SmallInteger(nullable=True)
class Meta: class Meta:
tablename = "quiz" tablename = "quiz"
classquiz/helpers/__init__.py
+1
View File
@@ -170,6 +170,7 @@ async def handle_import_from_excel(data: BinaryIO, user: User) -> Quiz:
else: else:
existing_quiz.questions = [*existing_quiz.questions, *questions] existing_quiz.questions = [*existing_quiz.questions, *questions]
existing_quiz.updated_at = datetime.now() existing_quiz.updated_at = datetime.now()
existing_quiz.mod_rating = None
await existing_quiz.update() await existing_quiz.update()
quiz = existing_quiz quiz = existing_quiz
return quiz return quiz
classquiz/routers/editor.py
+1
View File
@@ -129,6 +129,7 @@ async def finish_edit(edit_id: str, quiz_input: QuizInput):
quiz.cover_image = quiz_input.cover_image quiz.cover_image = quiz_input.cover_image
quiz.background_color = quiz_input.background_color quiz.background_color = quiz_input.background_color
quiz.background_image = quiz_input.background_image quiz.background_image = quiz_input.background_image
quiz.mod_rating = None
for image in images_to_delete: for image in images_to_delete:
if image is not None: if image is not None:
try: try:
classquiz/routers/eximport.py
+1
View File
@@ -128,5 +128,6 @@ async def import_quiz(file: UploadFile = File(), user: User = Depends(get_curren
quiz = Quiz.parse_obj(quiz_dict) quiz = Quiz.parse_obj(quiz_dict)
quiz.user_id = user.id quiz.user_id = user.id
quiz.imported_from_kahoot = None quiz.imported_from_kahoot = None
quiz.mod_rating = None
await quiz.save() await quiz.save()
return quiz return quiz
classquiz/routers/moderation.py
+61
View File
@@ -0,0 +1,61 @@
# SPDX-FileCopyrightText: 2023 Marlon W (Mawoka)
#
# SPDX-License-Identifier: MPL-2.0
import uuid
from fastapi import APIRouter, Depends, Response, HTTPException
from pydantic import BaseModel
from classquiz.auth import get_current_moderator
from classquiz.db.models import User, Quiz
router = APIRouter()
@router.get("/status")
async def get_mod_status(resp: Response, user: User = Depends(get_current_moderator)):
resp.status_code = 200
resp.set_cookie("moderator", "yes", path="/")
resp.headers.update({"Content-Type": "application/json"})
resp.body = '{"status": "ok"}'
return resp
@router.get("/quizzes")
async def get_newest_quizzes(
page: int = 1, all: bool = False, user: User = Depends(get_current_moderator)
) -> list[Quiz]:
if page < 1:
raise HTTPException(status_code=400, detail="page 1 is the first")
if all:
quizzes = (
await Quiz.objects.paginate(page=page)
.order_by(Quiz.updated_at.desc())
.filter(Quiz.public == True) # noqa: E712
.all()
)
else:
# noinspection PyComparisonWithNone
quizzes = (
await Quiz.objects.paginate(page=page)
.order_by(Quiz.updated_at.desc())
.filter(Quiz.public == True) # noqa: E712
.filter(Quiz.mod_rating == None) # noqa: E711
.all()
)
return quizzes
class SetModRatingForQuizInput(BaseModel):
rating: int | None
@router.post("/rating/set/{quiz_id}")
async def set_mod_rating_for_quiz(
data: SetModRatingForQuizInput, quiz_id: uuid.UUID, user: User = Depends(get_current_moderator)
) -> Quiz:
quiz = await Quiz.objects.get_or_none(public=True, id=quiz_id)
if quiz is None:
raise HTTPException(status_code=404, detail="Quiz not found")
quiz.mod_rating = data.rating
return await quiz.update()
frontend/src/lib/collapsible.svelte
+1 -1
View File
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MPL-2.0
<script> <script>
export let headerText; export let headerText;
let expanded = false; export let expanded = false;
</script> </script>
<div> <div>
frontend/src/routes/moderation/+page.svelte
+51
View File
@@ -0,0 +1,51 @@
<!--
SPDX-FileCopyrightText: 2023 Marlon W (Mawoka)
SPDX-License-Identifier: MPL-2.0
-->
<script lang='ts'>
import type { PageData } from './$types';
import BrownButton from '$lib/components/buttons/brown.svelte';
import { page } from '$app/stores';
export let data: PageData;
</script>
<div class='flex flex-col p-2'>
{#each data.quizzes as quiz}
<div class='border-2 border-[#B07156] rounded w-full h-[20vh] p-2 flex flex-col gap-2'>
<div class='grid grid-cols-3 h-full'>
<div class='hidden lg:flex w-auto h-full items-center relative'>
{#if quiz.cover_image}
<img
src='/api/v1/storage/download/{quiz.cover_image}'
alt='user provided'
loading='lazy'
class='shrink-0 max-w-full max-h-full absolute rounded'
/>
{/if}
</div>
<div class='my-auto mx-auto max-h-full overflow-hidden'>
<p class='text-xl text-center'>{@html quiz.title}</p>
<p class='text-sm text-center text-clip overflow-hidden'>
{@html quiz.description ?? ''}
</p>
</div>
<div class='flex justify-center'>
<p class='m-auto'>Questions: {quiz.questions.length}</p>
</div>
</div>
<div class='flex w-full'>
<BrownButton href='/view/{quiz.id}?mod=true&autoExpand=true&autoReturn=true'>View</BrownButton>
</div>
</div>
{/each}
</div>
<div class='flex'>
<div class='grid grid-cols-3 mx-auto'>
<BrownButton disabled={data.page === "1"} href='/moderation?page={parseInt(data.page)+1}'>Previous Page</BrownButton>
<p class='m-auto'>Page {data.page}</p>
<BrownButton disabled={data.quizzes.length !== 10} href='/moderation?page={parseInt(data.page)-1}'>Next Page</BrownButton>
</div>
</div>
frontend/src/routes/moderation/+page.ts
+18
View File
@@ -0,0 +1,18 @@
// SPDX-FileCopyrightText: 2023 Marlon W (Mawoka)
//
// SPDX-License-Identifier: MPL-2.0
import type { PageLoad } from './$types';
export const load = (async ({ fetch, url }) => {
const page = url.searchParams.get('page') ?? '1';
const all = Boolean(url.searchParams.get('all')) ?? false;
const resp = await fetch(
`/api/v1/moderation/quizzes?page=${page}&all=${all ? 'true' : 'false'}`
);
const quizzes = await resp.json();
return {
page,
all,
quizzes
};
}) satisfies PageLoad;
frontend/src/routes/view/[quiz_id]/+page.svelte
+109 -99
View File
@@ -4,7 +4,7 @@ SPDX-FileCopyrightText: 2023 Marlon W (Mawoka)
SPDX-License-Identifier: MPL-2.0 SPDX-License-Identifier: MPL-2.0
--> -->
<script lang="ts"> <script lang='ts'>
import { getLocalization } from '$lib/i18n'; import { getLocalization } from '$lib/i18n';
import CollapsSection from '$lib/collapsible.svelte'; import CollapsSection from '$lib/collapsible.svelte';
import { createTippy } from 'svelte-tippy'; import { createTippy } from 'svelte-tippy';
@@ -16,6 +16,8 @@ SPDX-License-Identifier: MPL-2.0
import GrayButton from '$lib/components/buttons/gray.svelte'; import GrayButton from '$lib/components/buttons/gray.svelte';
import MediaComponent from '$lib/editor/MediaComponent.svelte'; import MediaComponent from '$lib/editor/MediaComponent.svelte';
import RatingComponent from '$lib/view_quiz/RatingComponent.svelte'; import RatingComponent from '$lib/view_quiz/RatingComponent.svelte';
import { page } from '$app/stores';
import ModComponent from './ModComponent.svelte';
const tippy = createTippy({ const tippy = createTippy({
arrow: true, arrow: true,
@@ -24,7 +26,11 @@ SPDX-License-Identifier: MPL-2.0
}); });
let start_game = null; let start_game = null;
const urlparams = $page.url.searchParams;
const mod_view = Boolean(urlparams.get('mod'));
const auto_expand = Boolean(urlparams.get('autoExpand'));
const auto_return = Boolean(urlparams.get('autoReturn'));
console.log(auto_expand, 'autoexpand');
const close_start_game_if_esc_is_pressed = (key: KeyboardEvent) => { const close_start_game_if_esc_is_pressed = (key: KeyboardEvent) => {
if (key.code === 'Escape') { if (key.code === 'Escape') {
start_game = null; start_game = null;
@@ -61,6 +67,7 @@ SPDX-License-Identifier: MPL-2.0
imported_from_kahoot?: boolean; imported_from_kahoot?: boolean;
questions: Question[]; questions: Question[];
kahoot_id?: string; kahoot_id?: string;
mod_rating?: number
} }
</script> </script>
@@ -69,45 +76,48 @@ SPDX-License-Identifier: MPL-2.0
</svelte:head> </svelte:head>
<div> <div>
<h1 class="text-4xl text-center">{@html quiz.title}</h1> <h1 class='text-4xl text-center'>{@html quiz.title}</h1>
<div class="text-center"> <div class='text-center'>
<p>{@html quiz.description}</p> <p>{@html quiz.description}</p>
</div> </div>
<p class="text-center"> <p class='text-center'>
{$t('view_quiz_page.made_by')} {$t('view_quiz_page.made_by')}
<a href="/user/{quiz.user_id.id}" class="underline">@{quiz.user_id.username}</a> <a href='/user/{quiz.user_id.id}' class='underline'>@{quiz.user_id.username}</a>
</p> </p>
{#if quiz.cover_image} {#if quiz.cover_image}
<div class="flex justify-center align-middle items-center"> <div class='flex justify-center align-middle items-center'>
<div class="h-[15vh] m-auto w-auto my-3"> <div class='h-[15vh] m-auto w-auto my-3'>
<img <img
class="max-h-full max-w-full block" class='max-h-full max-w-full block'
src="/api/v1/storage/download/{quiz.cover_image}" src='/api/v1/storage/download/{quiz.cover_image}'
alt="Not provided" alt='Not provided'
/> />
</div> </div>
</div> </div>
{/if} {/if}
<div class="text-center text-sm pt-1 mb-4"> <div class='text-center text-sm pt-1 mb-4'>
<ImportedOrNot imported={quiz.imported_from_kahoot} /> <ImportedOrNot imported={quiz.imported_from_kahoot} />
</div> </div>
<div class="flex justify-center mb-2"> <div class='flex justify-center mb-2 flex-row gap-2'>
<RatingComponent bind:quiz /> <RatingComponent bind:quiz />
{#if mod_view}
<ModComponent autoReturn={auto_return} quiz_id={quiz.id} />
{/if}
</div> </div>
<div class="flex flex-col justify-center"> <div class='flex flex-col justify-center'>
<div class="mx-auto flex flex-col gap-2 justify-center w-fit"> <div class='mx-auto flex flex-col gap-2 justify-center w-fit'>
{#if quiz.imported_from_kahoot && quiz.kahoot_id} {#if quiz.imported_from_kahoot && quiz.kahoot_id}
<div class="w-full"> <div class='w-full'>
<GrayButton <GrayButton
href="https://create.kahoot.it/details/{quiz.kahoot_id}" href='https://create.kahoot.it/details/{quiz.kahoot_id}'
target="_blank" target='_blank'
> >
{$t('view_quiz_page.view_on_kahoot')} {$t('view_quiz_page.view_on_kahoot')}
</GrayButton> </GrayButton>
</div> </div>
{/if} {/if}
{#if logged_in} {#if logged_in}
<div class="w-full"> <div class='w-full'>
<GrayButton <GrayButton
on:click={() => { on:click={() => {
start_game = quiz.id; start_game = quiz.id;
@@ -116,76 +126,76 @@ SPDX-License-Identifier: MPL-2.0
> >
<!-- heroicons/legacy-outline/Play --> <!-- heroicons/legacy-outline/Play -->
<svg <svg
class="w-5 h-5" class='w-5 h-5'
aria-hidden="true" aria-hidden='true'
fill="none" fill='none'
stroke="currentColor" stroke='currentColor'
stroke-width="2" stroke-width='2'
viewBox="0 0 24 24" viewBox='0 0 24 24'
xmlns="http://www.w3.org/2000/svg" xmlns='http://www.w3.org/2000/svg'
> >
<path <path
d="M14.752 11.168l-3.197-2.132A1 1 0 0010 9.87v4.263a1 1 0 001.555.832l3.197-2.132a1 1 0 000-1.664z" d='M14.752 11.168l-3.197-2.132A1 1 0 0010 9.87v4.263a1 1 0 001.555.832l3.197-2.132a1 1 0 000-1.664z'
stroke-linecap="round" stroke-linecap='round'
stroke-linejoin="round" stroke-linejoin='round'
/> />
<path <path
d="M21 12a9 9 0 11-18 0 9 9 0 0118 0z" d='M21 12a9 9 0 11-18 0 9 9 0 0118 0z'
stroke-linecap="round" stroke-linecap='round'
stroke-linejoin="round" stroke-linejoin='round'
/> />
</svg> </svg>
</GrayButton> </GrayButton>
</div> </div>
{:else} {:else}
<div use:tippy={{ content: 'You need to be logged in to start a game' }}> <div use:tippy={{ content: 'You need to be logged in to start a game' }}>
<div class="w-full"> <div class='w-full'>
<GrayButton disabled={true} flex={true}> <GrayButton disabled={true} flex={true}>
<!-- heroicons/legacy-outline/Play --> <!-- heroicons/legacy-outline/Play -->
<svg <svg
class="w-5 h-5" class='w-5 h-5'
aria-hidden="true" aria-hidden='true'
fill="none" fill='none'
stroke="currentColor" stroke='currentColor'
stroke-width="2" stroke-width='2'
viewBox="0 0 24 24" viewBox='0 0 24 24'
xmlns="http://www.w3.org/2000/svg" xmlns='http://www.w3.org/2000/svg'
> >
<path <path
d="M14.752 11.168l-3.197-2.132A1 1 0 0010 9.87v4.263a1 1 0 001.555.832l3.197-2.132a1 1 0 000-1.664z" d='M14.752 11.168l-3.197-2.132A1 1 0 0010 9.87v4.263a1 1 0 001.555.832l3.197-2.132a1 1 0 000-1.664z'
stroke-linecap="round" stroke-linecap='round'
stroke-linejoin="round" stroke-linejoin='round'
/> />
<path <path
d="M21 12a9 9 0 11-18 0 9 9 0 0118 0z" d='M21 12a9 9 0 11-18 0 9 9 0 0118 0z'
stroke-linecap="round" stroke-linecap='round'
stroke-linejoin="round" stroke-linejoin='round'
/> />
</svg> </svg>
</GrayButton> </GrayButton>
</div> </div>
</div> </div>
{/if} {/if}
<div class="w-full"> <div class='w-full'>
<GrayButton href="/practice?quiz_id={quiz.id}"> <GrayButton href='/practice?quiz_id={quiz.id}'>
{$t('words.practice')} {$t('words.practice')}
</GrayButton> </GrayButton>
</div> </div>
<div class="w-full"> <div class='w-full'>
{#if logged_in} {#if logged_in}
<GrayButton flex={true} href="/api/v1/eximport/{quiz.id}"> <GrayButton flex={true} href='/api/v1/eximport/{quiz.id}'>
<svg <svg
class="w-5 h-5 inline-block" class='w-5 h-5 inline-block'
fill="none" fill='none'
stroke="currentColor" stroke='currentColor'
viewBox="0 0 24 24" viewBox='0 0 24 24'
xmlns="http://www.w3.org/2000/svg" xmlns='http://www.w3.org/2000/svg'
> >
<path <path
stroke-linecap="round" stroke-linecap='round'
stroke-linejoin="round" stroke-linejoin='round'
stroke-width="2" stroke-width='2'
d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4" d='M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4'
/> />
</svg> </svg>
{$t('words.download')} {$t('words.download')}
@@ -194,17 +204,17 @@ SPDX-License-Identifier: MPL-2.0
<div use:tippy={{ content: 'You need to be logged in to download a game' }}> <div use:tippy={{ content: 'You need to be logged in to download a game' }}>
<GrayButton disabled={true} flex={true}> <GrayButton disabled={true} flex={true}>
<svg <svg
class="w-5 h-5 inline-block" class='w-5 h-5 inline-block'
fill="none" fill='none'
stroke="currentColor" stroke='currentColor'
viewBox="0 0 24 24" viewBox='0 0 24 24'
xmlns="http://www.w3.org/2000/svg" xmlns='http://www.w3.org/2000/svg'
> >
<path <path
stroke-linecap="round" stroke-linecap='round'
stroke-linejoin="round" stroke-linejoin='round'
stroke-width="2" stroke-width='2'
d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4" d='M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4'
/> />
</svg> </svg>
{$t('words.download')} {$t('words.download')}
@@ -213,10 +223,10 @@ SPDX-License-Identifier: MPL-2.0
{/if} {/if}
</div> </div>
</div> </div>
<div class="flex justify-center"> <div class='flex justify-center'>
<a <a
href="mailto:report@mawoka.eu?subject=Report quiz {quiz.id}" href='mailto:report@mawoka.eu?subject=Report quiz {quiz.id}'
class="text-sm underline" class='text-sm underline'
> >
{$t('words.report')} {$t('words.report')}
</a> </a>
@@ -224,10 +234,10 @@ SPDX-License-Identifier: MPL-2.0
</div> </div>
{#each quiz.questions as question, index_question} {#each quiz.questions as question, index_question}
<div class="px-4 py-1"> <div class='px-4 py-1'>
<CollapsSection headerText={question.question}> <CollapsSection headerText={question.question} expanded={auto_expand}>
<div class="grid grid-cols-1 gap-2 rounded-b-lg bg-white dark:bg-gray-700 -mt-1"> <div class='grid grid-cols-1 gap-2 rounded-b-lg bg-white dark:bg-gray-700 -mt-1'>
<h3 class="text-3xl m-1 text-center"> <h3 class='text-3xl m-1 text-center'>
{index_question + 1}: {@html question.question} {index_question + 1}: {@html question.question}
</h3> </h3>
@@ -237,41 +247,41 @@ SPDX-License-Identifier: MPL-2.0
{#if question.image} {#if question.image}
<span> <span>
<MediaComponent <MediaComponent
css_classes="mx-auto" css_classes='mx-auto'
src={question.image} src={question.image}
alt="Not provided" alt='Not provided'
muted={true} muted={true}
/> />
</span> </span>
{/if} {/if}
<p <p
class="m-1 flex flex-row gap-2 flex-nowrap whitespace-nowrap w-full justify-center" class='m-1 flex flex-row gap-2 flex-nowrap whitespace-nowrap w-full justify-center'
> >
<svg <svg
class="w-8 h-8 inline-block" class='w-8 h-8 inline-block'
fill="none" fill='none'
stroke="currentColor" stroke='currentColor'
viewBox="0 0 24 24" viewBox='0 0 24 24'
xmlns="http://www.w3.org/2000/svg" xmlns='http://www.w3.org/2000/svg'
> >
<path <path
stroke-linecap="round" stroke-linecap='round'
stroke-linejoin="round" stroke-linejoin='round'
stroke-width="2" stroke-width='2'
d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" d='M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z'
/> />
</svg> </svg>
<span class="text-lg">{question.time}s</span> <span class='text-lg'>{question.time}s</span>
</p> </p>
{#if question.type === QuizQuestionType.ABCD || question.type === undefined || question.type === QuizQuestionType.CHECK} {#if question.type === QuizQuestionType.ABCD || question.type === undefined || question.type === QuizQuestionType.CHECK}
<div class="grid grid-cols-2 gap-4 m-4 p-6"> <div class='grid grid-cols-2 gap-4 m-4 p-6'>
{#each question.answers as answer, index_answer} {#each question.answers as answer, index_answer}
<div <div
class="p-1 rounded-lg py-4" class='p-1 rounded-lg py-4'
class:bg-green-500={answer.right} class:bg-green-500={answer.right}
class:bg-red-500={!answer.right} class:bg-red-500={!answer.right}
> >
<h4 class="text-center"> <h4 class='text-center'>
{quiz.questions[index_question].answers[index_answer] {quiz.questions[index_question].answers[index_answer]
.answer} .answer}
</h4> </h4>
@@ -279,26 +289,26 @@ SPDX-License-Identifier: MPL-2.0
{/each} {/each}
</div> </div>
{:else if question.type === QuizQuestionType.RANGE} {:else if question.type === QuizQuestionType.RANGE}
<p class="m-1 text-center"> <p class='m-1 text-center'>
All numbers between {question.answers.min_correct} All numbers between {question.answers.min_correct}
and {question.answers.max_correct} are correct, where numbers between {question and {question.answers.max_correct} are correct, where numbers between {question
.answers.min} and {question.answers.max} can be selected. .answers.min} and {question.answers.max} can be selected.
</p> </p>
{:else if question.type === QuizQuestionType.ORDER} {:else if question.type === QuizQuestionType.ORDER}
<ul class="flex flex-col gap-4 m-4 p-6"> <ul class='flex flex-col gap-4 m-4 p-6'>
{#each question.answers as answer} {#each question.answers as answer}
<li class="p-1 rounded-lg py-3 dark:bg-gray-500 bg-gray-300"> <li class='p-1 rounded-lg py-3 dark:bg-gray-500 bg-gray-300'>
<h4 class="text-center"> <h4 class='text-center'>
{answer.answer} {answer.answer}
</h4> </h4>
</li> </li>
{/each} {/each}
</ul> </ul>
{:else if question.type === QuizQuestionType.VOTING || question.type === QuizQuestionType.TEXT} {:else if question.type === QuizQuestionType.VOTING || question.type === QuizQuestionType.TEXT}
<div class="grid grid-cols-2 gap-4 m-4 p-6"> <div class='grid grid-cols-2 gap-4 m-4 p-6'>
{#each question.answers as answer, index_answer} {#each question.answers as answer, index_answer}
<div class="p-1 rounded-lg py-4 dark:bg-gray-500 bg-gray-300"> <div class='p-1 rounded-lg py-4 dark:bg-gray-500 bg-gray-300'>
<h4 class="text-center"> <h4 class='text-center'>
{quiz.questions[index_question].answers[index_answer] {quiz.questions[index_question].answers[index_answer]
.answer} .answer}
</h4> </h4>
@@ -309,7 +319,7 @@ SPDX-License-Identifier: MPL-2.0
{#await import('$lib/play/admin/slide.svelte')} {#await import('$lib/play/admin/slide.svelte')}
<Spinner my={false} /> <Spinner my={false} />
{:then c} {:then c}
<div class="max-h-[90%] max-w-[90%]"> <div class='max-h-[90%] max-w-[90%]'>
<svelte:component this={c.default} bind:question /> <svelte:component this={c.default} bind:question />
</div> </div>
{/await} {/await}
frontend/src/routes/view/[quiz_id]/ModComponent.svelte
+55
View File
@@ -0,0 +1,55 @@
<!--
SPDX-FileCopyrightText: 2023 Marlon W (Mawoka)
SPDX-License-Identifier: MPL-2.0
-->
<script lang='ts'>
import BrownButton from '$lib/components/buttons/brown.svelte';
import GrayButton from '$lib/components/buttons/gray.svelte';
export let autoReturn = false;
export let quiz_id: string;
let mod_rating: number | undefined;
const submit = async () => {
const res = await fetch(`/api/v1/moderation/rating/set/${quiz_id}`, {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify({ rating: mod_rating })
});
if (res.ok && autoReturn) {
window.history.back()
}
if (!res.ok) {
alert("Setting rating failed")
}
};
</script>
<div class='rounded border-2 border-[#B07156] flex flex-col w-fit gap-2 p-2'>
<div class:opacity-50={mod_rating !== null && mod_rating !== undefined} class='transition'>
<BrownButton on:click={() => mod_rating = null}>Not Checked</BrownButton>
</div>
<div class:opacity-50={mod_rating !== 0 && mod_rating !== undefined} class='transition'>
<BrownButton on:click={() => mod_rating = 0}>Ok</BrownButton>
</div>
<div class:opacity-50={mod_rating !== 1 && mod_rating !== undefined} class='transition'>
<BrownButton on:click={() => mod_rating = 1}>Attention</BrownButton>
</div>
<div class:opacity-50={mod_rating !== 2 && mod_rating !== undefined} class='transition'>
<BrownButton on:click={() => mod_rating = 2}>NFSW</BrownButton>
</div>
<div class:opacity-50={mod_rating !== 3 && mod_rating !== undefined} class='transition'>
<BrownButton on:click={() => mod_rating = 3}>Plausibility Checked</BrownButton>
</div>
<div class:opacity-50={mod_rating !== 4 && mod_rating !== undefined} class='transition'>
<BrownButton on:click={() => mod_rating = 4}>Fact Checked</BrownButton>
</div>
<div class:opacity-50={mod_rating !== 5 && mod_rating !== undefined} class='transition'>
<BrownButton on:click={() => mod_rating = 5}>Exceptional</BrownButton>
</div>
<GrayButton on:click={submit} disabled={mod_rating === undefined}>Submit</GrayButton>
</div>
migrations/versions/9d7fa2e6b24c_added_mod_rating.py
+33
View File
@@ -0,0 +1,33 @@
# SPDX-FileCopyrightText: 2023 Marlon W (Mawoka)
#
# SPDX-License-Identifier: MPL-2.0
"""Added Mod Rating
Revision ID: 9d7fa2e6b24c
Revises: 2ed6823c69b2
Create Date: 2023-08-01 16:06:22.419662
"""
from alembic import op
import sqlalchemy as sa
import ormar
# revision identifiers, used by Alembic.
revision = "9d7fa2e6b24c"
down_revision = "2ed6823c69b2"
branch_labels = None
depends_on = None
def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.add_column("quiz", sa.Column("mod_rating", sa.SmallInteger(), nullable=True))
# ### end Alembic commands ###
def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column("quiz", "mod_rating")
# ### end Alembic commands ###