fix: merge main

.gitlab-ci.yml

@@ -29,7 +29,5 @@ auto-deploy:
     - main
     - dev-landing-v2
   image: curlimages/curl:latest
-  services:
-    - docker:dind
   script:
     - curl --user admin:$JENKINS_PWD http://38.47.185.86:8080/job/auto-deploy-new-mediahub-fe/build?token=autodeploynewmediahub

app/[locale]/(protected)/contributor/report/components/columns.tsx

@@ -170,7 +170,7 @@ const useTableColumns = ({
         //   try {
         //     loading();
         //     const response = await axios.get(
-        //       `https://netidhub.com/api/media/report/download?id=${id}`,
+        //       `https://new.netidhub.com/api/media/report/download?id=${id}`,
         //       {
         //         responseType: "blob",
         //       }

components/form/setting/form-add-iklan-update.tsx

@@ -296,7 +296,10 @@ export function TambahIklanUpdate() {
       formMedia.append("file", imageFiles[0]);
     } else if (detail?.id) {
       const existingFile = await fetchExistingImageAsFile(
-        `https://netidhub.com/api/advertisements/viewer/${detail.id}`,
+        // `https://new.netidhub.com/api/advertisements/viewer/${detail.id}`,
+                `https://mediahub.polri.go.id/api/advertisements/viewer/${detail.id}`,
+
+
         "existing-image.jpg"
       );
       formMedia.append("file", existingFile);
@@ -631,7 +634,11 @@ export function TambahIklanUpdate() {
                 ))}
 
                 <Image
+<<<<<<< HEAD
                   src={`https://mediahub.polri.go.id/api/v2/advertisements/viewer/${id}`}
+=======
+                  src={`https://new.netidhub.com/api/advertisements/viewer/${id}`}
+>>>>>>> 1a0d53bb11c159ffc7aebaa09bb0c98d0d982815
                   alt="Thumbnail Gambar Utama"
                   className=" rounded-md my-3"
                   width={300}

components/landing-page/hero-new-satker.tsx

@@ -63,7 +63,7 @@ type HeroModalProps = {
 
 //   useEffect(() => {
 //     async function fetchCategories() {
-//       const url = "https://netidhub.com/api/csrf";
+//       const url = "https://new.netidhub.com/api/csrf";
 
 //       try {
 //         const response = await fetch(url);