From 1206a056334b872cf4646a79e61ae050ec9b5c89 Mon Sep 17 00:00:00 2001 From: exyi Date: Mon, 28 Sep 2020 14:36:50 +0000 Subject: [PATCH] =?UTF-8?q?Na=C4=8D=C3=ADt=C3=A1n=C3=AD=20=C5=99e=C5=A1en?= =?UTF-8?q?=C3=AD=20=C3=BAlohy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/Editor.svelte | 2 +- frontend/src/TaskDisplay.svelte | 32 +++++++++++++++++++++++++++----- frontend/src/TaskPanel.svelte | 3 ++- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/frontend/src/Editor.svelte b/frontend/src/Editor.svelte index 40f243a..ad48a12 100644 --- a/frontend/src/Editor.svelte +++ b/frontend/src/Editor.svelte @@ -153,7 +153,7 @@
  • {cat}
  • {/each} - + {:else}

    Nothing selected...

    {/if} diff --git a/frontend/src/TaskDisplay.svelte b/frontend/src/TaskDisplay.svelte index 1b16866..79c34b0 100644 --- a/frontend/src/TaskDisplay.svelte +++ b/frontend/src/TaskDisplay.svelte @@ -1,7 +1,14 @@
    - {#if task != null} - {#await grabAssignment(nonNull(task))} + {#if taskId != null} + {#await grabAssignment(nonNull(taskId))} Načítám úlohu {:then task} {@html task.titleHtml} -
    {@html task.description}
    + +
    + {#if !showSolution} + showSolution = true}> + Zobrazit řešení úlohy + + {:else} +

    Řešení

    + {#await grabSolution(nonNull(taskId))} + Načítám... + {:then solution} + {@html solution.description} + {/await} + {/if} +
    {/await} {/if}
    diff --git a/frontend/src/TaskPanel.svelte b/frontend/src/TaskPanel.svelte index 43f4743..bbd3f9d 100644 --- a/frontend/src/TaskPanel.svelte +++ b/frontend/src/TaskPanel.svelte @@ -38,6 +38,7 @@ import TaskDisplay from "./TaskDisplay.svelte"; overflow: hidden; padding: 0 100px 0 100px; box-sizing: border-box; + z-index: 120; } .panel.collapsed:not(:hover) { display: none; @@ -54,7 +55,7 @@ import TaskDisplay from "./TaskDisplay.svelte";
    selectedTask && select(selectedTask)}> - +