diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62e0291c..4cde977b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.2.26](https://github.com/bipproduction/hipmi/compare/v1.2.25...v1.2.26) (2024-12-12)
+
+## [1.2.25](https://github.com/bipproduction/hipmi/compare/v1.2.24...v1.2.25) (2024-12-12)
+
+## [1.2.24](https://github.com/bipproduction/hipmi/compare/v1.2.23...v1.2.24) (2024-12-11)
+
+
+### Bug Fixes
+
+* drawer katalog ([eab293d](https://github.com/bipproduction/hipmi/commit/eab293dd35a6f061cfa4675679de1ce68f506c3c))
+* loading button tambah portofolio ([8823a01](https://github.com/bipproduction/hipmi/commit/8823a01b067928cbeea195402f2bb454df8e8bea))
+* pencegahan error ([afe8014](https://github.com/bipproduction/hipmi/commit/afe8014cc8b4ab7266f3c52918a6bc82bb62bc58))
+
 ## [1.2.23](https://github.com/bipproduction/hipmi/compare/v1.2.22...v1.2.23) (2024-12-11)
 
 ## [1.2.22](https://github.com/bipproduction/hipmi/compare/v1.2.21...v1.2.22) (2024-12-10)
diff --git a/package.json b/package.json
index 68de6a42..5813c14a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hipmi",
-  "version": "1.2.23",
+  "version": "1.2.26",
   "private": true,
   "prisma": {
     "seed": "npx tsx prisma/seed.ts --yes"
diff --git a/public/aset/investasi/logo-crowd-panjang-new.png b/public/aset/investasi/logo-crowd-panjang-new.png
new file mode 100644
index 00000000..5e17ee4e
Binary files /dev/null and b/public/aset/investasi/logo-crowd-panjang-new.png differ
diff --git a/src/app/api/job/get-all/route.ts b/src/app/api/job/get-all/route.ts
new file mode 100644
index 00000000..21db076c
--- /dev/null
+++ b/src/app/api/job/get-all/route.ts
@@ -0,0 +1,16 @@
+import { job_getAllListPublish } from "@/app_modules/job/fun/get/get_all_publish";
+import _ from "lodash";
+import { NextResponse } from "next/server";
+
+export async function GET(params: Request) {
+  const { searchParams } = new URL(params.url);
+  const page = searchParams.get("page");
+  const search = searchParams.get("search");
+
+  const data = await job_getAllListPublish({
+    page: _.toNumber(page),
+    search: search as string,
+  });
+
+  return NextResponse.json({ data });
+}
diff --git a/src/app/api/new/donasi/route.ts b/src/app/api/new/donasi/route.ts
new file mode 100644
index 00000000..2782e7de
--- /dev/null
+++ b/src/app/api/new/donasi/route.ts
@@ -0,0 +1,75 @@
+import { prisma } from "@/app/lib";
+import { funGetUserIdByToken } from "@/app_modules/_global/fun/get";
+import _ from "lodash";
+import { NextResponse } from "next/server";
+export const dynamic = "force-dynamic";
+
+
+// GET ALL DATA DONASI
+export async function GET(request: Request) {
+   try {
+      let dataFix
+      const { searchParams } = new URL(request.url)
+      const kategori = searchParams.get("cat")
+      const status = searchParams.get("status")
+      const page = searchParams.get("page")
+      const dataSkip = Number(page) * 5 - 5;
+
+      if (kategori == "beranda") {
+         const data = await prisma.donasi.findMany({
+            take: 5,
+            skip: dataSkip,
+            orderBy: {
+               publishTime: "desc",
+            },
+            where: {
+               donasiMaster_StatusDonasiId: "1",
+               active: true,
+            },
+            select: {
+               id: true,
+               imageId: true,
+               title: true,
+               publishTime: true,
+               progres: true,
+               terkumpul: true,
+               DonasiMaster_Durasi: {
+                  select: {
+                     name: true
+                  }
+               },
+
+            }
+         });
+
+         dataFix = data.map((v: any) => ({
+            ..._.omit(v, ["DonasiMaster_Durasi"]),
+            nameDonasiDurasi: v.DonasiMaster_Durasi.name
+         }))
+      } else {
+         const userLoginId = await funGetUserIdByToken()
+         if (userLoginId == null) {
+            return NextResponse.json({ success: false, message: "Gagal mendapatkan data, user id tidak ada" }, { status: 500 });
+         }
+
+         dataFix = await prisma.donasi.findMany({
+            take: 5,
+            skip: dataSkip,
+            where: {
+               authorId: userLoginId,
+               donasiMaster_StatusDonasiId: status,
+            },
+            orderBy: {
+               updatedAt: "desc",
+            },
+         });
+      }
+
+      return NextResponse.json({ success: true, message: "Berhasil mendapatkan data", data: dataFix }, { status: 200 });
+
+   }
+   catch (error) {
+      console.error(error);
+      return NextResponse.json({ success: false, message: "Gagal mendapatkan data, coba lagi nanti ", reason: (error as Error).message, }, { status: 500 });
+   }
+}
\ No newline at end of file
diff --git a/src/app/dev/donasi/main/beranda/page.tsx b/src/app/dev/donasi/main/beranda/page.tsx
index 21e01bd7..08d64509 100644
--- a/src/app/dev/donasi/main/beranda/page.tsx
+++ b/src/app/dev/donasi/main/beranda/page.tsx
@@ -1,8 +1,8 @@
-import { MainDonasi } from "@/app_modules/donasi";
-import { donasi_funGetAllPublish } from "@/app_modules/donasi/fun/get/get_list_beranda";
+import { MainDonasiNew } from "@/app_modules/donasi";
 
 export default async function Page() {
-  const listDonasi = await donasi_funGetAllPublish({ page: 1 });
-  // console.log(listDonasi)
-  return <MainDonasi listDonasi={listDonasi as any} />;
+  // const listDonasi = await donasi_funGetAllPublish({ page: 1 });
+
+  // return <MainDonasi listDonasi={listDonasi as any} />;
+  return <MainDonasiNew />
 }
diff --git a/src/app/dev/donasi/main/galang_dana/[id]/page.tsx b/src/app/dev/donasi/main/galang_dana/[id]/page.tsx
index e663633a..b4ff467c 100644
--- a/src/app/dev/donasi/main/galang_dana/[id]/page.tsx
+++ b/src/app/dev/donasi/main/galang_dana/[id]/page.tsx
@@ -1,4 +1,4 @@
-import { PostingDonasi } from "@/app_modules/donasi";
+import { GalangDanaDonasiNew, PostingDonasi } from "@/app_modules/donasi";
 import { donasi_funGetAllStatusById } from "@/app_modules/donasi/fun";
 import { donasi_funMasterStatusDonasi } from "@/app_modules/donasi/fun/master/get_status_donasi";
 
@@ -18,6 +18,10 @@ export default async function Page({ params }: { params: { id: string } }) {
         dataStatus={dataDonasi}
         listStatus={listStatus}
       />
+
+
+      {/* NANTI AJA LANJUT -- KEJAR TAYANG :) */}
+      {/* <GalangDanaDonasiNew listStatus={listStatus}/> */}
     </>
   );
 }
diff --git a/src/app/dev/job/main/beranda/page.tsx b/src/app/dev/job/main/beranda/page.tsx
index 1a4bce82..c8cf14d0 100644
--- a/src/app/dev/job/main/beranda/page.tsx
+++ b/src/app/dev/job/main/beranda/page.tsx
@@ -1,12 +1,9 @@
 import { Job_ViewBeranda } from "@/app_modules/job";
-import { job_getAllListPublish } from "@/app_modules/job/fun/get/get_all_publish";
 
 export default async function Page() {
-  const listJob = await job_getAllListPublish({ page: 1 });
-
   return (
     <>
-      <Job_ViewBeranda listJob={listJob as any} />
+      <Job_ViewBeranda />
     </>
   );
 }
diff --git a/src/app/dev/map/create/[id]/page.tsx b/src/app/dev/map/create/[id]/page.tsx
index 5a27ae8e..320e0b54 100644
--- a/src/app/dev/map/create/[id]/page.tsx
+++ b/src/app/dev/map/create/[id]/page.tsx
@@ -4,7 +4,7 @@ export default async function Page({ params }: { params: { id: string } }) {
   let portofolioId = params.id;
   return (
     <>
-      <Map_CreateNewPin  portofolioId={portofolioId}/>
+      <Map_CreateNewPin portofolioId={portofolioId} />
     </>
   );
 }
diff --git a/src/app/dev/profile/upload/foto/[id]/page.tsx b/src/app/dev/profile/upload/foto/[id]/page.tsx
index ea595412..b36862ab 100644
--- a/src/app/dev/profile/upload/foto/[id]/page.tsx
+++ b/src/app/dev/profile/upload/foto/[id]/page.tsx
@@ -1,11 +1,13 @@
 import { UploadFotoProfile } from "@/app_modules/katalog/profile";
 import { Profile_getOneById } from "@/app_modules/katalog/profile/fun/get/get_one_profile";
 
-export default async function Page({params}: {params: {id: string}}) {
-    let profileId = params.id
-    const dataProfile = await Profile_getOneById(profileId)
+export default async function Page({ params }: { params: { id: string } }) {
+  let profileId = params.id;
+  const dataProfile = await Profile_getOneById(profileId);
 
-    return <>
-    <UploadFotoProfile dataProfile={dataProfile as any}/>
+  return (
+    <>
+      <UploadFotoProfile dataProfile={dataProfile as any} />
     </>
-}
\ No newline at end of file
+  );
+}
diff --git a/src/app/lib/api_user_router/route_api_job.ts b/src/app/lib/api_user_router/route_api_job.ts
new file mode 100644
index 00000000..66234665
--- /dev/null
+++ b/src/app/lib/api_user_router/route_api_job.ts
@@ -0,0 +1,4 @@
+export const API_RouteJob = {
+  get_all: ({ page, search }: { page: number; search?: string }) =>
+    `/api/job/get-all?page=${page}&search=${search || ""}`,
+};
diff --git a/src/app/lib/prisma.ts b/src/app/lib/prisma.ts
index a0d1a749..25a08ef9 100644
--- a/src/app/lib/prisma.ts
+++ b/src/app/lib/prisma.ts
@@ -23,4 +23,6 @@ process.on('SIGINT', async () => {
   process.exit(0);
 });
 
+// console.log('==> Test prisma');
+
 export default prisma;
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 3a1f99a2..3dc0d2d4 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,11 +2,14 @@
 
 import { SplashScreen } from "@/app_modules/auth";
 import { useShallowEffect } from "@mantine/hooks";
+import { useRouter } from "next/navigation";
 
 export default function Page() {
+  const router = useRouter()
   useShallowEffect(() => {
     setTimeout(() => {
-      window.location.replace("/dev/home");
+      // window.location.replace("/dev/home");
+      router.replace("/dev/home");
     }, 1000);
   }, []);
 
diff --git a/src/app_modules/_global/button/comp_button_upload_photo.tsx b/src/app_modules/_global/button/comp_button_upload_photo.tsx
index 8cd0b16b..0a28c023 100644
--- a/src/app_modules/_global/button/comp_button_upload_photo.tsx
+++ b/src/app_modules/_global/button/comp_button_upload_photo.tsx
@@ -4,6 +4,7 @@ import { Button, FileButton } from "@mantine/core";
 import { IconCamera } from "@tabler/icons-react";
 import { MainColor } from "../color";
 import { MAX_SIZE } from "../lib";
+import { PemberitahuanMaksimalFile } from "../lib/max_size";
 import { ComponentGlobal_NotifikasiPeringatan } from "../notif_global";
 
 export function ComponentGlobal_ButtonUploadFileImage({
@@ -22,9 +23,7 @@ export function ComponentGlobal_ButtonUploadFileImage({
           );
 
           if (files.size > MAX_SIZE) {
-            ComponentGlobal_NotifikasiPeringatan(
-              "Ukuran file terlalu besar. Maksimal 2 MB."
-            );
+            ComponentGlobal_NotifikasiPeringatan(PemberitahuanMaksimalFile);
           } else {
             onSetFile(files);
             onSetImage(buffer);
diff --git a/src/app_modules/_global/component/comp_load_avatar.tsx b/src/app_modules/_global/component/comp_load_avatar.tsx
index 696160a3..ba034154 100644
--- a/src/app_modules/_global/component/comp_load_avatar.tsx
+++ b/src/app_modules/_global/component/comp_load_avatar.tsx
@@ -17,7 +17,7 @@ export function ComponentGlobal_LoaderAvatar({
 }) {
   const [isImage, setIsImage] = useState<boolean | null>(null);
 
-  const url = APIs.GET({ fileId: fileId, size: imageSize });
+  const url = APIs.GET({ fileId: fileId, size: imageSize ? imageSize : "400" });
 
   useShallowEffect(() => {
     onLoadImage();
diff --git a/src/app_modules/_global/component/comp_load_image.tsx b/src/app_modules/_global/component/comp_load_image.tsx
index 03bcbcdb..50a5709e 100644
--- a/src/app_modules/_global/component/comp_load_image.tsx
+++ b/src/app_modules/_global/component/comp_load_image.tsx
@@ -24,7 +24,7 @@ export function ComponentGlobal_LoadImage({
   const [isImage, setIsImage] = useState<boolean | null>(null);
   const [isLoading, setIsLoading] = useState(false);
 
-  const url = APIs.GET({ fileId: fileId });
+  const url = APIs.GET({ fileId: fileId, size: "500" });
 
   useShallowEffect(() => {
     onLoadImage();
diff --git a/src/app_modules/_global/component/comp_load_image_custom.tsx b/src/app_modules/_global/component/comp_load_image_custom.tsx
index 9cfd3b73..b71c0ead 100644
--- a/src/app_modules/_global/component/comp_load_image_custom.tsx
+++ b/src/app_modules/_global/component/comp_load_image_custom.tsx
@@ -15,7 +15,7 @@ export function ComponentGlobal_LoadImageCustom({
   height: number;
 }) {
   const [isImage, setIsImage] = useState<boolean | null>(null);
-  const url = APIs.GET({ fileId: fileId });
+  const url = APIs.GET({ fileId: fileId, size: "500" });
 
   useShallowEffect(() => {
     onLoadImage();
diff --git a/src/app_modules/_global/component/comp_load_image_landscape.tsx b/src/app_modules/_global/component/comp_load_image_landscape.tsx
index 0fc435b3..b121dc99 100644
--- a/src/app_modules/_global/component/comp_load_image_landscape.tsx
+++ b/src/app_modules/_global/component/comp_load_image_landscape.tsx
@@ -16,7 +16,7 @@ export function ComponentGlobal_LoadImageLandscape({
   const router = useRouter();
   const [isImage, setIsImage] = useState<boolean | null>(null);
   const [isLoading, setLoading] = useState(false);
-  const url = APIs.GET({ fileId: fileId });
+  const url = APIs.GET({ fileId: fileId, size: "500" });
 
   useShallowEffect(() => {
     onLoadImage();
diff --git a/src/app_modules/_global/component/comp_not_user_load_image.tsx b/src/app_modules/_global/component/comp_not_user_load_image.tsx
index c8b14574..6c6745fb 100644
--- a/src/app_modules/_global/component/comp_not_user_load_image.tsx
+++ b/src/app_modules/_global/component/comp_not_user_load_image.tsx
@@ -22,7 +22,7 @@ export function ComponentGlobal_NotUserLoadImage({
   const [isImage, setIsImage] = useState<boolean | null>(null);
   const [isLoading, setIsLoading] = useState(false);
 
-  const url = APIs.GET({ fileId: fileId });
+  const url = APIs.GET({ fileId: fileId , size: "500" });
 
   useShallowEffect(() => {
     onLoadImage();
diff --git a/src/app_modules/_global/fun/upload/fun_upload_to_storage.ts b/src/app_modules/_global/fun/upload/fun_upload_to_storage.ts
index 52155b9b..06ed38f4 100644
--- a/src/app_modules/_global/fun/upload/fun_upload_to_storage.ts
+++ b/src/app_modules/_global/fun/upload/fun_upload_to_storage.ts
@@ -1,6 +1,4 @@
-import { ServerEnv } from "@/app/lib/server_env";
 import { TokenStorage } from "@/app/lib/token";
-import { envs } from "@/lib/envs";
 
 export async function funGlobal_UploadToStorage({
   file,
@@ -24,9 +22,19 @@ export async function funGlobal_UploadToStorage({
     "text/plain",
   ];
 
-  if (!allowedMimeTypes.includes(file.type)) console.log("File tidak sesuai");
+  // if (!allowedMimeTypes.includes(file.type)) console.log("File tidak sesuai");
+  if (!allowedMimeTypes.includes(file.type)) {
+    console.error("File tidak sesuai");
+    return { success: false, message: "File type not allowed" };
+  }
 
-  if (file.size > 100 * 1024 * 1024) console.log("File terlalu besar");
+  if (file.size > 100 * 1024 * 1024) {
+    console.error("File terlalu besar");
+    return { success: false, message: "File size exceeds limit" };
+  }
+
+  const controller = new AbortController();
+  const timeoutId = setTimeout(() => controller.abort(), 30000); // Timeout 30 detik
 
   const formData = new FormData();
   formData.append("file", file);
@@ -39,19 +47,23 @@ export async function funGlobal_UploadToStorage({
       headers: {
         Authorization: `Bearer ${Env_WS_APIKEY}`,
       },
+      signal: controller.signal,
     });
 
-    const dataRes = await res.json();
+    clearTimeout(timeoutId); // Bersihkan timeout jika selesai tepat waktu
 
     if (res.ok) {
+      const dataRes = await res.json();
       return { success: true, data: dataRes.data };
     } else {
       const errorText = await res.text();
       console.error("Error:", errorText);
-      return { success: false, data: {} };
+      return { success: false, message: errorText };
     }
   } catch (error) {
+    clearTimeout(timeoutId); //
+
     console.error("Error:", error);
-    return { success: false, data: {} };
+    return { success: false, message: "An unexpected error occurred" };
   }
 }
diff --git a/src/app_modules/_global/lib/max_size.ts b/src/app_modules/_global/lib/max_size.ts
index d312cf45..5541c5c9 100644
--- a/src/app_modules/_global/lib/max_size.ts
+++ b/src/app_modules/_global/lib/max_size.ts
@@ -1,2 +1,3 @@
-// Maksimal ukuran file dalam byte (2 MB)
-export const MAX_SIZE = 2 * 1024 * 1024; // 2 MB
+// Maksimal ukuran file dalam byte (3 MB)
+export const MAX_SIZE = 3 * 1024 * 1024; // 3 MB
+export const PemberitahuanMaksimalFile = "Ukuran file terlalu besar. Maksimal 3 MB.";
\ No newline at end of file
diff --git a/src/app_modules/_global/ui/ui_not_user_image_preview.tsx b/src/app_modules/_global/ui/ui_not_user_image_preview.tsx
index 134c594f..0d7c400b 100644
--- a/src/app_modules/_global/ui/ui_not_user_image_preview.tsx
+++ b/src/app_modules/_global/ui/ui_not_user_image_preview.tsx
@@ -23,7 +23,7 @@ export function UIGlobal_NotUserImagePreview({ fileId }: { fileId: string }) {
   const router = useRouter();
   const [isImage, setIsImage] = useState<boolean | null>(null);
 
-  const url = APIs.GET({ fileId: fileId });
+  const url = APIs.GET({ fileId: fileId, size: "500" });
 
   useShallowEffect(() => {
     onLoadImage();
diff --git a/src/app_modules/admin/_admin_global/_component/comp_admin_load_image.tsx b/src/app_modules/admin/_admin_global/_component/comp_admin_load_image.tsx
index 1e74a89e..fca862c7 100644
--- a/src/app_modules/admin/_admin_global/_component/comp_admin_load_image.tsx
+++ b/src/app_modules/admin/_admin_global/_component/comp_admin_load_image.tsx
@@ -15,7 +15,7 @@ export function Admin_ComponentLoadImageLandscape({
   const router = useRouter();
   const [isImage, setIsImage] = useState<boolean | null>(null);
   const [isLoading, setLoading] = useState(false);
-  const url = APIs.GET({ fileId: fileId });
+  const url = APIs.GET({ fileId: fileId, size: "500" });
 
   useShallowEffect(() => {
     onLoadImage();
diff --git a/src/app_modules/admin/_admin_global/comp_preview_image_admin.tsx b/src/app_modules/admin/_admin_global/comp_preview_image_admin.tsx
index f75bdb40..55633e6c 100644
--- a/src/app_modules/admin/_admin_global/comp_preview_image_admin.tsx
+++ b/src/app_modules/admin/_admin_global/comp_preview_image_admin.tsx
@@ -13,7 +13,7 @@ export function Admin_ComponentPreviewImageAdmin({
 }) {
   const [isImage, setIsImage] = useState<boolean | null>(null);
 
-  const url = APIs.GET({ fileId: fileId });
+  const url = APIs.GET({ fileId: fileId, size: "500" });
 
   useShallowEffect(() => {
     onLoadImage();
diff --git a/src/app_modules/admin/map/ui/ui_map_view.tsx b/src/app_modules/admin/map/ui/ui_map_view.tsx
index 1b7ba919..9f7672c1 100644
--- a/src/app_modules/admin/map/ui/ui_map_view.tsx
+++ b/src/app_modules/admin/map/ui/ui_map_view.tsx
@@ -88,8 +88,8 @@ export function UiAdminMap_MapBoxView({
                     }}
                     src={
                       e.pinId === null
-                        ? APIs.GET({ fileId: e.Portofolio.logoId })
-                        : APIs.GET({ fileId: e.pinId })
+                        ? APIs.GET({ fileId: e.Portofolio.logoId, size: "300" })
+                        : APIs.GET({ fileId: e.pinId, size: "300" })
                     }
                   />
                 </Stack>
diff --git a/src/app_modules/auth/register/view.tsx b/src/app_modules/auth/register/view.tsx
index a8b6f985..79d4b59a 100644
--- a/src/app_modules/auth/register/view.tsx
+++ b/src/app_modules/auth/register/view.tsx
@@ -64,11 +64,6 @@ export default function Register() {
 
       const result = await res.json();
 
-      if (res.status === 400) {
-        setLoading(false);
-        ComponentGlobal_NotifikasiPeringatan(result.message);
-      }
-
       if (res.status === 200) {
         localStorage.removeItem("hipmi_auth_code_id");
         ComponentGlobal_NotifikasiBerhasil(result.message);
@@ -78,8 +73,15 @@ export default function Register() {
           nomor: data.nomor,
         });
       }
+
+      if (res.status === 400) {
+        ComponentGlobal_NotifikasiPeringatan(result.message);
+        return;
+      }
     } catch (error) {
       console.log(error);
+    } finally {
+      setLoading(false);
     }
   }
 
diff --git a/src/app_modules/crowd/main/view.tsx b/src/app_modules/crowd/main/view.tsx
index dc93ff28..026d2c06 100644
--- a/src/app_modules/crowd/main/view.tsx
+++ b/src/app_modules/crowd/main/view.tsx
@@ -32,7 +32,7 @@ export default function MainCrowd() {
           </AspectRatio> */}
           <Image
             alt="Logo"
-            src={"/aset/investasi/logo-crowd-panjang.png"}
+            src={"/aset/investasi/logo-crowd-panjang-new.png"}
             mah={"100%"}
             styles={{
               image: {
diff --git a/src/app_modules/donasi/component/card_view/card_publish_new.tsx b/src/app_modules/donasi/component/card_view/card_publish_new.tsx
new file mode 100644
index 00000000..ae9f6cb6
--- /dev/null
+++ b/src/app_modules/donasi/component/card_view/card_publish_new.tsx
@@ -0,0 +1,57 @@
+"use client";
+import { ComponentGlobal_CardLoadingOverlay, ComponentGlobal_CardStyles, ComponentGlobal_LoadImageCustom, } from "@/app_modules/_global/component";
+import { Grid, Progress, Stack, Text } from "@mantine/core";
+import { useRouter } from "next/navigation";
+import { useState } from "react";
+import ComponentDonasi_TampilanHitungMundur from "../tampilan_hitung_mundur";
+import TampilanRupiahDonasi from "../tampilan_rupiah";
+
+export default function ComponentDonasi_CardPublishNew({ data, path, }: { data: any; path: string; }) {
+  const router = useRouter();
+  const [visible, setVisible] = useState(false);
+  const [donasiId, setDonasiId] = useState("");
+
+  return (
+    <>
+      <ComponentGlobal_CardStyles
+        onClickHandler={() => {
+          setVisible(true);
+          setDonasiId(data.id);
+          router.push(path + `${data.id}`);
+        }}
+      >
+        <Stack>
+          <Grid>
+            <Grid.Col span={6}>
+              <ComponentGlobal_LoadImageCustom
+                fileId={data.imageId}
+                height={150}
+              />
+            </Grid.Col>
+            <Grid.Col span={6}>
+              <Stack spacing={"xs"}>
+                <Stack spacing={0}>
+                  <Text fz={"sm"} fw={"bold"} lineClamp={2}>
+                    {data.title}
+                  </Text>
+                  <ComponentDonasi_TampilanHitungMundur
+                    durasi={data?.nameDonasiDurasi}
+                    publishTime={data.publishTime}
+                    textSize={10}
+                  />
+                </Stack>
+                <Progress value={+data.progres} color="yellow" />
+                <Stack spacing={0}>
+                  <Text fz={"sm"}>Terkumpul</Text>
+                  <Text fz={"sm"} fw={"bold"} c={"orange"} truncate>
+                    <TampilanRupiahDonasi nominal={+data.terkumpul} />
+                  </Text>
+                </Stack>
+              </Stack>
+            </Grid.Col>
+          </Grid>
+        </Stack>
+      </ComponentGlobal_CardStyles>
+    </>
+  );
+}
diff --git a/src/app_modules/donasi/component/skeleton_donasi.tsx b/src/app_modules/donasi/component/skeleton_donasi.tsx
new file mode 100644
index 00000000..7c27f924
--- /dev/null
+++ b/src/app_modules/donasi/component/skeleton_donasi.tsx
@@ -0,0 +1,31 @@
+import { ComponentGlobal_CardStyles } from "@/app_modules/_global/component";
+import { Box, Grid, Group, Skeleton, Stack } from "@mantine/core";
+
+export default function SkeletonDonasi() {
+   return <>
+      <Box>
+         {[...Array(3)].map((_, index) => (
+            <ComponentGlobal_CardStyles key={index}>
+               <Grid>
+                  <Grid.Col span={6}>
+                     <Skeleton w={"100%"} height={100} radius="md" />
+                  </Grid.Col>
+                  <Grid.Col span={6}>
+                     <Box>
+                        {[...Array(4)].map((_, index) => (
+                           <Box key={index} py={5}>
+                              <Grid align="center">
+                                 <Grid.Col span={12}>
+                                    <Skeleton w={"100%"} h={15} />
+                                 </Grid.Col>
+                              </Grid>
+                           </Box>
+                        ))}
+                     </Box>
+                  </Grid.Col>
+               </Grid>
+            </ComponentGlobal_CardStyles>
+         ))}
+      </Box >
+   </>;
+}
\ No newline at end of file
diff --git a/src/app_modules/donasi/fun/get/fun_check_status.tsx b/src/app_modules/donasi/fun/get/fun_check_status.tsx
index 1b751153..2ff3fad7 100644
--- a/src/app_modules/donasi/fun/get/fun_check_status.tsx
+++ b/src/app_modules/donasi/fun/get/fun_check_status.tsx
@@ -9,7 +9,6 @@ export async function donasi_checkStatus({ id }: { id: string }) {
     },
   });
 
-  console.log(checkStatus?.donasiMaster_StatusDonasiId, "ini status nya")
 
   if (checkStatus?.donasiMaster_StatusDonasiId == "2") return true;
   return false;
diff --git a/src/app_modules/donasi/index.ts b/src/app_modules/donasi/index.ts
index e0c0ec64..62da8ec0 100644
--- a/src/app_modules/donasi/index.ts
+++ b/src/app_modules/donasi/index.ts
@@ -1,6 +1,8 @@
 import MainDonasi from "./main/beranda";
+import MainDonasiNew from "./main/beranda_new";
 import LayoutDonasi from "./main/layout";
 import GalangDanaDonasi from "./main/galang_dana/ui_galang_dana";
+import GalangDanaDonasiNew from "./main/galang_dana/ui_galang_dana_new";
 import DonasiSayaDonasi from "./main/donasi_saya";
 import CreateDonasi from "./create/create_donasi";
 import LayoutCreateDonasi from "./create/layout";
@@ -99,4 +101,6 @@ export {
   LayoutDonasi_CreateKabar,
   Donasi_EditRekening,
   LayoutDonasi_EditRekening,
+  MainDonasiNew,
+  GalangDanaDonasiNew,
 };
diff --git a/src/app_modules/donasi/lib/api_donasi.ts b/src/app_modules/donasi/lib/api_donasi.ts
new file mode 100644
index 00000000..36e2f5f6
--- /dev/null
+++ b/src/app_modules/donasi/lib/api_donasi.ts
@@ -0,0 +1,4 @@
+export const apiGetAllDonasi = async (path?: string) => {
+   const response = await fetch(`/api/new/donasi${(path) ? path : ''}`)
+   return await response.json().catch(() => null)
+}
\ No newline at end of file
diff --git a/src/app_modules/donasi/lib/type_donasi.ts b/src/app_modules/donasi/lib/type_donasi.ts
new file mode 100644
index 00000000..fabb23d5
--- /dev/null
+++ b/src/app_modules/donasi/lib/type_donasi.ts
@@ -0,0 +1,9 @@
+export interface IDataAllDonasi {
+   id: string
+   imageId: string
+   title: string
+   publishTime: Date
+   progres: string
+   terkumpul: string
+   nameDonasiDurasi: string
+}
\ No newline at end of file
diff --git a/src/app_modules/donasi/main/beranda_new.tsx b/src/app_modules/donasi/main/beranda_new.tsx
new file mode 100644
index 00000000..87f9a696
--- /dev/null
+++ b/src/app_modules/donasi/main/beranda_new.tsx
@@ -0,0 +1,135 @@
+"use client";
+import { gs_donasiTriggerBeranda } from "@/app/lib/global_state";
+import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi";
+import { AccentColor } from "@/app_modules/_global/color";
+import ComponentGlobal_CreateButton from "@/app_modules/_global/component/button_create";
+import ComponentGlobal_IsEmptyData from "@/app_modules/_global/component/is_empty_data";
+import ComponentGlobal_Loader from "@/app_modules/_global/component/loader";
+import { Affix, Box, Button, Center, rem } from "@mantine/core";
+import { useShallowEffect } from "@mantine/hooks";
+import { useAtom } from "jotai";
+import _ from "lodash";
+import { ScrollOnly } from "next-scroll-loader";
+import { useState } from "react";
+import ComponentDonasi_CardPublishNew from "../component/card_view/card_publish_new";
+import SkeletonDonasi from "../component/skeleton_donasi";
+import { apiGetAllDonasi } from "../lib/api_donasi";
+import { IDataAllDonasi } from "../lib/type_donasi";
+
+export default function MainDonasiNew() {
+   const [data, setData] = useState<IDataAllDonasi[]>([]);
+   const [activePage, setActivePage] = useState(1);
+   const [loading, setLoading] = useState(true)
+
+   // Realtime
+   const [isTriggerDonasiBeranda, setIsTriggerDonasiBeranda] = useAtom(
+      gs_donasiTriggerBeranda
+   );
+   const [isShowUpdate, setIsShowUpdate] = useState(false);
+   const [isLoading, setIsLoading] = useState(false);
+
+   useShallowEffect(() => {
+      if (isTriggerDonasiBeranda) {
+         setIsShowUpdate(true);
+      }
+   }, [isTriggerDonasiBeranda, setIsShowUpdate]);
+
+   async function onLoadData({ onPublish }: { onPublish: (val: any) => void }) {
+      setIsLoading(true);
+      const loadData = await apiGetAllDonasi(`?cat=beranda&page=1`)
+      onPublish(loadData);
+
+      setIsShowUpdate(false);
+      setIsTriggerDonasiBeranda(false);
+      setIsLoading(false);
+   }
+
+
+   async function getDataDonasi() {
+      try {
+         setLoading(true)
+         const response = await apiGetAllDonasi(`?cat=beranda&page=1`)
+         if (response.success) {
+            setData(response.data);
+         }
+      } catch (error) {
+         console.error(error);
+      } finally {
+         setLoading(false)
+      }
+   }
+
+
+   useShallowEffect(() => {
+      getDataDonasi()
+   }, []);
+
+   return (
+      <>
+         <Box>
+            {isShowUpdate && (
+               <Affix position={{ top: rem(100) }} w={"100%"}>
+                  <Center>
+                     <Button
+                        style={{
+                           transition: "0.5s",
+                           border: `1px solid ${AccentColor.skyblue}`,
+                        }}
+                        bg={AccentColor.blue}
+                        loaderPosition="center"
+                        loading={isLoading}
+                        radius={"xl"}
+                        opacity={0.8}
+                        onClick={() => {
+                           onLoadData({
+                              onPublish(val) {
+                                 setData(val);
+                              },
+                           });
+                        }}
+                     >
+                        Update beranda
+                     </Button>
+                  </Center>
+               </Affix>
+            )}
+
+            <ComponentGlobal_CreateButton path={RouterDonasi.create_donasi} />
+            {
+               loading
+                  ? <SkeletonDonasi />
+                  :
+                  _.isEmpty(data) ? (
+                     <ComponentGlobal_IsEmptyData />
+                  ) : (
+                     <ScrollOnly
+                        height="82vh"
+                        renderLoading={() => (
+                           <Center>
+                              <ComponentGlobal_Loader size={25} />
+                           </Center>
+                        )}
+                        data={data}
+                        setData={setData}
+                        moreData={async () => {
+                           const pageNew = activePage + 1
+                           const loadData = await apiGetAllDonasi(`?cat=beranda&page=${pageNew}`)
+
+                           setActivePage((val) => val + 1);
+
+                           return loadData;
+                        }}
+                     >
+                        {(item) => (
+                           <ComponentDonasi_CardPublishNew
+                              data={item as any}
+                              path={RouterDonasi.detail_main}
+                           />
+                        )}
+                     </ScrollOnly>
+                  )
+            }
+         </Box>
+      </>
+   );
+}
diff --git a/src/app_modules/donasi/main/galang_dana/ui_galang_dana_new.tsx b/src/app_modules/donasi/main/galang_dana/ui_galang_dana_new.tsx
new file mode 100644
index 00000000..dea0613a
--- /dev/null
+++ b/src/app_modules/donasi/main/galang_dana/ui_galang_dana_new.tsx
@@ -0,0 +1,69 @@
+"use client";
+import { RouterDonasi } from "@/app/lib/router_hipmi/router_donasi";
+import { AccentColor, MainColor, } from "@/app_modules/_global/color/color_pallet";
+import { MODEL_NEW_DEFAULT_MASTER } from "@/app_modules/model_global/interface";
+import { Stack, Tabs } from "@mantine/core";
+import { useParams, useRouter } from "next/navigation";
+
+export default function GalangDanaDonasiNew({listStatus,}: {listStatus: MODEL_NEW_DEFAULT_MASTER[]; }) {
+  const router = useRouter();
+  const param = useParams<{ id: string }>();
+
+  async function onChangeStatus({ statusId }: { statusId: string }) {
+    router.replace(RouterDonasi.status_galang_dana({ id: statusId }));
+  }
+
+  return (
+    <>
+      <Tabs
+        color="orange"
+        variant="pills"
+        radius="xl"
+        value={param.id}
+        onTabChange={(val: any) => {
+          onChangeStatus({ statusId: val });
+        }}
+        styles={{
+          tabsList: {
+            backgroundColor: MainColor.darkblue,
+            position: "sticky",
+            top: 0,
+            zIndex: 99,
+          },
+        }}
+      >
+        <Stack>
+          <Tabs.List grow>
+            {listStatus.map((e, i) => (
+              <Tabs.Tab
+                key={e.id}
+                value={e.id}
+                fw={"bold"}
+                c={"black"}
+                style={{
+                  transition: "0.5s",
+                  backgroundColor:
+                    param.id === e.id ? MainColor.yellow : "white",
+                  border:
+                    param.id === e.id
+                      ? `1px solid ${AccentColor.yellow}`
+                      : `1px solid white`,
+                }}
+              >
+                {e.name}
+              </Tabs.Tab>
+            ))}
+          </Tabs.List>
+
+          {/* {param.id == "1" && <PostingPublishDonasi listPublish={dataStatus} />}
+
+          {param.id == "2" && <PostingReviewDonasi listReview={dataStatus} />}
+
+          {param.id == "3" && <PostingDraftDonasi listDraft={dataStatus} />}
+
+          {param.id == "4" && <PostingRejectDonasi listReject={dataStatus} />} */}
+        </Stack>
+      </Tabs>
+    </>
+  );
+}
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 00a5e2e2..ccbe263c 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
@@ -33,92 +33,101 @@ function Job_ComponentButtonSaveCreate({
   const [hotMenu, setHotMenu] = useAtom(gs_job_hot_menu);
 
   async function onCreate() {
-    if (file === null) {
-      const createNoFile = await job_funCreateNoFile({
-        data: value,
-      });
-
-      if (createNoFile.status === 201) {
-        const dataNotifikasi: IRealtimeData = {
-          appId: createNoFile.data?.id as any,
-          status: createNoFile.data?.MasterStatus?.name as any,
-          userId: createNoFile.data?.authorId as any,
-          pesan: createNoFile.data?.title as any,
-          kategoriApp: "JOB",
-          title: "Job baru",
-        };
-
-        const notif = await notifikasiToAdmin_funCreate({
-          data: dataNotifikasi as any,
+    try {
+      setIsLoading(true);
+      if (file === null) {
+        const createNoFile = await job_funCreateNoFile({
+          data: value,
         });
 
-        if (notif.status === 201) {
-          WibuRealtime.setData({
-            type: "notification",
-            pushNotificationTo: "ADMIN",
+        if (createNoFile.status === 201) {
+          const dataNotifikasi: IRealtimeData = {
+            appId: createNoFile.data?.id as any,
+            status: createNoFile.data?.MasterStatus?.name as any,
+            userId: createNoFile.data?.authorId as any,
+            pesan: createNoFile.data?.title as any,
+            kategoriApp: "JOB",
+            title: "Job baru",
+          };
+
+          const notif = await notifikasiToAdmin_funCreate({
+            data: dataNotifikasi as any,
           });
 
-          WibuRealtime.setData({
-            type: "trigger",
-            pushNotificationTo: "ADMIN",
-            dataMessage: dataNotifikasi,
-          });
+          if (notif.status === 201) {
+            WibuRealtime.setData({
+              type: "notification",
+              pushNotificationTo: "ADMIN",
+            });
 
-          setHotMenu(2);
-          router.replace(RouterJob.status({ id: "2" }));
-          setIsLoading(true);
-          ComponentGlobal_NotifikasiBerhasil(createNoFile.message);
+            WibuRealtime.setData({
+              type: "trigger",
+              pushNotificationTo: "ADMIN",
+              dataMessage: dataNotifikasi,
+            });
+
+            setHotMenu(2);
+            router.replace(RouterJob.status({ id: "2" }));
+            ComponentGlobal_NotifikasiBerhasil(createNoFile.message);
+          }
+        } else {
+          ComponentGlobal_NotifikasiGagal(createNoFile.message);
         }
       } else {
-        ComponentGlobal_NotifikasiGagal(createNoFile.message);
+        const uploadFile = await funGlobal_UploadToStorage({
+          file: file,
+          dirId: DIRECTORY_ID.job_image,
+        });
+
+        if (!uploadFile.success) {
+          ComponentGlobal_NotifikasiPeringatan("Gagal upload gambar");
+          return;
+        }
+
+        const createWithFile = await job_funCreateWithFile({
+          data: value,
+          fileId: uploadFile.data.id,
+        });
+
+        if (createWithFile.status === 201) {
+          const dataNotifikasi: IRealtimeData = {
+            appId: createWithFile.data?.id as any,
+            status: createWithFile.data?.MasterStatus?.name as any,
+            userId: createWithFile.data?.authorId as any,
+            pesan: createWithFile.data?.title as any,
+            kategoriApp: "JOB",
+            title: "Job baru",
+          };
+
+          const notif = await notifikasiToAdmin_funCreate({
+            data: dataNotifikasi as any,
+          });
+
+          if (notif.status === 201) {
+            WibuRealtime.setData({
+              type: "notification",
+              pushNotificationTo: "ADMIN",
+            });
+
+            WibuRealtime.setData({
+              type: "trigger",
+              pushNotificationTo: "ADMIN",
+              dataMessage: dataNotifikasi,
+            });
+
+            setHotMenu(2);
+            router.replace(RouterJob.status({ id: "2" }));
+            ComponentGlobal_NotifikasiBerhasil(createWithFile.message);
+          }
+        } else {
+          ComponentGlobal_NotifikasiGagal(createWithFile.message);
+        }
       }
-    } else {
-      const uploadFile = await funGlobal_UploadToStorage({
-        file: file,
-        dirId: DIRECTORY_ID.job_image,
-      });
-
-      if (!uploadFile.success)
-        return ComponentGlobal_NotifikasiPeringatan("Gagal upload gambar");
-
-      const createWithFile = await job_funCreateWithFile({
-        data: value,
-        fileId: uploadFile.data.id,
-      });
-
-      if (createWithFile.status === 201) {
-        const dataNotifikasi: IRealtimeData = {
-          appId: createWithFile.data?.id as any,
-          status: createWithFile.data?.MasterStatus?.name as any,
-          userId: createWithFile.data?.authorId as any,
-          pesan: createWithFile.data?.title as any,
-          kategoriApp: "JOB",
-          title: "Job baru",
-        };
-
-        const notif = await notifikasiToAdmin_funCreate({
-          data: dataNotifikasi as any,
-        });
-
-        if (notif.status === 201) {
-          WibuRealtime.setData({
-            type: "notification",
-            pushNotificationTo: "ADMIN",
-          });
-
-          WibuRealtime.setData({
-            type: "trigger",
-            pushNotificationTo: "ADMIN",
-            dataMessage: dataNotifikasi,
-          });
-
-          setHotMenu(2);
-          router.replace(RouterJob.status({ id: "2" }));
-          setIsLoading(true);
-          ComponentGlobal_NotifikasiBerhasil(createWithFile.message);
-        }
-      } else {
-        ComponentGlobal_NotifikasiGagal(createWithFile.message);
+    } catch (error) {
+      console.log(error);
+    } finally {
+      if (window.location.pathname !== RouterJob.status({ id: "2" })) {
+        setIsLoading(false);
       }
     }
   }
diff --git a/src/app_modules/job/component/index.ts b/src/app_modules/job/component/index.ts
index 810f60b3..156a94cd 100644
--- a/src/app_modules/job/component/index.ts
+++ b/src/app_modules/job/component/index.ts
@@ -2,8 +2,10 @@ import Job_ComponentButtonSaveCreate from "./button/comp_button_save_create";
 import { Job_ComponentButtonUpdateBeranda } from "./button/comp_button_update_beranda";
 import { Job_ComponentButtonUpdateData } from "./button/comp_button_update_data";
 import { Job_ComponentBoxUploadImage } from "./detail/comp_box_upload_image";
+import Job_ComponentSkeletonBeranda from "./skeleton/comp_skeleton_beranda";
 
 export { Job_ComponentButtonSaveCreate };
 export { Job_ComponentBoxUploadImage };
 export { Job_ComponentButtonUpdateData as Job_ComponentButtonUpdate };
 export { Job_ComponentButtonUpdateBeranda };
+export { Job_ComponentSkeletonBeranda };
diff --git a/src/app_modules/job/component/skeleton/comp_skeleton_beranda.tsx b/src/app_modules/job/component/skeleton/comp_skeleton_beranda.tsx
new file mode 100644
index 00000000..7e773ed6
--- /dev/null
+++ b/src/app_modules/job/component/skeleton/comp_skeleton_beranda.tsx
@@ -0,0 +1,25 @@
+import { ComponentGlobal_CardStyles } from "@/app_modules/_global/component";
+import { Box, Center, Group, Skeleton, Stack } from "@mantine/core";
+
+export default function Job_ComponentSkeletonBeranda() {
+  return (
+    <>
+      <Box>
+        {Array.from(new Array(10)).map((e, i) => (
+          <ComponentGlobal_CardStyles key={i} marginBottom={"15px"}>
+            <Stack>
+              <Group position="left">
+                <Skeleton height={40} width={40} circle />
+                <Skeleton height={20} width={200} />
+              </Group>
+
+              <Center my={"md"}>
+                <Skeleton height={20} width={300} />
+              </Center>
+            </Stack>
+          </ComponentGlobal_CardStyles>
+        ))}
+      </Box>
+    </>
+  );
+}
diff --git a/src/app_modules/job/detail/main/view.tsx b/src/app_modules/job/detail/main/view.tsx
index a9e21aec..e2bcdf6d 100644
--- a/src/app_modules/job/detail/main/view.tsx
+++ b/src/app_modules/job/detail/main/view.tsx
@@ -24,19 +24,10 @@ function ButtonAction({ jobId }: { jobId: string }) {
   const [origin, setOrigin] = useState("");
 
   useShallowEffect(() => {
-    onLoadOrigin(setOrigin);
-    // if (typeof window !== "undefined") {
-    //   setOrigin(window.location.origin);
-    // }
-
-  }, [setOrigin]);
-
-  async function onLoadOrigin(setOrigin: any) {
-    const res = await fetch("/api/origin-url");
-    const result = await res.json();
-    console.log(result);
-    setOrigin(result.origin);
-  }
+    if (typeof window !== "undefined") {
+      setOrigin(window.location.origin);
+    }
+  }, []);
 
   return (
     <>
diff --git a/src/app_modules/job/main/beranda/ui_beranda.tsx b/src/app_modules/job/main/beranda/ui_beranda.tsx
index 6b0a8505..0783e9f7 100644
--- a/src/app_modules/job/main/beranda/ui_beranda.tsx
+++ b/src/app_modules/job/main/beranda/ui_beranda.tsx
@@ -4,20 +4,24 @@ import { gs_jobTiggerBeranda } from "@/app/lib/global_state";
 import { RouterJob } from "@/app/lib/router_hipmi/router_job";
 import ComponentGlobal_CreateButton from "@/app_modules/_global/component/button_create";
 import ComponentGlobal_IsEmptyData from "@/app_modules/_global/component/is_empty_data";
-import { Center, Loader, Stack, TextInput } from "@mantine/core";
+import { Box, Center, Loader, Stack, TextInput } from "@mantine/core";
 import { useShallowEffect } from "@mantine/hooks";
 import { IconSearch } from "@tabler/icons-react";
 import { useAtom } from "jotai";
 import _ from "lodash";
 import { ScrollOnly } from "next-scroll-loader";
-import { useEffect, useState } from "react";
+import { useState } from "react";
+import {
+  Job_ComponentButtonUpdateBeranda,
+  Job_ComponentSkeletonBeranda,
+} from "../../component";
 import ComponentJob_BerandaCardView from "../../component/beranda/card_view";
 import { job_getAllListPublish } from "../../fun/get/get_all_publish";
 import { MODEL_JOB } from "../../model/interface";
-import { Job_ComponentButtonUpdateBeranda } from "../../component";
+import { API_RouteJob } from "@/app/lib/api_user_router/route_api_job";
 
-export function Job_UiBeranda({ listData }: { listData: MODEL_JOB[] }) {
-  const [data, setData] = useState(listData);
+export function Job_UiBeranda() {
+  const [data, setData] = useState<MODEL_JOB[] | null>(null);
   const [activePage, setActivePage] = useState(1);
   const [isSearch, setIsSearch] = useState("");
 
@@ -26,19 +30,16 @@ export function Job_UiBeranda({ listData }: { listData: MODEL_JOB[] }) {
   const [isTriggerJob, setIsTriggerJob] = useAtom(gs_jobTiggerBeranda);
 
   useShallowEffect(() => {
-    onLoadNewData({
-      onLoad(val) {
-        setData(val);
-      },
-    });
-  }, [setData]);
+    if (isTriggerJob == true) {
+      setIsShowUpdate(true);
+    }
+  }, [isTriggerJob]);
 
   useShallowEffect(() => {
-    if (isTriggerJob) {
-      setIsShowUpdate(true);
-      // setIsTriggerJob(false);
-    }
-  }, [isTriggerJob, setIsShowUpdate]);
+    setIsTriggerJob(false);
+    setIsShowUpdate(false);
+    onLoadNewData();
+  }, []);
 
   async function onSearch(text: string) {
     setIsSearch(text);
@@ -50,9 +51,11 @@ export function Job_UiBeranda({ listData }: { listData: MODEL_JOB[] }) {
     setActivePage(1);
   }
 
-  async function onLoadNewData({ onLoad }: { onLoad: (val: any) => void }) {
-    const loadData = await job_getAllListPublish({ page: 1 });
-    onLoad(loadData);
+  async function onLoadNewData() {
+    const loadData = await fetch(API_RouteJob.get_all({ page: activePage }));
+    const res = await loadData.json();
+
+    setData(res.data);
   }
 
   return (
@@ -62,6 +65,7 @@ export function Job_UiBeranda({ listData }: { listData: MODEL_JOB[] }) {
           <Job_ComponentButtonUpdateBeranda
             onSetIsNewPost={(val) => {
               setIsShowUpdate(val);
+              setIsTriggerJob(val);
             }}
             onSetData={(val: any[]) => {
               setData(val);
@@ -85,7 +89,9 @@ export function Job_UiBeranda({ listData }: { listData: MODEL_JOB[] }) {
           }}
         />
 
-        {_.isEmpty(data) ? (
+        {_.isNull(data) ? (
+          <Job_ComponentSkeletonBeranda />
+        ) : _.isEmpty(data) ? (
           <ComponentGlobal_IsEmptyData />
         ) : (
           // --- Main component --- //
@@ -97,7 +103,7 @@ export function Job_UiBeranda({ listData }: { listData: MODEL_JOB[] }) {
               </Center>
             )}
             data={data}
-            setData={setData}
+            setData={setData as any}
             moreData={async () => {
               const loadData = await job_getAllListPublish({
                 page: activePage + 1,
diff --git a/src/app_modules/job/main/beranda/view_beranda.tsx b/src/app_modules/job/main/beranda/view_beranda.tsx
index c56f1feb..d6004905 100644
--- a/src/app_modules/job/main/beranda/view_beranda.tsx
+++ b/src/app_modules/job/main/beranda/view_beranda.tsx
@@ -1,10 +1,10 @@
 import { MODEL_JOB } from "../../model/interface";
 import { Job_UiBeranda } from "./ui_beranda";
 
-export default function Job_ViewBeranda({ listJob }: { listJob: MODEL_JOB[] }) {
+export default function Job_ViewBeranda() {
   return (
     <>
-      <Job_UiBeranda listData={listJob} />
+      <Job_UiBeranda />
     </>
   );
 }
diff --git a/src/app_modules/katalog/portofolio/component/card_view_daftar.tsx b/src/app_modules/katalog/portofolio/component/card_view_daftar.tsx
index 671b0ee6..4335c846 100644
--- a/src/app_modules/katalog/portofolio/component/card_view_daftar.tsx
+++ b/src/app_modules/katalog/portofolio/component/card_view_daftar.tsx
@@ -43,11 +43,16 @@ export function ComponentPortofolio_DaftarBoxView({
           </Stack>
 
           <Stack>
-            {isLoading ? (
+            {/* PAKE LOADING */}
+            {/* {isLoading ? (
               <ComponentGlobal_Loader />
             ) : (
               <IconCaretRight color="white" size={25} />
-            )}
+            )} */}
+
+
+            {/* GA PAKE LOADING */}
+            <IconCaretRight color="white" size={25} />
           </Stack>
         </Group>
       </Paper>
diff --git a/src/app_modules/katalog/portofolio/create/view.tsx b/src/app_modules/katalog/portofolio/create/view.tsx
index 97b009ab..7fdffaec 100644
--- a/src/app_modules/katalog/portofolio/create/view.tsx
+++ b/src/app_modules/katalog/portofolio/create/view.tsx
@@ -22,6 +22,9 @@ import { IconCamera } from "@tabler/icons-react";
 import _ from "lodash";
 import { useState } from "react";
 import { Portofolio_ComponentButtonSelanjutnya } from "../component";
+import { MAX_SIZE } from "@/app_modules/_global/lib";
+import { PemberitahuanMaksimalFile } from "@/app_modules/_global/lib/max_size";
+import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/_global/notif_global";
 
 export default function CreatePortofolio({
   bidangBisnis,
@@ -184,8 +187,16 @@ export default function CreatePortofolio({
                   const buffer = URL.createObjectURL(
                     new Blob([new Uint8Array(await files.arrayBuffer())])
                   );
-                  setImg(buffer);
-                  setFile(files);
+                  if (files.size > MAX_SIZE) {
+                    setImg(null);
+                    setFile(null);
+                    ComponentGlobal_NotifikasiPeringatan(
+                      PemberitahuanMaksimalFile
+                    );
+                  } else {
+                    setImg(buffer);
+                    setFile(files);
+                  }
                 } catch (error) {
                   console.log(error);
                 }
diff --git a/src/app_modules/katalog/portofolio/edit/logo/ui_edit_logo.tsx b/src/app_modules/katalog/portofolio/edit/logo/ui_edit_logo.tsx
index b90ec446..b6971b41 100644
--- a/src/app_modules/katalog/portofolio/edit/logo/ui_edit_logo.tsx
+++ b/src/app_modules/katalog/portofolio/edit/logo/ui_edit_logo.tsx
@@ -11,6 +11,9 @@ import { IconCamera } from "@tabler/icons-react";
 import { useState } from "react";
 import { MODEL_PORTOFOLIO } from "../../model/interface";
 import { ComponentPortofolio_ButtonEditLogoBisnis } from "../../component";
+import { MAX_SIZE } from "@/app_modules/_global/lib";
+import { PemberitahuanMaksimalFile } from "@/app_modules/_global/lib/max_size";
+import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/_global/notif_global";
 
 export default function Portofolio_EditLogoBisnis({
   dataPorto,
@@ -47,8 +50,15 @@ export default function Portofolio_EditLogoBisnis({
                     const buffer = URL.createObjectURL(
                       new Blob([new Uint8Array(await files.arrayBuffer())])
                     );
-                    setImg(buffer);
-                    setFile(files);
+
+                    if (files.size > MAX_SIZE) {
+                      ComponentGlobal_NotifikasiPeringatan(
+                        PemberitahuanMaksimalFile
+                      );
+                    } else {
+                      setImg(buffer);
+                      setFile(files);
+                    }
                   } catch (error) {
                     console.log(error);
                   }
diff --git a/src/app_modules/katalog/portofolio/ui/ui_detail_map.tsx b/src/app_modules/katalog/portofolio/ui/ui_detail_map.tsx
index 8d0aaa43..09559684 100644
--- a/src/app_modules/katalog/portofolio/ui/ui_detail_map.tsx
+++ b/src/app_modules/katalog/portofolio/ui/ui_detail_map.tsx
@@ -102,8 +102,8 @@ function MapView({
             <Avatar
               src={
                 data.pinId === null
-                  ? APIs.GET({ fileId: logoId })
-                  : APIs.GET({ fileId: data.pinId })
+                  ? APIs.GET({ fileId: logoId , size: "300"})
+                  : APIs.GET({ fileId: data.pinId, size: "300" })
               }
               alt="Logo"
               style={{
diff --git a/src/app_modules/katalog/portofolio/ui/ui_detail_map_new.tsx b/src/app_modules/katalog/portofolio/ui/ui_detail_map_new.tsx
index b24770bd..524beaba 100644
--- a/src/app_modules/katalog/portofolio/ui/ui_detail_map_new.tsx
+++ b/src/app_modules/katalog/portofolio/ui/ui_detail_map_new.tsx
@@ -96,8 +96,8 @@ export default function Portofolio_UiMapNew({ mapboxToken }: { mapboxToken: stri
                                  <Avatar
                                     src={
                                        dataPorto?.pinId === null
-                                          ? APIs.GET({ fileId: String(dataPorto?.logoId) })
-                                          : APIs.GET({ fileId: String(dataPorto?.pinId) })
+                                          ? APIs.GET({ fileId: String(dataPorto?.logoId), size: "300" })
+                                          : APIs.GET({ fileId: String(dataPorto?.pinId), size: "300" })
                                     }
                                     alt="Logo"
                                     style={{
diff --git a/src/app_modules/katalog/profile/_component/button/comp_create_new_profile.tsx b/src/app_modules/katalog/profile/_component/button/comp_create_new_profile.tsx
index d649d346..104afedf 100644
--- a/src/app_modules/katalog/profile/_component/button/comp_create_new_profile.tsx
+++ b/src/app_modules/katalog/profile/_component/button/comp_create_new_profile.tsx
@@ -56,10 +56,8 @@ export function Profile_ComponentCreateNewProfile({
         dirId: DIRECTORY_ID.profile_foto,
       });
       if (!uploadPhoto.success) {
-        setLoading(false);
-        return ComponentGlobal_NotifikasiPeringatan(
-          "Gagal upload foto profile"
-        );
+        ComponentGlobal_NotifikasiPeringatan("Gagal upload foto profile");
+        return;
       }
 
       const uploadBackground = await funGlobal_UploadToStorage({
@@ -67,10 +65,8 @@ export function Profile_ComponentCreateNewProfile({
         dirId: DIRECTORY_ID.profile_background,
       });
       if (!uploadBackground.success) {
-        setLoading(false);
-        return ComponentGlobal_NotifikasiPeringatan(
-          "Gagal upload background profile"
-        );
+        ComponentGlobal_NotifikasiPeringatan("Gagal upload background profile");
+        return;
       }
 
       const create = await funCreateNewProfile({
@@ -78,15 +74,24 @@ export function Profile_ComponentCreateNewProfile({
         imageId: uploadPhoto.data.id,
         imageBackgroundId: uploadBackground.data.id,
       });
+
       if (create.status === 201) {
         ComponentGlobal_NotifikasiBerhasil("Berhasil membuat profile", 3000);
         router.push(RouterHome.main_home, { scroll: false });
-      } else {
-        ComponentGlobal_NotifikasiGagal(create.message);
-        setLoading(false);
       }
+
+      if (create.status === 400) {
+        ComponentGlobal_NotifikasiGagal(create.message);
+      }
+
+      if (create.status === 500) {
+        ComponentGlobal_NotifikasiGagal(create.message);
+      }
+      
     } catch (error) {
-      console.log(error);
+      console.log("Terjadi kesalahan", error);
+    } finally {
+      setLoading(false);
     }
   }
 
diff --git a/src/app_modules/katalog/profile/create/view.tsx b/src/app_modules/katalog/profile/create/view.tsx
index dce45a60..1c3a1578 100644
--- a/src/app_modules/katalog/profile/create/view.tsx
+++ b/src/app_modules/katalog/profile/create/view.tsx
@@ -26,6 +26,7 @@ import { IconAt, IconCamera, IconUpload } from "@tabler/icons-react";
 import { useState } from "react";
 import { gmailRegex } from "../../component/regular_expressions";
 import { Profile_ComponentCreateNewProfile } from "../_component";
+import { PemberitahuanMaksimalFile } from "@/app_modules/_global/lib/max_size";
 
 export default function CreateProfile() {
   const [filePP, setFilePP] = useState<File | null>(null);
@@ -88,7 +89,7 @@ export default function CreateProfile() {
 
                     if (files.size > MAX_SIZE) {
                       ComponentGlobal_NotifikasiPeringatan(
-                        "Ukuran file terlalu besar. Maksimal 2 MB."
+                        PemberitahuanMaksimalFile
                       );
                     } else {
                       setImgPP(buffer);
@@ -150,7 +151,7 @@ export default function CreateProfile() {
 
                     if (files.size > MAX_SIZE) {
                       ComponentGlobal_NotifikasiPeringatan(
-                        "Ukuran file terlalu besar. Maksimal 2 MB."
+                        PemberitahuanMaksimalFile
                       );
                     } else {
                       setImgBG(buffer);
diff --git a/src/app_modules/katalog/profile/fun/fun_create_profile.ts b/src/app_modules/katalog/profile/fun/fun_create_profile.ts
index eb49f756..ff8eb96d 100644
--- a/src/app_modules/katalog/profile/fun/fun_create_profile.ts
+++ b/src/app_modules/katalog/profile/fun/fun_create_profile.ts
@@ -1,14 +1,10 @@
 "use server";
 
 import prisma from "@/app/lib/prisma";
-import { MODEL_PROFILE } from "../model/interface";
-import _ from "lodash";
-import { v4 } from "uuid";
-import fs from "fs";
-import { revalidatePath } from "next/cache";
 import { RouterHome } from "@/app/lib/router_hipmi/router_home";
-import { Prisma } from "@prisma/client";
 import { funGetUserIdByToken } from "@/app_modules/_global/fun/get";
+import { Prisma } from "@prisma/client";
+import { revalidatePath } from "next/cache";
 
 export default async function funCreateNewProfile({
   data,
@@ -19,33 +15,53 @@ export default async function funCreateNewProfile({
   imageId: string;
   imageBackgroundId: string;
 }) {
-  const userLoginId = await funGetUserIdByToken();
+  try {
+    const userLoginId = await funGetUserIdByToken();
 
-  const findEmail = await prisma.profile.findUnique({
-    where: {
-      email: data.email,
-    },
-  });
+    if (!userLoginId) {
+      return { status: 400, message: "User tidak terautentikasi" }; // Validasi user login
+    }
 
-  if (findEmail) return { status: 400, message: "Email telah digunakan" };
+    const findEmail = await prisma.profile.findUnique({
+      where: {
+        email: data.email,
+      },
+    });
 
-  const createProfile = await prisma.profile.create({
-    data: {
-      userId: userLoginId,
-      name: data.name,
-      email: data.email,
-      alamat: data.alamat,
-      jenisKelamin: data.jenisKelamin,
-      imageId: imageId,
-      imageBackgroundId: imageBackgroundId,
-    },
-  });
+    if (findEmail) {
+      return { status: 400, message: "Email telah digunakan" };
+    }
 
-  if (!createProfile) return { status: 400, message: "Gagal membuat profile" };
-  revalidatePath(RouterHome.main_home);
+    const createProfile = await prisma.profile.create({
+      data: {
+        userId: userLoginId,
+        name: data.name,
+        email: data.email,
+        alamat: data.alamat,
+        jenisKelamin: data.jenisKelamin,
+        imageId: imageId,
+        imageBackgroundId: imageBackgroundId,
+      },
+    });
 
-  return {
-    status: 201,
-    message: "Berhasil",
-  };
+    if (!createProfile) {
+      return { status: 400, message: "Gagal membuat profile" };
+    }
+
+    // Revalidate cache halaman home
+    try {
+      revalidatePath(RouterHome.main_home);
+    } catch (cacheError) {
+      console.error("Cache revalidation failed:", cacheError);
+      // Tidak membuat fungsi gagal, cukup log error cache
+    }
+
+    return {
+      status: 201,
+      message: "Berhasil",
+    };
+  } catch (error) {
+    console.error("Error creating profile:", error);
+    return { status: 500, message: "Terjadi kesalahan pada server" };
+  }
 }
diff --git a/src/app_modules/map/_component/comp_load_image_map.tsx b/src/app_modules/map/_component/comp_load_image_map.tsx
index 33fb58d5..c2622a18 100644
--- a/src/app_modules/map/_component/comp_load_image_map.tsx
+++ b/src/app_modules/map/_component/comp_load_image_map.tsx
@@ -17,7 +17,7 @@ export function ComponentMap_LoadImageMap({
   const router = useRouter();
   const [isImage, setIsImage] = useState<boolean | null>(null);
 
-  const url = APIs.GET({ fileId: fileId, size: size });
+  const url = APIs.GET({ fileId: fileId, size: size ? size : "400" });
 
   useShallowEffect(() => {
     onLoadImage();
diff --git a/src/app_modules/map/ui/ui_create_pin.tsx b/src/app_modules/map/ui/ui_create_pin.tsx
index db5e656c..c5864b66 100644
--- a/src/app_modules/map/ui/ui_create_pin.tsx
+++ b/src/app_modules/map/ui/ui_create_pin.tsx
@@ -16,7 +16,7 @@ import {
   Stack,
   Text,
   TextInput,
-  Title
+  Title,
 } from "@mantine/core";
 import { IconCamera } from "@tabler/icons-react";
 import _ from "lodash";
@@ -29,6 +29,8 @@ import Map, {
 } from "react-map-gl";
 import { ComponentMap_ButtonSavePin } from "../_component";
 import { defaultLatLong, defaultMapZoom } from "../lib/default_lat_long";
+import { MAX_SIZE } from "@/app_modules/_global/lib";
+import { PemberitahuanMaksimalFile } from "@/app_modules/_global/lib/max_size";
 
 export function UiMap_CreatePin({
   mapboxToken,
@@ -141,9 +143,12 @@ export function UiMap_CreatePin({
                   const buffer = URL.createObjectURL(
                     new Blob([new Uint8Array(await files.arrayBuffer())])
                   );
-                  if (files.size > 2000000) {
+
+                  if (files.size > MAX_SIZE) {
+                    setImg(null);
+                    setFile(null);
                     ComponentGlobal_NotifikasiPeringatan(
-                      "Maaf, Ukuran file terlalu besar, maximum 2mb",
+                      PemberitahuanMaksimalFile,
                       3000
                     );
                   } else {
diff --git a/src/app_modules/map/ui/ui_custom_pin.tsx b/src/app_modules/map/ui/ui_custom_pin.tsx
index 0b963d28..d9799565 100644
--- a/src/app_modules/map/ui/ui_custom_pin.tsx
+++ b/src/app_modules/map/ui/ui_custom_pin.tsx
@@ -27,6 +27,8 @@ import { defaultMapZoom } from "../lib/default_lat_long";
 import { MODEL_MAP } from "../lib/interface";
 import { APIs, DIRECTORY_ID } from "@/app/lib";
 import { funGlobal_UploadToStorage } from "@/app_modules/_global/fun";
+import { MAX_SIZE } from "@/app_modules/_global/lib";
+import { PemberitahuanMaksimalFile } from "@/app_modules/_global/lib/max_size";
 
 export function UiMap_CustomPin({
   dataMap,
@@ -72,8 +74,8 @@ export function UiMap_CustomPin({
                 radius={"100%"}
                 src={
                   data.pinId === null
-                    ? APIs.GET({ fileId: data.Portofolio.logoId })
-                    : APIs.GET({ fileId: data.pinId })
+                    ? APIs.GET({ fileId: data.Portofolio.logoId, size: "300" })
+                    : APIs.GET({ fileId: data.pinId, size: "300" })
                 }
                 style={{
                   border: `2px solid ${AccentColor.skyblue}`,
@@ -90,9 +92,9 @@ export function UiMap_CustomPin({
                   const buffer = URL.createObjectURL(
                     new Blob([new Uint8Array(await files.arrayBuffer())])
                   );
-                  if (files.size > 2000000) {
+                  if (files.size > MAX_SIZE) {
                     ComponentGlobal_NotifikasiPeringatan(
-                      "Maaf, Ukuran file terlalu besar, maximum 2mb",
+                      PemberitahuanMaksimalFile,
                       3000
                     );
                   } else {
@@ -155,8 +157,8 @@ export function UiMap_CustomPin({
                 imgPin
                   ? imgPin
                   : data.pinId === null
-                    ? APIs.GET({ fileId: data.Portofolio.logoId })
-                    : APIs.GET({ fileId: data.pinId })
+                    ? APIs.GET({ fileId: data.Portofolio.logoId, size: "300" })
+                    : APIs.GET({ fileId: data.pinId, size: "300" })
               }
               style={{
                 border: `2px solid ${AccentColor.softblue}`,
diff --git a/src/app_modules/map/ui/ui_edit_map.tsx b/src/app_modules/map/ui/ui_edit_map.tsx
index 9cabf547..438ddae0 100644
--- a/src/app_modules/map/ui/ui_edit_map.tsx
+++ b/src/app_modules/map/ui/ui_edit_map.tsx
@@ -33,6 +33,8 @@ import Map, {
 import { ComponentMap_ButtonUpdateDataMap } from "../_component";
 import { defaultMapZoom } from "../lib/default_lat_long";
 import { MODEL_MAP } from "../lib/interface";
+import { MAX_SIZE } from "@/app_modules/_global/lib";
+import { PemberitahuanMaksimalFile } from "@/app_modules/_global/lib/max_size";
 
 export function UiMap_EditMap({
   mapboxToken,
@@ -85,8 +87,8 @@ export function UiMap_EditMap({
             <Avatar
               src={
                 data.pinId === null
-                  ? APIs.GET({ fileId: dataMap.Portofolio.logoId })
-                  : APIs.GET({ fileId: data.pinId })
+                  ? APIs.GET({ fileId: dataMap.Portofolio.logoId, size: "400" })
+                  : APIs.GET({ fileId: data.pinId, size: "400" })
               }
               alt="Logo"
               style={{
@@ -141,44 +143,6 @@ export function UiMap_EditMap({
             )}
           </ComponentGlobal_BoxUploadImage>
 
-          {/* {img ? (
-            <AspectRatio ratio={1 / 1} mah={300}>
-              <Paper
-                style={{
-                  border: `2px solid ${AccentColor.blue}`,
-                  backgroundColor: AccentColor.darkblue,
-                  padding: "10px",
-                  borderRadius: "10px",
-                }}
-              >
-                <Image
-                  radius={"sm"}
-                  alt="Photo"
-                  src={img ? img : "/aset/no-img.png"}
-                  maw={250}
-                />
-              </Paper>
-            </AspectRatio>
-          ) : (
-            <AspectRatio ratio={1 / 1} mah={300}>
-              <Paper
-                style={{
-                  border: `2px solid ${AccentColor.blue}`,
-                  backgroundColor: AccentColor.darkblue,
-                  padding: "10px",
-                  borderRadius: "10px",
-                }}
-              >
-                <Image
-                  radius={"sm"}
-                  alt="Photo"
-                  src={RouterMap.api_foto + data.imageId}
-                  maw={250}
-                />
-              </Paper>
-            </AspectRatio>
-          )} */}
-
           <Center>
             <FileButton
               onChange={async (files: any | null) => {
@@ -186,9 +150,9 @@ export function UiMap_EditMap({
                   const buffer = URL.createObjectURL(
                     new Blob([new Uint8Array(await files.arrayBuffer())])
                   );
-                  if (files.size > 2000000) {
+                  if (files.size > MAX_SIZE) {
                     ComponentGlobal_NotifikasiPeringatan(
-                      "Maaf, Ukuran file terlalu besar, maximum 2mb",
+                      PemberitahuanMaksimalFile,
                       3000
                     );
                   } else {
diff --git a/src/app_modules/map/ui/ui_map.tsx b/src/app_modules/map/ui/ui_map.tsx
index b84fe339..e66051a3 100644
--- a/src/app_modules/map/ui/ui_map.tsx
+++ b/src/app_modules/map/ui/ui_map.tsx
@@ -91,8 +91,8 @@ export function UiMap_MapBoxView({
                     }}
                     src={
                       e.pinId === null
-                        ? APIs.GET({ fileId: e.Portofolio.logoId })
-                        : APIs.GET({ fileId: e.pinId })
+                        ? APIs.GET({ fileId: e.Portofolio.logoId, size: "300" })
+                        : APIs.GET({ fileId: e.pinId, size: "300" })
                     }
                   />
                 </Stack>
@@ -110,7 +110,7 @@ export function UiMap_MapBoxView({
         opened={openDrawer}
         close={() => setOpenDrawer(false)}
         mapId={mapId}
-        component={<ComponentMap_DetailData mapId={mapId}  />}
+        component={<ComponentMap_DetailData mapId={mapId} />}
       />
     </>
   );
diff --git a/src/app_modules/map/ui/ui_map_new.tsx b/src/app_modules/map/ui/ui_map_new.tsx
index 2ce61efc..ac27da54 100644
--- a/src/app_modules/map/ui/ui_map_new.tsx
+++ b/src/app_modules/map/ui/ui_map_new.tsx
@@ -94,8 +94,8 @@ export function UiMap_MapBoxViewNew({ mapboxToken, }: { mapboxToken: string }) {
                                     }}
                                     src={
                                        e.pinId === null
-                                          ? APIs.GET({ fileId: e.logoId })
-                                          : APIs.GET({ fileId: e.pinId })
+                                          ? APIs.GET({ fileId: e.logoId, size: "300" })
+                                          : APIs.GET({ fileId: e.pinId, size: "300" })
                                     }
                                  />
                               </Stack>
diff --git a/src/app_modules/user_search/component/ui_user_search.tsx b/src/app_modules/user_search/component/ui_user_search.tsx
index cdefcc7c..56b3c28c 100644
--- a/src/app_modules/user_search/component/ui_user_search.tsx
+++ b/src/app_modules/user_search/component/ui_user_search.tsx
@@ -115,11 +115,15 @@ function CardView({ data }: { data: MODEL_USER }) {
           <Group position="right" align="center" h={"100%"}>
             <Center>
               <ActionIcon variant="transparent">
-                {loading ? (
+                {/* PAKE LOADING */}
+                {/* {loading ? (
                   <ComponentGlobal_Loader />
                 ) : (
                   <IconChevronRight color="white" />
-                )}
+                )} */}
+
+                {/* GA PAKE LOADING */}
+                <IconChevronRight color="white" />
               </ActionIcon>
             </Center>
           </Group>
diff --git a/src/middleware.ts b/src/middleware.ts
index f4cd23ab..705192f2 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -20,6 +20,7 @@ const middlewareConfig: MiddlewareConfig = {
   publicRoutes: [
     "/",
     "/api/upload",
+    "/api/job/*",
     "/api/validation",
     "/api/auth/*",
     "/api/origin-url",