Update Versi 1.5.27 #32

Merged
bagasbanuna merged 1009 commits from staging into main 2025-12-17 12:22:28 +08:00
1448 changed files with 51094 additions and 14745 deletions
Showing only changes of commit 2d4eddfc41 - Show all commits

View File

@@ -7,13 +7,7 @@ import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/_global/notif_glo
import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/_global/notif_global/notifikasi_peringatan";
import { clientLogger } from "@/util/clientLogger";
import mqtt_client from "@/util/mqtt_client";
import {
Button,
Select,
Stack,
TextInput,
Textarea
} from "@mantine/core";
import { Button, Select, Stack, TextInput, Textarea } from "@mantine/core";
import { useShallowEffect } from "@mantine/hooks";
import { useRouter } from "next/navigation";
import { useState } from "react";
@@ -51,7 +45,6 @@ export default function Colab_Create() {
}
}
if (listIndustri == null) {
return (
<>
@@ -194,34 +187,32 @@ function ButtonAction({ value }: { value: any }) {
if (value.projectCollaborationMaster_IndustriId === 0)
return ComponentGlobal_NotifikasiPeringatan("Pilih Industri");
const res = await colab_funCreateProyek(value);
try {
setLoading(true)
setLoading(true);
const res = await colab_funCreateProyek(value);
if (res.status === 201) {
setLoading(true);
router.back();
ComponentGlobal_NotifikasiBerhasil(res.message);
} else {
setLoading(false)
setLoading(false);
ComponentGlobal_NotifikasiGagal(res.message);
}
} catch (error) {
setLoading(false)
setLoading(false);
clientLogger.error("Error create proyek", error);
}
}
return (
<>
<Button
disabled={
!value.title ||
!value.lokasi ||
!value.purpose ||
!value.benefit ||
value.projectCollaborationMaster_IndustriId === 0
!value.lokasi ||
!value.purpose ||
!value.benefit ||
value.projectCollaborationMaster_IndustriId === 0
? true
: false
}

View File

@@ -9,22 +9,27 @@ import { MODEL_COLLABORATION } from "../../model/interface";
export default async function colab_funCreateProyek(
value: MODEL_COLLABORATION
) {
const userLoginId = await funGetUserIdByToken();
try {
const userLoginId = await funGetUserIdByToken();
if (!userLoginId) return { status: 400, message: "Gagal Membuat Proyek" };
const data = await prisma.projectCollaboration.create({
data: {
title: value.title,
lokasi: value.lokasi,
purpose: value.purpose,
benefit: value.benefit,
projectCollaborationMaster_IndustriId:
value.projectCollaborationMaster_IndustriId,
userId: userLoginId,
// jumlah_partisipan: + value.jumlah_partisipan,
},
});
const data = await prisma.projectCollaboration.create({
data: {
title: value.title,
lokasi: value.lokasi,
purpose: value.purpose,
benefit: value.benefit,
projectCollaborationMaster_IndustriId:
value.projectCollaborationMaster_IndustriId,
userId: userLoginId,
// jumlah_partisipan: + value.jumlah_partisipan,
},
});
if (!data) return { status: 400, message: "Gagal Membuat Proyek" };
revalidatePath(RouterColab.beranda);
return { data, status: 201, message: "Berhasil Membuat Proyek" };
if (!data) return { status: 400, message: "Gagal Membuat Proyek" };
revalidatePath(RouterColab.beranda);
return { data, status: 201, message: "Berhasil Membuat Proyek" };
} catch (error) {
return { status: 500, message: "Gagal Membuat Proyek" };
}
}

View File

@@ -35,6 +35,7 @@ export default function Forum_Forumku({
const userId = params.id;
const [dataUser, setDataUser] = useState<MODEL_USER | null>(null);
const [dataPosting, setDataPosting] = useState<MODEL_FORUM_POSTING[]>([]);
const [isLoading, setIsLoading] = useState(false);
const [activePage, setActivePage] = useState(1);
useShallowEffect(() => {
@@ -61,6 +62,7 @@ export default function Forum_Forumku({
const handleLoadDataForum = async () => {
try {
setIsLoading(true);
const response = await apiGetForumkuById({
id: userId,
page: "1",
@@ -69,9 +71,14 @@ export default function Forum_Forumku({
if (response.success) {
setDataPosting(response.data);
setActivePage(1);
setIsLoading(false);
} else {
setDataPosting([]);
setIsLoading(false);
}
} catch (error) {
clientLogger.error("Error get data forum");
setIsLoading(false);
setDataPosting([]);
}
};
@@ -109,7 +116,7 @@ export default function Forum_Forumku({
/>
)}
{!dataPosting.length ? (
{!dataPosting.length && isLoading ? (
<Forum_SkeletonCard />
) : _.isEmpty(dataPosting) ? (
<Forum_ComponentIsDataEmpty />

View File

@@ -29,6 +29,7 @@ const middlewareConfig: MiddlewareConfig = {
"/api/logs/*",
"/api/auth/*",
"/api/origin-url",
"/api/job*",
// "/api/event/*",
// ADMIN API