diff --git a/src/module/_global/layout/layout_modal_view_file.tsx b/src/module/_global/layout/layout_modal_view_file.tsx index 3ac27e5..584da23 100644 --- a/src/module/_global/layout/layout_modal_view_file.tsx +++ b/src/module/_global/layout/layout_modal_view_file.tsx @@ -13,17 +13,18 @@ export default function LayoutModal({ opened, onClose, extension, fitur, file }: margin: 10, }, content: { - border: `2px solid ${'#828AFC'}`, - borderRadius: 10 + maxWidth: 550, } - }} opened={opened} onClose={onClose} withCloseButton={true} centered closeOnClickOutside={false}> + }} opened={opened} onClose={onClose} withCloseButton={true} centered closeOnClickOutside={false} fullScreen> { extension === 'pdf' ? : diff --git a/src/module/project/ui/add_detail_task_project.tsx b/src/module/project/ui/add_detail_task_project.tsx index 2a6d219..a799ddf 100644 --- a/src/module/project/ui/add_detail_task_project.tsx +++ b/src/module/project/ui/add_detail_task_project.tsx @@ -93,7 +93,7 @@ export default function AddDetailTaskProject() { - + {selectAll ? : ""} - {loading ? + {loading ? Array(8) - .fill(null) - .map((_, i) => ( - - - - )) - : - - {isData.map((v, i) => { - const isSelected = selectedFiles.some((i: any) => i?.idUser == v.idUser); - const found = isDataMember.some((i: any) => i.idUser == v.idUser) - return ( - (!found) ? handleFileClick(i) : null}> - + .fill(null) + .map((_, i) => ( + + + + )) + : + + {isData.map((v, i) => { + const isSelected = selectedFiles.some((i: any) => i?.idUser == v.idUser); + const found = isDataMember.some((i: any) => i.idUser == v.idUser) + return ( + (!found) ? handleFileClick(i) : null}> + {/* @@ -156,21 +156,44 @@ export default function AddMemberDetailProject() { {isSelected ? : ""} - - - ); - })} - - } + */} + + + + + + + + {v.name} + {(found) ? "sudah menjadi anggota" : ""} + + {isSelected ? : null} + + + + + + + + ); + })} + + } - - {loading ? + {loading ? - : + : - } - + } + setOpenModal(false)} description="Apakah Anda yakin ingin menambahkan anggota?" diff --git a/src/module/project/ui/create_project.tsx b/src/module/project/ui/create_project.tsx index 9b5c039..e519fb8 100644 --- a/src/module/project/ui/create_project.tsx +++ b/src/module/project/ui/create_project.tsx @@ -1,6 +1,6 @@ "use client"; import { LayoutDrawer, LayoutNavbarNew, WARNA } from "@/module/_global"; -import { Avatar, Box, Button, Center, Flex, Group, rem, Select, SimpleGrid, Stack, Text, TextInput } from "@mantine/core"; +import { Avatar, Box, Button, Center, Divider, Flex, Grid, Group, rem, Select, SimpleGrid, Stack, Text, TextInput } from "@mantine/core"; import { useRouter, useSearchParams } from "next/navigation"; import React, { useRef, useState } from "react"; import { IoIosArrowDropright } from "react-icons/io"; @@ -227,166 +227,174 @@ export default function CreateProject() { - { - dataTask.length > 0 && - - Tanggal & Tugas - { - dataTask.map((v, i) => { - return ( - { - setIndexDelTask(i) - setOpenDrawerTask(true) - }}> - - - ) - }) - } - - } - - { - listFile.length > 0 && - - File - + { + dataTask.length > 0 && + + Tanggal & Tugas { - listFile.map((v, i) => { + dataTask.map((v, i) => { return ( { - setIndexDelFile(i) - setOpenDrawerFile(true) + setIndexDelTask(i) + setOpenDrawerTask(true) }}> - + ) }) } - - } + } - { - member.length > 0 && - - - Anggota Terpilih - Total {member.length} Anggota - - - - - {member.get().map((v: any, i: any) => { + { + listFile.length > 0 && + + File + + { + listFile.map((v, i) => { return ( - - - - - - {v.name} + { + setIndexDelFile(i) + setOpenDrawerFile(true) + }}> + + + ) + }) + } + + + } + + { + member.length > 0 && + + + Anggota Terpilih + Total {member.length} Anggota + + + + + {member.get().map((v: any, i: any) => { + return ( + + + + + + + + {v.name} + + + + + + + Anggota - - - - Anggota - - + + + + + + ); })} - - + + } + + + + + - - - - - - {/* Drawer pilih file */} - setOpenDrawer(false)} - title={"Pilih File"} - > - - { - if (!files || _.isEmpty(files)) - return toast.error('Tidak ada file yang dipilih') - setFileForm([...fileForm, files[0]]) - setListFile([...listFile, { name: files[0].name, extension: files[0].type.split("/")[1] }]) - }} - activateOnClick={false} - maxSize={3 * 1024 ** 2} - accept={['text/csv', 'image/png', 'image/jpeg', 'image/heic', 'application/pdf']} - onReject={(files) => { - return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf dengan ukuran maksimal 3 MB') - }} - > - openRef.current?.()}> - -
- -
+ {/* Drawer pilih file */} + setOpenDrawer(false)} + title={"Pilih File"} + > + + { + if (!files || _.isEmpty(files)) + return toast.error('Tidak ada file yang dipilih') + setFileForm([...fileForm, files[0]]) + setListFile([...listFile, { name: files[0].name, extension: files[0].type.split("/")[1] }]) + }} + activateOnClick={false} + maxSize={3 * 1024 ** 2} + accept={['text/csv', 'image/png', 'image/jpeg', 'image/heic', 'application/pdf']} + onReject={(files) => { + return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf dengan ukuran maksimal 3 MB') + }} + > + openRef.current?.()}> + +
+ +
+ + + Pilih file + + diperangkat - - Pilih file - - diperangkat - - - {/* router.push("/project/create?page=file-save")}> + + {/* router.push("/project/create?page=file-save")}> sudah ada */} - - + + - {/* Drawer hapus file */} - setOpenDrawerFile(false)} - title={""} - > - - - deleteFile(indexDelFile)}> - - - - - Hapus File - - - - - + {/* Drawer hapus file */} + setOpenDrawerFile(false)} + title={""} + > + + + deleteFile(indexDelFile)}> + + + + + Hapus File + + + + + - {/* Drawer hapus tugas */} - setOpenDrawerTask(false)} - title={""} - > - - - deleteTask(indexDelTask)}> - - - - - Hapus Tugas - - - - - + {/* Drawer hapus tugas */} + setOpenDrawerTask(false)} + title={""} + > + + + deleteTask(indexDelTask)}> + + + + + Hapus Tugas + + + + + - setModal(false)} - description="Apakah Anda yakin ingin menambahkan data?" - onYes={(val) => { - if (val) { - onSubmit() - } - setModal(false) - }} /> - - ); + setModal(false)} + description="Apakah Anda yakin ingin menambahkan data?" + onYes={(val) => { + if (val) { + onSubmit() + } + setModal(false) + }} /> + + ); } diff --git a/src/module/project/ui/create_users_project.tsx b/src/module/project/ui/create_users_project.tsx index cb59a3d..1b113f6 100644 --- a/src/module/project/ui/create_users_project.tsx +++ b/src/module/project/ui/create_users_project.tsx @@ -116,7 +116,7 @@ export default function CreateUsersProject({ grup, onClose }: { grup?: string, o
- + {v.name} diff --git a/src/module/project/ui/list_anggota_detail_project.tsx b/src/module/project/ui/list_anggota_detail_project.tsx index fbce9d4..964015c 100644 --- a/src/module/project/ui/list_anggota_detail_project.tsx +++ b/src/module/project/ui/list_anggota_detail_project.tsx @@ -1,6 +1,6 @@ 'use client' import { LayoutDrawer, SkeletonSingle, WARNA } from '@/module/_global'; -import { Avatar, Box, Flex, Group, SimpleGrid, Stack, Text } from '@mantine/core'; +import { Avatar, Box, Flex, Grid, Group, SimpleGrid, Stack, Text } from '@mantine/core'; import React, { useState } from 'react'; import { funDeleteMemberProject, funGetOneProjectById } from '../lib/api_project'; import toast from 'react-hot-toast'; @@ -89,42 +89,45 @@ export default function ListAnggotaDetailProject() { isData.length === 0 ? Tidak ada anggota : isData.map((v, i) => { return ( - { - setDataChoose({ id: v.idUser, name: v.name }) + + { + setDataChoose({ id: v.idUser, name: v.name }) setOpenDrawer(true) - }} - > - - - - - {v.name} + }} + > + + + + + + {v.name} + {v.email} + + + + + + + Anggota - - {v.email} - - - - - Anggota - - + + + ); })} - setOpenDrawer(false)}> + {dataChoose.name}} onClose={() => setOpenDrawer(false)}> { router.push('/member/' + dataChoose.id) }} justify={'center'} align={'center'} direction={'column'} > diff --git a/src/module/project/ui/list_project.tsx b/src/module/project/ui/list_project.tsx index 476583a..03eb872 100644 --- a/src/module/project/ui/list_project.tsx +++ b/src/module/project/ui/list_project.tsx @@ -121,8 +121,11 @@ export default function ListProject() { {isData.map((v, i) => { return ( - - + + router.push(`/project/${v.id}`)}>
- + {v.title} - {/* */} { return ( - { - setIdData(item.id) - setStatusData(item.status) - setOpenDrawer(true) - }} - > - -
- -
- - - - + { + setIdData(item.id) + setStatusData(item.status) + setOpenDrawer(true) + }}> + + + + -
- +
+
- {item.title} + {item.title} - - - + Tanggal Mulai {item.dateStart} - Tanggal Berakhir + Tanggal Berakhir {item.dateEnd} - - - {isData.length >= 1 - ? "" : - - } + + + ) }) diff --git a/src/module/task/ui/add_member_detail_task.tsx b/src/module/task/ui/add_member_detail_task.tsx index 00ba18c..32a0d4c 100644 --- a/src/module/task/ui/add_member_detail_task.tsx +++ b/src/module/task/ui/add_member_detail_task.tsx @@ -143,7 +143,7 @@ export default function AddMemberDetailTask() { )) : - + {isData.map((v, i) => { const isSelected = selectedFiles.some((i: any) => i?.idUser == v.idUser); const found = isDataMember.some((i: any) => i.idUser == v.idUser) diff --git a/src/module/task/ui/create_task.tsx b/src/module/task/ui/create_task.tsx index 6f932f4..6cbf879 100644 --- a/src/module/task/ui/create_task.tsx +++ b/src/module/task/ui/create_task.tsx @@ -1,6 +1,6 @@ "use client"; import { LayoutDrawer, LayoutNavbarNew, WARNA } from "@/module/_global"; -import { Avatar, Box, Button, Center, Flex, Group, Input, rem, SimpleGrid, Stack, Text, TextInput } from "@mantine/core"; +import { Avatar, Box, Button, Center, Divider, Flex, Grid, Group, Input, rem, SimpleGrid, Stack, Text, TextInput } from "@mantine/core"; import { useParams, useRouter } from "next/navigation"; import React, { useRef, useState } from "react"; import { IoIosArrowDropright } from "react-icons/io"; @@ -230,24 +230,32 @@ export default function CreateTask() { > {member.get().map((v: any, i: any) => { return ( - - - - - - {v.name} + + + + + + + + {v.name} + + + + + + + Anggota - - - - Anggota - - + + + + + + ); })}