diff --git a/src/app_modules/admin/_components_v3/comp_button_user_circle.tsx b/src/app_modules/admin/_components_v3/comp_button_user_circle.tsx index 5e39ad0b..92c9e378 100644 --- a/src/app_modules/admin/_components_v3/comp_button_user_circle.tsx +++ b/src/app_modules/admin/_components_v3/comp_button_user_circle.tsx @@ -82,11 +82,11 @@ export function Admin_V3_ComponentButtonUserCircle({ label: "Notifikasi", color: "", onClick: () => { - ComponentAdminGlobal_NotifikasiPeringatan( - "Notifikasi: Masih dalam pengembangan", - 2000 - ); - // setDrawerNotifikasi(true); + // ComponentAdminGlobal_NotifikasiPeringatan( + // "Notifikasi: Masih dalam pengembangan", + // 2000 + // ); + setDrawerNotifikasi(true); }, }, { @@ -109,12 +109,11 @@ export function Admin_V3_ComponentButtonUserCircle({ label: "Notifikasi", color: "", onClick: () => { - ComponentAdminGlobal_NotifikasiPeringatan( - "Notifikasi: Masih dalam pengembangan", - 2000 - ); - - // setDrawerNotifikasi(true); + // ComponentAdminGlobal_NotifikasiPeringatan( + // "Notifikasi: Masih dalam pengembangan", + // 2000 + // ); + setDrawerNotifikasi(true); }, }, { diff --git a/src/app_modules/admin/_components_v3/main_layout.tsx b/src/app_modules/admin/_components_v3/main_layout.tsx index 29ca047f..fe269df2 100644 --- a/src/app_modules/admin/_components_v3/main_layout.tsx +++ b/src/app_modules/admin/_components_v3/main_layout.tsx @@ -83,7 +83,6 @@ export function Admin_V3_MainLayout({ const [opened, handlers] = useDisclosure(false); const [openedDrawer, handlersDrawer] = useDisclosure(false); - return ( <> { - handlersDrawer.close + val === false && handlersDrawer.close(); }} /> {/* {data.title} - + {/* {data.pesan} - + */} diff --git a/src/app_modules/admin/_components_v3/notifikasi/view_drawer_notifikasi.tsx b/src/app_modules/admin/_components_v3/notifikasi/view_drawer_notifikasi.tsx index 9e3e9180..c2bc29d1 100644 --- a/src/app_modules/admin/_components_v3/notifikasi/view_drawer_notifikasi.tsx +++ b/src/app_modules/admin/_components_v3/notifikasi/view_drawer_notifikasi.tsx @@ -1,30 +1,30 @@ +import { + MainColor +} from "@/app_modules/_global/color/color_pallet"; +import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; import { MODEL_NOTIFIKASI } from "@/app_modules/notifikasi/model/interface"; import { - Box, Button, Center, + Divider, Group, Loader, - Paper, Stack, - Text, + Text } from "@mantine/core"; import { useShallowEffect } from "@mantine/hooks"; import _ from "lodash"; import { ScrollOnly } from "next-scroll-loader"; -import adminNotifikasi_getByUserId from "../../notifikasi/fun/get/get_notifikasi_by_user_id"; import { useState } from "react"; import { apiGetNotifikasiByUserId, apiPostIsReadNotifikasi, } from "../../notifikasi/lib/api_fetch_notifikasi"; -import AdminNotifikasi_ViewCardDrawer from "../../notifikasi/view_card_drawer"; -import Admin_V3_ComponentCardNotifikasi from "./comp_card_notifikasi"; -import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; import { - IAdmin_ActivePage, IAdmin_ActiveChildId, + IAdmin_ActivePage, } from "../../notifikasi/route_setting/type_of_select_page"; +import Admin_V3_ComponentCardNotifikasi from "./comp_card_notifikasi"; export function Admin_V3_ViewDrawerNotifikasi({ userLoginId, @@ -158,8 +158,12 @@ export function Admin_V3_ViewDrawerNotifikasi({ return ( <> - + + {_.isEmpty(data) ? (
diff --git a/src/app_modules/admin/notifikasi/route_setting/forum.ts b/src/app_modules/admin/notifikasi/route_setting/forum.ts index 49591930..93a208ae 100644 --- a/src/app_modules/admin/notifikasi/route_setting/forum.ts +++ b/src/app_modules/admin/notifikasi/route_setting/forum.ts @@ -1,33 +1,45 @@ import { RouterAdminForum } from "@/lib/router_admin/router_admin_forum"; import { MODEL_NOTIFIKASI } from "@/app_modules/notifikasi/model/interface"; import { AppRouterInstance } from "next/dist/shared/lib/app-router-context.shared-runtime"; +import { IAdmin_ActivePage, IAdmin_ActiveChildId } from "./type_of_select_page"; +import adminNotifikasi_funUpdateIsReadById from "../fun/update/fun_update_is_read_by_id"; export default async function adminNotifikasi_findRouterForum({ data, router, onChangeNavbar, - onToggleNavbar, }: { data: MODEL_NOTIFIKASI; router: AppRouterInstance; - onChangeNavbar: (val: any) => void; - onToggleNavbar: (val: any) => void; + onChangeNavbar: (val: { + id: IAdmin_ActivePage; + childId: IAdmin_ActiveChildId; + }) => void; }) { - if (data.status === "Report Posting") { - const routeName = RouterAdminForum.table_report_posting; - router.push(routeName); - onChangeNavbar({ - id: 7, - childId: 73, - }); - } + const udpateReadNotifikasi = await adminNotifikasi_funUpdateIsReadById({ + notifId: data.id, + }); + if (udpateReadNotifikasi.status == 200) { + let pagePath = ""; + if (data.status === "Report Posting") { + pagePath = RouterAdminForum.table_report_posting; + // router.push(routeName); + onChangeNavbar({ + id: "Forum", + childId: "Forum_3", + }); + } - if (data.status === "Report Komentar") { - const routeName = RouterAdminForum.table_report_komentar; - router.push(routeName); - onChangeNavbar({ - id: 7, - childId: 74, - }); + if (data.status === "Report Komentar") { + pagePath = RouterAdminForum.table_report_komentar; + // router.push(routeName); + onChangeNavbar({ + id: "Forum", + childId: "Forum_4", + }); + } + return pagePath; + } else { + return ""; } } diff --git a/src/app_modules/admin/notifikasi/route_setting/job.ts b/src/app_modules/admin/notifikasi/route_setting/job.ts index e601220b..1d348912 100644 --- a/src/app_modules/admin/notifikasi/route_setting/job.ts +++ b/src/app_modules/admin/notifikasi/route_setting/job.ts @@ -1,27 +1,18 @@ -import { MODEL_NOTIFIKASI } from "@/app_modules/notifikasi/model/interface"; +import { AppRouterInstance } from "next/dist/shared/lib/app-router-context.shared-runtime"; import { ComponentAdminGlobal_NotifikasiPeringatan } from "../../_admin_global/admin_notifikasi/notifikasi_peringatan"; import { admin_funCheckStatusJob } from "../fun/get/fun_check_status_job"; import adminNotifikasi_funUpdateIsReadById from "../fun/update/fun_update_is_read_by_id"; -import { AppRouterInstance } from "next/dist/shared/lib/app-router-context.shared-runtime"; -import adminNotifikasi_countNotifikasi from "../fun/count/count_is_read"; -import adminNotifikasi_getByUserId from "../fun/get/get_notifikasi_by_user_id"; -import { IAdmin_ActivePage, IAdmin_ActiveChildId } from "./type_of_select_page"; +import { IAdmin_ActiveChildId, IAdmin_ActivePage } from "./type_of_select_page"; export async function adminNotifikasi_findRouterJob({ appId, notifikasiId, router, - activePage, - // onLoadCountNotif, - // onLoadDataNotifikasi , onChangeNavbar, }: { appId: string; notifikasiId: string; router: AppRouterInstance; - activePage: number; - // onLoadCountNotif: (val: any) => void; - // onLoadDataNotifikasi: (val: any) => void; onChangeNavbar: (val: { id: IAdmin_ActivePage; childId: IAdmin_ActiveChildId; @@ -35,14 +26,6 @@ export async function adminNotifikasi_findRouterJob({ }); if (udpateReadNotifikasi.status == 200) { - // const loadCountNotif = await adminNotifikasi_countNotifikasi(); - // onLoadCountNotif(loadCountNotif); - - // const loadListNotifikasi = await adminNotifikasi_getByUserId({ - // page: 1, - // }); - // onLoadDataNotifikasi(loadListNotifikasi); - const path = `/dev/admin/job/child/${check.statusName}`; if (check.statusName == "draft") { diff --git a/src/app_modules/admin/notifikasi/view_card_drawer.tsx b/src/app_modules/admin/notifikasi/view_card_drawer.tsx index b613f078..b76f6053 100644 --- a/src/app_modules/admin/notifikasi/view_card_drawer.tsx +++ b/src/app_modules/admin/notifikasi/view_card_drawer.tsx @@ -5,7 +5,7 @@ import { gs_adminVoting_triggerReview, ITypeStatusNotifikasi, } from "@/lib/global_state"; -import { AccentColor } from "@/app_modules/_global/color"; +import { AccentColor, MainColor } from "@/app_modules/_global/color"; import { ComponentGlobal_CardLoadingOverlay } from "@/app_modules/_global/component"; import { MODEL_NOTIFIKASI } from "@/app_modules/notifikasi/model/interface"; import { Badge, Card, Divider, Group, Stack, Text } from "@mantine/core"; @@ -263,11 +263,12 @@ export default function AdminNotifikasi_ViewCardDrawer({