From 0e19b59452d040a49fa3cb6466efdccb51e63e84 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Mon, 7 Nov 2022 03:47:48 +0100 Subject: [PATCH] qa: Improve design --- qa/ui/src/app.css | 11 + qa/ui/src/app.html | 4 +- qa/ui/src/lib/components/BadgeState.svelte | 41 +++ qa/ui/src/lib/components/ExerciceQA.svelte | 103 ++++-- qa/ui/src/lib/components/Header.svelte | 16 +- qa/ui/src/lib/components/MyExercices.svelte | 4 + qa/ui/src/lib/components/MyTodo.svelte | 7 + qa/ui/src/lib/components/QAItem.svelte | 326 ++++++++++++------ qa/ui/src/lib/components/QAItems.svelte | 103 +++--- qa/ui/src/lib/qa.js | 2 +- qa/ui/src/lib/stores/exercices.js | 16 + qa/ui/src/lib/stores/todo.js | 40 ++- qa/ui/src/routes/+layout.svelte | 6 + qa/ui/src/routes/+page.svelte | 9 +- qa/ui/src/routes/exercices/+page.svelte | 3 + qa/ui/src/routes/exercices/[eid]/+page.svelte | 19 +- qa/ui/src/routes/themes/+page.svelte | 4 +- qa/ui/src/routes/themes/[tid]/+page.svelte | 7 +- .../routes/themes/[tid]/[eid]/+page.svelte | 19 +- 19 files changed, 493 insertions(+), 247 deletions(-) create mode 100644 qa/ui/src/app.css create mode 100644 qa/ui/src/lib/components/BadgeState.svelte diff --git a/qa/ui/src/app.css b/qa/ui/src/app.css new file mode 100644 index 00000000..0daa760f --- /dev/null +++ b/qa/ui/src/app.css @@ -0,0 +1,11 @@ +.level .level-item { + text-align: center; +} +.level .level-item .heading { + font-variant: small-caps; + text-transform: lowercase; +} +.level .level-item .value { + font-size: 1.2rem; + font-weight: bolder; +} diff --git a/qa/ui/src/app.html b/qa/ui/src/app.html index ce9b197c..a693f2ea 100644 --- a/qa/ui/src/app.html +++ b/qa/ui/src/app.html @@ -1,5 +1,5 @@ - + @@ -10,7 +10,7 @@ %sveltekit.head% - + %sveltekit.body% diff --git a/qa/ui/src/lib/components/BadgeState.svelte b/qa/ui/src/lib/components/BadgeState.svelte new file mode 100644 index 00000000..7cd28ab3 --- /dev/null +++ b/qa/ui/src/lib/components/BadgeState.svelte @@ -0,0 +1,41 @@ + + + + {state} + diff --git a/qa/ui/src/lib/components/ExerciceQA.svelte b/qa/ui/src/lib/components/ExerciceQA.svelte index fcda18d1..f7975e1d 100644 --- a/qa/ui/src/lib/components/ExerciceQA.svelte +++ b/qa/ui/src/lib/components/ExerciceQA.svelte @@ -3,12 +3,15 @@ import { Button, + Col, Container, Icon, + Row, Table, } from 'sveltestrap'; import QAItems from '$lib/components/QAItems.svelte'; + import QAItem from '$lib/components/QAItem.svelte'; import QANewItem from '$lib/components/QANewItem.svelte'; import { themes, themesIdx } from '$lib/stores/themes'; @@ -16,49 +19,87 @@ themes.refresh(); } + export let theme_id = null; export let exercice = {}; + let query_selected = null; let countCreation = 0;

+ {#if query_selected} + + {:else if theme_id} + + {:else} + + {/if} {exercice.title} + {#if exercice.wip} + + {/if} {#if $themes.length && $themesIdx[exercice.id_theme]} {$themesIdx[exercice.id_theme].name} - {#if $themesIdx[exercice.id_theme].exercices && $themesIdx[exercice.id_theme].exercices[exercice.id]} -
- - -
- {/if} Site du challenge {/if}

-
-
- {@html exercice.statement} -
-
- {@html exercice.overview} -
-
+ + + + {#key countCreation} + + {/key} + + + {#if query_selected} + countCreation++} + /> + {:else} + +
+ {@html exercice.statement} +
+
+ {@html exercice.overview} +
+ -
- countCreation++} - /> - {#key countCreation} - - {/key} -
+ countCreation++} + /> + {/if} + + + diff --git a/qa/ui/src/lib/components/Header.svelte b/qa/ui/src/lib/components/Header.svelte index 6140d96d..b1ee241a 100644 --- a/qa/ui/src/lib/components/Header.svelte +++ b/qa/ui/src/lib/components/Header.svelte @@ -33,9 +33,9 @@ } - + - FIC + FIC QA