From 654796dab75919e610f28e7cd9f295128aa3eb9d Mon Sep 17 00:00:00 2001 From: lukman Date: Thu, 26 Sep 2024 15:25:25 +0800 Subject: [PATCH] style : update style --- src/module/division_new/ui/list_document.tsx | 6 ++-- src/module/division_new/ui/list_task.tsx | 6 ++-- .../document/ui/navbar_document_division.tsx | 26 +++++++------- .../project/ui/progress_detail_project.tsx | 35 ++++++++++--------- src/module/task/ui/detail_list_file_task.tsx | 23 ++++++------ src/module/task/ui/detail_progress_task.tsx | 29 +++++++-------- src/module/task/ui/results_file.tsx | 8 +++-- 7 files changed, 70 insertions(+), 63 deletions(-) diff --git a/src/module/division_new/ui/list_document.tsx b/src/module/division_new/ui/list_document.tsx index ba48fdd..4a292a2 100644 --- a/src/module/division_new/ui/list_document.tsx +++ b/src/module/division_new/ui/list_document.tsx @@ -71,13 +71,13 @@ export default function ListDocumentOnDetailDivision() { router.push(`/division/${param.id}/document`)}> - +
image
-
+ - {v.name + '.' + v.extension} + {v.name + '.' + v.extension}
diff --git a/src/module/division_new/ui/list_task.tsx b/src/module/division_new/ui/list_task.tsx index 43f3b26..9ae596f 100644 --- a/src/module/division_new/ui/list_task.tsx +++ b/src/module/division_new/ui/list_task.tsx @@ -72,10 +72,10 @@ export default function ListTaskOnDetailDivision() { router.push(`/task/${v.id}`)} bg={tema.get().utama} style={{ borderRadius: 10, border: `1px solid ${"#D6D8F6"}` }}> - {_.startCase(v.title)} + }} onClick={() => router.push(`/task/${v.id}`)} bg={"white"} style={{ borderRadius: 10, border: `1px solid ${"#D6D8F6"}` }}> + {_.startCase(v.title)} - + {v.dateStart} diff --git a/src/module/document/ui/navbar_document_division.tsx b/src/module/document/ui/navbar_document_division.tsx index 2bbf0e7..717f207 100644 --- a/src/module/document/ui/navbar_document_division.tsx +++ b/src/module/document/ui/navbar_document_division.tsx @@ -526,19 +526,15 @@ export default function NavbarDocumentDivision() { > {dataJalur.slice(0, 3).map((v, i) => { return ( + router.push("?path=" + v.id)} key={i} - style={{ - overflow: "hidden", - textOverflow: "ellipsis", - whiteSpace: "nowrap", - maxWidth: "100%", - }} - truncate={"end"} + truncate="end" > {v.name} + ); })} {dataJalur.length > 3 && ( @@ -575,13 +571,15 @@ export default function NavbarDocumentDivision() { > {dataJalur.slice(0, 4).map((v, i) => { return ( - router.push("?path=" + v.id)} - key={i} - truncate="end" - > - {v.name} - + + router.push("?path=" + v.id)} + key={i} + truncate="end" + > + {v.name} + + ); })} {dataJalur.length > 4 && ( diff --git a/src/module/project/ui/progress_detail_project.tsx b/src/module/project/ui/progress_detail_project.tsx index c772cc1..ffd23fb 100644 --- a/src/module/project/ui/progress_detail_project.tsx +++ b/src/module/project/ui/progress_detail_project.tsx @@ -19,7 +19,7 @@ export default function ProgressDetailProject() { const [loading, setLoading] = useState(true) const tema = useHookstate(TEMA) const [reason, setReason] = useState("") - + async function getOneData() { try { setLoading(true) @@ -76,22 +76,23 @@ export default function ProgressDetailProject() { return ( <> - {reason !== null ? - ( - - - - - Kegiatan dibatalkan - - {reason} - - - ) - : null - } + {loading ? "" : + reason !== null ? + ( + + + + + Kegiatan dibatalkan + + {reason} + + + ) + : null + } {loading ? : diff --git a/src/module/task/ui/detail_list_file_task.tsx b/src/module/task/ui/detail_list_file_task.tsx index a8037d2..fb441dd 100644 --- a/src/module/task/ui/detail_list_file_task.tsx +++ b/src/module/task/ui/detail_list_file_task.tsx @@ -131,14 +131,17 @@ export default function ListFileDetailTask() { }} > - +
- {item.extension == "pdf" && } - {item.extension == "csv" && } - {item.extension == "png" && } - {item.extension == "jpg" && } - {item.extension == "jpeg" && } - {item.extension == "heic" && } + {item.extension == "pdf" && } + {item.extension == "csv" && } + {item.extension == "png" && } + {item.extension == "jpg" && } + {item.extension == "jpeg" && } + {item.extension == "PNG" && } + {item.extension == "JPG" && } + {item.extension == "JPEG" && } + {item.extension == "heic" && }
@@ -155,7 +158,7 @@ export default function ListFileDetailTask() { - {nameData}} onClose={() => setOpenDrawer(false)}> + {nameData}} onClose={() => setOpenDrawer(false)}> { reason == null ? - setOpenModal(true) - : setOpenModal(false) + setOpenModal(true) + : setOpenModal(false) }} justify={'center'} align={'center'} direction={'column'} > diff --git a/src/module/task/ui/detail_progress_task.tsx b/src/module/task/ui/detail_progress_task.tsx index f200f7f..5b7216e 100644 --- a/src/module/task/ui/detail_progress_task.tsx +++ b/src/module/task/ui/detail_progress_task.tsx @@ -78,21 +78,22 @@ export default function ProgressDetailTask() { return ( - {reason !== null ? - ( - - - - - Tugas dibatalkan - - {reason} + {loading ? "" : + reason !== null ? + ( + + + + + Tugas dibatalkan + + {reason} + - - ) - : null + ) + : null } {loading ? diff --git a/src/module/task/ui/results_file.tsx b/src/module/task/ui/results_file.tsx index 69cb781..4bc6f5c 100644 --- a/src/module/task/ui/results_file.tsx +++ b/src/module/task/ui/results_file.tsx @@ -16,12 +16,16 @@ export default function ResultsFile({ name, extension }: IListFileTask) { {extension == "pdf" && } {extension == "csv" && } {extension == "png" && } - {extension == "jpg" || extension == "jpeg" && } + {extension == "jpg" && } + {extension == "jpeg" && } + {extension == "PNG" && } + {extension == "JPG" && } + {extension == "JPEG" && } {extension == "heic" && } - {name} + {name}