From 145f19f49b583afb900e6eb3d59244b311f837a7 Mon Sep 17 00:00:00 2001 From: sosokker Date: Tue, 28 Nov 2023 11:58:08 +0700 Subject: [PATCH] Change card Style --- .../src/components/kanbanBoard/taskCard.jsx | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/kanbanBoard/taskCard.jsx b/frontend/src/components/kanbanBoard/taskCard.jsx index 179ea49..4c40a9e 100644 --- a/frontend/src/components/kanbanBoard/taskCard.jsx +++ b/frontend/src/components/kanbanBoard/taskCard.jsx @@ -25,6 +25,10 @@ export function TaskCard({ task, deleteTask, updateTask }) { // ---- DESC AND TAG ---- */ + if (task.tags === undefined) { + task.tags = []; + } + // Tags const tags = task.tags.length > 0 ? ( @@ -32,8 +36,8 @@ export function TaskCard({ task, deleteTask, updateTask }) { {task.tags.map((tag, index) => (
- {tag.label} + className={`inline-flex items-center font-bold leading-sm uppercase w-1/3 h-3 p-2 mr-1 bg-${tag.color}-200 text-${tag.color}-700 rounded`}> +

{tag}

))} @@ -42,7 +46,7 @@ export function TaskCard({ task, deleteTask, updateTask }) { // difficulty? const difficultyTag = task.difficulty ? ( difficulty @@ -60,7 +64,7 @@ export function TaskCard({ task, deleteTask, updateTask }) { // Due Date const dueDateTag = task.end_event && new Date(task.end_event) > new Date() - ? (() => { + ? (() => { const daysUntilDue = Math.ceil((new Date(task.end_event) - new Date()) / (1000 * 60 * 60 * 24)); let colorClass = @@ -93,7 +97,7 @@ export function TaskCard({ task, deleteTask, updateTask }) { // Subtask count const subtaskCountTag = task.subtaskCount ? ( - + {task.subtaskCount} ) : null; @@ -124,6 +128,7 @@ export function TaskCard({ task, deleteTask, updateTask }) { challenge={task.challenge} importance={task.importance} updateTask={updateTask} + completed={task.completed} /> {/* -------- Task Card -------- */} @@ -138,7 +143,8 @@ export function TaskCard({ task, deleteTask, updateTask }) { }} onMouseLeave={() => { setMouseIsOver(false); - }}> + }} + onClick={() => document.getElementById(`task_detail_modal_${task.id}`).showModal()}> {/* -------- Task Content -------- */} {/* Tags */} {tags}