merge dev-sabda-v2

This commit is contained in:
Sabda Yagra 2025-06-25 11:10:40 +07:00
commit 3c6358fa62
2 changed files with 13 additions and 2 deletions

View File

@ -48,6 +48,7 @@ import "swiper/css/navigation";
import "swiper/css/pagination"; import "swiper/css/pagination";
import { ChevronLeft, ChevronRight } from "lucide-react"; import { ChevronLeft, ChevronRight } from "lucide-react";
import { Link } from "@/i18n/routing"; import { Link } from "@/i18n/routing";
import { listBannerHero } from "@/service/settings/settings";
type HeroModalProps = { type HeroModalProps = {
onClose: () => void; onClose: () => void;
@ -354,7 +355,8 @@ const HeroNew = (props: { group?: string }) => {
const response = await getHeroData(locale == "en"); const response = await getHeroData(locale == "en");
console.log(response); console.log(response);
let data = response?.data?.data?.content; let data = response?.data?.data?.content;
setHeroData(response?.data?.data?.content); setHeroData(data);
if (data) { if (data) {
const resStatic = await listStaticBanner( const resStatic = await listStaticBanner(
props.group == "mabes" props.group == "mabes"
@ -368,12 +370,16 @@ const HeroNew = (props: { group?: string }) => {
: "", : "",
locale == "en" locale == "en"
); );
for (let i = 0; i < resStatic?.data?.data?.length; i++) { for (let i = 0; i < resStatic?.data?.data?.length; i++) {
const media = resStatic?.data.data[i]?.mediaUpload; 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 = data.filter((item: any) => item.id != media.id);
data.splice(0, 0, media); data.splice(0, 0, media);
} }
setContent(data); setContent(data);
} }
}; };

View File

@ -57,6 +57,11 @@ export async function listBanner() {
return httpGetInterceptor(url); 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() { export async function listStaticBanner() {
const url = "media/static-banner"; const url = "media/static-banner";
return httpGetInterceptor(url); return httpGetInterceptor(url);