diff --git a/components/landing-page/header-banner-satker.tsx b/components/landing-page/header-banner-satker.tsx index 102b1091..ca46ffb0 100644 --- a/components/landing-page/header-banner-satker.tsx +++ b/components/landing-page/header-banner-satker.tsx @@ -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"); diff --git a/components/landing-page/header-banner.tsx b/components/landing-page/header-banner.tsx index 19958146..c48c8bf4 100644 --- a/components/landing-page/header-banner.tsx +++ b/components/landing-page/header-banner.tsx @@ -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"); diff --git a/components/landing-page/hero.tsx b/components/landing-page/hero.tsx index b1b7d48c..3485d734 100644 --- a/components/landing-page/hero.tsx +++ b/components/landing-page/hero.tsx @@ -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 (