merge

app/[locale]/(protected)/admin/media-tracking/component/modal.tsx

@@ -1,30 +1,14 @@
 "use client";
 import { Button } from "@/components/ui/button";
-import {
+import { Dialog, DialogClose, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog";
-  Dialog,
-  DialogClose,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from "@/components/ui/dialog";
 import { toast } from "sonner";
 
 import { Input } from "@/components/ui/input";
 import { close, error, loading, successCallback } from "@/config/swal";
-import {
+import { getMediaTracking, listDataAllNonPagination, listDataTracking, mediaTrackingSave } from "@/service/media-tracking/media-tracking";
-  getMediaTracking,
-  listDataAllNonPagination,
-  listDataTracking,
-  mediaTrackingSave,
-} from "@/service/media-tracking/media-tracking";
 import { useEffect, useState } from "react";
 
-export default function TrackingMediaModal(props: {
+export default function TrackingMediaModal(props: { triggerFetch: () => void }) {
-  triggerFetch: () => void;
-}) {
   const [content, setContent] = useState<any>([]);
   const [inputValue, setInputValue] = useState("");
   const [selectedId, setSelectedId] = useState(0);
@@ -103,22 +87,13 @@ export default function TrackingMediaModal(props: {
         </DialogHeader>
         <div className="flex flex-col gap-2">
           {" "}
-          <Input
+          <Input type="text" placeholder="Content" value={inputValue} onChange={handleInputChange} />{" "}
-            type="text"
-            placeholder="Content"
-            value={inputValue}
-            onChange={handleInputChange}
-          />{" "}
           <div className="w-full border rounded-sm text-xs p-2 flex flex-col max-h-[300px] overflow-auto">
             {content.length > 0 &&
               content.map((item: any) => (
                 <a
                   key={item.id}
-                  className={`cursor-pointer  px-2 py-4 ${
+                  className={`cursor-pointer  px-2 py-4 ${selectedId === item.id ? "font-bold bg-gray-200 rounded-sm" : "hover:bg-gray-100 hover:font-semibold"}`}
-                    selectedId === item.id
-                      ? "font-bold bg-gray-200 rounded-sm"
-                      : "hover:bg-gray-100 hover:font-semibold"
-                  }`}
                   onClick={() => {
                     setSelectedId(item.id);
                     setInputValue(item.title);

app/[locale]/(public)/(polda)/polda/[polda_name]/page.tsx

@@ -45,7 +45,7 @@ const page = () => {
     //   <ContentCategory type="" group="polda" />
     // </div>
     <div>
-      <HeroNewPolda />
+      <HeroNew group="polda" />
       <div className="flex-1 ">
         <SearchSectionPolda />
       </div>

app/[locale]/(public)/(satker)/satker/[satker_name]/page.tsx

@@ -3,6 +3,7 @@
 import ContentCategory from "@/components/landing-page/content-category";
 import Footer from "@/components/landing-page/footer";
 import HeaderBannerSatker from "@/components/landing-page/header-banner-satker";
+import HeroNew from "@/components/landing-page/hero-new";
 import HeroNewSatker from "@/components/landing-page/hero-new-satker";
 import NewContent from "@/components/landing-page/new-content";
 import SearchSectionSatker from "@/components/landing-page/search-section-satker";
@@ -19,11 +20,11 @@ const page = () => {
     //   <ContentCategory group="satker" type="latest" />
     // </div>
     <div>
-          <HeroNewSatker />
+      <HeroNew group="satker" />
-          <div className="flex-1 ">
+      <div className="flex-1 ">
-            <SearchSectionSatker />
+        <SearchSectionSatker />
-          </div>
+      </div>
-        </div>
+    </div>
   );
 };
 

components/landing-page/dynamic-logo-polda.tsx

@@ -0,0 +1,20 @@
+"use client";
+
+import Image from "next/image";
+import { usePathname } from "next/navigation";
+
+export const DynamicLogoPolda = () => {
+  const pathname = usePathname();
+
+  const getLogoSrc = () => {
+    if (pathname?.startsWith("/polda/aceh")) return "/logo/polda/polda-aceh.png";
+    if (pathname?.startsWith("/user")) return "/logos/user-logo.svg";
+    return "/logos/default-logo.svg";
+  };
+
+  return (
+    <div className="p-2">
+      <Image src={getLogoSrc()} alt="Logo" width={120} height={40} className="object-contain" />
+    </div>
+  );
+};

components/landing-page/navbar.tsx

@@ -22,6 +22,7 @@ import { getUserNotifications, listRole } from "@/service/landing/landing";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
 import PoldaLogo from "./polda-logo";
+import { DynamicLogoPolda } from "./dynamic-logo-polda";
 
 type Detail = {
   id: number;
@@ -161,7 +162,7 @@ const Navbar = () => {
           <Link href={prefixPath} className="flex items-center">
             <Image src="/assets/mediahub-logo.gif" alt="Media Hub Logo" width={2560} height={1440} className=" w-[200px] h-full shrink-0 object-contain" />
           </Link>
-          {/* <PoldaLogo /> */}
+          <DynamicLogoPolda />
           {/* Nav Menu */}
           <div className="hidden custom-lg-button:flex items-center gap-5">
             <NavigationMenu>