merge main

This commit is contained in:
Anang Yusman 2025-05-23 10:29:06 +08:00
commit a25869bb67
4 changed files with 38 additions and 8 deletions

View File

@ -1,5 +1,5 @@
"use client";
import { listData } from "@/service/landing/landing";
import { listData, listStaticBanner } from "@/service/landing/landing";
import { useParams, usePathname, useRouter } from "next/navigation";
import React, { useEffect, useState } from "react";
import Skeleton, { SkeletonTheme } from "react-loading-skeleton";
@ -28,8 +28,17 @@ const HeaderBannerSatker = () => {
async function fetchData() {
const res = await listData("1", "", "", 5, 0, "createdAt", "", "", "satker-" + satkerName);
let data = res?.data?.data?.content;
setContent(data);
var data = res?.data?.data?.content;
if (data) {
const resStatic = await listStaticBanner(satkerName, false);
for (let i = 0; i < resStatic?.data?.data?.length; i++) {
const media = resStatic?.data.data[i]?.mediaUpload;
media.fileTypeId = media.fileType?.id;
data = data.filter((item: any) => item.id != media.id);
data.splice(0, 0, media);
}
setContent(data);
}
setCenterPadding(`${Math.trunc(Number(window.innerWidth) / 10 + 40)}px`);
setIsBannerLoading(false);
console.log("Done");

View File

@ -1,5 +1,5 @@
"use client";
import { listData } from "@/service/landing/landing";
import { listData, listStaticBanner } from "@/service/landing/landing";
import { useParams } from "next/navigation";
import React, { useEffect, useState } from "react";
import Skeleton, { SkeletonTheme } from "react-loading-skeleton";
@ -29,8 +29,17 @@ const HeaderBanner = () => {
async function fetchData() {
const res = await listData("1", "", "", 5, 0, "createdAt", "", "", poldaName);
let data = res?.data?.data?.content;
setContent(data);
var data = res?.data?.data?.content;
if (data) {
const resStatic = await listStaticBanner(poldaName, false);
for (let i = 0; i < resStatic?.data?.data?.length; i++) {
const media = resStatic?.data.data[i]?.mediaUpload;
media.fileTypeId = media.fileType?.id;
data = data.filter((item: any) => item.id != media.id);
data.splice(0, 0, media);
}
setContent(data);
}
setCenterPadding(`${Math.trunc(Number(window.innerWidth) / 10 + 40)}px`);
setIsBannerLoading(false);
console.log("Done");

View File

@ -81,8 +81,20 @@ const HeroModal = ({ onClose }: { onClose: () => void }) => {
const initFetch = async () => {
const response = await getHeroData();
console.log(response);
setHeroData(response?.data?.data?.content);
let data = response?.data?.data?.content;
if (data) {
const resStatic = await listStaticBanner();
for (let i = 0; i < resStatic?.data?.data?.length; i++) {
const media = resStatic?.data.data[i]?.mediaUpload;
media.fileTypeId = media.fileType?.id;
data = data.filter((item: any) => item.id != media.id);
data.splice(0, 0, media);
}
setHeroData(data);
}
};
return (
<div className="fixed inset-0 flex items-center justify-center backdrop-brightness-50 z-50 ">
<div className="relative dark:bg-gray-900 rounded-lg w-[90%] md:w-[600px] p-4 shadow-none">

View File

@ -41,7 +41,7 @@ export async function listStaticBanner(
group: any = "",
isInt: Boolean = false
) {
const url = `media/static-banner?&group=${group}&isInt=${isInt}`;
const url = `media/static-banner?group=${group}&isInt=${isInt}`;
return httpGetInterceptor(url);
}