wibu/hipmi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #310 from bipproduction/bagas/13-feb-25

Browse Source 
fix api forum
This commit is contained in:
Bagasbanuna02
2025-02-14 11:06:04 +08:00
committed by GitHub
parent a0933acc40 eb335533eb
commit 3cfaed02ac
24 changed files with 755 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/app_modules/_global/lib/api_user.ts
View File

@@ -1,3 +1,4 @@
import { apiGetUserProfile } from './../../user/lib/api_user';
export const apiGetUserId = async () => {
const { token } = await fetch("/api/get-cookie").then((res) => res.json());
if (!token) return await token.json().catch(() => null);
@@ -58,3 +59,43 @@ export const apiGetAllUserWithExceptId = async ({
});
return await response.json().catch(() => null);
};
export const apiGetUserById = async ({ id }: { id: string }) => {
try {
// Fetch token from cookie
const { token } = await fetch("/api/get-cookie").then((res) => res.json());
if (!token) {
console.error("No token found");
return null;
}
// Send PUT request to update portfolio logo
const response = await fetch(`/api/user/${id}`, {
method: "GET",
headers: {
"Content-Type": "application/json",
Accept: "application/json",
Authorization: `Bearer ${token}`,
},
});
// Check if the response is OK
if (!response.ok) {
const errorData = await response.json().catch(() => null);
console.error(
"Failed to get user",
response.statusText,
errorData
);
throw new Error(
errorData?.message || "Failed to get user"
);
}
// Return the JSON response
return await response.json();
} catch (error) {
console.error("Error get user:", error);
throw error; // Re-throw the error to handle it in the calling function
}
};

41
src/app_modules/forum/component/api_fetch_forum.ts Normal file
View File

@@ -0,0 +1,41 @@
export { apiGetAllForum };
const apiGetAllForum = async ({
page,
search,
}: {
page: string;
search?: string;
}) => {
try {
// Fetch token from cookie
const { token } = await fetch("/api/get-cookie").then((res) => res.json());
if (!token) {
console.error("No token found");
return null;
}
const isSearch = search ? `&search=${search}` : "";
const response = await fetch(`/api/forum?page=${page}${isSearch}`, {
method: "GET",
headers: {
"Content-Type": "application/json",
Accept: "application/json",
Authorization: `Bearer ${token}`,
},
});
// Check if the response is OK
if (!response.ok) {
const errorData = await response.json().catch(() => null);
console.error("Failed to get all forum:", response.statusText, errorData);
throw new Error(errorData?.message || "Failed to get all forum");
}
// Return the JSON response
return await response.json();
} catch (error) {
console.error("Error get all forum", error);
throw error; // Re-throw the error to handle it in the calling function
}
};

70
src/app_modules/forum/main/beranda.tsx
View File

