diff --git a/app/[locale]/page.tsx b/app/[locale]/page.tsx
index 52ec5403..215b8b15 100644
--- a/app/[locale]/page.tsx
+++ b/app/[locale]/page.tsx
@@ -5,7 +5,7 @@ import NewContent from "@/components/landing-page/new-content";
 import PopularContent from "@/components/landing-page/popular-content";
 import ContentCategory from "@/components/landing-page/content-category";
 import Coverage from "@/components/landing-page/coverage";
-import Navbar from "@/components/landing-page/navbar";
+import Navbar from "@/components/landing-page/Navbar";
 import Hero from "@/components/landing-page/hero";
 import Footer from "@/components/landing-page/footer";
 import Division from "@/components/landing-page/division";
@@ -16,8 +16,9 @@ const Home = ({ params: { locale } }: { params: { locale: string } }) => {
       <Navbar />
       <Hero />
       <SearchSection />
-      <NewContent />
-      <PopularContent />
+      <NewContent type="latest" />
+      <NewContent type="popular" />
+      {/* <PopularContent /> */}
       <ContentCategory />
       <Coverage />
       <Division />
diff --git a/components/landing-page/Hero.tsx b/components/landing-page/Hero.tsx
index 5db61cc1..48f13719 100644
--- a/components/landing-page/Hero.tsx
+++ b/components/landing-page/Hero.tsx
@@ -1,122 +1,80 @@
-import { textEllipsis } from "@/utils/globals";
+import { formatDateToIndonesian, textEllipsis } from "@/utils/globals";
 import React, { useEffect, useState } from "react";
 import { Swiper, SwiperSlide } from "swiper/react";
 import "swiper/css/bundle";
+import { getHeroData } from "@/service/landing/landing";
+import Link from "next/link";
+import { useParams, usePathname, useRouter } from "next/navigation";
 
 const Hero: React.FC = () => {
+  const router = useRouter();
+  const pathname = usePathname();
+  const params = useParams();
+  const locale = params?.locale;
+
+  const [heroData, setHeroData] = useState<any>();
+  useEffect(() => {
+    initFetch();
+  }, []);
+  const initFetch = async () => {
+    const response = await getHeroData();
+    console.log(response);
+    setHeroData(response?.data?.data?.content);
+  };
   return (
     <div className="flex flex-col lg:flex-row items-start gap-4 px-4 lg:px-12 max-w-screen-xl py-4 mx-auto">
       {/* Section Gambar Utama */}
-      <div className="lg:w-2/3 w-full lg:h-full cursor-pointer">
+      <div className="lg:w-2/3 w-full lg:h-full">
         <Swiper spaceBetween={50} slidesPerView={1} pagination={{ clickable: true }} onSlideChange={() => console.log("slide change")} onSwiper={(swiper) => console.log(swiper)}>
-          <SwiperSlide>
-            <div className="relative h-[310px] lg:h-[420px]">
-              <img src="/assets/banner-sample.png" alt="Gambar Utama" className="w-full h-[310px] lg:h-[420px] rounded-lg" />
-              <div className="absolute bottom-0 left-0 right-0 bg-black bg-opacity-70 text-white p-4 rounded-b-lg">
-                <span className="text-white bg-[#bb3523] rounded-md w-full h-full font-semibold uppercase text-sm px-4 py-1">Liputan Kegiatan</span>
-                <h2 className="text-lg font-bold mt-2">Divisi Humas Polri Siap Menuju Zona Integritas</h2>
-                <p className="text-sm flex flex-row items-center gap-1 mt-1">15 Maret 2024 14:01 WIB | </p>
+          {heroData?.map((list: any) => (
+            <SwiperSlide key={list?.id}>
+              <div className="relative h-[310px] lg:h-[420px]">
+                <img src={list?.thumbnailLink} alt="Gambar Utama" className="w-full h-[310px] lg:h-[420px] rounded-lg" />
+                <div className="absolute bottom-0 left-0 right-0 bg-black bg-opacity-70 text-white p-4 rounded-b-lg">
+                  <span className="text-white bg-[#bb3523] rounded-md w-full h-full font-semibold uppercase text-sm px-4 py-1">{list?.categoryName}</span>
+                  <Link href={`${locale}/image/detail/${list?.slug}`}>
+                    <h2 className="text-lg font-bold mt-2">{list?.title}</h2>
+                  </Link>
+
+                  <p className="text-sm flex flex-row items-center gap-1 mt-1">
+                    {formatDateToIndonesian(new Date(list?.createdAt))} {list?.timezone ? list?.timezone : "WIB"}|{" "}
+                    <svg xmlns="http://www.w3.org/2000/svg" width="1.2em" height="1.2em" viewBox="0 0 24 24">
+                      <path
+                        fill="white"
+                        d="M11.5 18c4 0 7.46-2.22 9.24-5.5C18.96 9.22 15.5 7 11.5 7s-7.46 2.22-9.24 5.5C4.04 15.78 7.5 18 11.5 18m0-12c4.56 0 8.5 2.65 10.36 6.5C20 16.35 16.06 19 11.5 19S3 16.35 1.14 12.5C3 8.65 6.94 6 11.5 6m0 2C14 8 16 10 16 12.5S14 17 11.5 17S7 15 7 12.5S9 8 11.5 8m0 1A3.5 3.5 0 0 0 8 12.5a3.5 3.5 0 0 0 3.5 3.5a3.5 3.5 0 0 0 3.5-3.5A3.5 3.5 0 0 0 11.5 9"
+                      />
+                    </svg>{" "}
+                    {list?.clickCount}{" "}
+                  </p>
+                </div>
               </div>
-            </div>
-          </SwiperSlide>
-          <SwiperSlide>
-            <div className="relative h-[310px] lg:h-[420px]">
-              <img src="/assets/banner-sample.png" alt="Gambar Utama" className="w-full h-[310px] lg:h-[420px] rounded-lg" />
-              <div className="absolute bottom-0 left-0 right-0 bg-black bg-opacity-70 text-white p-4 rounded-b-lg">
-                <span className="text-white bg-[#bb3523] rounded-md w-full h-full font-semibold uppercase text-sm px-4 py-1">Liputan Kegiatan</span>
-                <h2 className="text-lg font-bold mt-2">Divisi Humas Polri Siap Menuju Zona Integritas</h2>
-                <p className="text-sm flex flex-row items-center gap-1 mt-1">15 Maret 2024 14:01 WIB | </p>
-              </div>
-            </div>
-          </SwiperSlide>
-          <SwiperSlide>
-            <div className="relative h-[310px] lg:h-[420px]">
-              <img src="/assets/banner-sample.png" alt="Gambar Utama" className="w-full h-[310px] lg:h-[420px] rounded-lg" />
-              <div className="absolute bottom-0 left-0 right-0 bg-black bg-opacity-70 text-white p-4 rounded-b-lg">
-                <span className="text-white bg-[#bb3523] rounded-md w-full h-full font-semibold uppercase text-sm px-4 py-1">Liputan Kegiatan</span>
-                <h2 className="text-lg font-bold mt-2">Divisi Humas Polri Siap Menuju Zona Integritas</h2>
-                <p className="text-sm flex flex-row items-center gap-1 mt-1">15 Maret 2024 14:01 WIB | </p>
-              </div>
-            </div>
-          </SwiperSlide>
-          <SwiperSlide>
-            <div className="relative h-[310px] lg:h-[420px]">
-              <img src="/assets/banner-sample.png" alt="Gambar Utama" className="w-full h-[310px] lg:h-[420px] rounded-lg" />
-              <div className="absolute bottom-0 left-0 right-0 bg-black bg-opacity-70 text-white p-4 rounded-b-lg">
-                <span className="text-white bg-[#bb3523] rounded-md w-full h-full font-semibold uppercase text-sm px-4 py-1">Liputan Kegiatan</span>
-                <h2 className="text-lg font-bold mt-2">Divisi Humas Polri Siap Menuju Zona Integritas</h2>
-                <p className="text-sm flex flex-row items-center gap-1 mt-1">
-                  15 Maret 2024 14:01 WIB |{" "}
-                  <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24">
-                    <path
-                      fill="white"
-                      d="M11.5 18c4 0 7.46-2.22 9.24-5.5C18.96 9.22 15.5 7 11.5 7s-7.46 2.22-9.24 5.5C4.04 15.78 7.5 18 11.5 18m0-12c4.56 0 8.5 2.65 10.36 6.5C20 16.35 16.06 19 11.5 19S3 16.35 1.14 12.5C3 8.65 6.94 6 11.5 6m0 2C14 8 16 10 16 12.5S14 17 11.5 17S7 15 7 12.5S9 8 11.5 8m0 1A3.5 3.5 0 0 0 8 12.5a3.5 3.5 0 0 0 3.5 3.5a3.5 3.5 0 0 0 3.5-3.5A3.5 3.5 0 0 0 11.5 9"
-                    />
-                  </svg>{" "}
-                  633{" "}
-                </p>
-              </div>
-            </div>
-          </SwiperSlide>
+            </SwiperSlide>
+          ))}
         </Swiper>
       </div>
 
       {/* Section Kanan */}
       <div className="lg:w-1/3 w-full">
         <ul className="py-4 lg:py-0 flex flex-row lg:flex-col gap-4 flex-nowrap w-full overflow-x-auto">
-          {[
-            {
-              label: "OPS MANTAP PRAJA & PILKADA 2024",
-              title: "Doa Bersama Lintas Agama Jelang Pilkada di Papua",
-              time: "26 November 2024 16:33 WIT",
-              views: 13,
-              src: "https://mediahub.polri.go.id/api/media/view?id=113865&operation=thumbnail&isSmall=true&currentMilis=1732784412735",
-            },
-            {
-              label: "OPS MANTAP PRAJA & PILKADA 2024",
-              title: "Potret Pengawalan Distribusi Logistik Pilkada ke Distrik-distrik di Kabupaten Yahukimo",
-              time: "26 November 2024 16:29 WIT",
-              views: 29,
-              src: "https://mediahub.polri.go.id/api/media/view?id=113948&operation=thumbnail&isSmall=true&currentMilis=1732784412735",
-            },
-            {
-              label: "INFOGRAFIS",
-              title: "Dirgahayu ke-62 Seskoal",
-              time: "26 November 2024 16:26 WIB",
-              views: 2,
-              src: "https://mediahub.polri.go.id/api/media/view?id=113624&operation=thumbnail&isSmall=true&currentMilis=1732784412736",
-            },
-            {
-              label: "UNGKAP KASUS",
-              title: "Evakuasi 30 Korban Kecelakaan Maut Truk di Tolikara",
-              time: "26 November 2024 16:25 WIT",
-              views: 26,
-              src: "https://mediahub.polri.go.id/api/media/view?id=113815&operation=thumbnail&isSmall=true&currentMilis=1732784412736",
-            },
-            {
-              label: "UNGKAP KASUS",
-              title: "Evakuasi 30 Korban Kecelakaan Maut Truk di Tolikara",
-              time: "26 November 2024 16:25 WIT",
-              views: 26,
-              src: "https://mediahub.polri.go.id/api/media/view?id=113815&operation=thumbnail&isSmall=true&currentMilis=1732784412736",
-            },
-          ].map((item, index) => (
-            <li key={index} className="flex gap-4 flex-row lg:w-full ">
+          {heroData?.map((item: any) => (
+            <li key={item?.id} className="flex gap-4 flex-row lg:w-full ">
               <div className="flex-shrink-0 w-24 rounded-lg">
-                <img src={item.src} alt={item.title} className="w-full object-cover rounded-lg" />
+                <img src={item?.thumbnailLink} alt={item?.title} className="w-full object-cover rounded-lg" />
               </div>
               <div className="w-[280px] lg:w-auto">
-                <span className="text-white bg-[#bb3523] px-4 py-1 rounded-lg flex text-xs font-bold uppercase w-fit">{item.label}</span>
-                <h3 className="text-sm font-bold mt-2">{textEllipsis(item.title, 30)}</h3>
+                <span className="text-white bg-[#bb3523] px-4 py-1 rounded-lg flex text-xs font-bold uppercase w-fit">{item?.categoryName}</span>
+                <Link href={`${locale}/image/detail/${item?.slug}`}>
+                  <h3 className="text-sm font-bold mt-2">{textEllipsis(item?.title, 30)}</h3>
+                </Link>
                 <p className="text-xs flex flex-row items-center gap-1 text-gray-500 mt-1">
-                  {item.time} |{" "}
+                  {formatDateToIndonesian(new Date(item?.createdAt))} {item?.timezone ? item?.timezone : "WIB"} |{" "}
                   <svg xmlns="http://www.w3.org/2000/svg" width="1.2em" height="1.2em" viewBox="0 0 24 24">
                     <path
-                      fill="black"
+                      fill="currentColor"
                       d="M11.5 18c4 0 7.46-2.22 9.24-5.5C18.96 9.22 15.5 7 11.5 7s-7.46 2.22-9.24 5.5C4.04 15.78 7.5 18 11.5 18m0-12c4.56 0 8.5 2.65 10.36 6.5C20 16.35 16.06 19 11.5 19S3 16.35 1.14 12.5C3 8.65 6.94 6 11.5 6m0 2C14 8 16 10 16 12.5S14 17 11.5 17S7 15 7 12.5S9 8 11.5 8m0 1A3.5 3.5 0 0 0 8 12.5a3.5 3.5 0 0 0 3.5 3.5a3.5 3.5 0 0 0 3.5-3.5A3.5 3.5 0 0 0 11.5 9"
                     />
                   </svg>{" "}
-                  {item.views}
+                  {item?.clickCount}
                 </p>
               </div>
             </li>
diff --git a/components/landing-page/content-category.tsx b/components/landing-page/content-category.tsx
index 26fbbe3b..581a963c 100644
--- a/components/landing-page/content-category.tsx
+++ b/components/landing-page/content-category.tsx
@@ -1,69 +1,17 @@
+import { getCategoryData } from "@/service/landing/landing";
 import Link from "next/link";
-import React from "react";
+import React, { useEffect, useState } from "react";
 
 const ContentCategory = () => {
-  const categories = [
-    {
-      id: 1,
-      thumbnail: "https://mediahub.polri.go.id/api/media/categories/view-thumbnail?id=125&currentMilis=1732769540018",
-      title: "PON XXI",
-    },
-    {
-      id: 2,
-      thumbnail: "https://mediahub.polri.go.id/api/media/categories/view-thumbnail?id=128&currentMilis=1732769540018",
-      title: "OPS LILIN NATARU 2024",
-    },
-    {
-      id: 3,
-      thumbnail: "https://mediahub.polri.go.id/api/media/categories/view-thumbnail?id=125&currentMilis=1732769540018",
-      title: "PON XXI",
-    },
-    {
-      id: 4,
-      thumbnail: "https://mediahub.polri.go.id/api/media/categories/view-thumbnail?id=125&currentMilis=1732769540018",
-      title: "PON XXI",
-    },
-    {
-      id: 5,
-      thumbnail: "https://mediahub.polri.go.id/api/media/categories/view-thumbnail?id=125&currentMilis=1732769540018",
-      title: "PON XXI",
-    },
-    {
-      id: 6,
-      thumbnail: "https://mediahub.polri.go.id/api/media/categories/view-thumbnail?id=125&currentMilis=1732769540018",
-      title: "PON XXI",
-    },
-    {
-      id: 7,
-      thumbnail: "https://mediahub.polri.go.id/api/media/categories/view-thumbnail?id=125&currentMilis=1732769540018",
-      title: "PON XXI",
-    },
-    {
-      id: 8,
-      thumbnail: "https://mediahub.polri.go.id/api/media/categories/view-thumbnail?id=125&currentMilis=1732769540018",
-      title: "PON XXI",
-    },
-    {
-      id: 9,
-      thumbnail: "https://mediahub.polri.go.id/api/media/categories/view-thumbnail?id=125&currentMilis=1732769540018",
-      title: "PON XXI",
-    },
-    {
-      id: 10,
-      thumbnail: "https://mediahub.polri.go.id/api/media/categories/view-thumbnail?id=125&currentMilis=1732769540018",
-      title: "PON XXI",
-    },
-    {
-      id: 11,
-      thumbnail: "https://mediahub.polri.go.id/api/media/categories/view-thumbnail?id=125&currentMilis=1732769540018",
-      title: "PON XXI",
-    },
-    {
-      id: 12,
-      thumbnail: "https://mediahub.polri.go.id/api/media/categories/view-thumbnail?id=125&currentMilis=1732769540018",
-      title: "PON XXI",
-    },
-  ];
+  const [categories, setCategories] = useState<any>();
+  useEffect(() => {
+    initFetch();
+  }, []);
+  const initFetch = async () => {
+    const response = await getCategoryData();
+    console.log("category",response);
+    setCategories(response?.data?.data?.content);
+  };
 
   return (
     <div className="mx-auto px-4 lg:px-12 py-10 max-w-screen-xl ">
@@ -73,11 +21,11 @@ const ContentCategory = () => {
       <div className="h-1 w-48 bg-[#bb3523] mx-auto mb-6 rounded"></div>
 
       <div className="grid my-3 grid-cols-2 lg:grid-cols-4 gap-4">
-        {categories.map((category) => (
-          <Link key={category.id} href="#" className="relative group rounded-md overflow-hidden shadow-md hover:shadow-lg">
-            <img src={category.thumbnail} className="w-full h-48 sm:h-40 object-cover group-hover:scale-110 transition-transform duration-300" />
+        {categories?.map((category: any) => (
+          <Link key={category?.id} href={`all/filter?category=${category?.id}`} className="relative group rounded-md overflow-hidden shadow-md hover:shadow-lg">
+            <img src={category?.thumbnailLink} className="w-full h-48 sm:h-40 object-cover group-hover:scale-110 transition-transform duration-300" />
             <div className="absolute bottom-0 left-0 right-0 bg-gradient-to-t from-black to-transparent text-white p-2">
-              <h3 className="text-sm font-semibold truncate">{category.title}</h3>
+              <h3 className="text-sm font-semibold truncate">{category?.name}</h3>
             </div>
           </Link>
         ))}
diff --git a/components/landing-page/new-content.tsx b/components/landing-page/new-content.tsx
index 7ca9028d..e5d668c3 100644
--- a/components/landing-page/new-content.tsx
+++ b/components/landing-page/new-content.tsx
@@ -1,156 +1,38 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
-import {
-  Carousel,
-  CarouselContent,
-  CarouselItem,
-  CarouselNext,
-  CarouselPrevious,
-} from "@/components/ui/carousel";
+import { Carousel, CarouselContent, CarouselItem, CarouselNext, CarouselPrevious } from "@/components/ui/carousel";
 import Link from "next/link";
 import { useParams, usePathname, useRouter } from "next/navigation";
 import { Icon } from "@iconify/react/dist/iconify.js";
-import { textEllipsis } from "@/utils/globals";
+import { formatDateToIndonesian, textEllipsis } from "@/utils/globals";
 import { generateLocalizedPath } from "@/utils/globals";
+import { getListContent } from "@/service/landing/landing";
 
-const dummyImage = [
-  {
-    id: 1,
-    thumbnail: "/assets/banner-sample.png",
-    date: "17 MEI 2024",
-    title:
-      "Kapolres Batam Berikan pengarahan pagi kepada para anggota dan staf yang terkait",
-    time: "18.00 WIB",
-  },
-  {
-    id: 2,
-    thumbnail: "/assets/banner-sample.png",
-    date: "17 MEI 2024",
-    title:
-      "Kapolres Batam Berikan pengarahan pagi kepada para anggota dan staf yang terkait",
-    time: "18.00 WIB",
-  },
-  {
-    id: 3,
-    thumbnail: "/assets/banner-sample.png",
-    date: "17 MEI 2024",
-    title:
-      "Kapolres Batam Berikan pengarahan pagi kepada para anggota dan staf yang terkait",
-    time: "18.00 WIB",
-  },
-  {
-    id: 4,
-    thumbnail: "/assets/banner-sample.png",
-    date: "17 MEI 2024",
-    title:
-      "Kapolres Batam Berikan pengarahan pagi kepada para anggota dan staf yang terkait",
-    time: "18.00 WIB",
-  },
-  {
-    id: 5,
-    thumbnail: "/assets/banner-sample.png",
-    date: "17 MEI 2024",
-    title:
-      "Kapolres Batam Berikan pengarahan pagi kepada para anggota dan staf yang terkait",
-    time: "18.00 WIB",
-  },
-  {
-    id: 6,
-    thumbnail: "/assets/banner-sample.png",
-    date: "17 MEI 2024",
-    title:
-      "Kapolres Batam Berikan pengarahan pagi kepada para anggota dan staf yang terkait",
-    time: "18.00 WIB",
-  },
-  {
-    id: 7,
-    thumbnail: "/assets/banner-sample.png",
-    date: "17 MEI 2024",
-    title:
-      "Kapolres Batam Berikan pengarahan pagi kepada para anggota dan staf yang terkait",
-    time: "18.00 WIB",
-  },
-  {
-    id: 8,
-    thumbnail: "/assets/banner-sample.png",
-    date: "17 MEI 2024",
-    title:
-      "Kapolres Batam Berikan pengarahan pagi kepada para anggota dan staf yang terkait",
-    time: "18.00 WIB",
-  },
-  {
-    id: 9,
-    thumbnail: "/assets/banner-sample.png",
-    date: "17 MEI 2024",
-    title:
-      "Kapolres Batam Berikan pengarahan pagi kepada para anggota dan staf yang terkait",
-    time: "18.00 WIB",
-  },
-];
-
-const dummyDescription = [
-  {
-    id: 1,
-    title:
-      "Kapolres Batam Berikan pengarahan pagi kepada para anggota dan staf yang terkait",
-    date: "28 November 2024",
-    time: "11.15 WIB",
-    duration: "00:24:55",
-  },
-  {
-    id: 2,
-    title:
-      "Kapolres Lahat Himbau Cipta Kondisi Cooling System Pasca Pemungutan Suara Pilkada 2024",
-    date: "28 November 2024",
-    time: "11.15 WIB",
-    duration: "00:24:55",
-  },
-  {
-    id: 3,
-    title:
-      "17 Ton Pupuk Bersubsidi yang Akan Diselewengkan ke Banyuasin Berhasil Digagalkan",
-    date: "28 November 2024",
-    time: "11.15 WIB",
-    duration: "00:24:55",
-  },
-  {
-    id: 4,
-    title:
-      "Kapolda Sumsel Apelkan 1471 Personel Persiapan Pengamanan Pengawalan Tahan Pungut dan Hitung Suara",
-    date: "28 November 2024",
-    time: "11.15 WIB",
-    duration: "00:24:55",
-  },
-  {
-    id: 5,
-    title:
-      "Polrestabes Palembang Berhasil Mengungkap Kasus Penganiayaan Berat di Ilir Barat II",
-    date: "28 November 2024",
-    time: "11.15 WIB",
-    duration: "00:24:55",
-  },
-  {
-    id: 6,
-    title: "Tahapan Pilkada di Sumsel Berlangsung Kondusif",
-    date: "28 November 2024",
-    time: "11.15 WIB",
-    duration: "00:24:55",
-  },
-];
-
-const NewContent = () => {
+const NewContent = (props: { type: string }) => {
+  const [newContent, setNewContent] = useState<any>();
   const [selectedTab, setSelectedTab] = useState("video");
   const router = useRouter();
   const pathname = usePathname();
   const params = useParams();
   const locale = params?.locale;
 
+  useEffect(() => {
+    initFetch();
+  }, [selectedTab]);
+  const initFetch = async () => {
+    const request = { sortBy: props.type == "popular" ? "clickCount" : "createdAt", contentTypeId: selectedTab == "image" ? "1" : selectedTab == "video" ? "2" : selectedTab == "text" ? "3" : selectedTab == "audio" ? "4" : "" };
+    const response = await getListContent(request);
+    console.log("category", response);
+    setNewContent(response?.data?.data?.content);
+  };
+
   return (
     <div className="px-4 lg:px-16 ">
       <div className="flex flex-col p-4">
         <div className="mx-auto w-full max-w-7xl justify-start flex px-5 flex-col lg:flex-row gap-5 mb-4">
           <h2 className="flex items-center text-sm lg:text-xl w-fit font-bold bg-[#bb3523] px-4 py-1 rounded-lg text-white">
-            <span className="text-black ">Konten </span> Terbaru
+            <span className="text-black ">Konten&nbsp;</span>
+            {props.type == "popular" ? "Populer" : "Terbaru"}
           </h2>
           <Tabs value={selectedTab} onValueChange={setSelectedTab}>
             <TabsList>
@@ -173,7 +55,7 @@ const NewContent = () => {
                 Foto
               </TabsTrigger>
               <TabsTrigger
-                value="teks"
+                value="text"
                 className="relative text-sm md:text-xl font-bold text-black dark:text-white dark:bg-transparent before:absolute before:top-full before:left-0 before:h-px before:w-full data-[state=active]:before:bg-primary"
               >
                 Teks
@@ -183,125 +65,108 @@ const NewContent = () => {
         </div>
         <div className="px-10">
           {selectedTab == "video" ? (
-            <Carousel className="w-full max-w-7xl mx-auto">
-              <CarouselContent>
-                {dummyImage.map((image) => (
-                  <CarouselItem key={image.id} className="md:basis-1/2 lg:basis-1/3">
-                    <Link href={generateLocalizedPath(`/video/detail/${image.id}`, String(locale))} className="relative group rounded-md overflow-hidden shadow-md hover:shadow-lg">
-                      <img src={image.thumbnail} className="w-full h-32 lg:h-60 object-cover group-hover:scale-100 transition-transform duration-300" />
-                      <div className="absolute bottom-0 left-0 right-0 bg-gradient-to-r from-black to-slate-500 text-white p-2">
-                        <h1 className="text-sm font-semibold truncate">{image.title}</h1>
-                        <p className="flex flex-row items-center text-sm gap-2">
-                          {image.date} {image.time} | <Icon icon="formkit:eye" width="15" height="15" /> 518{" "}
-                          <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 20 20">
-                            <path
-                              fill="#f00"
-                              d="M7.707 10.293a1 1 0 1 0-1.414 1.414l3 3a1 1 0 0 0 1.414 0l3-3a1 1 0 0 0-1.414-1.414L11 11.586V6h5a2 2 0 0 1 2 2v7a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h5v5.586zM9 4a1 1 0 0 1 2 0v2H9z"
-                            />
-                          </svg>{" "}
-                        </p>
-                      </div>
-                    </Link>
-                  </CarouselItem>
-                ))}
-              </CarouselContent>
-              <CarouselPrevious />
-              <CarouselNext />
-            </Carousel>
+            newContent?.length > 0 ? (
+              <Carousel className="w-full max-w-7xl mx-auto">
+                <CarouselContent>
+                  {newContent?.map((video: any) => (
+                    <CarouselItem key={video?.id} className="md:basis-1/2 lg:basis-1/3">
+                      <Link href={generateLocalizedPath(`/video/detail/${video?.id}`, String(locale))} className="relative group rounded-md overflow-hidden shadow-md hover:shadow-lg">
+                        <img src={video?.thumbnailLink} className="w-full h-32 lg:h-60 object-cover group-hover:scale-100 transition-transform duration-300" />
+                        <div className="absolute bottom-0 left-0 right-0 bg-gradient-to-r from-black to-slate-500 text-white p-2">
+                          <h1 className="text-sm font-semibold truncate">{video?.title}</h1>
+                          <p className="flex flex-row items-center text-sm gap-2">
+                            {formatDateToIndonesian(new Date(video?.createdAt))} {video?.timezone ? video?.timezone : "WIB"} | <Icon icon="formkit:eye" width="15" height="15" /> {video.clickCount}{" "}
+                            <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 20 20">
+                              <path
+                                fill="#f00"
+                                d="M7.707 10.293a1 1 0 1 0-1.414 1.414l3 3a1 1 0 0 0 1.414 0l3-3a1 1 0 0 0-1.414-1.414L11 11.586V6h5a2 2 0 0 1 2 2v7a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h5v5.586zM9 4a1 1 0 0 1 2 0v2H9z"
+                              />
+                            </svg>{" "}
+                          </p>
+                        </div>
+                      </Link>
+                    </CarouselItem>
+                  ))}
+                </CarouselContent>
+                <CarouselPrevious />
+                <CarouselNext />
+              </Carousel>
+            ) : (
+              <p>No Data</p>
+            )
           ) : selectedTab == "audio" ? (
-            <Carousel>
-              <CarouselContent>
-                {dummyDescription.map((description) => (
-                  <CarouselItem
-                    key={description.id}
-                    className="md:basis-1/2 lg:basis-1/3"
-                  >
-                    <div className="flex flex-row gap-6">
-                      <a
-                        href="#"
-                        key={description.id}
-                        className="flex flex-col  sm:flex-row items-center bg-white dark:bg-gray-800 cursor-pointer shadow-md rounded-lg p-4 gap-4 w-full"
-                      >
-                        <div className="flex items-center justify-center bg-red-500 text-white rounded-lg w-16 h-8 lg:h-16">
-                          <svg
-                            width="32"
-                            height="34"
-                            viewBox="0 0 32 34"
-                            fill="null"
-                            xmlns="http://www.w3.org/2000/svg"
-                          >
-                            <path
-                              d="M23.404 0.452014C23.7033 0.35857 24.0204 0.336816 24.3297 0.388509C24.639 0.440203 24.9318 0.563895 25.1845 0.749599C25.4371 0.935304 25.6426 1.17782 25.7843 1.45756C25.9259 1.73731 25.9998 2.04644 26 2.36001V14.414C25.3462 14.2296 24.6766 14.1064 24 14.046V8.36001L10 12.736V27C10 28.1264 9.6197 29.2197 8.92071 30.1029C8.22172 30.9861 7.24499 31.6075 6.14877 31.8663C5.05255 32.125 3.90107 32.0061 2.88089 31.5287C1.86071 31.0514 1.03159 30.2435 0.52787 29.2361C0.024152 28.2286 -0.124656 27.0806 0.105556 25.9781C0.335768 24.8755 0.931513 23.883 1.79627 23.1613C2.66102 22.4396 3.74413 22.031 4.87009 22.0017C5.99606 21.9724 7.09893 22.3242 8.00001 23V6.73601C7.99982 6.30956 8.13596 5.8942 8.38854 5.55059C8.64112 5.20698 8.99692 4.9531 9.40401 4.82601L23.404 0.452014ZM10 10.64L24 6.26601V2.36001L10 6.73601V10.64ZM5.00001 24C4.20436 24 3.44129 24.3161 2.87869 24.8787C2.31608 25.4413 2.00001 26.2044 2.00001 27C2.00001 27.7957 2.31608 28.5587 2.87869 29.1213C3.44129 29.6839 4.20436 30 5.00001 30C5.79566 30 6.55872 29.6839 7.12133 29.1213C7.68394 28.5587 8.00001 27.7957 8.00001 27C8.00001 26.2044 7.68394 25.4413 7.12133 24.8787C6.55872 24.3161 5.79566 24 5.00001 24ZM32 25C32 27.387 31.0518 29.6761 29.364 31.364C27.6761 33.0518 25.387 34 23 34C20.6131 34 18.3239 33.0518 16.636 31.364C14.9482 29.6761 14 27.387 14 25C14 22.6131 14.9482 20.3239 16.636 18.6361C18.3239 16.9482 20.6131 16 23 16C25.387 16 27.6761 16.9482 29.364 18.6361C31.0518 20.3239 32 22.6131 32 25ZM27.47 24.128L21.482 20.828C21.3298 20.7443 21.1583 20.7016 20.9846 20.7043C20.8108 20.707 20.6408 20.7549 20.4912 20.8433C20.3416 20.9317 20.2176 21.0576 20.1315 21.2086C20.0453 21.3595 20 21.5302 20 21.704V28.304C20 28.4778 20.0453 28.6486 20.1315 28.7995C20.2176 28.9504 20.3416 29.0763 20.4912 29.1647C20.6408 29.2531 20.8108 29.301 20.9846 29.3037C21.1583 29.3064 21.3298 29.2638 21.482 29.18L27.47 25.88C27.6268 25.7937 27.7575 25.6669 27.8486 25.5128C27.9397 25.3587 27.9877 25.183 27.9877 25.004C27.9877 24.825 27.9397 24.6493 27.8486 24.4952C27.7575 24.3412 27.6268 24.2143 27.47 24.128Z"
-                              fill="white"
-                            />
-                          </svg>
-                        </div>
+            newContent?.length > 0 ? (
+              <Carousel>
+                <CarouselContent>
+                  {newContent?.map((audio: any) => (
+                    <CarouselItem key={audio?.id} className="md:basis-1/2 lg:basis-1/3">
+                      <div className="flex flex-row gap-6">
+                        <a href="#" className="flex flex-col  sm:flex-row items-center bg-white dark:bg-gray-800 cursor-pointer shadow-md rounded-lg p-4 gap-4 w-full">
+                          <div className="flex items-center justify-center bg-red-500 text-white rounded-lg w-16 h-8 lg:h-16">
+                            <svg width="32" height="34" viewBox="0 0 32 34" fill="null" xmlns="http://www.w3.org/2000/svg">
+                              <path
+                                d="M23.404 0.452014C23.7033 0.35857 24.0204 0.336816 24.3297 0.388509C24.639 0.440203 24.9318 0.563895 25.1845 0.749599C25.4371 0.935304 25.6426 1.17782 25.7843 1.45756C25.9259 1.73731 25.9998 2.04644 26 2.36001V14.414C25.3462 14.2296 24.6766 14.1064 24 14.046V8.36001L10 12.736V27C10 28.1264 9.6197 29.2197 8.92071 30.1029C8.22172 30.9861 7.24499 31.6075 6.14877 31.8663C5.05255 32.125 3.90107 32.0061 2.88089 31.5287C1.86071 31.0514 1.03159 30.2435 0.52787 29.2361C0.024152 28.2286 -0.124656 27.0806 0.105556 25.9781C0.335768 24.8755 0.931513 23.883 1.79627 23.1613C2.66102 22.4396 3.74413 22.031 4.87009 22.0017C5.99606 21.9724 7.09893 22.3242 8.00001 23V6.73601C7.99982 6.30956 8.13596 5.8942 8.38854 5.55059C8.64112 5.20698 8.99692 4.9531 9.40401 4.82601L23.404 0.452014ZM10 10.64L24 6.26601V2.36001L10 6.73601V10.64ZM5.00001 24C4.20436 24 3.44129 24.3161 2.87869 24.8787C2.31608 25.4413 2.00001 26.2044 2.00001 27C2.00001 27.7957 2.31608 28.5587 2.87869 29.1213C3.44129 29.6839 4.20436 30 5.00001 30C5.79566 30 6.55872 29.6839 7.12133 29.1213C7.68394 28.5587 8.00001 27.7957 8.00001 27C8.00001 26.2044 7.68394 25.4413 7.12133 24.8787C6.55872 24.3161 5.79566 24 5.00001 24ZM32 25C32 27.387 31.0518 29.6761 29.364 31.364C27.6761 33.0518 25.387 34 23 34C20.6131 34 18.3239 33.0518 16.636 31.364C14.9482 29.6761 14 27.387 14 25C14 22.6131 14.9482 20.3239 16.636 18.6361C18.3239 16.9482 20.6131 16 23 16C25.387 16 27.6761 16.9482 29.364 18.6361C31.0518 20.3239 32 22.6131 32 25ZM27.47 24.128L21.482 20.828C21.3298 20.7443 21.1583 20.7016 20.9846 20.7043C20.8108 20.707 20.6408 20.7549 20.4912 20.8433C20.3416 20.9317 20.2176 21.0576 20.1315 21.2086C20.0453 21.3595 20 21.5302 20 21.704V28.304C20 28.4778 20.0453 28.6486 20.1315 28.7995C20.2176 28.9504 20.3416 29.0763 20.4912 29.1647C20.6408 29.2531 20.8108 29.301 20.9846 29.3037C21.1583 29.3064 21.3298 29.2638 21.482 29.18L27.47 25.88C27.6268 25.7937 27.7575 25.6669 27.8486 25.5128C27.9397 25.3587 27.9877 25.183 27.9877 25.004C27.9877 24.825 27.9397 24.6493 27.8486 24.4952C27.7575 24.3412 27.6268 24.2143 27.47 24.128Z"
+                                fill="white"
+                              />
+                            </svg>
+                          </div>
 
-                        <div className="flex flex-col  flex-1">
-                          <div className="text-gray-500 dark:text-gray-400 flex flex-row text-sm">
-                            {description.date} |{" "}
-                            <Icon icon="formkit:eye" width="15" height="15" />{" "}
-                            518
+                          <div className="flex flex-col  flex-1">
+                            <div className="text-gray-500 dark:text-gray-400 flex flex-row text-sm">
+                              {formatDateToIndonesian(new Date(audio?.createdAt))} {audio?.timezone ? audio?.timezone : "WIB"} | <Icon icon="formkit:eye" width="15" height="15" /> {audio?.clickCount}{" "}
+                            </div>
+                            <div className="font-semibold text-gray-900 dark:text-white mt-1 text-sm">{textEllipsis(audio.title, 50)}</div>
                           </div>
-                          <div className="font-semibold text-gray-900 dark:text-white mt-1 text-sm">
-                            {textEllipsis(description.title, 50)}
-                          </div>
-                        </div>
-                      </a>
-                    </div>
-                  </CarouselItem>
-                ))}
-              </CarouselContent>
-              <CarouselPrevious />
-              <CarouselNext />
-            </Carousel>
-          ) : selectedTab == "image" ? (
-            <Carousel>
-              <CarouselContent>
-                {dummyImage.map((image) => (
-                  <CarouselItem key={image.id} className="md:basis-1/2 lg:basis-1/3">
-                    <Link href={generateLocalizedPath(`/image/detail/${image.id}`, String(locale))} className="relative group rounded-md overflow-hidden shadow-md hover:shadow-lg">
-                      <img src={image.thumbnail} className="w-full h-32 lg:h-60 object-cover group-hover:scale-100 transition-transform duration-300" />
-                      <div className="absolute bottom-0 left-0 right-0 bg-gradient-to-r from-black to-slate-500 text-white p-2">
-                        <h1 className="text-sm font-semibold truncate">{image.title}</h1>
-                        <p className="flex flex-row items-center text-sm gap-2">
-                          {image.date} {image.time} | <Icon icon="formkit:eye" width="15" height="15" /> 518{" "}
-                          <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 20 20">
-                            <path
-                              fill="#f00"
-                              d="M7.707 10.293a1 1 0 1 0-1.414 1.414l3 3a1 1 0 0 0 1.414 0l3-3a1 1 0 0 0-1.414-1.414L11 11.586V6h5a2 2 0 0 1 2 2v7a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h5v5.586zM9 4a1 1 0 0 1 2 0v2H9z"
-                            />
-                          </svg>{" "}
-                        </p>
+                        </a>
                       </div>
-                    </Link>
-                  </CarouselItem>
-                ))}
-              </CarouselContent>
-              <CarouselPrevious />
-              <CarouselNext />
-            </Carousel>
-          ) : (
+                    </CarouselItem>
+                  ))}
+                </CarouselContent>
+                <CarouselPrevious />
+                <CarouselNext />
+              </Carousel>
+            ) : (
+              <p>No Data</p>
+            )
+          ) : selectedTab == "image" ? (
+            newContent?.length > 0 ? (
+              <Carousel>
+                <CarouselContent>
+                  {newContent?.map((image: any) => (
+                    <CarouselItem key={image?.id} className="md:basis-1/2 lg:basis-1/3">
+                      <Link href={generateLocalizedPath(`/image/detail/${image?.id}`, String(locale))} className="relative group rounded-md overflow-hidden shadow-md hover:shadow-lg">
+                        <img src={image?.thumbnailLink} className="w-full h-32 lg:h-60 object-cover group-hover:scale-100 transition-transform duration-300" />
+                        <div className="absolute bottom-0 left-0 right-0 bg-gradient-to-r from-black to-slate-500 text-white p-2">
+                          <h1 className="text-sm font-semibold truncate">{image?.title}</h1>
+                          <p className="flex flex-row items-center text-sm gap-2">
+                            {formatDateToIndonesian(new Date(image?.createdAt))} {image?.timezone ? image?.timezone : "WIB"}| <Icon icon="formkit:eye" width="15" height="15" /> {image?.clickCount}{" "}
+                            <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 20 20">
+                              <path
+                                fill="#f00"
+                                d="M7.707 10.293a1 1 0 1 0-1.414 1.414l3 3a1 1 0 0 0 1.414 0l3-3a1 1 0 0 0-1.414-1.414L11 11.586V6h5a2 2 0 0 1 2 2v7a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h5v5.586zM9 4a1 1 0 0 1 2 0v2H9z"
+                              />
+                            </svg>{" "}
+                          </p>
+                        </div>
+                      </Link>
+                    </CarouselItem>
+                  ))}
+                </CarouselContent>
+                <CarouselPrevious />
+                <CarouselNext />
+              </Carousel>
+            ) : (
+              <p>No Data</p>
+            )
+          ) : newContent.length > 0 ? (
             <Carousel>
               <CarouselContent>
-                {dummyImage.map((description) => (
-                  <CarouselItem
-                    key={description.id}
-                    className="md:basis-1/2 lg:basis-1/3"
-                  >
+                {newContent?.map((text: any) => (
+                  <CarouselItem key={text?.id} className="md:basis-1/2 lg:basis-1/3">
                     <div className="md:basis-1/2 lg:basis-1/3">
-                      <a
-                        href="#"
-                        className="flex flex-col bg-yellow-500 sm:flex-row items-center dark:bg-gray-800 cursor-pointer shadow-md rounded-lg p-4 gap-4 w-full"
-                      >
+                      <a href="#" className="flex flex-col bg-yellow-500 sm:flex-row items-center dark:bg-gray-800 cursor-pointer shadow-md rounded-lg p-4 gap-4 w-full">
                         <div className="flex items-center justify-center rounded-lg w-16 h-2 lg:h-16">
-                          <svg
-                            width="28"
-                            height="34"
-                            viewBox="0 0 28 34"
-                            fill="none"
-                            xmlns="http://www.w3.org/2000/svg"
-                          >
+                          <svg width="28" height="34" viewBox="0 0 28 34" fill="none" xmlns="http://www.w3.org/2000/svg">
                             <path
                               d="M5.6665 17.4167C5.6665 17.0851 5.7982 16.7672 6.03262 16.5328C6.26704 16.2984 6.58498 16.1667 6.9165 16.1667C7.24802 16.1667 7.56597 16.2984 7.80039 16.5328C8.03481 16.7672 8.1665 17.0851 8.1665 17.4167C8.1665 17.7482 8.03481 18.0661 7.80039 18.3005C7.56597 18.535 7.24802 18.6667 6.9165 18.6667C6.58498 18.6667 6.26704 18.535 6.03262 18.3005C5.7982 18.0661 5.6665 17.7482 5.6665 17.4167ZM6.9165 21.1667C6.58498 21.1667 6.26704 21.2984 6.03262 21.5328C5.7982 21.7672 5.6665 22.0851 5.6665 22.4167C5.6665 22.7482 5.7982 23.0661 6.03262 23.3005C6.26704 23.535 6.58498 23.6667 6.9165 23.6667C7.24802 23.6667 7.56597 23.535 7.80039 23.3005C8.03481 23.0661 8.1665 22.7482 8.1665 22.4167C8.1665 22.0851 8.03481 21.7672 7.80039 21.5328C7.56597 21.2984 7.24802 21.1667 6.9165 21.1667ZM5.6665 27.4167C5.6665 27.0851 5.7982 26.7672 6.03262 26.5328C6.26704 26.2984 6.58498 26.1667 6.9165 26.1667C7.24802 26.1667 7.56597 26.2984 7.80039 26.5328C8.03481 26.7672 8.1665 27.0851 8.1665 27.4167C8.1665 27.7482 8.03481 28.0661 7.80039 28.3005C7.56597 28.535 7.24802 28.6667 6.9165 28.6667C6.58498 28.6667 6.26704 28.535 6.03262 28.3005C5.7982 28.0661 5.6665 27.7482 5.6665 27.4167ZM11.9165 16.1667C11.585 16.1667 11.267 16.2984 11.0326 16.5328C10.7982 16.7672 10.6665 17.0851 10.6665 17.4167C10.6665 17.7482 10.7982 18.0661 11.0326 18.3005C11.267 18.535 11.585 18.6667 11.9165 18.6667H21.0832C21.4147 18.6667 21.7326 18.535 21.9671 18.3005C22.2015 18.0661 22.3332 17.7482 22.3332 17.4167C22.3332 17.0851 22.2015 16.7672 21.9671 16.5328C21.7326 16.2984 21.4147 16.1667 21.0832 16.1667H11.9165ZM10.6665 22.4167C10.6665 22.0851 10.7982 21.7672 11.0326 21.5328C11.267 21.2984 11.585 21.1667 11.9165 21.1667H21.0832C21.4147 21.1667 21.7326 21.2984 21.9671 21.5328C22.2015 21.7672 22.3332 22.0851 22.3332 22.4167C22.3332 22.7482 22.2015 23.0661 21.9671 23.3005C21.7326 23.535 21.4147 23.6667 21.0832 23.6667H11.9165C11.585 23.6667 11.267 23.535 11.0326 23.3005C10.7982 23.0661 10.6665 22.7482 10.6665 22.4167ZM11.9165 26.1667C11.585 26.1667 11.267 26.2984 11.0326 26.5328C10.7982 26.7672 10.6665 27.0851 10.6665 27.4167C10.6665 27.7482 10.7982 28.0661 11.0326 28.3005C11.267 28.535 11.585 28.6667 11.9165 28.6667H21.0832C21.4147 28.6667 21.7326 28.535 21.9671 28.3005C22.2015 28.0661 22.3332 27.7482 22.3332 27.4167C22.3332 27.0851 22.2015 26.7672 21.9671 26.5328C21.7326 26.2984 21.4147 26.1667 21.0832 26.1667H11.9165ZM26.3565 11.0233L16.6415 1.31C16.6157 1.28605 16.5885 1.26378 16.5598 1.24333C16.5392 1.22742 16.5192 1.21074 16.4998 1.19333C16.3852 1.08512 16.2632 0.984882 16.1348 0.893332C16.0922 0.865802 16.0476 0.841298 16.0015 0.819999L15.9215 0.779999L15.8382 0.731666C15.7482 0.679999 15.6565 0.626665 15.5615 0.586665C15.2296 0.454104 14.8783 0.376423 14.5215 0.356665C14.4885 0.354519 14.4557 0.350625 14.4232 0.344999C14.3779 0.338012 14.3323 0.334114 14.2865 0.333332H3.99984C3.11578 0.333332 2.26794 0.684521 1.64281 1.30964C1.01769 1.93476 0.666504 2.78261 0.666504 3.66667V30.3333C0.666504 31.2174 1.01769 32.0652 1.64281 32.6904C2.26794 33.3155 3.11578 33.6667 3.99984 33.6667H23.9998C24.8839 33.6667 25.7317 33.3155 26.3569 32.6904C26.982 32.0652 27.3332 31.2174 27.3332 30.3333V13.38C27.333 12.496 26.9817 11.6483 26.3565 11.0233ZM24.8332 30.3333C24.8332 30.5543 24.7454 30.7663 24.5891 30.9226C24.4328 31.0789 24.2208 31.1667 23.9998 31.1667H3.99984C3.77882 31.1667 3.56686 31.0789 3.41058 30.9226C3.2543 30.7663 3.1665 30.5543 3.1665 30.3333V3.66667C3.1665 3.44565 3.2543 3.23369 3.41058 3.07741C3.56686 2.92113 3.77882 2.83333 3.99984 2.83333H13.9998V10.3333C13.9998 11.2174 14.351 12.0652 14.9761 12.6904C15.6013 13.3155 16.4491 13.6667 17.3332 13.6667H24.8332V30.3333ZM16.4998 4.70166L22.9632 11.1667H17.3332C17.1122 11.1667 16.9002 11.0789 16.7439 10.9226C16.5876 10.7663 16.4998 10.5543 16.4998 10.3333V4.70166Z"
                               fill="black"
@@ -311,24 +176,12 @@ const NewContent = () => {
 
                         <div className="flex flex-col flex-1">
                           <div className="text-gray-500 dark:text-gray-400 flex flex-row text-sm">
-                            {description.date} |{" "}
-                            <Icon icon="formkit:eye" width="15" height="15" />{" "}
-                            518
-                          </div>
-                          <div className="font-semibold text-gray-900 dark:text-white mt-1 text-sm">
-                            {textEllipsis(description.title, 50)}
+                            {formatDateToIndonesian(new Date(text?.createdAt))} {text?.timezone ? text?.timezone : "WIB"} | <Icon icon="formkit:eye" width="15" height="15" /> {text?.clickCount}{" "}
                           </div>
+                          <div className="font-semibold text-gray-900 dark:text-white mt-1 text-sm">{textEllipsis(text?.title, 50)}</div>
                           <div className="flex gap-2 items-center text-sm text-red-500 dark:text-red-500">
-                            <svg
-                              xmlns="http://www.w3.org/2000/svg"
-                              width="1em"
-                              height="1em"
-                              viewBox="0 0 512 512"
-                            >
-                              <path
-                                fill="#f00"
-                                d="M224 30v256h-64l96 128l96-128h-64V30zM32 434v48h448v-48z"
-                              />
+                            <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 512 512">
+                              <path fill="#f00" d="M224 30v256h-64l96 128l96-128h-64V30zM32 434v48h448v-48z" />
                             </svg>
                             Download Dokumen
                           </div>
@@ -341,14 +194,13 @@ const NewContent = () => {
               <CarouselPrevious />
               <CarouselNext />
             </Carousel>
+          ) : (
+            <p>No Data</p>
           )}
         </div>
       </div>
       <div className="flex items-center flex-row justify-center">
-        <Link
-          href="#"
-          className="border text-[#bb3523] text-sm lg:text-md px-4 py-1 border-[#bb3523]"
-        >
+        <Link href="#" className="border text-[#bb3523] text-sm lg:text-md px-4 py-1 border-[#bb3523]">
           LIHAT SEMUA
         </Link>
       </div>
diff --git a/service/landing/landing.ts b/service/landing/landing.ts
new file mode 100644
index 00000000..1176bed4
--- /dev/null
+++ b/service/landing/landing.ts
@@ -0,0 +1,13 @@
+import { httpGetInterceptor } from "../http-config/http-interceptor-service";
+
+export async function getHeroData() {
+  return await httpGetInterceptor(`media/public/list?enablePage=1&sort=desc&sortBy=createdAt&size=5&page=0&typeId=1&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=`);
+}
+
+export async function getCategoryData() {
+  return await httpGetInterceptor(`media/categories/list/publish?enablePage=1&sort=desc&sortBy=updatedAt&size=12&type=`);
+}
+
+export async function getListContent(data:{sortBy: string, contentTypeId: string}) {
+  return await httpGetInterceptor(`media/public/list?enablePage=1&sort=desc&sortBy=${data.sortBy}&size=5&page=0&typeId=${data.contentTypeId}&title=&categoryId=&fileFormats=&tags=&group=&startDate=&endDate=&month=&year=`);
+}
diff --git a/utils/globals.tsx b/utils/globals.tsx
index cde194da..2d7e5386 100644
--- a/utils/globals.tsx
+++ b/utils/globals.tsx
@@ -1,3 +1,8 @@
+import { format } from "date-fns";
+import { id, tr } from "date-fns/locale";
+
+
+
 export const generateLocalizedPath = (href: string, locale: string): string => {
   if (href.startsWith(`/${locale}`)) {
     return href;
@@ -16,4 +21,13 @@ export function textEllipsis(str: string, maxLength: number, { side = "end", ell
     }
   }
   return str;
+};
+
+export function formatDateToIndonesian(d: Date) {
+  try {
+    const dateString = format(d, "d MMMM yyyy HH:mm", { locale: id });
+    return dateString;
+  } catch (error) {
+    return "";
+  }
 }