From 6ec29708464ac2613e08aac9ebcd1681aa4ae016 Mon Sep 17 00:00:00 2001 From: Mawoka Date: Wed, 14 Dec 2022 18:42:02 +0100 Subject: [PATCH] :sparkles: Made old-school mode no longer be old-school --- frontend/src/lib/admin.svelte | 235 +++++++++---------------- frontend/src/lib/play/question.svelte | 104 ++++++----- frontend/src/routes/admin/+page.svelte | 10 -- frontend/src/routes/play/+page.svelte | 4 +- 4 files changed, 132 insertions(+), 221 deletions(-) diff --git a/frontend/src/lib/admin.svelte b/frontend/src/lib/admin.svelte index 67393fd..1d63a18 100644 --- a/frontend/src/lib/admin.svelte +++ b/frontend/src/lib/admin.svelte @@ -99,63 +99,59 @@ } -{#if game_mode === 'kahoot'} -
-

- {selected_question === -1 ? '0' : selected_question + 1} - /{quiz_data.questions.length} -

-
- {#if selected_question + 1 === quiz_data.questions.length && timer_res === '0' && question_results !== null} - {#if JSON.stringify(final_results) === JSON.stringify([null])} - - {/if} - {:else if timer_res === '0' || selected_question === -1} - {#if (selected_question + 1 !== quiz_data.questions.length && question_results !== null) || selected_question === -1} - - {/if} - {#if question_results === null && selected_question !== -1} - - {/if} - {:else if selected_question !== -1} - - {:else} - + class="admin-button" + >Next Question ({selected_question + 2}) + {/if} -
+ {#if question_results === null && selected_question !== -1} + + {/if} + {:else if selected_question !== -1} + + {:else} + + {/if}
- {#if timer_res !== '0' && selected_question >= 0} - - {/if} + +{#if timer_res !== '0' && selected_question >= 0} + {/if} -
+ +
{#if timer_res !== undefined && !final_results_clicked && !question_results}

@@ -179,50 +175,29 @@ />

{/if} - {#if game_mode === 'kahoot'} - {#if quiz_data.questions[selected_question].type === QuizQuestionType.ABCD || quiz_data.questions[selected_question].type === QuizQuestionType.VOTING} -
- {#each quiz_data.questions[selected_question].answers as answer, i} -
+ {#each quiz_data.questions[selected_question].answers as answer, i} +
+ icon + {answer.answer} - icon - {answer.answer} - -
- {/each} -
- {/if} + +
+ {/each} +
{/if} {/if}
{#if timer_res === '0' && JSON.stringify(final_results) === JSON.stringify([null])} - {#if question_results === null} - {#if game_mode === 'normal'} -
- -
- {/if} - {:else if question_results === undefined} + {#if question_results === null}{:else if question_results === undefined} {#if !final_results_clicked}

{$t('admin_page.no_answers')}

@@ -249,73 +224,23 @@ /> {/await} {/if} - {:else if timer_res !== undefined} - {#if game_mode === 'normal'} -
- -
- {/if} - {/if} + {:else if timer_res !== undefined}{/if}
- {#if get_question_title(selected_question + 1, quiz_data) !== '' && selected_question + 1 !== 0} - {#if game_mode === 'normal'} -
- -
- {/if} - {:else if selected_question + 1 === 0} - {#if game_mode === 'normal'} -
- -
- {:else} -
-

{@html quiz_data.title}

-

{@html quiz_data.description}

- {#if quiz_data.cover_image} -
-
- Not provided -
+ {#if get_question_title(selected_question + 1, quiz_data) !== '' && selected_question + 1 !== 0}{:else if selected_question + 1 === 0} +
+

{@html quiz_data.title}

+

{@html quiz_data.description}

+ {#if quiz_data.cover_image} +
+
+ Not provided
- {/if} -
- {/if} - {:else if final_results_clicked === false} - {#if game_mode === 'normal'} -
- -
- {/if} +
+ {/if} +
{/if}
diff --git a/frontend/src/lib/play/question.svelte b/frontend/src/lib/play/question.svelte index 02230fd..d4d3035 100644 --- a/frontend/src/lib/play/question.svelte +++ b/frontend/src/lib/play/question.svelte @@ -95,79 +95,75 @@ } } + const get_div_height = (): string => { + if (game_mode === 'normal') { + if (question.image) { + return '66.666667'; + } else { + return '83.333333'; + } + } else { + return '100'; + } + }; $: console.log(slider_value, 'values');
-
-

- {@html question.question} -

-
- {#if game_mode !== 'kahoot'} - + {#if game_mode === 'normal'} +
+

+ {@html question.question} +

+ {#if question.image !== null && game_mode !== 'kahoot'} +
+ Content for Question +
{/if}
-
- {#if question.image !== null && game_mode !== 'kahoot'} -
- Content for Question -
{/if} {#if timer_res !== '0'} {#if question.type === QuizQuestionType.ABCD || question.type === QuizQuestionType.VOTING} - {#if game_mode === 'normal'} -
- {#each question.answers as answer} +
+
+ +
+ +
+ {#each question.answers as answer, i} selectAnswer(answer.answer)} > + {#if game_mode === 'kahoot'} + Icon + {:else} +

{answer.answer}

+ {/if} + {/each}
- {:else if game_mode === 'kahoot'} -
-
- -
- -
- {#each question.answers as answer, i} - - {/each} -
-
- {:else} -

Error

- {/if} +
{:else if question.type === QuizQuestionType.RANGE} {#await import('svelte-range-slider-pips')} {:then c} -
+
{$t('admin_page.export_results')}
- - {/if} {#if !success} diff --git a/frontend/src/routes/play/+page.svelte b/frontend/src/routes/play/+page.svelte index 56dd1ed..3f91ba8 100644 --- a/frontend/src/routes/play/+page.svelte +++ b/frontend/src/routes/play/+page.svelte @@ -7,7 +7,7 @@ import Question from '$lib/play/question.svelte'; // import ShowResults from '$lib/play/show_results.svelte'; import { navbarVisible } from '$lib/stores'; - import ShowEndScreen from '$lib/play/end.svelte'; + import ShowEndScreen from '$lib/play/admin/final_results.svelte'; import KahootResults from '$lib/play/results_kahoot.svelte'; import { getLocalization } from '$lib/i18n'; import Cookies from 'js-cookie'; @@ -151,7 +151,7 @@ {#if !gameMeta.started && gameData === undefined} {:else if JSON.stringify(final_results) !== JSON.stringify([null])} - + {:else if gameData !== undefined && question_index === ''}