From 0db13c9e5ec38bdcc41dcd24de805241c5c8aab0 Mon Sep 17 00:00:00 2001 From: lukman Date: Mon, 23 Sep 2024 15:28:30 +0800 Subject: [PATCH] style : update style --- .../_global/components/skeleton_list.tsx | 21 +++ .../_global/components/skeleton_user.tsx | 22 +++ src/module/_global/index.ts | 4 + .../announcement/ui/list_announcement.tsx | 17 +- .../calender/ui/create_user_calender.tsx | 2 +- .../ui/create_user_detail_calender.tsx | 2 +- src/module/calender/ui/update_list_users.tsx | 2 +- .../ui/create_anggota_division.tsx | 2 +- .../division_new/ui/navbar_create_users.tsx | 2 +- .../project/ui/add_member_detail_project.tsx | 2 +- .../project/ui/create_date_end_task.tsx | 6 +- src/module/project/ui/create_project.tsx | 17 +- .../project/ui/create_users_project.tsx | 37 ++-- src/module/project/ui/list_project.tsx | 161 +++++++++--------- src/module/task/ui/add_member_detail_task.tsx | 2 +- src/module/task/ui/create_users_project.tsx | 2 +- src/module/user/member/ui/tab_list_member.tsx | 34 +--- 17 files changed, 187 insertions(+), 148 deletions(-) create mode 100644 src/module/_global/components/skeleton_list.tsx create mode 100644 src/module/_global/components/skeleton_user.tsx diff --git a/src/module/_global/components/skeleton_list.tsx b/src/module/_global/components/skeleton_list.tsx new file mode 100644 index 0000000..a61bb3c --- /dev/null +++ b/src/module/_global/components/skeleton_list.tsx @@ -0,0 +1,21 @@ +import { Box, Divider, Grid, Skeleton } from '@mantine/core'; +import React from 'react'; + +export default function SkeletonList() { + return ( +
+ + + + + + + + + + + +
+ ); +} + diff --git a/src/module/_global/components/skeleton_user.tsx b/src/module/_global/components/skeleton_user.tsx new file mode 100644 index 0000000..899dfac --- /dev/null +++ b/src/module/_global/components/skeleton_user.tsx @@ -0,0 +1,22 @@ +import { Box, Divider, Grid, Skeleton } from '@mantine/core'; +import React from 'react'; + +export default function SkeletonUser() { + return ( +
+ + + + + + + + + + + + +
+ ); +} + diff --git a/src/module/_global/index.ts b/src/module/_global/index.ts index 3f987f4..cc3e59a 100644 --- a/src/module/_global/index.ts +++ b/src/module/_global/index.ts @@ -25,6 +25,8 @@ import ViewFilter from "./view/view_filter"; import mtqq_client from "./bin/mqtt_client" import NotificationCustome from "./components/notification_custome"; import { ScrollProvider } from "./components/scroll_provider"; +import SkeletonUser from "./components/skeleton_user"; +import SkeletonList from "./components/skeleton_list"; export { WARNA }; export { LayoutLogin }; @@ -58,3 +60,5 @@ export { ReloadButtonTop } export { NotificationCustome } export { ScrollProvider } export { currentScroll } +export { SkeletonUser } +export { SkeletonList } diff --git a/src/module/announcement/ui/list_announcement.tsx b/src/module/announcement/ui/list_announcement.tsx index 966d95e..93f3f89 100644 --- a/src/module/announcement/ui/list_announcement.tsx +++ b/src/module/announcement/ui/list_announcement.tsx @@ -1,5 +1,5 @@ 'use client' -import { currentScroll, globalNotifPage, SkeletonSingle, TEMA, WARNA } from '@/module/_global'; +import { currentScroll, globalNotifPage, SkeletonSingle, SkeletonUser, TEMA, WARNA } from '@/module/_global'; import { ActionIcon, Box, Center, Divider, Grid, Group, Spoiler, Stack, Text, TextInput } from '@mantine/core'; import React, { useEffect, useState } from 'react'; import { TfiAnnouncement } from "react-icons/tfi"; @@ -63,13 +63,6 @@ export default function ListAnnouncement() { }, [isPage]) - // useShallowEffect(() => { - // if (load.get().category == "announcement") { - // console.log('masuk sinii', load.get().load) - // fetchData() - // } - // }, [load.get().load]) - useEffect(() => { const handleScroll = async () => { @@ -111,8 +104,8 @@ export default function ListAnnouncement() { ? Array(6) .fill(null) .map((_, i) => ( - - + + )) : (isData.length === 0) ? @@ -135,7 +128,7 @@ export default function ListAnnouncement() { { router.push(`/announcement/${v.id}`) - }} mb={10}> + }}> - + ) })} diff --git a/src/module/calender/ui/create_user_calender.tsx b/src/module/calender/ui/create_user_calender.tsx index f538ef0..e2e506b 100644 --- a/src/module/calender/ui/create_user_calender.tsx +++ b/src/module/calender/ui/create_user_calender.tsx @@ -176,7 +176,7 @@ export default function CreateUserCalender({ onClose }: { onClose: (val: any) => borderBottom: `1px solid ${"#E0DFDF"}` }}> {selectedFiles.length > 0 ? ( - + {selectedFiles.map((v: any, i: any) => { return ( diff --git a/src/module/calender/ui/create_user_detail_calender.tsx b/src/module/calender/ui/create_user_detail_calender.tsx index a2a31e9..e5c338f 100644 --- a/src/module/calender/ui/create_user_detail_calender.tsx +++ b/src/module/calender/ui/create_user_detail_calender.tsx @@ -183,7 +183,7 @@ export default function CreateUserDetailCalender() { borderBottom: `1px solid ${"#E0DFDF"}` }}> {selectedFiles.length > 0 ? ( - + {selectedFiles.map((v: any, i: any) => { return ( diff --git a/src/module/calender/ui/update_list_users.tsx b/src/module/calender/ui/update_list_users.tsx index 7fcd86c..c59a38b 100644 --- a/src/module/calender/ui/update_list_users.tsx +++ b/src/module/calender/ui/update_list_users.tsx @@ -170,7 +170,7 @@ export default function UpdateListUsers({ onClose }: { onClose: (val: any) => vo borderBottom: `1px solid ${"#E0DFDF"}` }}> {selectedFiles.length > 0 ? ( - + {selectedFiles.map((v: any, i: any) => { return ( diff --git a/src/module/division_new/ui/create_anggota_division.tsx b/src/module/division_new/ui/create_anggota_division.tsx index 577457e..64910df 100644 --- a/src/module/division_new/ui/create_anggota_division.tsx +++ b/src/module/division_new/ui/create_anggota_division.tsx @@ -148,7 +148,7 @@ export default function CreateAnggotaDivision() { borderBottom: `1px solid ${"#E0DFDF"}` }}> {selectedFiles.length > 0 ? ( - + {selectedFiles.map((v: any, i: any) => { return ( diff --git a/src/module/division_new/ui/navbar_create_users.tsx b/src/module/division_new/ui/navbar_create_users.tsx index 38b3cba..6727c42 100644 --- a/src/module/division_new/ui/navbar_create_users.tsx +++ b/src/module/division_new/ui/navbar_create_users.tsx @@ -134,7 +134,7 @@ export default function NavbarCreateUsers({ grup, onClose }: { grup?: string, on borderBottom: `1px solid ${"#E0DFDF"}` }}> {selectedFiles.length > 0 ? ( - + {selectedFiles.map((v: any, i: any) => { return ( diff --git a/src/module/project/ui/add_member_detail_project.tsx b/src/module/project/ui/add_member_detail_project.tsx index a8ecaac..952de33 100644 --- a/src/module/project/ui/add_member_detail_project.tsx +++ b/src/module/project/ui/add_member_detail_project.tsx @@ -176,7 +176,7 @@ export default function AddMemberDetailProject() { borderBottom: `1px solid ${"#E0DFDF"}` }}> {selectedFiles.length > 0 ? ( - + {selectedFiles.map((v: any, i: any) => { return ( diff --git a/src/module/project/ui/create_date_end_task.tsx b/src/module/project/ui/create_date_end_task.tsx index 0310803..d5b6155 100644 --- a/src/module/project/ui/create_date_end_task.tsx +++ b/src/module/project/ui/create_date_end_task.tsx @@ -58,7 +58,7 @@ export default function ViewDateEndTask({ onClose, onSet }: {onClose: (val: bool - } title={"Tanggal Tugas"} menu /> + } title={"Tanggal dan Tugas"} menu /> setTouched({ ...touched, title: true })} error={ touched.title && ( - title == "" ? "Judul Tidak Boleh Kosong" : null + title == "" ? "Judul Tahapan Tidak Boleh Kosong" : null ) } /> diff --git a/src/module/project/ui/create_project.tsx b/src/module/project/ui/create_project.tsx index 45ab3dd..723f5ec 100644 --- a/src/module/project/ui/create_project.tsx +++ b/src/module/project/ui/create_project.tsx @@ -138,15 +138,20 @@ export default function CreateProject() { - + { (roleLogin.get() == "supadmin") && (