upd: task

Deskripsi:
- role user
- log user

No Issues

src/module/task/ui/detail_list_anggota_task.tsx

@@ -1,5 +1,5 @@
 'use client'
-import { LayoutDrawer, SkeletonSingle, WARNA } from "@/module/_global";
+import { globalRole, LayoutDrawer, SkeletonSingle, WARNA } from "@/module/_global";
 import { Box, Group, Flex, Avatar, Text, SimpleGrid, Stack, Grid } from "@mantine/core";
 import { useShallowEffect } from "@mantine/hooks";
 import { useParams, useRouter } from "next/navigation";
@@ -10,6 +10,8 @@ import { IDataMemberTaskDivision } from "../lib/type_task";
 import { FaUser } from "react-icons/fa6";
 import { IoIosCloseCircle } from "react-icons/io";
 import LayoutModal from "@/module/_global/layout/layout_modal";
+import { useHookstate } from "@hookstate/core";
+import { globalIsAdminDivision } from "@/module/division_new";
 
 
 export default function ListAnggotaDetailTask() {
@@ -20,6 +22,8 @@ export default function ListAnggotaDetailTask() {
    const [isOpenModal, setOpenModal] = useState(false)
    const [dataChoose, setDataChoose] = useState({ id: '', name: '' })
    const router = useRouter()
+   const roleLogin = useHookstate(globalRole)
+   const adminLogin = useHookstate(globalIsAdminDivision)
 
    async function getOneData() {
       try {
@@ -140,7 +144,8 @@ export default function ListAnggotaDetailTask() {
                            <Text c={WARNA.biruTua}>Lihat profil</Text>
                         </Box>
                      </Flex>
-
+                     {
+                        (roleLogin.get() != "user" && roleLogin.get() != "coadmin") || adminLogin.get() ?
                            <Flex onClick={() => { setOpenModal(true) }} justify={'center'} align={'center'} direction={'column'} >
                               <Box>
                                  <IoIosCloseCircle size={30} color={WARNA.biruTua} />
@@ -149,6 +154,8 @@ export default function ListAnggotaDetailTask() {
                                  <Text c={WARNA.biruTua}>Keluarkan anggota</Text>
                               </Box>
                            </Flex>
+                           : <></>
+                     }
                   </SimpleGrid>
                </Stack>
             </Box>

src/module/task/ui/list_division_task.tsx

@@ -1,5 +1,5 @@
 import { WARNA } from "@/module/_global";
-import { ActionIcon, Avatar, Badge, Box, Card, Center, Divider, Flex, Grid, Group, Progress, Skeleton, Text, TextInput, Title } from "@mantine/core";
+import { ActionIcon, Avatar, Box, Card, Center, Divider, Flex, Grid, Group, Progress, Skeleton, Text, TextInput, Title } from "@mantine/core";
 import { useParams, useRouter, useSearchParams } from "next/navigation";
 import { useState } from "react";
 import { HiMagnifyingGlass, HiMiniPresentationChartBar, HiOutlineListBullet, HiSquares2X2 } from "react-icons/hi2";
@@ -67,6 +67,7 @@ export default function ListDivisionTask() {
                   radius={30}
                   leftSection={<HiMagnifyingGlass size={20} />}
                   placeholder="Pencarian"
+                  onChange={(val) => setSearchQuery(val.target.value)}
                />
             </Grid.Col>
             <Grid.Col span={'auto'}>
@@ -181,7 +182,7 @@ export default function ListDivisionTask() {
                                              <Avatar>
                                                 <MdAccountCircle size={32} color={WARNA.biruTua} />
                                              </Avatar>
-                                             <Avatar>+{v.member - 1}</Avatar>
+                                             <Avatar>{(v.member == 0) ? "0" : "+" + (v.member - 1)}</Avatar>
                                           </Avatar.Group>
                                        </Group>
                                     </Box>

src/module/task/ui/navbar_detail_division_task.tsx

@@ -1,5 +1,5 @@
 'use client'
-import { LayoutDrawer, LayoutNavbarNew, WARNA } from "@/module/_global";
+import { globalRole, LayoutDrawer, LayoutNavbarNew, WARNA } from "@/module/_global";
 import { ActionIcon, Box, Flex, SimpleGrid, Stack, Text } from "@mantine/core";
 import { useParams, useRouter } from "next/navigation";
 import { useState } from "react";
@@ -10,12 +10,16 @@ import { HiMenu } from "react-icons/hi";
 import { IoAddCircle } from "react-icons/io5";
 import { FaFileCirclePlus, FaPencil, FaUsers } from "react-icons/fa6";
 import { MdCancel } from "react-icons/md";
+import { globalIsAdminDivision } from "@/module/division_new";
+import { useHookstate } from "@hookstate/core";
 
 export default function NavbarDetailDivisionTask() {
    const router = useRouter()
    const param = useParams<{ id: string, detail: string }>()
    const [name, setName] = useState('')
    const [isOpen, setOpen] = useState(false)
+   const roleLogin = useHookstate(globalRole)
+   const adminLogin = useHookstate(globalIsAdminDivision)
 
    async function getOneData() {
       try {
@@ -80,9 +84,25 @@ export default function NavbarDetailDivisionTask() {
                            cursor: 'pointer'
                         }}
                         onClick={() => {
-                           router.push(param.detail + '/add-member')
+                           router.push(param.detail + '/add-file')
                         }}
                      >
+                        <Box>
+                           <FaFileCirclePlus size={30} color={WARNA.biruTua} />
+                        </Box>
+                        <Box>
+                           <Text c={WARNA.biruTua} ta='center'>Tambah file</Text>
+                        </Box>
+                     </Flex>
+
+                     {
+                        (roleLogin.get() != "user" && roleLogin.get() != "coadmin") || adminLogin.get() ?
+                           <>
+                              <Flex justify={'center'} align={'center'} direction={'column'}
+                                 style={{
+                                    cursor: 'pointer'
+                                 }}
+                                 onClick={() => { router.push(param.detail + '/add-member') }} >
                                  <Box>
                                     <FaUsers size={30} color={WARNA.biruTua} />
                                  </Box>
@@ -95,24 +115,7 @@ export default function NavbarDetailDivisionTask() {
                                  style={{
                                     cursor: 'pointer'
                                  }}
-                        onClick={() => {
+                                 onClick={() => { router.push(param.detail + '/edit') }} >
-                           router.push(param.detail + '/add-file')
-                        }}
-                     >
-                        <Box>
-                           <FaFileCirclePlus size={30} color={WARNA.biruTua} />
-                        </Box>
-                        <Box>
-                           <Text c={WARNA.biruTua} ta='center'>Tambah file</Text>
-                        </Box>
-                     </Flex>
-
-                     <Flex justify={'center'} align={'center'} direction={'column'}
-                        style={{
-                           cursor: 'pointer'
-                        }}
-                        onClick={() => { router.push(param.detail + '/edit') }}
-                     >
                                  <Box>
                                     <FaPencil size={30} color={WARNA.biruTua} />
                                  </Box>
@@ -125,8 +128,7 @@ export default function NavbarDetailDivisionTask() {
                                  style={{
                                     cursor: 'pointer'
                                  }}
-                        onClick={() => { router.push(param.detail + '/cancel') }}
+                                 onClick={() => { router.push(param.detail + '/cancel') }} >
-                     >
                                  <Box>
                                     <MdCancel size={30} color={WARNA.biruTua} />
                                  </Box>
@@ -134,6 +136,10 @@ export default function NavbarDetailDivisionTask() {
                                     <Text c={WARNA.biruTua} ta='center'>Batal</Text>
                                  </Box>
                               </Flex>
+                           </> : <></>
+
+                     }
+
 
                   </SimpleGrid>
                </Stack>

src/module/task/ui/navbar_division_task.tsx

@@ -1,21 +1,27 @@
 'use client'
-import { LayoutDrawer, LayoutNavbarNew, WARNA } from "@/module/_global";
+import { globalRole, LayoutDrawer, LayoutNavbarNew, WARNA } from "@/module/_global";
 import { ActionIcon } from "@mantine/core";
 import { useState } from "react";
 import { HiMenu } from "react-icons/hi";
 import DrawerDivisionTask from "./drawer_division_task";
 import { useParams } from "next/navigation";
+import { useHookstate } from "@hookstate/core";
+import { globalIsAdminDivision } from "@/module/division_new";
 
 export default function NavbarDivisionTask() {
    const [openDrawer, setOpenDrawer] = useState(false)
    const param = useParams<{ id: string }>()
+   const roleLogin = useHookstate(globalRole)
+   const adminLogin = useHookstate(globalIsAdminDivision)
+
    return (
       <>
          <LayoutNavbarNew back={`/division/${param.id}`} title="Divisi - Tugas"
-            menu={
+            menu={((roleLogin.get() != "user" && roleLogin.get() != "coadmin") || adminLogin.get()) ?
                <ActionIcon variant="light" onClick={() => setOpenDrawer(true)} bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings">
                   <HiMenu size={20} color='white' />
                </ActionIcon>
+               : <></>
             }
          />
          <LayoutDrawer opened={openDrawer} title={'Menu'} onClose={() => setOpenDrawer(false)}>

src/module/task/ui/tabs_division_task.tsx

@@ -19,12 +19,12 @@ export default function TabsDivisionTask() {
       {
          id: "0",
          title: "Segera",
-        icon: <RiProgress3Line style={iconStyle} />
+         icon: <TbClockPause style={iconStyle} />
       },
       {
          id: "1",
          title: "Dikerjakan",
-        icon: <TbClockPause style={iconStyle} />
+         icon: <RiProgress3Line style={iconStyle} />
       },
       {
          id: "2",
@@ -77,7 +77,7 @@ export default function TabsDivisionTask() {
                      color={
                         status == item.id
                            ? "white"
-                           : WARNA.biruTua
+                           : (status == null && item.id == "0") ? "white" : WARNA.biruTua
                      }
                      onClick={() => { router.push("?status=" + item.id) }}
                      defaultValue={(status == "1" || status == "2" || status == "3") ? status : "0"}
@@ -85,7 +85,7 @@ export default function TabsDivisionTask() {
                      bg={
                         status == item.id
                            ? "#FF9861"
-                           : "transparent"
+                           : (status == null && item.id == "0") ? "#FF9861" : "transparent"
                      }
                   >
                      {item.icon}