🚨 Fixed linter errors and formatting

This commit is contained in:
Mawoka
2023-08-02 09:45:02 +02:00
parent 36dbd6cd60
commit f84900b99a
5 changed files with 152 additions and 146 deletions
@@ -4,7 +4,7 @@ SPDX-FileCopyrightText: 2023 Marlon W (Mawoka)
SPDX-License-Identifier: MPL-2.0
-->
<script lang='ts'>
<script lang="ts">
import { browser } from '$app/environment';
import { fade } from 'svelte/transition';
@@ -71,14 +71,14 @@ SPDX-License-Identifier: MPL-2.0
<video
class={css_classes}
disablepictureinpicture
x-webkit-airplay='deny'
x-webkit-airplay="deny"
controls
autoplay
loop
{muted}
preload='metadata'
preload="metadata"
>
<source src='/api/v1/storage/download/{src}' />
<source src="/api/v1/storage/download/{src}" />
</video>
{:else}
<p>Unknown media type</p>
@@ -87,14 +87,14 @@ SPDX-License-Identifier: MPL-2.0
{#if fullscreen_open}
<div
class='fixed top-0 left-0 z-50 w-screen h-screen bg-black bg-opacity-50 fle p-2'
class="fixed top-0 left-0 z-50 w-screen h-screen bg-black bg-opacity-50 fle p-2"
transition:fade={{ duration: 80 }}
on:click={() => (fullscreen_open = false)}
>
<img
src={img_data.data}
alt={img_data.alt_text ?? 'Not available'}
class='object-cover rounded m-auto max-h-full max-w-full'
class="object-cover rounded m-auto max-h-full max-w-full"
/>
</div>
{/if}
+28 -22
View File
@@ -4,48 +4,54 @@ SPDX-FileCopyrightText: 2023 Marlon W (Mawoka)
SPDX-License-Identifier: MPL-2.0
-->
<script lang='ts'>
<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'>
<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'>
<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'
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'>
<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 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 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 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>
+99 -99
View File
@@ -4,7 +4,7 @@ SPDX-FileCopyrightText: 2023 Marlon W (Mawoka)
SPDX-License-Identifier: MPL-2.0
-->
<script lang='ts'>
<script lang="ts">
import { getLocalization } from '$lib/i18n';
import CollapsSection from '$lib/collapsible.svelte';
import { createTippy } from 'svelte-tippy';
@@ -67,7 +67,7 @@ SPDX-License-Identifier: MPL-2.0
imported_from_kahoot?: boolean;
questions: Question[];
kahoot_id?: string;
mod_rating?: number
mod_rating?: number;
}
</script>
@@ -76,48 +76,48 @@ SPDX-License-Identifier: MPL-2.0
</svelte:head>
<div>
<h1 class='text-4xl text-center'>{@html quiz.title}</h1>
<div class='text-center'>
<h1 class="text-4xl text-center">{@html quiz.title}</h1>
<div class="text-center">
<p>{@html quiz.description}</p>
</div>
<p class='text-center'>
<p class="text-center">
{$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>
{#if quiz.cover_image}
<div class='flex justify-center align-middle items-center'>
<div class='h-[15vh] m-auto w-auto my-3'>
<div class="flex justify-center align-middle items-center">
<div class="h-[15vh] m-auto w-auto my-3">
<img
class='max-h-full max-w-full block'
src='/api/v1/storage/download/{quiz.cover_image}'
alt='Not provided'
class="max-h-full max-w-full block"
src="/api/v1/storage/download/{quiz.cover_image}"
alt="Not provided"
/>
</div>
</div>
{/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} />
</div>
<div class='flex justify-center mb-2 flex-row gap-2'>
<div class="flex justify-center mb-2 flex-row gap-2">
<RatingComponent bind:quiz />
{#if mod_view}
<ModComponent autoReturn={auto_return} quiz_id={quiz.id} />
{/if}
</div>
<div class='flex flex-col justify-center'>
<div class='mx-auto flex flex-col gap-2 justify-center w-fit'>
<div class="flex flex-col justify-center">
<div class="mx-auto flex flex-col gap-2 justify-center w-fit">
{#if quiz.imported_from_kahoot && quiz.kahoot_id}
<div class='w-full'>
<div class="w-full">
<GrayButton
href='https://create.kahoot.it/details/{quiz.kahoot_id}'
target='_blank'
href="https://create.kahoot.it/details/{quiz.kahoot_id}"
target="_blank"
>
{$t('view_quiz_page.view_on_kahoot')}
</GrayButton>
</div>
{/if}
{#if logged_in}
<div class='w-full'>
<div class="w-full">
<GrayButton
on:click={() => {
start_game = quiz.id;
@@ -126,76 +126,76 @@ SPDX-License-Identifier: MPL-2.0
>
<!-- heroicons/legacy-outline/Play -->
<svg
class='w-5 h-5'
aria-hidden='true'
fill='none'
stroke='currentColor'
stroke-width='2'
viewBox='0 0 24 24'
xmlns='http://www.w3.org/2000/svg'
class="w-5 h-5"
aria-hidden="true"
fill="none"
stroke="currentColor"
stroke-width="2"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<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'
stroke-linecap='round'
stroke-linejoin='round'
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-linejoin="round"
/>
<path
d='M21 12a9 9 0 11-18 0 9 9 0 0118 0z'
stroke-linecap='round'
stroke-linejoin='round'
d="M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
stroke-linecap="round"
stroke-linejoin="round"
/>
</svg>
</GrayButton>
</div>
{:else}
<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}>
<!-- heroicons/legacy-outline/Play -->
<svg
class='w-5 h-5'
aria-hidden='true'
fill='none'
stroke='currentColor'
stroke-width='2'
viewBox='0 0 24 24'
xmlns='http://www.w3.org/2000/svg'
class="w-5 h-5"
aria-hidden="true"
fill="none"
stroke="currentColor"
stroke-width="2"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<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'
stroke-linecap='round'
stroke-linejoin='round'
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-linejoin="round"
/>
<path
d='M21 12a9 9 0 11-18 0 9 9 0 0118 0z'
stroke-linecap='round'
stroke-linejoin='round'
d="M21 12a9 9 0 11-18 0 9 9 0 0118 0z"
stroke-linecap="round"
stroke-linejoin="round"
/>
</svg>
</GrayButton>
</div>
</div>
{/if}
<div class='w-full'>
<GrayButton href='/practice?quiz_id={quiz.id}'>
<div class="w-full">
<GrayButton href="/practice?quiz_id={quiz.id}">
{$t('words.practice')}
</GrayButton>
</div>
<div class='w-full'>
<div class="w-full">
{#if logged_in}
<GrayButton flex={true} href='/api/v1/eximport/{quiz.id}'>
<GrayButton flex={true} href="/api/v1/eximport/{quiz.id}">
<svg
class='w-5 h-5 inline-block'
fill='none'
stroke='currentColor'
viewBox='0 0 24 24'
xmlns='http://www.w3.org/2000/svg'
class="w-5 h-5 inline-block"
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
stroke-linecap='round'
stroke-linejoin='round'
stroke-width='2'
d='M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4'
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4"
/>
</svg>
{$t('words.download')}
@@ -204,17 +204,17 @@ SPDX-License-Identifier: MPL-2.0
<div use:tippy={{ content: 'You need to be logged in to download a game' }}>
<GrayButton disabled={true} flex={true}>
<svg
class='w-5 h-5 inline-block'
fill='none'
stroke='currentColor'
viewBox='0 0 24 24'
xmlns='http://www.w3.org/2000/svg'
class="w-5 h-5 inline-block"
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
stroke-linecap='round'
stroke-linejoin='round'
stroke-width='2'
d='M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4'
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4"
/>
</svg>
{$t('words.download')}
@@ -223,10 +223,10 @@ SPDX-License-Identifier: MPL-2.0
{/if}
</div>
</div>
<div class='flex justify-center'>
<div class="flex justify-center">
<a
href='mailto:report@mawoka.eu?subject=Report quiz {quiz.id}'
class='text-sm underline'
href="mailto:report@mawoka.eu?subject=Report quiz {quiz.id}"
class="text-sm underline"
>
{$t('words.report')}
</a>
@@ -234,10 +234,10 @@ SPDX-License-Identifier: MPL-2.0
</div>
{#each quiz.questions as question, index_question}
<div class='px-4 py-1'>
<div class="px-4 py-1">
<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'>
<h3 class='text-3xl m-1 text-center'>
<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">
{index_question + 1}: {@html question.question}
</h3>
@@ -247,41 +247,41 @@ SPDX-License-Identifier: MPL-2.0
{#if question.image}
<span>
<MediaComponent
css_classes='mx-auto'
css_classes="mx-auto"
src={question.image}
alt='Not provided'
alt="Not provided"
muted={true}
/>
</span>
{/if}
<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
class='w-8 h-8 inline-block'
fill='none'
stroke='currentColor'
viewBox='0 0 24 24'
xmlns='http://www.w3.org/2000/svg'
class="w-8 h-8 inline-block"
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<path
stroke-linecap='round'
stroke-linejoin='round'
stroke-width='2'
d='M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z'
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z"
/>
</svg>
<span class='text-lg'>{question.time}s</span>
<span class="text-lg">{question.time}s</span>
</p>
{#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}
<div
class='p-1 rounded-lg py-4'
class="p-1 rounded-lg py-4"
class:bg-green-500={answer.right}
class:bg-red-500={!answer.right}
>
<h4 class='text-center'>
<h4 class="text-center">
{quiz.questions[index_question].answers[index_answer]
.answer}
</h4>
@@ -289,26 +289,26 @@ SPDX-License-Identifier: MPL-2.0
{/each}
</div>
{: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}
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>
{: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}
<li class='p-1 rounded-lg py-3 dark:bg-gray-500 bg-gray-300'>
<h4 class='text-center'>
<li class="p-1 rounded-lg py-3 dark:bg-gray-500 bg-gray-300">
<h4 class="text-center">
{answer.answer}
</h4>
</li>
{/each}
</ul>
{: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}
<div class='p-1 rounded-lg py-4 dark:bg-gray-500 bg-gray-300'>
<h4 class='text-center'>
<div class="p-1 rounded-lg py-4 dark:bg-gray-500 bg-gray-300">
<h4 class="text-center">
{quiz.questions[index_question].answers[index_answer]
.answer}
</h4>
@@ -319,7 +319,7 @@ SPDX-License-Identifier: MPL-2.0
{#await import('$lib/play/admin/slide.svelte')}
<Spinner my={false} />
{: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 />
</div>
{/await}
@@ -4,7 +4,7 @@ SPDX-FileCopyrightText: 2023 Marlon W (Mawoka)
SPDX-License-Identifier: MPL-2.0
-->
<script lang='ts'>
<script lang="ts">
import BrownButton from '$lib/components/buttons/brown.svelte';
import GrayButton from '$lib/components/buttons/gray.svelte';
@@ -21,35 +21,35 @@ SPDX-License-Identifier: MPL-2.0
body: JSON.stringify({ rating: mod_rating })
});
if (res.ok && autoReturn) {
window.history.back()
window.history.back();
}
if (!res.ok) {
alert("Setting rating failed")
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 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 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 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 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 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 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 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>