From 23ea1aa58e92e7ae95d2b23c6fa914d4e5772a3d Mon Sep 17 00:00:00 2001 From: Mawoka Date: Sat, 25 Jun 2022 17:29:18 +0200 Subject: [PATCH] :sparkles: Displaying if Quiz is imported in search-results directly --- classquiz/routers/search.py | 1 + frontend/src/lib/search-card.svelte | 26 +++++--- .../src/lib/view_quiz/imported_or_not.svelte | 62 +++++++++++++++++++ frontend/src/routes/view/[quiz_id].svelte | 51 +-------------- 4 files changed, 83 insertions(+), 57 deletions(-) create mode 100644 frontend/src/lib/view_quiz/imported_or_not.svelte diff --git a/classquiz/routers/search.py b/classquiz/routers/search.py index 147bdf6..6fb1b5b 100644 --- a/classquiz/routers/search.py +++ b/classquiz/routers/search.py @@ -17,6 +17,7 @@ class Hit(pydantic.BaseModel): title: str description: str user: str + imported_from_kahoot: bool formatted: Optional["Hit"] = pydantic.Field(None, alias="_formatted") diff --git a/frontend/src/lib/search-card.svelte b/frontend/src/lib/search-card.svelte index 54a4007..13ed198 100644 --- a/frontend/src/lib/search-card.svelte +++ b/frontend/src/lib/search-card.svelte @@ -4,6 +4,7 @@ const { t } = getLocalization(); export let quiz; export let enable_html = false; + import ImportedOrNot from '$lib/view_quiz/imported_or_not.svelte';
@@ -14,14 +15,23 @@ src='https://images.unsplash.com/photo-1499714608240-22fc6ad53fb2?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=334&q=80'>
-->
-

- {#if enable_html} - {@html quiz.title} - {:else} - {quiz.title} - {/if} -

-

+

+

+ {#if enable_html} + {@html quiz.title} + {:else} + {quiz.title} + {/if} +

+ + + +
+

{#if enable_html} {@html quiz.description}{:else}{quiz.description} {/if}

diff --git a/frontend/src/lib/view_quiz/imported_or_not.svelte b/frontend/src/lib/view_quiz/imported_or_not.svelte new file mode 100644 index 0000000..e530a49 --- /dev/null +++ b/frontend/src/lib/view_quiz/imported_or_not.svelte @@ -0,0 +1,62 @@ + + +{#if imported === true} + + + +{:else if imported === false} + + + +{:else} + + + +{/if} diff --git a/frontend/src/routes/view/[quiz_id].svelte b/frontend/src/routes/view/[quiz_id].svelte index cd7d37c..54a8b78 100644 --- a/frontend/src/routes/view/[quiz_id].svelte +++ b/frontend/src/routes/view/[quiz_id].svelte @@ -28,6 +28,7 @@ import { createTippy } from 'svelte-tippy'; import 'tippy.js/animations/perspective-subtle.css'; import 'tippy.js/dist/tippy.css'; + import ImportedOrNot from '$lib/view_quiz/imported_or_not.svelte'; const tippy = createTippy({ arrow: true, @@ -94,55 +95,7 @@

{quiz.description}

- {#if quiz.imported_from_kahoot === true} - - - - {:else if quiz.imported_from_kahoot === false} - - - - {:else} - - - - {/if} +