From 4a85357a6d27d1b4514e715ef965cdb934fc37f2 Mon Sep 17 00:00:00 2001 From: Kato Hiroki Date: Sun, 1 Dec 2024 13:53:41 +0000 Subject: [PATCH 1/5] :art: Improve table layout (#1526) --- src/lib/components/TaskList.svelte | 20 +++++------ .../WorkBookTasks/WorkBookTasksTable.svelte | 34 +++++++++++-------- src/routes/workbooks/[slug]/+page.svelte | 23 ++++++------- 3 files changed, 40 insertions(+), 37 deletions(-) diff --git a/src/lib/components/TaskList.svelte b/src/lib/components/TaskList.svelte index 433bd3890..73aa865db 100644 --- a/src/lib/components/TaskList.svelte +++ b/src/lib/components/TaskList.svelte @@ -53,16 +53,14 @@
- +
- 回答 - - 問題名 - - + 回答 + 問題名 + - + 編集 @@ -80,7 +78,7 @@ - + - + - + {#if isAdmin}
問題一覧（{workBookTasksForTable.length} 問） -
+
- # - グレード - 問題名 - 出典 - - 一言（50文字以下） - - + # + グレード + 問題名 + + + 編集 @@ -140,8 +142,8 @@ - -
+ +
@@ -158,7 +160,9 @@ - +
- removeWorkBookTask(task)}> -
削除
+ removeWorkBookTask(task)}> +
削除
 {/each} diff --git a/src/routes/workbooks/[slug]/+page.svelte b/src/routes/workbooks/[slug]/+page.svelte index 038edf851..474daff2f 100644 --- a/src/routes/workbooks/[slug]/+page.svelte +++ b/src/routes/workbooks/[slug]/+page.svelte @@ -140,14 +140,13 @@ {#if workBookTasks.length}
-
updateComment(index, event)} on:focus={handleFocus} on:blur={handleBlur} @@ -179,8 +183,8 @@
+
- グレード - 回答 - 問題名 - 出典 - 一言 + グレード + 回答 + 問題名 + + 一言 {#each workBookTasks as workBookTask} @@ -156,7 +155,7 @@ class={getBackgroundColorFrom(getTaskResult(workBookTask.taskId).status_name)} > - +
@@ -176,7 +175,7 @@ - +
- + - -
+ +
Date: Tue, 3 Dec 2024 13:40:28 +0000 Subject: [PATCH 2/5] :art: Improve table layout (#1526) --- src/lib/components/TaskList.svelte | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/components/TaskList.svelte b/src/lib/components/TaskList.svelte index 73aa865db..d1eca17b5 100644 --- a/src/lib/components/TaskList.svelte +++ b/src/lib/components/TaskList.svelte @@ -55,8 +55,10 @@
- 回答 - 問題名 + 回答 + + 問題名 + From 716f3768fa8774d2a11e6114c24747bee17d4f8d Mon Sep 17 00:00:00 2001 From: Kato Hiroki Date: Tue, 3 Dec 2024 13:41:05 +0000 Subject: [PATCH 3/5] :art: Improve table layout and UX (#1526) --- .../WorkBookTasks/WorkBookTasksTable.svelte | 34 +++++++++++++++---- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/src/lib/components/WorkBookTasks/WorkBookTasksTable.svelte b/src/lib/components/WorkBookTasks/WorkBookTasksTable.svelte index cdfd00506..2df283591 100644 --- a/src/lib/components/WorkBookTasks/WorkBookTasksTable.svelte +++ b/src/lib/components/WorkBookTasks/WorkBookTasksTable.svelte @@ -9,6 +9,8 @@ TableHeadCell, } from 'flowbite-svelte'; + import TrashBinOutline from 'flowbite-svelte-icons/TrashBinOutline.svelte'; + import GradeLabel from '$lib/components/GradeLabel.svelte'; import ExternalLinkWrapper from '$lib/components/ExternalLinkWrapper.svelte'; @@ -104,6 +106,8 @@ return task; } + + let isDeleting = false; {#if workBookTasksForTable.length} @@ -119,10 +123,10 @@ > 問題名 - - + + 編集 @@ -162,6 +166,7 @@