diff --git a/src/app/(application)/project/create/page.tsx b/src/app/(application)/project/create/page.tsx index e571503..acb388e 100644 --- a/src/app/(application)/project/create/page.tsx +++ b/src/app/(application)/project/create/page.tsx @@ -1,11 +1,7 @@ -import { CreateProject, ViewFileSave } from "@/module/project"; +import { CreateProject } from "@/module/project"; import React from "react"; function Page({ searchParams }: { searchParams: any }) { - - // if (searchParams.page == "file-save") - // return - return ; } diff --git a/src/app/api/group/route.ts b/src/app/api/group/route.ts index 7a6c886..ae855d5 100644 --- a/src/app/api/group/route.ts +++ b/src/app/api/group/route.ts @@ -31,6 +31,9 @@ export async function GET(request: Request) { id: true, name: true, isActive: true + }, + orderBy: { + name: 'asc' } }); diff --git a/src/app/api/project/[id]/route.ts b/src/app/api/project/[id]/route.ts index 2d5a51e..cb52b0a 100644 --- a/src/app/api/project/[id]/route.ts +++ b/src/app/api/project/[id]/route.ts @@ -67,7 +67,7 @@ export async function GET(request: Request, context: { params: { id: string } }) dateEnd: true, }, orderBy: { - status: 'desc' + createdAt: 'asc' } }) diff --git a/src/app/api/project/route.ts b/src/app/api/project/route.ts index 37408a3..2a6ea0d 100644 --- a/src/app/api/project/route.ts +++ b/src/app/api/project/route.ts @@ -89,6 +89,9 @@ export async function GET(request: Request) { idUser: true } } + }, + orderBy:{ + createdAt: 'desc' } }) diff --git a/src/app/api/user/route.ts b/src/app/api/user/route.ts index d424396..0870016 100644 --- a/src/app/api/user/route.ts +++ b/src/app/api/user/route.ts @@ -69,6 +69,9 @@ export async function GET(request: Request) { }, }, }, + orderBy: { + name: 'asc' + } }); const allData = users.map((v: any) => ({ @@ -108,6 +111,9 @@ export async function GET(request: Request) { }, }, }, + orderBy: { + name: 'asc' + } }); const allData = users.map((v: any) => ({ diff --git a/src/module/_global/layout/layout_modal.tsx b/src/module/_global/layout/layout_modal.tsx index e795a31..aa3858f 100644 --- a/src/module/_global/layout/layout_modal.tsx +++ b/src/module/_global/layout/layout_modal.tsx @@ -6,6 +6,7 @@ import { useMediaQuery } from '@mantine/hooks'; export default function LayoutModal({ opened, onClose, description, onYes }: { opened: boolean, onClose: () => void, description: string, onYes: (val: boolean) => void }) { const [isValModal, setValModal] = useState(opened) const isMobile = useMediaQuery('(max-width: 768px)'); + const [loading, setLoading] = useState(false) return ( {isMobile ? <> - + : <> - + } diff --git a/src/module/project/ui/add_file_detail_project.tsx b/src/module/project/ui/add_file_detail_project.tsx index f272fb3..c9d102f 100644 --- a/src/module/project/ui/add_file_detail_project.tsx +++ b/src/module/project/ui/add_file_detail_project.tsx @@ -100,9 +100,9 @@ export default function AddFileDetailProject() { }} activateOnClick={false} maxSize={3 * 1024 ** 2} - accept={['text/csv', 'image/png', 'image/jpeg', 'image/heic', 'application/pdf']} + accept={['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') + return toast.error('File yang diizinkan: .png, .jpg, .heic, .pdf dengan ukuran maksimal 3 MB') }} > diff --git a/src/module/project/ui/create_project.tsx b/src/module/project/ui/create_project.tsx index 723f5ec..04b7c01 100644 --- a/src/module/project/ui/create_project.tsx +++ b/src/module/project/ui/create_project.tsx @@ -1,10 +1,9 @@ "use client"; import { globalRole, LayoutDrawer, LayoutNavbarNew, TEMA } from "@/module/_global"; -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 { Avatar, Box, Button, Divider, Flex, Grid, Group, rem, Select, SimpleGrid, Stack, Text, TextInput } from "@mantine/core"; +import { useRouter } from "next/navigation"; import React, { useRef, useState } from "react"; import { IoIosArrowDropright } from "react-icons/io"; -import { BsFiletypeCsv } from "react-icons/bs"; import ResultsDateAndTask from "./results_date-and_task"; import ResultsFile from "./results_file"; import LayoutModal from "@/module/_global/layout/layout_modal"; @@ -374,9 +373,9 @@ export default function CreateProject() { }} activateOnClick={false} maxSize={3 * 1024 ** 2} - accept={['text/csv', 'image/png', 'image/jpeg', 'image/heic', 'application/pdf']} + accept={['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') + return toast.error('File yang diizinkan: .png, .jpg, .heic, .pdf dengan ukuran maksimal 3 MB') }} > @@ -399,9 +398,9 @@ export default function CreateProject() { }} activateOnClick={false} maxSize={3 * 1024 ** 2} - accept={['text/csv', 'image/png', 'image/jpeg', 'image/heic', 'application/pdf']} + accept={['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') + return toast.error('File yang diizinkan: .png, .jpg, .heic, .pdf dengan ukuran maksimal 3 MB') }} > openRef.current?.()}> diff --git a/src/module/project/ui/list_project.tsx b/src/module/project/ui/list_project.tsx index 1cd8e71..c03af79 100644 --- a/src/module/project/ui/list_project.tsx +++ b/src/module/project/ui/list_project.tsx @@ -1,5 +1,5 @@ "use client" -import { currentScroll, globalRole, SkeletonList, SkeletonUser, TEMA, WARNA } from '@/module/_global'; +import { currentScroll, globalRole, SkeletonList, TEMA } from '@/module/_global'; import { ActionIcon, Avatar, Badge, Box, Card, Center, Divider, Flex, Grid, Group, Skeleton, Text, TextInput, Title } from '@mantine/core'; import { useRouter, useSearchParams } from 'next/navigation'; import React, { useEffect, useState } from 'react'; @@ -257,7 +257,7 @@ export default function ListProject() { - +{v.member - 1} + {(v.member == 0) ? "0" : "+" + (v.member - 1)} diff --git a/src/module/project/ui/tab_project.tsx b/src/module/project/ui/tab_project.tsx index 6a7c73a..ef72296 100644 --- a/src/module/project/ui/tab_project.tsx +++ b/src/module/project/ui/tab_project.tsx @@ -1,6 +1,6 @@ "use client" import { globalRole, LayoutDrawer, LayoutNavbarNew, TEMA } from '@/module/_global'; -import { ActionIcon, Box, Button, Flex, Group, Indicator, Progress, rem, SimpleGrid, Tabs } from '@mantine/core'; +import { ActionIcon, Box, Button, Flex, rem } from '@mantine/core'; import React, { useState } from 'react'; import { HiMenu } from 'react-icons/hi'; import { RiProgress3Line } from "react-icons/ri"; @@ -11,7 +11,6 @@ import { IoCloseCircleOutline } from 'react-icons/io5'; import ListProject from './list_project'; import MenuDrawerProject from './menu_drawer_project'; import { useHookstate } from '@hookstate/core'; -import { Carousel } from '@mantine/carousel'; export default function TabProject() { const [openDrawer, setOpenDrawer] = useState(false)