@@ -23,35 +23,42 @@ import { useState } from "react";
import ComponentForum_BerandaCardView from "../component/main_component/card_view";
import { forum_new_getAllPosting } from "../fun/get/new_get_all_posting";
import { MODEL_FORUM_POSTING } from "../model/interface";
import { apiGetAllForum } from "../component/api_fetch_forum";
import { clientLogger } from "@/util/clientLogger";
import CustomSkeleton from "@/app_modules/components/CustomSkeleton";
export default function Forum_Beranda({
listForum,
userLoginId,
}: {
listForum: any;
userLoginId: string;
}) {
const router = useRouter();
const [scroll, scrollTo] = useWindowScroll();
const [data, setData] = useState<MODEL_FORUM_POSTING[]>(listForum);
const [data, setData] = useState<MODEL_FORUM_POSTING[] | null>(null);
const [activePage, setActivePage] = useState(1);
const [isSearch, setIsSearch] = useState("");
const [isNewPost, setIsNewPost] = useState(false);
const [countNewPost, setCountNewPost] = useState(0);
useShallowEffect(() => {
onLoadAllData({
onLoad(val) {
setData(val);
},
});
}, [setData]);
handleLoadData(isSearch);
}, [isSearch]);
async function onLoadAllData({ onLoad }: { onLoad: (val: any) => void }) {
const loadData = await forum_new_getAllPosting({ page: 1 });
onLoad(loadData);
}
const handleLoadData = async (isSearch: string) => {
try {
const response = await apiGetAllForum({
page: `${activePage}`,
search: isSearch,
});
if (response) {
setData(response.data);
}
} catch (error) {
clientLogger.error("Error get data forum", error);
}
};
useShallowEffect(() => {
mqtt_client.subscribe("Forum_create_new");
@@ -83,7 +90,7 @@ export default function Forum_Beranda({
if (topic === "Forum_detail_ganti_status") {
const newData = JSON.parse(message.toString());
const updateOneData = cloneData.map((val) => ({
const updateOneData = cloneData?.map((val) => ({
...val,
ForumMaster_StatusPosting: {
id:
@@ -104,12 +111,8 @@ export default function Forum_Beranda({
async function onSearch(text: string) {
setIsSearch(text);
const loadSearch = await forum_new_getAllPosting({
page: activePage,
search: text,
});
setData(loadSearch as any);
setActivePage(1);
}
return (
@@ -133,6 +136,7 @@ export default function Forum_Beranda({
<Stack spacing={"xl"}>
<TextInput
disabled={!data}
radius={"xl"}
placeholder="Topik forum apa yang anda cari hari ini ?"
onChange={(val) => {
@@ -140,7 +144,12 @@ export default function Forum_Beranda({
}}
/>
{_.isEmpty(data) ? (
{!data ? (
<Stack>
<CustomSkeleton height={230} width={"100%"} />
<CustomSkeleton height={230} width={"100%"} />
</Stack>
) : _.isEmpty(data) ? (
<Stack align="center" justify="center" h={"80vh"}>
<IconSearchOff size={80} color="white" />
<Stack spacing={0} align="center">
@@ -159,15 +168,22 @@ export default function Forum_Beranda({
</Center>
)}
data={data}
setData={setData}
setData={setData as any}
moreData={async () => {
const loadData = await forum_new_getAllPosting({
page: activePage + 1,
search: isSearch,
});
setActivePage((val) => val + 1);
try {
const nextPage = activePage + 1;
const response = await apiGetAllForum({
page: `${nextPage}`,
search: isSearch,
});
return loadData;
if (response) {
setActivePage((val) => val + 1);
return response.data;
}
} catch (error) {
clientLogger.error("Error get data forum", error);
}
}}
>
{(item) => (

80
src/app_modules/forum/main/layout.tsx
View File

@@ -9,17 +9,39 @@ import { MODEL_USER } from "@/app_modules/home/model/interface";
import { ActionIcon, Avatar } from "@mantine/core";
import { useRouter } from "next/navigation";
import React, { useState } from "react";
import { useShallowEffect } from "@mantine/hooks";
import { apiGetUserById } from "@/app_modules/_global/lib/api_user";
import { clientLogger } from "@/util/clientLogger";
export default function LayoutForum_Main({
userLoginId,
children,
dataAuthor,
}: {
userLoginId: string;
children: React.ReactNode;
dataAuthor: MODEL_USER;
}) {
const router = useRouter();
const [data, setData] = useState<MODEL_USER | null>(null);
const [isLoading, setIsLoading] = useState(false);
useShallowEffect(() => {
handleLoadData();
}, []);
const handleLoadData = async () => {
try {
const response = await apiGetUserById({
id: userLoginId,
});
if (response) {
setData(response.data);
}
} catch (error) {
clientLogger.error("Error get user", error);
}
};
return (
<>
<UIGlobal_LayoutTamplate
@@ -27,15 +49,14 @@ export default function LayoutForum_Main({
<UIGlobal_LayoutHeaderTamplate
title="Forum"
iconRight={
<ActionIcon
radius={"xl"}
variant="transparent"
onClick={() => {
setIsLoading(true);
router.push(RouterForum.forumku + dataAuthor?.id);
}}
>
{isLoading ? (
!data ? (
<ActionIcon
radius={"xl"}
variant="transparent"
onClick={() => {
return null;
}}
>
<Avatar
size={30}
radius={"100%"}
@@ -47,13 +68,36 @@ export default function LayoutForum_Main({
>
<ComponentGlobal_Loader variant="dots" />
</Avatar>
) : (
<ComponentGlobal_LoaderAvatar
fileId={dataAuthor.Profile.imageId as any}
sizeAvatar={30}
/>
)}
</ActionIcon>
</ActionIcon>
) : (
<ActionIcon
radius={"xl"}
variant="transparent"
onClick={() => {
setIsLoading(true);
router.push(RouterForum.forumku + data?.id);
}}
>
{isLoading ? (
<Avatar
size={30}
radius={"100%"}
style={{
borderColor: "white",
borderStyle: "solid",
borderWidth: "1px",
}}
>
<ComponentGlobal_Loader variant="dots" />
</Avatar>
) : (
<ComponentGlobal_LoaderAvatar
fileId={data.Profile.imageId as any}
sizeAvatar={30}
/>
)}
</ActionIcon>
)
}
/>
}

103
src/app_modules/katalog/portofolio/component/api_fetch_portofolio.ts
View File

@@ -1,4 +1,10 @@
export { apiCreatePortofolio, apiGetPortofolioById, apiUpdatePortofolioById };
export {
apiCreatePortofolio,
apiGetPortofolioById,
apiUpdatePortofolioById,
apiUpdateLogoPortofolioById,
apiUpdateMedsosPortofolioById,
};
const apiCreatePortofolio = async ({
profileId,
@@ -16,7 +22,6 @@ const apiCreatePortofolio = async ({
headers: {
"Content-Type": "application/json",
Accept: "application/json",
"Access-Control-Allow-Origin": "*",
Authorization: `Bearer ${token}`,
},
});
@@ -33,7 +38,6 @@ const apiGetPortofolioById = async ({ id }: { id: string }) => {
headers: {
"Content-Type": "application/json",
Accept: "application/json",
"Access-Control-Allow-Origin": "*",
Authorization: `Bearer ${token}`,
},
});
@@ -57,7 +61,6 @@ const apiUpdatePortofolioById = async ({
headers: {
"Content-Type": "application/json",
Accept: "application/json",
"Access-Control-Allow-Origin": "*",
Authorization: `Bearer ${token}`,
},
});
@@ -69,3 +72,95 @@ const apiUpdatePortofolioById = async ({
return await respone.json();
};
const apiUpdateLogoPortofolioById = async ({
id,
data,
}: {
id: string;
data: any;
}) => {
try {
// Fetch token from cookie
const { token } = await fetch("/api/get-cookie").then((res) => res.json());
if (!token) {
console.error("No token found");
return null;
}
// Send PUT request to update portfolio logo
const response = await fetch(`/api/portofolio/logo/${id}`, {
method: "PUT",
body: JSON.stringify({ data }),
headers: {
"Content-Type": "application/json",
Accept: "application/json",
Authorization: `Bearer ${token}`,
},
});
// Check if the response is OK
if (!response.ok) {
const errorData = await response.json().catch(() => null);
console.error(
"Failed to update portfolio logo:",
response.statusText,
errorData
);
throw new Error(errorData?.message || "Failed to update portfolio logo");
}
// Return the JSON response
return await response.json();
} catch (error) {
console.error("Error updating portfolio logo:", error);
throw error; // Re-throw the error to handle it in the calling function
}
};
const apiUpdateMedsosPortofolioById = async ({
id,
data,
}: {
id: string;
data: any;
}) => {
try {
// Fetch token from cookie
const { token } = await fetch("/api/get-cookie").then((res) => res.json());
if (!token) {
console.error("No token found");
return null;
}
// Send PUT request to update portfolio logo
const response = await fetch(`/api/portofolio/medsos/${id}`, {
method: "PUT",
body: JSON.stringify({ data }),
headers: {
"Content-Type": "application/json",
Accept: "application/json",
Authorization: `Bearer ${token}`,
},
});
// Check if the response is OK
if (!response.ok) {
const errorData = await response.json().catch(() => null);
console.error(
"Failed to update portfolio medsos:",
response.statusText,
errorData
);
throw new Error(
errorData?.message || "Failed to update portfolio medsos"
);
}
// Return the JSON response
return await response.json();
} catch (error) {
console.error("Error updating portfolio medsos:", error);
throw error; // Re-throw the error to handle it in the calling function
}
};

23
src/app_modules/katalog/portofolio/component/button/comp_button_edit_logo_bisnis.tsx
View File

@@ -8,15 +8,15 @@ import {
} from "@/app_modules/_global/notif_global";
import { Box, Button } from "@mantine/core";
import { DIRECTORY_ID } from "@/lib";
import {
funGlobal_DeleteFileById,
funGlobal_UploadToStorage,
} from "@/app_modules/_global/fun";
import { DIRECTORY_ID } from "@/lib";
import { clientLogger } from "@/util/clientLogger";
import { useRouter } from "next/navigation";
import { useState } from "react";
import { portofolio_funEditLogoBisnisById } from "../../fun";
import { apiUpdateLogoPortofolioById } from "../api_fetch_portofolio";
export function ComponentPortofolio_ButtonEditLogoBisnis({
file,
@@ -29,6 +29,7 @@ export function ComponentPortofolio_ButtonEditLogoBisnis({
}) {
const router = useRouter();
const [loading, setLoading] = useState(false);
async function onUpdate() {
try {
setLoading(true);
@@ -55,18 +56,20 @@ export function ComponentPortofolio_ButtonEditLogoBisnis({
}
const logoId = uploadFileToStorage.data.id;
const res = await portofolio_funEditLogoBisnisById({
portofolioId: portofolioId,
logoId: logoId,
const response = await apiUpdateLogoPortofolioById({
id: portofolioId,
data: logoId,
});
if (res.status === 200) {
ComponentGlobal_NotifikasiBerhasil(res.message);
router.back();
} else {
if (!response) {
setLoading(false);
ComponentGlobal_NotifikasiGagal(res.message);
ComponentGlobal_NotifikasiGagal("Gagal update logo");
return;
}
ComponentGlobal_NotifikasiBerhasil("Berhasil mengubah Logo Bisnis!");
router.back();
} catch (error) {
setLoading(false);
clientLogger.error("Error update logo", error);

4
src/app_modules/katalog/portofolio/edit/logo/ui_edit_logo.tsx
View File

@@ -60,7 +60,9 @@ export default function Portofolio_EditLogoBisnis() {
}}
>
{img ? (
<Image maw={250} alt="Image" src={img} />
<Center>
<Image maw={250} alt="Image" src={img} />
</Center>
) : (
<ComponentGlobal_LoadImage fileId={data.logoId} />
)}

202
src/app_modules/katalog/portofolio/edit/medsos/ui_edit_medsos.tsx
View File

@@ -1,61 +1,121 @@
"use client";
import ComponentKatalog_NotedBox from "@/app_modules/katalog/component/noted_box";
import { Box, Button, Paper, Stack, TextInput } from "@mantine/core";
import { useState } from "react";
import { MODEL_PORTOFOLIO_MEDSOS } from "../../model/interface";
import { Portofolio_funEditMedsosById } from "../../fun/edit/fun_edit_medsos_bisnis_by_id";
import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/_global/notif_global/notifikasi_berhasil";
import { useRouter } from "next/navigation";
import { AppRouterInstance } from "next/dist/shared/lib/app-router-context.shared-runtime";
import { ComponentGlobal_NotifikasiPeringatan } from "@/app_modules/_global/notif_global/notifikasi_peringatan";
import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/_global/notif_global/notifikasi_gagal";
import {
AccentColor,
MainColor,
} from "@/app_modules/_global/color/color_pallet";
import { ComponentGlobal_CardStyles } from "@/app_modules/_global/component";
import { ComponentGlobal_NotifikasiBerhasil } from "@/app_modules/_global/notif_global/notifikasi_berhasil";
import { ComponentGlobal_NotifikasiGagal } from "@/app_modules/_global/notif_global/notifikasi_gagal";
import CustomSkeleton from "@/app_modules/components/CustomSkeleton";
import { Button, Stack, TextInput } from "@mantine/core";
import { useShallowEffect } from "@mantine/hooks";
import { AppRouterInstance } from "next/dist/shared/lib/app-router-context.shared-runtime";
import { useParams, useRouter } from "next/navigation";
import { useState } from "react";
import {
apiGetPortofolioById,
apiUpdateMedsosPortofolioById,
} from "../../component/api_fetch_portofolio";
import { Portofolio_funEditMedsosById } from "../../fun/edit/fun_edit_medsos_bisnis_by_id";
import { MODEL_PORTOFOLIO_MEDSOS } from "../../model/interface";
import { clientLogger } from "@/util/clientLogger";
export default function Portofolio_EditMedsosBisnis({
dataMedsos,
}: {
dataMedsos: MODEL_PORTOFOLIO_MEDSOS;
}) {
interface IUpdateMedson {
facebook: string;
instagram: string;
tiktok: string;
twitter: string;
youtube: string;
}
export default function Portofolio_EditMedsosBisnis() {
const params = useParams<{ id: string }>();
const portofolioId = params.id;
const router = useRouter();
const [medsos, setMedsos] = useState(dataMedsos);
const [data, setData] = useState<MODEL_PORTOFOLIO_MEDSOS | null>(null);
const [loading, setLoading] = useState(false);
useShallowEffect(() => {
handleLoadData();
}, []);
const handleLoadData = async () => {
try {
const response = await apiGetPortofolioById({ id: portofolioId });
if (response.success) {
setData(response.data.Portofolio_MediaSosial);
}
} catch (error) {
clientLogger.error("Error Load Data Portofolio", error);
}
};
const hanldeUpdateData = async (data: any) => {
const newData: IUpdateMedson = {
facebook: data.facebook,
instagram: data.instagram,
tiktok: data.tiktok,
twitter: data.twitter,
youtube: data.youtube,
};
const response = await apiUpdateMedsosPortofolioById({
id: data.id,
data: newData,
});
return response;
};
async function submitUpdate() {
if (!data) {
ComponentGlobal_NotifikasiGagal("Data tidak valid");
return;
}
try {
setLoading(true);
const responseUpdate = await hanldeUpdateData(data);
if (responseUpdate.success) {
ComponentGlobal_NotifikasiBerhasil(responseUpdate.message);
router.back();
} else {
setLoading(false);
ComponentGlobal_NotifikasiGagal(responseUpdate.message);
}
} catch (error) {
setLoading(false);
clientLogger.error("Error Update Medsos", error);
ComponentGlobal_NotifikasiGagal("Error Update Medsos");
}
}
if (!data) return <CustomSkeleton height={450} width={"100%"} />;
return (
<>
{/* <pre>{JSON.stringify(dataMedsos, null, 2)}</pre> */}
<Paper
p={"sm"}
style={{
backgroundColor: AccentColor.darkblue,
border: `2px solid ${AccentColor.blue}`,
borderRadius: "10px ",
padding: "15px",
color: MainColor.white,
}}
>
<ComponentGlobal_CardStyles>
<Stack px={"sm"}>
<TextInput
styles={{
label: {
color: MainColor.white
color: MainColor.white,
},
input: {
backgroundColor: MainColor.white
backgroundColor: MainColor.white,
},
required: {
color: MainColor.red
}
color: MainColor.red,
},
}}
label="Facebook"
value={medsos.facebook}
value={data.facebook}
placeholder="Facebook"
onChange={(val) => {
setMedsos({
...medsos,
setData({
...data,
facebook: val.target.value,
});
}}
@@ -63,21 +123,21 @@ export default function Portofolio_EditMedsosBisnis({
<TextInput
styles={{
label: {
color: MainColor.white
color: MainColor.white,
},
input: {
backgroundColor: MainColor.white
backgroundColor: MainColor.white,
},
required: {
color: MainColor.red
}
color: MainColor.red,
},
}}
label="Instagram"
value={medsos.instagram}
value={data.instagram}
placeholder="Instagram"
onChange={(val) => {
setMedsos({
...medsos,
setData({
...data,
instagram: val.target.value,
});
}}
@@ -85,21 +145,21 @@ export default function Portofolio_EditMedsosBisnis({
<TextInput
styles={{
label: {
color: MainColor.white
color: MainColor.white,
},
input: {
backgroundColor: MainColor.white
backgroundColor: MainColor.white,
},
required: {
color: MainColor.red
}
color: MainColor.red,
},
}}
label="Tiktok"
value={medsos.tiktok}
value={data.tiktok}
placeholder="Tiktok"
onChange={(val) => {
setMedsos({
...medsos,
setData({
...data,
tiktok: val.target.value,
});
}}
@@ -107,21 +167,21 @@ export default function Portofolio_EditMedsosBisnis({
<TextInput
styles={{
label: {
color: MainColor.white
color: MainColor.white,
},
input: {
backgroundColor: MainColor.white
backgroundColor: MainColor.white,
},
required: {
color: MainColor.red
}
color: MainColor.red,
},
}}
label="Twitter"
value={medsos.twitter}
value={data.twitter}
placeholder="Twitter"
onChange={(val) => {
setMedsos({
...medsos,
setData({
...data,
twitter: val.target.value,
});
}}
@@ -129,21 +189,21 @@ export default function Portofolio_EditMedsosBisnis({
<TextInput
styles={{
label: {
color: MainColor.white
color: MainColor.white,
},
input: {
backgroundColor: MainColor.white
backgroundColor: MainColor.white,
},
required: {
color: MainColor.red
}
color: MainColor.red,
},
}}
label="Youtube"
value={medsos.youtube}
value={data.youtube}
placeholder="Youtube"
onChange={(val) => {
setMedsos({
...medsos,
setData({
...data,
youtube: val.target.value,
});
}}
@@ -154,7 +214,7 @@ export default function Portofolio_EditMedsosBisnis({
radius={"xl"}
loading={loading ? true : false}
loaderPosition="center"
onClick={() => onUpdate(router, medsos, setLoading)}
onClick={() => submitUpdate()}
style={{
backgroundColor: MainColor.yellow,
border: `2px solid ${AccentColor.yellow}`,
@@ -165,23 +225,7 @@ export default function Portofolio_EditMedsosBisnis({
Update
</Button>
</Stack>
</Paper>
</ComponentGlobal_CardStyles>
</>
);
}
async function onUpdate(
router: AppRouterInstance,
medsos: MODEL_PORTOFOLIO_MEDSOS,
setLoading: any
) {
await Portofolio_funEditMedsosById(medsos).then((res) => {
if (res.status === 200) {
setLoading(true);
ComponentGlobal_NotifikasiBerhasil(res.message);
router.back();
} else {
ComponentGlobal_NotifikasiGagal(res.message);
}
});
}

2
src/app_modules/map/_component/button/comp_button_save_pin.tsx
View File

@@ -65,8 +65,6 @@ export function ComponentMap_ButtonSavePin({
data: newData,
});
console.log("respone >", respone);
if (respone && respone.success) {
ComponentGlobal_NotifikasiBerhasil(respone.message);
router.back();

6
src/app_modules/map/_component/detail_data.tsx
View File

@@ -35,10 +35,10 @@ export function ComponentMap_DetailData({
const [openModal, setOpenModal] = useState(false);
useShallowEffect(() => {
onLoadData(setData, setDataUser);
}, [setData, setDataUser]);
onLoadData();
}, []);
async function onLoadData(setData: any, setDataUser: any) {
async function onLoadData() {
const res: any = await map_funGetOneById({ mapId: mapId });
setData(res);
setDataUser(res.Author);

4
src/app_modules/map/ui/ui_map_new.tsx
View File

@@ -1,7 +1,7 @@
"use client";
import { APIs } from "@/lib";
import { AccentColor } from "@/app_modules/_global/color/color_pallet";
import ComponentGlobal_IsEmptyData from "@/app_modules/_global/component/is_empty_data";
import { APIs } from "@/lib";
import { Avatar, Loader, Stack } from "@mantine/core";
import { useShallowEffect } from "@mantine/hooks";
import "mapbox-gl/dist/mapbox-gl.css";
@@ -64,7 +64,7 @@ export function UiMap_MapBoxViewNew({ mapboxToken, }: { mapboxToken: string }) {
}}
attributionControl={false}
>
{data.map((e, i) => (
{data?.map((e, i) => (
<Stack key={i}>
<Marker
style={{