From 82a4233fb1798669c2d0354197e857d5ef002a1d Mon Sep 17 00:00:00 2001 From: Sabda Yagra Date: Wed, 25 Jun 2025 10:28:45 +0700 Subject: [PATCH] QUDO-285 --- components/landing-page/hero-new.tsx | 10 ++++++++-- service/settings/settings.ts | 5 +++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/components/landing-page/hero-new.tsx b/components/landing-page/hero-new.tsx index 34f8e2ad..c97dbb0f 100644 --- a/components/landing-page/hero-new.tsx +++ b/components/landing-page/hero-new.tsx @@ -48,6 +48,7 @@ import "swiper/css/navigation"; import "swiper/css/pagination"; import { ChevronLeft, ChevronRight } from "lucide-react"; import { Link } from "@/i18n/routing"; +import { listBannerHero } from "@/service/settings/settings"; type HeroModalProps = { onClose: () => void; @@ -354,7 +355,8 @@ const HeroNew = (props: { group?: string }) => { const response = await getHeroData(locale == "en"); console.log(response); let data = response?.data?.data?.content; - setHeroData(response?.data?.data?.content); + setHeroData(data); + if (data) { const resStatic = await listStaticBanner( props.group == "mabes" @@ -368,12 +370,16 @@ const HeroNew = (props: { group?: string }) => { : "", locale == "en" ); + for (let i = 0; i < resStatic?.data?.data?.length; i++) { const media = resStatic?.data.data[i]?.mediaUpload; - media.fileTypeId = media.fileType?.id; + if (!media) continue; + media.fileTypeId = media?.fileType?.id ?? null; data = data.filter((item: any) => item.id != media.id); + data.splice(0, 0, media); } + setContent(data); } }; diff --git a/service/settings/settings.ts b/service/settings/settings.ts index 71e31f61..49058bd8 100644 --- a/service/settings/settings.ts +++ b/service/settings/settings.ts @@ -57,6 +57,11 @@ export async function listBanner() { return httpGetInterceptor(url); } +export async function listBannerHero(group: any = "", isInt: Boolean = false) { + const url = `media/banner?group=${group}&isInt=${isInt}`; + return httpGetInterceptor(url); +} + export async function listStaticBanner() { const url = "media/static-banner"; return httpGetInterceptor(url);