diff --git a/src/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/page.tsx b/src/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/page.tsx index 9069e10..9eed7ac 100644 --- a/src/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/page.tsx +++ b/src/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/page.tsx @@ -1,8 +1,9 @@ -import { ViewDetailDiscussion } from "@/module/division_new" +import { DetailDiscussion } from "@/module/discussion" -function Page() { + +function Page({ params }: { params: { detail: string } }) { return ( - + ) } diff --git a/src/app/(application)/division/[id]/(fitur-division)/discussion/create/page.tsx b/src/app/(application)/division/[id]/(fitur-division)/discussion/create/page.tsx index bc70708..aba906b 100644 --- a/src/app/(application)/division/[id]/(fitur-division)/discussion/create/page.tsx +++ b/src/app/(application)/division/[id]/(fitur-division)/discussion/create/page.tsx @@ -1,11 +1,11 @@ import { LayoutNavbarNew } from "@/module/_global"; import { FormCreateDiscussion } from "@/module/discussion"; -function Page() { +function Page({ params }: { params: { id: string } }) { return ( <> } /> - + ) } diff --git a/src/app/(application)/division/[id]/(fitur-division)/discussion/page.tsx b/src/app/(application)/division/[id]/(fitur-division)/discussion/page.tsx index 600d9ed..66c768a 100644 --- a/src/app/(application)/division/[id]/(fitur-division)/discussion/page.tsx +++ b/src/app/(application)/division/[id]/(fitur-division)/discussion/page.tsx @@ -1,11 +1,11 @@ import { ListDiscussion, NavbarListDiscussion } from '@/module/discussion'; import React from 'react'; -function Page() { +function Page({ params }: { params: { id: string } }) { return (
- +
); } diff --git a/src/app/api/discussion/[id]/route.ts b/src/app/api/discussion/[id]/route.ts new file mode 100644 index 0000000..fce65c1 --- /dev/null +++ b/src/app/api/discussion/[id]/route.ts @@ -0,0 +1,50 @@ +import { prisma } from "@/module/_global"; +import { funGetUserByCookies } from "@/module/auth"; +import { NextResponse } from "next/server"; + +// GET ONE DISCUSSION BY ID +export async function GET(request: Request, context: { params: { id: string } }) { + try { + const user = await funGetUserByCookies() + if (user.id == undefined) { + return NextResponse.json({ success: false, message: "Anda harus login untuk mengakses ini" }, { status: 401 }); + } + const {id} = context.params + + const data = await prisma.divisionDisscussion.findUnique({ + where: { + id: id + }, + select: { + id: true, + title: true, + desc: true, + status: true, + createdAt: true, + User: { + select: { + name: true + } + }, + DivisionDisscussionComment: { + select: { + id: true, + comment: true, + createdAt: true, + User: { + select: { + name: true + } + } + } + } + } + }); + + return NextResponse.json({ success: true, message: "Berhasil mendapatkan divisi", data: data }, { status: 200 }); + + } catch (error) { + console.log(error); + return NextResponse.json({ success: false, message: "Gagal mendapatkan divisi, coba lagi nanti", reason: (error as Error).message, }, { status: 500 }); + } +} \ No newline at end of file diff --git a/src/app/api/discussion/route.ts b/src/app/api/discussion/route.ts index 3937f60..e753077 100644 --- a/src/app/api/discussion/route.ts +++ b/src/app/api/discussion/route.ts @@ -1,7 +1,9 @@ import { prisma } from "@/module/_global"; import { funGetUserByCookies } from "@/module/auth"; import _ from "lodash"; +import moment from "moment"; import { NextResponse } from "next/server"; +import "moment/locale/id"; // GET ALL DISCUSSION DIVISION ACTIVE = TRUE @@ -14,7 +16,7 @@ export async function GET(request: Request) { const { searchParams } = new URL(request.url); const idDivision = searchParams.get("division"); - const title = searchParams.get('search'); + const name = searchParams.get('search'); if (idDivision != "null" && idDivision != null && idDivision != undefined) { @@ -33,9 +35,11 @@ export async function GET(request: Request) { where: { isActive: true, idDivision: idDivision, - title: { - contains: (title == undefined || title == "null") ? "" : title, - mode: "insensitive" + User: { + name: { + contains: (name == undefined || name == "null") ? "" : name, + mode: "insensitive" + } } }, orderBy: { @@ -63,9 +67,10 @@ export async function GET(request: Request) { const fixData = data.map((v: any) => ({ - ..._.omit(v, ["User", "DivisionDisscussionComment"]), + ..._.omit(v, ["User", "DivisionDisscussionComment", "createdAt"]), user_name: v.User.name, - total_komentar: v.DivisionDisscussionComment.length + total_komentar: v.DivisionDisscussionComment.length, + createdAt: moment(v.createdAt).format("LL") })) return NextResponse.json({ success: true, message: "Berhasil mendapatkan diskusi", data: fixData, }, { status: 200 }); diff --git a/src/app/api/division/[id]/detail/route.ts b/src/app/api/division/[id]/detail/route.ts index d6a649f..1566b25 100644 --- a/src/app/api/division/[id]/detail/route.ts +++ b/src/app/api/division/[id]/detail/route.ts @@ -269,8 +269,6 @@ export async function POST(request: Request, context: { params: { id: string } } const member = await request.json(); const idDivision = context.params.id; - console.log("amalia", member) - const data = await prisma.division.count({ where: { diff --git a/src/app/api/division/route.ts b/src/app/api/division/route.ts index 848fdc0..e3a68b1 100644 --- a/src/app/api/division/route.ts +++ b/src/app/api/division/route.ts @@ -55,6 +55,8 @@ export async function GET(request: Request) { jumlah_member: v.DivisionMember.length })) + console.log(allData) + return NextResponse.json({ success: true, message: "Berhasil mendapatkan divisi", data: allData, }, { status: 200 }); } catch (error) { diff --git a/src/module/discussion/index.ts b/src/module/discussion/index.ts index 13e1c2f..eaf116a 100644 --- a/src/module/discussion/index.ts +++ b/src/module/discussion/index.ts @@ -1,7 +1,9 @@ +import DetailDiscussion from "./ui/detail_discussion"; import FormCreateDiscussion from "./ui/form_create_discussion"; import ListDiscussion from "./ui/list_discussion"; import NavbarListDiscussion from "./ui/navbar_list_discussion"; export { ListDiscussion } export { NavbarListDiscussion } -export { FormCreateDiscussion } \ No newline at end of file +export { FormCreateDiscussion } +export {DetailDiscussion} \ No newline at end of file diff --git a/src/module/discussion/lib/api_discussion.ts b/src/module/discussion/lib/api_discussion.ts index 68ff0d0..0da72e0 100644 --- a/src/module/discussion/lib/api_discussion.ts +++ b/src/module/discussion/lib/api_discussion.ts @@ -17,4 +17,10 @@ export const funCreateDiscussion = async (data: IFormDiscussion) => { body: JSON.stringify(data), }); return await response.json().catch(() => null); +} + + +export const funGetDiscussionById = async (path: string) => { + const response = await fetch(`/api/discussion/${path}`); + return await response.json().catch(() => null); } \ No newline at end of file diff --git a/src/module/division_new/_division_fitur/discussion/view/view_detail_discussion.tsx b/src/module/discussion/ui/detail_discussion.tsx similarity index 87% rename from src/module/division_new/_division_fitur/discussion/view/view_detail_discussion.tsx rename to src/module/discussion/ui/detail_discussion.tsx index d0b3b22..30a9aa0 100644 --- a/src/module/division_new/_division_fitur/discussion/view/view_detail_discussion.tsx +++ b/src/module/discussion/ui/detail_discussion.tsx @@ -3,6 +3,10 @@ import { Avatar, Badge, Box, Center, Divider, Flex, Grid, Group, Text, TextInput import { WARNA } from "@/module/_global"; import { GrChatOption } from "react-icons/gr"; import { LuSendHorizonal } from "react-icons/lu"; +import NavbarDetailDiscussion from "@/module/discussion/ui/navbar_detail_discussion"; +import { useState } from "react"; +import { funGetAllDiscussion, funGetDiscussionById } from "../lib/api_discussion"; +import { useShallowEffect } from "@mantine/hooks"; const dataAnggota = [ { @@ -47,11 +51,27 @@ const dataAnggota = [ }, ]; -export default function ViewDetailDiscussion() { +export default function DetailDiscussion({ id }: { id: string }) { + + const [isData, setData] = useState([]) + + const getData = async () => { + try { + const response = await funGetDiscussionById(id) + setData(response.data) + } catch (error) { + console.log(error) + } + } + + useShallowEffect(() => { + getData() + }, []) return ( <> - {/* */} + + 
{JSON.stringify(isData, null, 1)}
) -} \ No newline at end of file +} + diff --git a/src/module/discussion/ui/form_create_discussion.tsx b/src/module/discussion/ui/form_create_discussion.tsx index d1354f2..1db0571 100644 --- a/src/module/discussion/ui/form_create_discussion.tsx +++ b/src/module/discussion/ui/form_create_discussion.tsx @@ -4,9 +4,15 @@ import LayoutModal from "@/module/_global/layout/layout_modal"; import { Avatar, Box, Button, Center, Grid, Group, Text, Textarea } from "@mantine/core"; import { useState } from "react"; import toast from "react-hot-toast"; +import { funCreateDiscussion } from "../lib/api_discussion"; -export default function FormCreateDiscussion() { +export default function FormCreateDiscussion({id}: {id: string}) { const [isValModal, setValModal] = useState(false) + const [isData, setData] = useState({ + desc: "", + idDivision: id + }) + function onTrue(val: boolean) { if (val) { @@ -15,6 +21,29 @@ export default function FormCreateDiscussion() { setValModal(false) } + async function createDiscussion(val: boolean) { + try { + const response = await funCreateDiscussion({ + desc: isData.desc, + idDivision: id + }) + + if (response.success) { + toast.success(response.message) + onTrue(true) + } else { + toast.error(response.message) + } + } catch (error) { + console.log(error); + toast.error("Gagal menambahkan diskusi, coba lagi nanti"); + } finally { + setValModal(false) + } + } + + + return ( @@ -30,6 +59,7 @@ export default function FormCreateDiscussion() { backgroundColor: 'transparent', } }} + onChange={(e) => setData({ ...isData, desc: e.target.value })} /> @@ -50,7 +80,7 @@ export default function FormCreateDiscussion() { setValModal(false)} description="Apakah Anda yakin ingin menambah data?" - onYes={(val) => { onTrue(val) }} /> + onYes={(val) => { createDiscussion(val) }} /> ) } \ No newline at end of file diff --git a/src/module/discussion/ui/list_discussion.tsx b/src/module/discussion/ui/list_discussion.tsx index daddb6a..536c1d3 100644 --- a/src/module/discussion/ui/list_discussion.tsx +++ b/src/module/discussion/ui/list_discussion.tsx @@ -1,54 +1,31 @@ 'use client' import { WARNA } from "@/module/_global"; import { Avatar, Badge, Box, Divider, Flex, Group, Text, TextInput } from "@mantine/core"; -import { useRouter } from "next/navigation"; +import { useRouter, useSearchParams } from "next/navigation"; +import { useState } from "react"; import { GrChatOption } from "react-icons/gr"; import { HiMagnifyingGlass } from "react-icons/hi2"; +import { funGetAllDiscussion } from "../lib/api_discussion"; +import { useShallowEffect } from "@mantine/hooks"; +import { IDataDiscussion } from "../lib/type_discussion"; -const dataAnggota = [ - { - id: 1, - name: "Iqbal Ramadan", - image: "https://i.pravatar.cc/1000?img=5", - status: true, - jumlah: 16, - desc: 'is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. ' - }, - { - id: 2, - name: "Doni Setiawan", - image: "https://i.pravatar.cc/1000?img=10", - status: true, - jumlah: 26, - desc: 'It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged.' - }, - { - id: 3, - name: "Rangga Agung", - image: "https://i.pravatar.cc/1000?img=51", - status: false, - jumlah: 11, - desc: 'It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.' - }, - { - id: 4, - name: "Ramadan Sananta", - image: "https://i.pravatar.cc/1000?img=15", - status: false, - jumlah: 30, - desc: 'It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. ' - }, - { - id: 5, - name: "Imam Baroni", - image: "https://i.pravatar.cc/1000?img=22", - status: false, - jumlah: 29, - desc: 'Contrary to popular belief, Lorem Ipsum is not simply random text' - }, -]; +export default function ListDiscussion({ id }: { id: string }) { + const [isData, setData] = useState([]) + const [searchQuery, setSearchQuery] = useState('') + + const getData = async () => { + try { + const response = await funGetAllDiscussion('?division=' + id + '&search=' + searchQuery) + setData(response.data) + } catch (error) { + console.log(error) + } + } + + useShallowEffect(() => { + getData() + }, [searchQuery]) -export default function ListDiscussion() { const router = useRouter() return ( @@ -64,12 +41,14 @@ export default function ListDiscussion() { radius={30} leftSection={} placeholder="Pencarian" + value={searchQuery} + onChange={(e) => setSearchQuery(e.target.value)} /> - {dataAnggota.map((v, i) => { + {isData.map((v, i) => { return ( { - router.push(`/discussion/${v.id}`) + router.push(`/division/${v.id}/discussion/${v.id}`) }} > - + - {v.name} + {v.user_name} {(v.status) ? "BUKA" : "TUTUP"} - 1 Jam + {v.createdAt} {v.desc} @@ -95,7 +74,7 @@ export default function ListDiscussion() { Diskusikan - {v.jumlah} Komentar + {v.total_komentar} Komentar