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

Merge pull request #213 from bipproduction/amalia/20-des-24

Browse Source 
Amalia/20 des 24
This commit is contained in:
Bagasbanuna02
2024-12-23 07:53:24 +08:00
committed by GitHub
parent 079b6b2f4b 692dd25609
commit 4a62205d8b
13 changed files with 588 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/dev/donasi/detail/main/[id]/layout.tsx
View File

@@ -1,29 +1,25 @@
import { funGetUserIdByToken } from "@/app_modules/_global/fun/get";
import { LayoutDetailMainDonasi } from "@/app_modules/donasi";
import { Donasi_getOneById } from "@/app_modules/donasi/fun/get/get_one_donasi_by_id";
import { LayoutDetailMainDonasiNew } from "@/app_modules/donasi";
import React from "react";
export default async function Layout({
children,
params,
}: {
children: React.ReactNode;
params: { id: string };
}) {
const donasiId = params.id;
const getData = await Donasi_getOneById(donasiId);
const authorId = getData?.authorId;
const userLoginId = await funGetUserIdByToken();
export default async function Layout({ children, params, }: { children: React.ReactNode; params: { id: string }; }) {
// const donasiId = params.id;
// const getData = await Donasi_getOneById(donasiId);
// const authorId = getData?.authorId;
// const userLoginId = await funGetUserIdByToken();
return (
<>
<LayoutDetailMainDonasi
{/* <LayoutDetailMainDonasi
donasiId={donasiId}
authorId={authorId as any}
userLoginId={userLoginId as string}
>
{children}
</LayoutDetailMainDonasi>
</LayoutDetailMainDonasi> */}
<LayoutDetailMainDonasiNew>
{children}
</LayoutDetailMainDonasiNew>
</>
);
}

18
src/app/dev/donasi/detail/main/[id]/page.tsx
View File

@@ -1,22 +1,20 @@
import { funGetUserIdByToken } from "@/app_modules/_global/fun/get";
import { DetailMainDonasi } from "@/app_modules/donasi";
import { Donasi_getCountDonatur } from "@/app_modules/donasi/fun/count/get_count_donatur";
import { Donasi_getOneById } from "@/app_modules/donasi/fun/get/get_one_donasi_by_id";
import DetailMainDonasiNew from "@/app_modules/donasi/detail/detail_main/index_new";
export default async function Page({ params }: { params: { id: string } }) {
let donasiId = params.id;
const userLoginId = await funGetUserIdByToken();
// let donasiId = params.id;
// const userLoginId = await funGetUserIdByToken();
const dataDonasi = await Donasi_getOneById(donasiId);
const countDonatur = await Donasi_getCountDonatur(donasiId);
// const dataDonasi = await Donasi_getOneById(donasiId);
// const countDonatur = await Donasi_getCountDonatur(donasiId);
return (
<>
<DetailMainDonasi
{/* <DetailMainDonasi
dataDonasi={dataDonasi as any}
countDonatur={countDonatur}
userLoginId={userLoginId as string}
/>
/> */}
<DetailMainDonasiNew />
</>
);
}