diff --git a/src/app/dev/(user)/job/create/layout.tsx b/src/app/dev/(user)/job/create/layout.tsx index e8e52d98..9272a8cd 100644 --- a/src/app/dev/(user)/job/create/layout.tsx +++ b/src/app/dev/(user)/job/create/layout.tsx @@ -1,11 +1,7 @@ import { LayoutJob_Create } from "@/app_modules/job"; import React from "react"; -export default async function Layout({ - children, -}: { - children: React.ReactNode; -}) { +export default function Layout({ children }: { children: React.ReactNode }) { return ( <> {children} diff --git a/src/app/dev/(user)/job/create/page.tsx b/src/app/dev/(user)/job/create/page.tsx index aac0feab..78a6d357 100644 --- a/src/app/dev/(user)/job/create/page.tsx +++ b/src/app/dev/(user)/job/create/page.tsx @@ -1,12 +1,9 @@ -import { funGetUserIdByToken } from "@/app_modules/_global/fun/get"; import { Job_Create } from "@/app_modules/job"; -export default async function Page() { - const userLoginId = await funGetUserIdByToken(); - +export default function Page() { return ( <> - + ); } diff --git a/src/app/dev/(user)/job/detail/arsip/[id]/layout.tsx b/src/app/dev/(user)/job/detail/arsip/[id]/layout.tsx index 835b852d..9ea9ae3f 100644 --- a/src/app/dev/(user)/job/detail/arsip/[id]/layout.tsx +++ b/src/app/dev/(user)/job/detail/arsip/[id]/layout.tsx @@ -1,11 +1,7 @@ import { LayoutJob_DetailArsip } from "@/app_modules/job"; import React from "react"; -export default async function Layout({ - children, -}: { - children: React.ReactNode; -}) { +export default function Layout({ children }: { children: React.ReactNode }) { return ( <> {children} diff --git a/src/app/dev/(user)/job/detail/arsip/[id]/page.tsx b/src/app/dev/(user)/job/detail/arsip/[id]/page.tsx index 455d6a9e..44944aac 100644 --- a/src/app/dev/(user)/job/detail/arsip/[id]/page.tsx +++ b/src/app/dev/(user)/job/detail/arsip/[id]/page.tsx @@ -1,6 +1,6 @@ import { Job_DetailArsip } from "@/app_modules/job"; -export default async function Page() { +export default function Page() { return ( <> diff --git a/src/app/dev/(user)/job/detail/draft/[id]/layout.tsx b/src/app/dev/(user)/job/detail/draft/[id]/layout.tsx index 27205e01..0f48d9cb 100644 --- a/src/app/dev/(user)/job/detail/draft/[id]/layout.tsx +++ b/src/app/dev/(user)/job/detail/draft/[id]/layout.tsx @@ -1,17 +1,14 @@ import { LayoutJob_DetailDraft } from "@/app_modules/job"; import React from "react"; -export default async function Layout({ +export default function Layout({ children, - params }: { children: React.ReactNode; - params: {id: string} }) { - let jobId = params.id return ( <> - {children} + {children} ); } diff --git a/src/app/dev/(user)/job/detail/draft/[id]/page.tsx b/src/app/dev/(user)/job/detail/draft/[id]/page.tsx index c5445f62..9a3680f7 100644 --- a/src/app/dev/(user)/job/detail/draft/[id]/page.tsx +++ b/src/app/dev/(user)/job/detail/draft/[id]/page.tsx @@ -1,11 +1,9 @@ import Job_DetailDraft from "@/app_modules/job/detail/draft/view"; - -export default async function Page() { - +export default function Page() { return ( <> - + ); } diff --git a/src/app/dev/(user)/job/detail/main/[id]/layout.tsx b/src/app/dev/(user)/job/detail/main/[id]/layout.tsx index 4e757aed..0f2012dd 100644 --- a/src/app/dev/(user)/job/detail/main/[id]/layout.tsx +++ b/src/app/dev/(user)/job/detail/main/[id]/layout.tsx @@ -1,7 +1,7 @@ import { LayoutJob_MainDetail } from "@/app_modules/job"; import React from "react"; -export default async function Layout({ +export default function Layout({ children, }: { children: React.ReactNode; diff --git a/src/app/dev/(user)/job/detail/main/[id]/page.tsx b/src/app/dev/(user)/job/detail/main/[id]/page.tsx index f8234a83..40799780 100644 --- a/src/app/dev/(user)/job/detail/main/[id]/page.tsx +++ b/src/app/dev/(user)/job/detail/main/[id]/page.tsx @@ -1,7 +1,6 @@ import { Job_MainDetail } from "@/app_modules/job"; -export default async function Page() { - +export default function Page() { return ( <> diff --git a/src/app/dev/(user)/job/detail/publish/[id]/layout.tsx b/src/app/dev/(user)/job/detail/publish/[id]/layout.tsx index 204d05d8..8077d8be 100644 --- a/src/app/dev/(user)/job/detail/publish/[id]/layout.tsx +++ b/src/app/dev/(user)/job/detail/publish/[id]/layout.tsx @@ -1,7 +1,7 @@ import { LayoutJob_DetailPublish } from "@/app_modules/job"; import React from "react"; -export default async function Layout({ +export default function Layout({ children, }: { children: React.ReactNode; diff --git a/src/app/dev/(user)/job/detail/publish/[id]/page.tsx b/src/app/dev/(user)/job/detail/publish/[id]/page.tsx index 54179745..eab8c78b 100644 --- a/src/app/dev/(user)/job/detail/publish/[id]/page.tsx +++ b/src/app/dev/(user)/job/detail/publish/[id]/page.tsx @@ -1,6 +1,6 @@ import { Job_DetailPublish } from "@/app_modules/job"; -export default async function Page() { +export default function Page() { return ( <> diff --git a/src/app/dev/(user)/job/detail/reject/[id]/layout.tsx b/src/app/dev/(user)/job/detail/reject/[id]/layout.tsx index f7ed9999..0840e170 100644 --- a/src/app/dev/(user)/job/detail/reject/[id]/layout.tsx +++ b/src/app/dev/(user)/job/detail/reject/[id]/layout.tsx @@ -1,7 +1,7 @@ import { LayoutJob_DetailReject } from "@/app_modules/job"; import React from "react"; -export default async function Layout({ +export default function Layout({ children, }: { children: React.ReactNode; diff --git a/src/app/dev/(user)/job/detail/reject/[id]/page.tsx b/src/app/dev/(user)/job/detail/reject/[id]/page.tsx index 1152ebe9..149f146d 100644 --- a/src/app/dev/(user)/job/detail/reject/[id]/page.tsx +++ b/src/app/dev/(user)/job/detail/reject/[id]/page.tsx @@ -1,11 +1,9 @@ - import Job_DetailReject from "@/app_modules/job/detail/reject/view"; -export default async function Page() { - +export default function Page() { return ( <> - + ); } diff --git a/src/app/dev/(user)/job/detail/review/[id]/layout.tsx b/src/app/dev/(user)/job/detail/review/[id]/layout.tsx index ad8216c2..f7791c42 100644 --- a/src/app/dev/(user)/job/detail/review/[id]/layout.tsx +++ b/src/app/dev/(user)/job/detail/review/[id]/layout.tsx @@ -1,7 +1,7 @@ import { LayoutJob_DetailReview } from "@/app_modules/job"; import React from "react"; -export default async function Layout({ +export default function Layout({ children, }: { children: React.ReactNode; diff --git a/src/app/dev/(user)/job/detail/review/[id]/page.tsx b/src/app/dev/(user)/job/detail/review/[id]/page.tsx index 7578351a..aa2b66b3 100644 --- a/src/app/dev/(user)/job/detail/review/[id]/page.tsx +++ b/src/app/dev/(user)/job/detail/review/[id]/page.tsx @@ -1,6 +1,6 @@ import Job_DetailReview from "@/app_modules/job/detail/review/view"; -export default async function Page() { +export default function Page() { return ( <> diff --git a/src/app/dev/(user)/job/edit/[id]/layout.tsx b/src/app/dev/(user)/job/edit/[id]/layout.tsx index f2024656..719cd2e0 100644 --- a/src/app/dev/(user)/job/edit/[id]/layout.tsx +++ b/src/app/dev/(user)/job/edit/[id]/layout.tsx @@ -1,11 +1,7 @@ import { LayoutJob_Edit } from "@/app_modules/job"; import React from "react"; -export default async function Layout({ - children, -}: { - children: React.ReactNode; -}) { +export default function Layout({ children }: { children: React.ReactNode }) { return ( <> {children} diff --git a/src/app/dev/(user)/job/edit/[id]/page.tsx b/src/app/dev/(user)/job/edit/[id]/page.tsx index 994e52d5..e4d5e95d 100644 --- a/src/app/dev/(user)/job/edit/[id]/page.tsx +++ b/src/app/dev/(user)/job/edit/[id]/page.tsx @@ -1,8 +1,6 @@ import { Job_Edit } from "@/app_modules/job"; -import { job_getOneById } from "@/app_modules/job/fun/get/get_one_by_id"; - -export default async function Page() { +export default function Page() { return ( <> diff --git a/src/app/dev/(user)/job/main/arsip/page.tsx b/src/app/dev/(user)/job/main/arsip/page.tsx index 65cbc583..fe90c783 100644 --- a/src/app/dev/(user)/job/main/arsip/page.tsx +++ b/src/app/dev/(user)/job/main/arsip/page.tsx @@ -1,6 +1,6 @@ import { Job_Arsip } from "@/app_modules/job"; -export default async function Page() { +export default function Page() { return ( <> diff --git a/src/app/dev/(user)/job/main/beranda/page.tsx b/src/app/dev/(user)/job/main/beranda/page.tsx index c8cf14d0..7a2bd101 100644 --- a/src/app/dev/(user)/job/main/beranda/page.tsx +++ b/src/app/dev/(user)/job/main/beranda/page.tsx @@ -1,6 +1,6 @@ import { Job_ViewBeranda } from "@/app_modules/job"; -export default async function Page() { +export default function Page() { return ( <> diff --git a/src/app/dev/(user)/job/main/layout.tsx b/src/app/dev/(user)/job/main/layout.tsx index 1d810b6a..d9815394 100644 --- a/src/app/dev/(user)/job/main/layout.tsx +++ b/src/app/dev/(user)/job/main/layout.tsx @@ -1,8 +1,7 @@ -import { LayoutJob_Main } from "@/app_modules/job"; import NewLayoutJob_Main from "@/app_modules/job/main/new_layout"; import React from "react"; -export default async function Layout({ +export default function Layout({ children, }: { children: React.ReactNode; diff --git a/src/app/dev/(user)/job/main/status/[id]/page.tsx b/src/app/dev/(user)/job/main/status/[id]/page.tsx index 7e45000b..3033a4e5 100644 --- a/src/app/dev/(user)/job/main/status/[id]/page.tsx +++ b/src/app/dev/(user)/job/main/status/[id]/page.tsx @@ -1,6 +1,6 @@ import { Job_Status } from "@/app_modules/job"; -export default async function Page() { +export default function Page() { return ( <> diff --git a/src/app/dev/(user)/job/splash/page.tsx b/src/app/dev/(user)/job/splash/page.tsx index 9e3d7f07..124f2255 100644 --- a/src/app/dev/(user)/job/splash/page.tsx +++ b/src/app/dev/(user)/job/splash/page.tsx @@ -1,6 +1,6 @@ import { Job_ViewSplash } from "@/app_modules/job"; -export default async function Page() { +export default function Page() { return ( <> diff --git a/src/app_modules/job/component/button/comp_button_save_create.tsx b/src/app_modules/job/component/button/comp_button_save_create.tsx index e06985fe..aab19fe7 100644 --- a/src/app_modules/job/component/button/comp_button_save_create.tsx +++ b/src/app_modules/job/component/button/comp_button_save_create.tsx @@ -1,8 +1,5 @@ "use client"; -import { DIRECTORY_ID } from "@/lib"; -import { IRealtimeData } from "@/lib/global_state"; -import { RouterJob } from "@/lib/router_hipmi/router_job"; import { AccentColor, MainColor } from "@/app_modules/_global/color"; import { funGlobal_UploadToStorage } from "@/app_modules/_global/fun"; import { @@ -11,6 +8,9 @@ import { ComponentGlobal_NotifikasiPeringatan, } from "@/app_modules/_global/notif_global"; import { notifikasiToAdmin_funCreate } from "@/app_modules/notifikasi/fun"; +import { DIRECTORY_ID } from "@/lib"; +import { IRealtimeData } from "@/lib/global_state"; +import { RouterJob } from "@/lib/router_hipmi/router_job"; import { clientLogger } from "@/util/clientLogger"; import { Button } from "@mantine/core"; import { useAtom } from "jotai"; @@ -20,13 +20,6 @@ import { WibuRealtime } from "wibu-pkg"; import { job_funCreateNoFile, job_funCreateWithFile } from "../../fun"; import { gs_job_hot_menu } from "../../global_state"; import { MODEL_JOB } from "../../model/interface"; -import { apiCreatedJob } from "../../lib/api_fetch_job"; -import { - apiCreatedNotificationToAdmin, - apiGetSeasonUserId, -} from "@/app_modules/_global/lib/api_fetch_global"; -import { useShallowEffect } from "@mantine/hooks"; -import { apiGetUserId } from "@/app_modules/_global/lib/api_user"; function Job_ComponentButtonSaveCreate({ value, @@ -35,13 +28,18 @@ function Job_ComponentButtonSaveCreate({ }: { value: MODEL_JOB; file: File; - userLoginId: string; + userLoginId: string | null; }) { const router = useRouter(); const [isLoading, setIsLoading] = useState(false); const [hotMenu, setHotMenu] = useAtom(gs_job_hot_menu); async function onCreate() { + if (!userLoginId) { + ComponentGlobal_NotifikasiGagal("User tidak ditemukan"); + return; + } + try { setIsLoading(true); if (file === null) { diff --git a/src/app_modules/job/create/view.tsx b/src/app_modules/job/create/view.tsx index bd52ca7c..b7536f94 100644 --- a/src/app_modules/job/create/view.tsx +++ b/src/app_modules/job/create/view.tsx @@ -26,10 +26,13 @@ import { ComponentGlobal_CardStyles, ComponentGlobal_InputCountDown, } from "@/app_modules/_global/component"; +import { apiNewGetUserIdByToken } from "@/app_modules/_global/lib/api_fetch_global"; +import CustomSkeleton from "@/app_modules/components/CustomSkeleton"; +import { useShallowEffect } from "@mantine/hooks"; import { Job_ComponentButtonSaveCreate } from "../component"; import { defaultDeskripsi, defaultSyarat } from "../component/default_value"; -export default function Job_Create({userLoginId}: {userLoginId: string}) { +export default function Job_Create() { const [value, setValue] = useState({ title: "", content: "", @@ -37,10 +40,28 @@ export default function Job_Create({userLoginId}: {userLoginId: string}) { }); const [file, setFile] = useState(null); const [img, setImg] = useState(); + const [userLoginId, setUserLoginId] = useState(null); - // useShallowEffect(() => { - // if (window && window.document) setReload(true); - // }, []); + useShallowEffect(() => { + handleGetUserLoginId(); + }, []); + + async function handleGetUserLoginId() { + try { + const response = await apiNewGetUserIdByToken(); + if (response.success) { + setUserLoginId(response.userId); + } else { + setUserLoginId(null); + } + } catch (error) { + setUserLoginId(null); + } + } + + if (!userLoginId) { + return ; + } return ( @@ -175,7 +196,7 @@ export default function Job_Create({userLoginId}: {userLoginId: string}) { diff --git a/src/app_modules/job/detail/draft/layout.tsx b/src/app_modules/job/detail/draft/layout.tsx index 339f9d84..72ff3262 100644 --- a/src/app_modules/job/detail/draft/layout.tsx +++ b/src/app_modules/job/detail/draft/layout.tsx @@ -10,15 +10,15 @@ import { RouterJob } from "@/lib/router_hipmi/router_job"; import { ActionIcon } from "@mantine/core"; import { useDisclosure } from "@mantine/hooks"; import { IconDotsVertical, IconEdit } from "@tabler/icons-react"; +import { useParams } from "next/navigation"; import React from "react"; export default function LayoutJob_DetailDraft({ children, - jobId, }: { children: React.ReactNode; - jobId: string; }) { + const { id } = useParams(); const [opened, { open, close }] = useDisclosure(); const listComponent = [ @@ -26,28 +26,12 @@ export default function LayoutJob_DetailDraft({ id: "1", name: "Edit Job", icon: , - path: RouterJob.edit + jobId, + path: RouterJob.edit + id, }, ]; return ( <> - {/* open()}> - - - } - // routerRight={} - /> - } - > - {children} - */} - - {!data ? ( + {/* {!data ? (
) : ( - )} + )} */}
);