Update Versi 1.5.27 #32

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

View File

@@ -1,12 +1,9 @@
import { funGetUserIdByToken } from "@/app_modules/_global/fun/get";
import { LayoutKatalogNew } from "@/app_modules/katalog/main";
export default async function Layout({ children }: { children: any }) {
const userLoginId = await funGetUserIdByToken();
export default function Layout({ children }: { children: any }) {
return (
<>
<LayoutKatalogNew userLoginId={userLoginId}>{children}</LayoutKatalogNew>
<LayoutKatalogNew>{children}</LayoutKatalogNew>
</>
);
}

View File

@@ -1,6 +1,6 @@
import { ViewKatalogNew } from "@/app_modules/katalog";
export default async function Page() {
export default function Page() {
return (
<>
<ViewKatalogNew />

View File

@@ -1,6 +1,6 @@
import { CreateProfile } from "@/app_modules/katalog/profile";
export default async function Page() {
export default function Page() {
return (
<>
<CreateProfile />

View File

@@ -1,12 +1,6 @@
import { EditProfileLayout } from "@/app_modules/katalog/profile";
export default async function Layout({
children,
params,
}: {
children: any;
params: { id: string };
}) {
export default function Layout({ children }: { children: any }) {
return (
<>
<EditProfileLayout>{children}</EditProfileLayout>

View File

@@ -1,10 +1,9 @@
import EditProfile from "@/app_modules/katalog/profile/edit/view";
export default async function Page() {
export default function Page() {
return (
<>
<EditProfile />
<EditProfile />
</>
);
}

View File

@@ -1,11 +1,7 @@
import LayoutProfile_UpdateFotoBackground from "@/app_modules/katalog/profile/upload/foto_background/layout";
import React from "react";
export default async function Layout({
children,
}: {
children: React.ReactNode;
}) {
export default function Layout({ children }: { children: React.ReactNode }) {
return (
<>
<LayoutProfile_UpdateFotoBackground>

View File

@@ -1,6 +1,6 @@
import Profile_UpdateFotoBackground from "@/app_modules/katalog/profile/upload/foto_background"
import Profile_UpdateFotoBackground from "@/app_modules/katalog/profile/upload/foto_background";
export default async function Page() {
export default function Page() {
return (
<>
<Profile_UpdateFotoBackground />

View File

@@ -1,11 +1,7 @@
import { UploadFotoProfileLayout } from "@/app_modules/katalog/profile";
import React from "react";
export default async function Layout({
children,
}: {
children: React.ReactNode;
}) {
export default function Layout({ children }: { children: React.ReactNode }) {
return (
<>
<UploadFotoProfileLayout>{children}</UploadFotoProfileLayout>

View File

@@ -1,6 +1,6 @@
import { UploadFotoProfile } from "@/app_modules/katalog/profile";
export default async function Page() {
export default function Page() {
return (
<>
<UploadFotoProfile />

View File

@@ -1,5 +1,6 @@
"use client";
import { Component_Header } from "@/app_modules/_global/component/new/component_header";
import { apiNewGetUserIdByToken } from "@/app_modules/_global/lib/api_fetch_global";
import UI_NewLayoutTamplate, {
UI_NewChildren,
UI_NewHeader,
@@ -13,22 +14,23 @@ import { useParams } from "next/navigation";
import { useState } from "react";
import DrawerKatalogNew from "../component/drawer_katalog_new";
export default function LayoutKatalogNew({
children,
userLoginId,
}: {
children: any;
userLoginId: string;
}) {
export default function LayoutKatalogNew({ children }: { children: any }) {
const param = useParams<{ id: string }>();
const [authorId, setAuthorId] = useState("");
const [userRoleId, setUserRoleId] = useState("");
const [opened, { open, close }] = useDisclosure();
const [loading, setLoading] = useState(true);
const [userLoginId, setUserLoginId] = useState("");
async function getProfile() {
async function handleLoadDataUser() {
try {
setLoading(true);
const reponseUser = await apiNewGetUserIdByToken();
if (reponseUser.success) {
setUserLoginId(reponseUser.userId);
}
const response = await apiGetUserProfile(`?profile=${param.id}`);
if (response) {
@@ -43,38 +45,11 @@ export default function LayoutKatalogNew({
}
useShallowEffect(() => {
getProfile();
handleLoadDataUser();
}, []);
return (
<>
{/* <UIGlobal_LayoutTamplate
header={
<UIGlobal_LayoutHeaderTamplate
title="KATALOG"
customButtonRight={
loading ? (
<ActionIcon disabled variant="transparent">
<CustomSkeleton h={20} w={20} radius={"100%"} />
</ActionIcon>
) : authorId == userLoginId ? (
<ActionIcon
c="white"
variant="transparent"
onClick={() => open()}
>
<IconDotsVertical />
</ActionIcon>
) : (
<ActionIcon disabled variant="transparent"></ActionIcon>
)
}
/>
}
>
{children}
</UIGlobal_LayoutTamplate> */}
<UI_NewLayoutTamplate>
<UI_NewHeader>
<Component_Header