fix notifikasi admin

2025-05-06 17:48:30 +08:00
parent b7f46f4c2a
commit 33b5b497fd
7 changed files with 103 additions and 96 deletions
--- 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);
      },
    },
    {
--- 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 (
    <>
      <AppShell
@@ -171,7 +170,7 @@ export function Admin_V3_MainLayout({
            color: AccentColor.white,
          },
          header: {
-            backgroundColor: AccentColor.darkblue,
+            backgroundColor: MainColor.darkblue,
            color: AccentColor.white,
          },
          close: {
@@ -202,7 +201,7 @@ export function Admin_V3_MainLayout({
            setActiveChildId(val.childId);
          }}
          onToggleNavbar={(val: any) => {
-            handlersDrawer.close
+            val === false && handlersDrawer.close();
          }}
        />
        {/* <ComponentAdmin_UIDrawerNotifikasi
--- a/src/app_modules/admin/_components_v3/notifikasi/comp_card_notifikasi.tsx
+++ b/src/app_modules/admin/_components_v3/notifikasi/comp_card_notifikasi.tsx
@@ -1,26 +1,27 @@
+import { AccentColor } from "@/app_modules/_global/color";
+import { ComponentGlobal_CardLoadingOverlay } from "@/app_modules/_global/component";
+import { MODEL_NOTIFIKASI } from "@/app_modules/notifikasi/model/interface";
 import {
  gs_adminDonasi_triggerReview,
  gs_adminEvent_triggerReview,
  gs_adminJob_triggerReview,
-  gs_adminVoting_triggerReview,
-  ITypeStatusNotifikasi,
+  gs_adminVoting_triggerReview
 } from "@/lib/global_state";
-import { AccentColor } from "@/app_modules/_global/color";
-import { ComponentGlobal_CardLoadingOverlay } from "@/app_modules/_global/component";
-import { MODEL_NOTIFIKASI } from "@/app_modules/notifikasi/model/interface";
+import { clientLogger } from "@/util/clientLogger";
 import { Badge, Card, Divider, Group, Stack, Text } from "@mantine/core";
 import { IconCheck, IconChecks, IconSpeakerphone } from "@tabler/icons-react";
 import { useAtom } from "jotai";
-import { useRouter } from "next/navigation";
-import { useState } from "react";
-import { clientLogger } from "@/util/clientLogger";
 import moment from "moment";
 import "moment/locale/id";
-import {
-  IAdmin_ActivePage,
-  IAdmin_ActiveChildId,
-} from "../../notifikasi/route_setting/type_of_select_page";
+import { useRouter } from "next/navigation";
+import { useState } from "react";
+import { ComponentAdminGlobal_NotifikasiPeringatan } from "../../_admin_global/admin_notifikasi/notifikasi_peringatan";
+import adminNotifikasi_findRouterForum from "../../notifikasi/route_setting/forum";
 import { adminNotifikasi_findRouterJob } from "../../notifikasi/route_setting/job";
+import {
+  IAdmin_ActiveChildId,
+  IAdmin_ActivePage,
+} from "../../notifikasi/route_setting/type_of_select_page";

 export default function Admin_V3_ComponentCardNotifikasi({
  data,
@@ -70,13 +71,6 @@ export default function Admin_V3_ComponentCardNotifikasi({
          appId: data.appId,
          notifikasiId: data.id,
          router: router,
-          activePage: activePage,
-          // onLoadCountNotif(val) {
-          //   onLoadCountNotif(val);
-          // },
-          // onLoadDataNotifikasi(val) {
-          //   onLoadDataNotifikasi(val);
-          // },
          onChangeNavbar(val) {
            onChangeNavbar({
              id: val.id,
@@ -96,6 +90,30 @@ export default function Admin_V3_ComponentCardNotifikasi({
      }
      // ========================== JOB ========================== //

+      // ========================== FORUM ==============================//
+
+      if (data.kategoriApp === "FORUM") {
+        setDataId(data.id);
+
+        const checkForum = await adminNotifikasi_findRouterForum({
+          data: data,
+          router: router,
+          onChangeNavbar(val) {
+            onChangeNavbar(val);
+          },
+        });
+
+        if (checkForum !== "") {
+          router.push(checkForum);
+          setDataId("");
+          setVisible(false);
+          onToggleNavbar(false);
+        } else {
+          ComponentAdminGlobal_NotifikasiPeringatan("Gagal memuat forum");
+        }
+      }
+      // ========================== FORUM ==============================//
+
      // ========================== EVENT ========================== //

      // if (data.kategoriApp == "EVENT") {
@@ -236,18 +254,7 @@ export default function Admin_V3_ComponentCardNotifikasi({
      //   return;
      // }

-      // // FORUM
-      // e?.kategoriApp === "FORUM" &&
-      //   adminNotifikasi_findRouterForum({
-      //     data: e,
-      //     router: router,
-      //     onChangeNavbar(val) {
-      //       onChangeNavbar(val);
-      //     },
-      //     onToggleNavbar(val) {
-      //       onToggleNavbar(val);
-      //     },
-      //   });
+      // ========================== INVESTASI ========================== //
    } catch (error) {
      clientLogger.error("Error notifikasi function", error);
    } finally {
@@ -260,9 +267,10 @@ export default function Admin_V3_ComponentCardNotifikasi({
      <Card
        style={{
          transition: "0.5s",
+          cursor: "pointer",
        }}
        mb={"15px"}
-        c={"white"}
+        c={data.isRead ? "gray" : "white"}
        key={data.id}
        bg={data.isRead ? AccentColor.blackgray : AccentColor.darkblue}
        sx={{
@@ -306,9 +314,9 @@ export default function Admin_V3_ComponentCardNotifikasi({
            <Text lineClamp={2} fw={"bold"} fz={"xs"}>
              {data.title}
            </Text>
-            <Text lineClamp={2} fz={"xs"}>
+            {/* <Text lineClamp={2} fz={"xs"}>
              {data.pesan}
-            </Text>
+            </Text> */}
          </Stack>
        </Card.Section>
        <Card.Section p={"sm"}>
--- 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 (
    <>
      <Stack pt={"sm"} pb={"xl"}>
-        <Group>
+        <Group position="right">
          <Button
+          size="xs"
+            bg={MainColor.yellow}
+            color="yellow"
+            c={"black"}
            radius={"xl"}
            onClick={() => {
              handleUpdateReadAll();
@@ -176,6 +180,7 @@ export function Admin_V3_ViewDrawerNotifikasi({
            Tandai belum baca
          </Button>
        </Group>
+        <Divider color={MainColor.white}/>

        {_.isEmpty(data) ? (
          <Center>