Test C 1

Reviewed-on: http://wibugit.wibudev.com/wibu/desa-darmasaba/pulls/23

prisma/schema.prisma

@@ -136,7 +136,6 @@ model MediaSosial {
   name      String
   image     FileStorage? @relation(fields: [imageId], references: [id])
   imageId   String?
-  icon      String?
   iconUrl   String?      @db.VarChar(255)
   createdAt DateTime     @default(now())
   updatedAt DateTime     @updatedAt

src/app/admin/(dashboard)/_com/selectSocialMedia.tsx

@@ -1,76 +0,0 @@
-'use client';
-
-import { Box, Image, Select, rem } from '@mantine/core';
-
-const sosmedMap = {
-  facebook: { label: 'Facebook', src: '/assets/images/sosmed/facebook.png' },
-  instagram: { label: 'Instagram', src: '/assets/images/sosmed/instagram.png' },
-  tiktok: { label: 'Tiktok', src: '/assets/images/sosmed/tiktok.png' },
-  youtube: { label: 'YouTube', src: '/assets/images/sosmed/youtube.png' },
-  whatsapp: { label: 'WhatsApp', src: '/assets/images/sosmed/whatsapp.png' },
-  gmail: { label: 'Gmail', src: '/assets/images/sosmed/gmail.png' },
-  telegram: { label: 'Telegram', src: '/assets/images/sosmed/telegram.png' },
-  x: { label: 'X (Twitter)', src: '/assets/images/sosmed/x-twitter.png' },
-  telephone: { label: 'Telephone', src: '/assets/images/sosmed/telephone-call.png' },
-  custom: { label: 'Custom Icon', src: null },
-};
-
-type SosmedKey = keyof typeof sosmedMap;
-
-const sosmedList = Object.entries(sosmedMap).map(([value, item]) => ({
-  value,
-  label: item.label,
-}));
-
-export default function SelectSosialMedia({
-  value,
-  onChange,
-}: {
-  value: SosmedKey;
-  onChange: (value: SosmedKey) => void;
-}) {
-  const selected = value;
-  const selectedImage = sosmedMap[selected]?.src;
-
-  return (
-    <Box maw={300}>
-      <Select
-        placeholder="Pilih sosial media"
-        value={selected}
-        data={sosmedList}
-        searchable={false}
-        withCheckIcon={false}
-        onChange={(val) => val && onChange(val as SosmedKey)}
-        styles={{
-          input: {
-            textAlign: 'left',
-            fontSize: rem(16),
-            paddingLeft: 36,
-          },
-          section: {
-            left: 10,
-            right: 'auto',
-          },
-        }}
-      />
-
-      {/* 🔥 PREVIEW DIPISAH DI LUAR SELECT */}
-      {selectedImage && (
-        <Box mt="md">
-          <Image
-            alt=""
-            src={selectedImage}
-            radius="md"
-            style={{
-              width: 120,
-              height: 120,
-              objectFit: 'contain',
-              border: '1px solid #eee',
-              padding: 8,
-            }}
-          />
-        </Box>
-      )}
-    </Box>
-  );
-}

src/app/admin/(dashboard)/_com/selectSocialMediaEdit.tsx

@@ -1,56 +0,0 @@
-'use client';
-
-import { Box, Select } from '@mantine/core';
-import { useEffect, useState } from 'react';
-
-export const sosmedMap = {
-  facebook: { label: 'Facebook', src: '/assets/images/sosmed/facebook.png' },
-  instagram: { label: 'Instagram', src: '/assets/images/sosmed/instagram.png' },
-  tiktok: { label: 'Tiktok', src: '/assets/images/sosmed/tiktok.png' },
-  youtube: { label: 'YouTube', src: '/assets/images/sosmed/youtube.png' },
-  whatsapp: { label: 'WhatsApp', src: '/assets/images/sosmed/whatsapp.png' },
-  gmail: { label: 'Gmail', src: '/assets/images/sosmed/gmail.png' },
-  telegram: { label: 'Telegram', src: '/assets/images/sosmed/telegram.png' },
-  x: { label: 'X (Twitter)', src: '/assets/images/sosmed/x-twitter.png' },
-  telephone: { label: 'Telephone', src: '/assets/images/sosmed/telephone-call.png' },
-  custom: { label: 'Custom Icon', src: null },
-};
-
-type SosmedKey = keyof typeof sosmedMap;
-
-const sosmedList = Object.entries(sosmedMap).map(([value, item]) => ({
-  value,
-  label: item.label,
-}));
-
-export default function SelectSocialMediaEdit({
-  value,
-  onChange,
-}: {
-  value: string;
-  onChange: (val: SosmedKey) => void;
-}) {
-  const [selected, setSelected] = useState<SosmedKey>('facebook');
-
-  useEffect(() => {
-    if (value && sosmedMap[value as SosmedKey]) {
-      setSelected(value as SosmedKey);
-    }
-  }, [value]);
-
-  return (
-    <Box>
-      <Select
-        label="Jenis Media Sosial"
-        value={selected}
-        data={sosmedList}
-        searchable={false}
-        onChange={(val) => {
-          if (!val) return;
-          setSelected(val as SosmedKey);
-          onChange(val as SosmedKey);
-        }}
-      />
-    </Box>
-  );
-}

src/app/admin/(dashboard)/_state/landing-page/profile.ts

@@ -27,7 +27,7 @@ const programInovasi = proxy({
       name: "",
       description: "",
       imageId: "",
-      link: "",
+      link: ""
     } as ProgramInovasiForm,
     loading: false,
     async create() {
@@ -71,21 +71,20 @@ const programInovasi = proxy({
     total: 0,
     loading: false,
     search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      // Change to arrow function
-      programInovasi.findMany.loading = true; // Use the full path to access the property
+    load: async (page = 1, limit = 10, search = "") => {  // Change to arrow function
+      programInovasi.findMany.loading = true;  // Use the full path to access the property
       programInovasi.findMany.page = page;
       programInovasi.findMany.search = search;
       try {
         const query: any = { page, limit };
         if (search) query.search = search;
-
+        
         const res = await ApiFetch.api.landingpage.programinovasi[
           "findMany"
         ].get({
-          query,
+          query
         });
-
+  
         if (res.status === 200 && res.data?.success) {
           programInovasi.findMany.data = res.data.data || [];
           programInovasi.findMany.total = res.data.total || 0;
@@ -390,10 +389,7 @@ const pejabatDesa = proxy({
 
       try {
         // Ensure ID is properly encoded in the URL
-        const url = new URL(
-          `/api/landingpage/pejabatdesa/${encodeURIComponent(this.id)}`,
-          window.location.origin
-        );
+        const url = new URL(`/api/landingpage/pejabatdesa/${encodeURIComponent(this.id)}`, window.location.origin);
         const response = await fetch(url.toString(), {
           method: "PUT",
           headers: {
@@ -442,19 +438,16 @@ const pejabatDesa = proxy({
 
 const templateMediaSosial = z.object({
   name: z.string().min(3, "Nama minimal 3 karakter"),
-  imageId: z.string().nullable().optional(),
+  imageId: z.string().min(1, "Gambar wajib dipilih"),
   iconUrl: z.string().min(3, "Icon URL minimal 3 karakter"),
-  icon: z.string().nullable().optional(),
 });
 
 type MediaSosialForm = {
   name: string;
-  imageId: string | null; // boleh null
+  imageId: string;
   iconUrl: string;
-  icon: string | null; // boleh null
 };
 
-
 const mediaSosial = proxy({
   create: {
     form: {} as MediaSosialForm,
@@ -462,10 +455,9 @@ const mediaSosial = proxy({
     async create() {
       // Ensure all required fields are non-null
       const formData = {
-        name: mediaSosial.create.form.name ?? "",
-        imageId: mediaSosial.create.form.imageId ?? null, // FIXED
-        iconUrl: mediaSosial.create.form.iconUrl ?? "",
-        icon: mediaSosial.create.form.icon ?? null, // FIXED
+        name: mediaSosial.create.form.name || "",
+        imageId: mediaSosial.create.form.imageId || "",
+        iconUrl: mediaSosial.create.form.iconUrl || "",
       };
 
       const cek = templateMediaSosial.safeParse(formData);
@@ -500,19 +492,20 @@ const mediaSosial = proxy({
     total: 0,
     loading: false,
     search: "",
-    load: async (page = 1, limit = 10, search = "") => {
-      // Change to arrow function
-      mediaSosial.findMany.loading = true; // Use the full path to access the property
+    load: async (page = 1, limit = 10, search = "") => {  // Change to arrow function
+      mediaSosial.findMany.loading = true;  // Use the full path to access the property
       mediaSosial.findMany.page = page;
       mediaSosial.findMany.search = search;
-      try {
+      try { 
         const query: any = { page, limit };
         if (search) query.search = search;
-
-        const res = await ApiFetch.api.landingpage.mediasosial["findMany"].get({
+        
+        const res = await ApiFetch.api.landingpage.mediasosial[
+          "findMany"
+        ].get({
           query,
         });
-
+  
         if (res.status === 200 && res.data?.success) {
           mediaSosial.findMany.data = res.data.data || [];
           mediaSosial.findMany.total = res.data.total || 0;
@@ -544,7 +537,7 @@ const mediaSosial = proxy({
         toast.warn("ID tidak valid");
         return null;
       }
-
+    
       mediaSosial.update.loading = true;
       try {
         const res = await fetch(`/api/landingpage/mediasosial/${id}`);
@@ -593,72 +586,66 @@ const mediaSosial = proxy({
     },
   },
   update: {
-    id: "",
-    form: {} as MediaSosialForm,
-    loading: false,
-
-    async load(id: string) {
-      if (!id) {
-        toast.warn("ID tidak valid");
-        return null;
-      }
-
-      mediaSosial.update.loading = true; // ✅ Tambahkan ini di awal
-
-      try {
-        const response = await fetch(`/api/landingpage/mediasosial/${id}`, {
-          method: "GET",
-          headers: {
-            "Content-Type": "application/json",
-          },
-        });
-
-        if (!response.ok) {
-          throw new Error(`HTTP error! status: ${response.status}`);
+      id: "",
+      form: {} as MediaSosialForm,
+      loading: false,
+  
+      async load(id: string) {
+        if (!id) {
+          toast.warn("ID tidak valid");
+          return null;
         }
-
-        const result = await response.json();
-
-        if (result?.success) {
-          const data = result.data;
-          this.id = data.id;
-          this.form = {
-            name: data.name || "",
-            imageId: data.imageId || null,
-            iconUrl: data.iconUrl || "",
-            icon: data.icon || null,
-            
-          };
-          return data;
-        } else {
-          throw new Error(
-            result?.message || "Gagal mengambil data media sosial"
-          );
+      
+        mediaSosial.update.loading = true; // ✅ Tambahkan ini di awal
+      
+        try {
+          const response = await fetch(`/api/landingpage/mediasosial/${id}`, {
+            method: "GET",
+            headers: {
+              "Content-Type": "application/json",
+            },
+          });
+      
+          if (!response.ok) {
+            throw new Error(`HTTP error! status: ${response.status}`);
+          }
+      
+          const result = await response.json();
+      
+          if (result?.success) {
+            const data = result.data;
+            this.id = data.id;
+            this.form = {
+              name: data.name || "",
+              imageId: data.imageId || "",
+              iconUrl: data.iconUrl || "",
+            };
+            return data;
+          } else {
+            throw new Error(result?.message || "Gagal mengambil data media sosial");
+          }
+        } catch (error) {
+          console.error((error as Error).message);
+          toast.error("Terjadi kesalahan saat mengambil data media sosial");
+        } finally {
+          mediaSosial.update.loading = false; // ✅ Supaya berhenti loading walau error
         }
-      } catch (error) {
-        console.error((error as Error).message);
-        toast.error("Terjadi kesalahan saat mengambil data media sosial");
-      } finally {
-        mediaSosial.update.loading = false; // ✅ Supaya berhenti loading walau error
-      }
-    },
-
-    async update() {
-      const cek = templateMediaSosial.safeParse(mediaSosial.update.form);
-      if (!cek.success) {
-        const err = `[${cek.error.issues
-          .map((v) => `${v.path.join(".")}`)
-          .join("\n")}] required`;
-        toast.error(err);
-        return false;
-      }
-
-      try {
-        mediaSosial.update.loading = true;
-
-        const response = await fetch(
-          `/api/landingpage/mediasosial/${this.id}`,
-          {
+      },
+      
+      async update() {
+        const cek = templateMediaSosial.safeParse(mediaSosial.update.form);
+        if (!cek.success) {
+          const err = `[${cek.error.issues
+            .map((v) => `${v.path.join(".")}`)
+            .join("\n")}] required`;
+          toast.error(err);
+          return false;
+        }
+  
+        try {
+          mediaSosial.update.loading = true;
+  
+          const response = await fetch(`/api/landingpage/mediasosial/${this.id}`, {
             method: "PUT",
             headers: {
               "Content-Type": "application/json",
@@ -667,40 +654,38 @@ const mediaSosial = proxy({
               name: this.form.name,
               imageId: this.form.imageId,
               iconUrl: this.form.iconUrl,
-              icon: this.form.icon,
             }),
+          });
+  
+          if (!response.ok) {
+            const errorData = await response.json().catch(() => ({}));
+            throw new Error(
+              errorData.message || `HTTP error! status: ${response.status}`
+            );
           }
-        );
-
-        if (!response.ok) {
-          const errorData = await response.json().catch(() => ({}));
-          throw new Error(
-            errorData.message || `HTTP error! status: ${response.status}`
+  
+          const result = await response.json();
+  
+          if (result.success) {
+            toast.success("Berhasil update media sosial");
+            await mediaSosial.findMany.load(); // refresh list
+            return true;
+          } else {
+            throw new Error(result.message || "Gagal update media sosial");
+          }
+        } catch (error) {
+          console.error("Error updating media sosial:", error);
+          toast.error(
+            error instanceof Error
+              ? error.message
+              : "Terjadi kesalahan saat update media sosial"
           );
+          return false;
+        } finally {
+          mediaSosial.update.loading = false;
         }
-
-        const result = await response.json();
-
-        if (result.success) {
-          toast.success("Berhasil update media sosial");
-          await mediaSosial.findMany.load(); // refresh list
-          return true;
-        } else {
-          throw new Error(result.message || "Gagal update media sosial");
-        }
-      } catch (error) {
-        console.error("Error updating media sosial:", error);
-        toast.error(
-          error instanceof Error
-            ? error.message
-            : "Terjadi kesalahan saat update media sosial"
-        );
-        return false;
-      } finally {
-        mediaSosial.update.loading = false;
-      }
+      },
     },
-  },
 });
 
 const profileLandingPageState = proxy({

src/app/admin/(dashboard)/auth/registrasi-admin/page.tsx

@@ -18,7 +18,6 @@ export default function Registrasi() {
   const [username, setUsername] = useState('');
   const [loading, setLoading] = useState(false);
   const [phone, setPhone] = useState(''); // ✅ tambahkan state untuk phone
-  const [agree, setAgree] = useState(false)
 
   // Ambil data dari localStorage (dari login)
   useEffect(() => {
@@ -47,11 +46,6 @@ export default function Registrasi() {
       return;
     }
 
-    if (!agree) {
-      toast.error("Anda harus menyetujui syarat dan ketentuan!");
-      return;
-    }
-
     try {
       setLoading(true);
       // ✅ Hanya kirim username & nomor → dapat kodeId
@@ -98,8 +92,8 @@ export default function Registrasi() {
                     username.length > 0 && username.length < 5
                       ? 'Minimal 5 karakter!'
                       : username.includes(' ')
-                        ? 'Tidak boleh ada spasi'
-                        : ''
+                      ? 'Tidak boleh ada spasi'
+                      : ''
                   }
                   required
                 />
@@ -114,29 +108,9 @@ export default function Registrasi() {
                 </Box>
 
                 <Box pt="md">
-                  <Checkbox
-                    checked={agree}
-                    onChange={(e) => setAgree(e.currentTarget.checked)}
-                    label={
-                      <Text fz="sm">
-                        Saya menyetujui{" "}
-                        <a
-                          href="/terms-of-service"
-                          target="_blank"
-                          style={{
-                            color: colors["blue-button"],
-                            textDecoration: "underline",
-                            fontWeight: 500,
-                          }}
-                        >
-                          syarat dan ketentuan
-                        </a>
-                      </Text>
-                    }
-                  />
+                  <Checkbox label="Saya menyetujui syarat dan ketentuan" defaultChecked />
                 </Box>
 
-
                 <Box pt="xl">
                   <Button
                     fullWidth

src/app/admin/(dashboard)/auth/validasi-admin/page.tsx

@@ -31,7 +31,7 @@ export default function Validasi() {
   useEffect(() => {
     const checkFlow = async () => {
       try {
-        const res = await fetch('/api/auth/get-flow', {
+        const res = await fetch('/api/get-flow', {
           credentials: 'include'
         });
         const data = await res.json();
@@ -60,7 +60,7 @@ export default function Validasi() {
     setKodeId(storedKodeId);
     const loadOtpData = async () => {
       try {
-        const res = await fetch(`/api/auth/otp-data?kodeId=${encodeURIComponent(storedKodeId)}`);
+        const res = await fetch(`/api/otp-data?kodeId=${encodeURIComponent(storedKodeId)}`);
         const result = await res.json();
 
         if (res.ok && result.data?.nomor) {
@@ -124,7 +124,6 @@ export default function Validasi() {
       return;
     }
 
-    // ✅ Finalize registration
     const finalizeRes = await fetch('/api/auth/finalize-registration', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
@@ -149,7 +148,7 @@ export default function Validasi() {
   };
 
   const handleLoginVerification = async () => {
-    const loginRes = await fetch('/api/auth/verify-otp-login', {
+    const loginRes = await fetch('/api/verify-otp-login', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({ nomor, otp, kodeId }),
@@ -207,7 +206,7 @@ export default function Validasi() {
 
     // Clear cookie
     try {
-      await fetch('/api/auth/clear-flow', {
+      await fetch('/api/clear-flow', {
         method: 'POST',
         credentials: 'include'
       });
@@ -219,7 +218,7 @@ export default function Validasi() {
   const handleResend = async () => {
     if (!nomor) return;
     try {
-      const res = await fetch('/api/auth/resend', {
+      const res = await fetch('/api/resend', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({ nomor }),

src/app/admin/(dashboard)/landing-page/apbdes/create/page.tsx

@@ -361,7 +361,6 @@ function CreateAPBDes() {
                   data={[
                     { value: 'pendapatan', label: 'Pendapatan' },
                     { value: 'belanja', label: 'Belanja' },
-                    { value: 'pembiayaan', label: 'Pembiayaan' },
                   ]}
                   value={newItem.level === 1 ? null : newItem.tipe}
                   onChange={(val) => setNewItem({ ...newItem, tipe: val as any })}

src/app/admin/(dashboard)/landing-page/profil/_lib/sosmed.ts

@@ -1,12 +0,0 @@
-export const sosmedMap = {
-  facebook: { label: 'Facebook', src: '/assets/images/sosmed/facebook.png' },
-  instagram: { label: 'Instagram', src: '/assets/images/sosmed/instagram.png' },
-  tiktok: { label: 'Tiktok', src: '/assets/images/sosmed/tiktok.png' },
-  youtube: { label: 'YouTube', src: '/assets/images/sosmed/youtube.png' },
-  whatsapp: { label: 'WhatsApp', src: '/assets/images/sosmed/whatsapp.png' },
-  gmail: { label: 'Gmail', src: '/assets/images/sosmed/gmail.png' },
-  telegram: { label: 'Telegram', src: '/assets/images/sosmed/telegram.png' },
-  x: { label: 'X (Twitter)', src: '/assets/images/sosmed/x-twitter.png' },
-  telephone: { label: 'Telephone', src: '/assets/images/sosmed/telephone-call.png' },
-  custom: { label: 'Custom Icon', src: null },
-};

src/app/admin/(dashboard)/landing-page/profil/media-sosial/[id]/edit/page.tsx

@@ -1,7 +1,5 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client';
-
-import SelectSocialMediaEdit from '@/app/admin/(dashboard)/_com/selectSocialMediaEdit';
 import profileLandingPageState from '@/app/admin/(dashboard)/_state/landing-page/profile';
 import colors from '@/con/colors';
 import ApiFetch from '@/lib/api-fetch';
@@ -16,7 +14,7 @@ import {
   Text,
   TextInput,
   Title,
-  Loader,
+  Loader
 } from '@mantine/core';
 import { Dropzone } from '@mantine/dropzone';
 import { IconArrowBack, IconPhoto, IconUpload, IconX } from '@tabler/icons-react';
@@ -25,45 +23,15 @@ import { useEffect, useState } from 'react';
 import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';
 
-type SosmedKey =
-  | 'none'
-  | 'facebook'
-  | 'instagram'
-  | 'tiktok'
-  | 'youtube'
-  | 'whatsapp'
-  | 'gmail'
-  | 'telegram'
-  | 'x'
-  | 'telephone'
-  | 'custom';
-
-const sosmedMap: Record<SosmedKey, { label: string; src: string | null }> = {
-  none: { label: "None", src: '/no-image.jpg' },
-  facebook: { label: 'Facebook', src: '/assets/images/sosmed/facebook.png' },
-  instagram: { label: 'Instagram', src: '/assets/images/sosmed/instagram.png' },
-  tiktok: { label: 'Tiktok', src: '/assets/images/sosmed/tiktok.png' },
-  youtube: { label: 'YouTube', src: '/assets/images/sosmed/youtube.png' },
-  whatsapp: { label: 'WhatsApp', src: '/assets/images/sosmed/whatsapp.png' },
-  gmail: { label: 'Gmail', src: '/assets/images/sosmed/gmail.png' },
-  telegram: { label: 'Telegram', src: '/assets/images/sosmed/telegram.png' },
-  x: { label: 'X (Twitter)', src: '/assets/images/sosmed/x-twitter.png' },
-  telephone: { label: 'Telephone', src: '/assets/images/sosmed/telephone-call.png' },
-  custom: { label: 'Custom Icon', src: null },
-};
-
 function EditMediaSosial() {
   const stateMediaSosial = useProxy(profileLandingPageState.mediaSosial);
   const router = useRouter();
   const params = useParams();
 
-  const [selectedSosmed, setSelectedSosmed] = useState<SosmedKey>('facebook');
   const [previewImage, setPreviewImage] = useState<string | null>(null);
   const [file, setFile] = useState<File | null>(null);
-
   const [formData, setFormData] = useState({
     name: '',
-    icon: '',
     iconUrl: '',
     imageId: '',
   });
@@ -71,14 +39,13 @@ function EditMediaSosial() {
   const [isSubmitting, setIsSubmitting] = useState(false);
 
   const [originalData, setOriginalData] = useState({
-    name: '',
-    icon: '',
-    iconUrl: '',
-    imageId: '',
-    imageUrl: '',
+    name: "",
+    iconUrl: "",
+    imageId: "",
+    imageUrl: "",
   });
 
-  // Load Data by ID
+  // Load data by ID
   useEffect(() => {
     const id = params?.id as string;
     if (!id) return;
@@ -87,97 +54,81 @@ function EditMediaSosial() {
       try {
         const data = await stateMediaSosial.update.load(id);
 
-        if (!data) return;
+        if (data) {
+          // isi form awal
+          const newForm = {
+            name: data.name || "",
+            iconUrl: data.iconUrl || "",
+            imageId: data.imageId || "",
+          };
+          setFormData(newForm);
 
-        // Tentukan default/custom icon
-        // Tentukan default/custom icon
-        if (data.imageId) {
-          setSelectedSosmed('custom');
-        } else {
-          // ✅ Gunakan langsung data.icon jika ada dan valid
-          if (data.icon && sosmedMap[data.icon as SosmedKey]) {
-            setSelectedSosmed(data.icon as SosmedKey);
-          } else {
-            setSelectedSosmed('none'); // fallback
-          }
+          // simpan juga versi original
+          setOriginalData({
+            ...newForm,
+            imageUrl: data.image?.link || "",
+          });
+
+          setPreviewImage(data.image?.link || null);
         }
-
-        const newForm = {
-          name: data.name || '',
-          icon: data.icon || '',
-          iconUrl: data.iconUrl || '',
-          imageId: data.imageId || '',
-        };
-
-        setFormData(newForm);
-
-        setOriginalData({
-          ...newForm,
-          imageUrl: data.image?.link || '',
-        });
-
-        setPreviewImage(data.image?.link || null);
-      } catch {
-        toast.error('Gagal mengambil data media sosial');
+      } catch (error) {
+        console.error('Error loading media sosial:', error);
+        toast.error(
+          error instanceof Error ? error.message : 'Gagal mengambil data media sosial'
+        );
       }
     };
 
     loadData();
   }, [params?.id]);
 
-  const handleChange = (field: keyof typeof formData, value: string) => {
+  const handleChange = (field: string, value: string) => {
     setFormData((prev) => ({ ...prev, [field]: value }));
   };
 
   const handleSubmit = async () => {
     setIsSubmitting(true);
-
     try {
+      // update global state hanya saat submit
       stateMediaSosial.update.form = { ...stateMediaSosial.update.form, ...formData };
 
       if (file) {
-        const res = await ApiFetch.api.fileStorage.create.post({
-          file,
-          name: file.name,
-        });
+        const res = await ApiFetch.api.fileStorage.create.post({ file, name: file.name });
         const uploaded = res.data?.data;
 
-        if (!uploaded?.id) {
-          toast.error('Gagal upload gambar');
-          return;
-        }
+        if (!uploaded?.id) return toast.error('Gagal upload gambar');
 
         stateMediaSosial.update.form.imageId = uploaded.id;
       }
 
-      // 🚨 Tambahkan ini untuk debugging
-      console.log("Data yang akan dikirim ke backend:", stateMediaSosial.update.form);
-
       await stateMediaSosial.update.update();
       toast.success('Media sosial berhasil diperbarui!');
       router.push('/admin/landing-page/profil/media-sosial');
     } catch (error) {
-      console.error("Error di handleSubmit:", error); // 🚨 Tambahkan ini juga
+      console.error('Error updating media sosial:', error);
       toast.error('Terjadi kesalahan saat memperbarui media sosial');
     } finally {
       setIsSubmitting(false);
     }
   };
 
+  // ✅ Tombol Batal → balikin ke data original
   const handleResetForm = () => {
     setFormData({
       name: originalData.name,
-      icon: originalData.icon,
       iconUrl: originalData.iconUrl,
       imageId: originalData.imageId,
     });
     setPreviewImage(originalData.imageUrl || null);
     setFile(null);
-    toast.info('Form dikembalikan ke data awal');
+    toast.info("Form dikembalikan ke data awal");
   };
 
   return (
-    <Box px={{ base: 'sm', md: 'lg' }} py="md">
+    <Box
+      px={{ base: 'sm', md: 'lg' }}
+      py="md"
+    >
       <Group mb="md">
         <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
           <IconArrowBack color={colors['blue-button']} size={24} />
@@ -196,119 +147,80 @@ function EditMediaSosial() {
         style={{ border: '1px solid #e0e0e0' }}
       >
         <Stack gap="md">
-          {/* Upload / Icon */}
+          {/* Upload Gambar */}
           <Box>
             <Text fw="bold" fz="sm" mb={6}>
-              Icon / Gambar Media Sosial
+              Gambar Program Inovasi
             </Text>
-
-            {/* Custom Upload */}
-            {/* PILIH ICON */}
-            <SelectSocialMediaEdit
-              value={selectedSosmed}
-              onChange={(key) => {
-                setSelectedSosmed(key);
-
-                if (key === 'custom') {
-                  // custom → gunakan Dropzone
-                  setFormData((prev) => ({
-                    ...prev,
-                    icon: '',
-                    imageId: '',
-                  }));
-                  return;
+            <Dropzone
+              onDrop={(files) => {
+                const selectedFile = files[0];
+                if (selectedFile) {
+                  setFile(selectedFile);
+                  setPreviewImage(URL.createObjectURL(selectedFile));
                 }
-
-                // default → pakai icon bawaan
-                setFormData((prev) => ({
-                  ...prev,
-                  icon: key, // <-- simpan 'facebook', bukan path
-                  imageId: '',
-                }));
               }}
-            />
+              onReject={() => toast.error('File tidak valid, gunakan format gambar')}
+              maxSize={5 * 1024 ** 2}
+              accept={{ 'image/*': ['.jpeg', '.jpg', '.png', '.webp'] }}
+              radius="md"
+              p="xl"
+            >
+              <Group justify="center" gap="xl" mih={180}>
+                <Dropzone.Accept>
+                  <IconUpload size={48} color={colors['blue-button']} stroke={1.5} />
+                </Dropzone.Accept>
+                <Dropzone.Reject>
+                  <IconX size={48} color="red" stroke={1.5} />
+                </Dropzone.Reject>
+                <Dropzone.Idle>
+                  <IconPhoto size={48} color="#868e96" stroke={1.5} />
+                </Dropzone.Idle>
+                <Stack gap="xs" align="center">
+                  <Text size="md" fw={500}>
+                    Seret gambar atau klik untuk memilih file
+                  </Text>
+                  <Text size="sm" c="dimmed">
+                  Maksimal 5MB, format gambar .png, .jpg, .jpeg, webp
+                  </Text>
+                </Stack>
+              </Group>
+            </Dropzone>
 
-            {selectedSosmed === 'custom' ? (
-              <>
-                <Dropzone
-                  onDrop={(files) => {
-                    const selectedFile = files[0];
-                    if (selectedFile) {
-                      setFile(selectedFile);
-                      setPreviewImage(URL.createObjectURL(selectedFile));
-                      handleChange('imageId', '');
-                    }
-                  }}
-                  onReject={() => toast.error('File tidak valid')}
-                  maxSize={5 * 1024 ** 2}
-                  accept={{ 'image/*': ['.jpeg', '.jpg', '.png', '.webp'] }}
-                  radius="md"
-                  p="xl"
-                >
-                  <Group justify="center" gap="xl" mih={180}>
-                    <Dropzone.Accept>
-                      <IconUpload size={48} color={colors['blue-button']} stroke={1.5} />
-                    </Dropzone.Accept>
-                    <Dropzone.Reject>
-                      <IconX size={48} color="red" stroke={1.5} />
-                    </Dropzone.Reject>
-                    <Dropzone.Idle>
-                      <IconPhoto size={48} color="#868e96" stroke={1.5} />
-                    </Dropzone.Idle>
-
-                    <Stack align="center" gap="xs">
-                      <Text fw={500}>Seret gambar atau klik untuk pilih</Text>
-                      <Text size="sm" c="dimmed">
-                        Maksimal 5MB, format: .png, .jpg, .jpeg, .webp
-                      </Text>
-                    </Stack>
-                  </Group>
-                </Dropzone>
-
-                {previewImage && (
-                  <Box mt="sm" pos="relative" style={{ textAlign: 'center' }}>
-                    <Image
-                      src={previewImage}
-                      alt="Preview"
-                      radius="md"
-                      style={{
-                        maxHeight: 200,
-                        objectFit: 'contain',
-                        border: '1px solid #ddd',
-                      }}
-                    />
-
-                    <ActionIcon
-                      variant="filled"
-                      color="red"
-                      radius="xl"
-                      size="sm"
-                      pos="absolute"
-                      top={5}
-                      right={5}
-                      onClick={() => {
-                        setFile(null);
-                        setPreviewImage(null);
-                        handleChange('imageId', '');
-                      }}
-                      style={{ boxShadow: '0 2px 6px rgba(0,0,0,0.15)' }}
-                    >
-                      <IconX size={14} />
-                    </ActionIcon>
-                  </Box>
-                )}
-              </>
-            ) : (
-              // Default icon
-              <Box mt="xs">
+            {/* ✅ Preview gambar + tombol X */}
+            {previewImage && (
+              <Box mt="sm" pos="relative" style={{ textAlign: 'center' }}>
                 <Image
-                  src={sosmedMap[selectedSosmed].src || ''}
-                  alt="Icon bawaan"
-                  width={40}
-                  height={40}
+                  src={previewImage}
+                  alt="Preview Gambar"
                   radius="md"
-                  style={{ border: '1px solid #ddd', padding: 4, background: '#fff' }}
+                  style={{
+                    maxHeight: 200,
+                    objectFit: 'contain',
+                    border: '1px solid #ddd',
+                  }}
+                  loading="lazy"
                 />
+
+                {/* Tombol hapus (pojok kanan atas) */}
+                <ActionIcon
+                  variant="filled"
+                  color="red"
+                  radius="xl"
+                  size="sm"
+                  pos="absolute"
+                  top={5}
+                  right={5}
+                  onClick={() => {
+                    setPreviewImage(null);
+                    setFile(null);
+                  }}
+                  style={{
+                    boxShadow: '0 2px 6px rgba(0,0,0,0.15)',
+                  }}
+                >
+                  <IconX size={14} />
+                </ActionIcon>
               </Box>
             )}
           </Box>
@@ -325,17 +237,25 @@ function EditMediaSosial() {
           {/* Link Media Sosial */}
           <TextInput
             label="Link Media Sosial / Nomor Telepon"
-            placeholder="Masukkan link atau nomor telepon"
+            placeholder="Masukkan link media sosial atau nomor telepon"
             value={formData.iconUrl}
             onChange={(e) => handleChange('iconUrl', e.target.value)}
             required
           />
 
-          <Group justify="right">
-            <Button variant="outline" color="gray" radius="md" size="md" onClick={handleResetForm}>
+<Group justify="right">
+            {/* Tombol Batal */}
+            <Button
+              variant="outline"
+              color="gray"
+              radius="md"
+              size="md"
+              onClick={handleResetForm}
+            >
               Batal
             </Button>
 
+            {/* Tombol Simpan */}
             <Button
               onClick={handleSubmit}
               radius="md"

src/app/admin/(dashboard)/landing-page/profil/media-sosial/[id]/page.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 'use client'
 import { ModalKonfirmasiHapus } from '@/app/admin/(dashboard)/_com/modalKonfirmasiHapus';
 import profileLandingPageState from '@/app/admin/(dashboard)/_state/landing-page/profile';
@@ -9,7 +8,6 @@ import { IconArrowBack, IconEdit, IconTrash } from '@tabler/icons-react';
 import { useParams, useRouter } from 'next/navigation';
 import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
-import { sosmedMap } from '../../_lib/sosmed';
 
 function DetailMediaSosial() {
   const stateMediaSosial = useProxy(profileLandingPageState.mediaSosial);
@@ -18,14 +16,6 @@ function DetailMediaSosial() {
   const params = useParams();
   const router = useRouter();
 
-  const getIconSource = (item: any) => {
-    if (item.image?.link) return item.image.link;
-    if (item.icon && sosmedMap[item.icon as keyof typeof sosmedMap]?.src) {
-      return sosmedMap[item.icon as keyof typeof sosmedMap].src;
-    }
-    return null;
-  };
-
   useShallowEffect(() => {
     stateMediaSosial.findUnique.load(params?.id as string);
   }, []);
@@ -87,47 +77,46 @@ function DetailMediaSosial() {
 
               <Box>
                 <Text fz="lg" fw="bold">Gambar</Text>
-                {(() => {
-                  const src = getIconSource(data);
+                {data.image?.link ? (
+                  <Image
+                    src={data.image.link}
+                    alt={data.name || 'Gambar Media Sosial'}
+                    w="100%"
+                    maw={120} // max width biar tidak keluar layar
+                    h="auto"
+                    radius="md"
+                    fit="cover"
+                    loading="lazy"
+                  />
 
-                  if (src) {
-                    return (
-                      <Image
-                        loading="lazy"
-                        src={src}
-                        alt={data.name}
-                        fit={data.image?.link ? "cover" : "contain"}
-                      />
-                    );
-                  }
-
-                  return <Box bg={colors['blue-button']} w="100%" h="100%" />;
-                })()}
+                ) : (
+                  <Text fz="sm" c="dimmed">Tidak ada gambar</Text>
+                )}
               </Box>
 
               <Group gap="sm">
-                <Button
-                  color="red"
-                  onClick={() => {
-                    setSelectedId(data.id);
-                    setModalHapus(true);
-                  }}
-                  variant="light"
-                  radius="md"
-                  size="md"
-                >
-                  <IconTrash size={20} />
-                </Button>
+                  <Button
+                    color="red"
+                    onClick={() => {
+                      setSelectedId(data.id);
+                      setModalHapus(true);
+                    }}
+                    variant="light"
+                    radius="md"
+                    size="md"
+                  >
+                    <IconTrash size={20} />
+                  </Button>
 
-                <Button
-                  color="green"
-                  onClick={() => router.push(`/admin/landing-page/profil/media-sosial/${data.id}/edit`)}
-                  variant="light"
-                  radius="md"
-                  size="md"
-                >
-                  <IconEdit size={20} />
-                </Button>
+                  <Button
+                    color="green"
+                    onClick={() => router.push(`/admin/landing-page/profil/media-sosial/${data.id}/edit`)}
+                    variant="light"
+                    radius="md"
+                    size="md"
+                  >
+                    <IconEdit size={20} />
+                  </Button>
               </Group>
             </Stack>
           </Paper>

src/app/admin/(dashboard)/landing-page/profil/media-sosial/create/page.tsx

@@ -1,6 +1,5 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client';
-
 import colors from '@/con/colors';
 import ApiFetch from '@/lib/api-fetch';
 import {
@@ -23,41 +22,10 @@ import { useEffect, useState } from 'react';
 import { toast } from 'react-toastify';
 import { useProxy } from 'valtio/utils';
 import profileLandingPageState from '../../../../_state/landing-page/profile';
-import SelectSosialMedia from '@/app/admin/(dashboard)/_com/selectSocialMedia';
-
-
-// ⭐ Tambah type SosmedKey
-type SosmedKey =
-  | 'facebook'
-  | 'instagram'
-  | 'tiktok'
-  | 'youtube'
-  | 'whatsapp'
-  | 'gmail'
-  | 'telegram'
-  | 'x'
-  | 'telephone'
-  | 'custom';
-
-// ⭐ mapping icon sosmed bawaan
-const sosmedMap: Record<SosmedKey, { label: string; src: string | null }> = {
-  facebook: { label: 'Facebook', src: '/assets/images/sosmed/facebook.png' },
-  instagram: { label: 'Instagram', src: '/assets/images/sosmed/instagram.png' },
-  tiktok: { label: 'Tiktok', src: '/assets/images/sosmed/tiktok.png' },
-  youtube: { label: 'YouTube', src: '/assets/images/sosmed/youtube.png' },
-  whatsapp: { label: 'WhatsApp', src: '/assets/images/sosmed/whatsapp.png' },
-  gmail: { label: 'Gmail', src: '/assets/images/sosmed/gmail.png' },
-  telegram: { label: 'Telegram', src: '/assets/images/sosmed/telegram.png' },
-  x: { label: 'X (Twitter)', src: '/assets/images/sosmed/x-twitter.png' },
-  telephone: { label: 'Telephone', src: '/assets/images/sosmed/telephone-call.png' },
-  custom: { label: 'Custom Icon', src: null },
-};
 
 export default function CreateMediaSosial() {
   const router = useRouter();
   const stateMediaSosial = useProxy(profileLandingPageState.mediaSosial);
-
-  const [selectedSosmed, setSelectedSosmed] = useState<SosmedKey>('facebook');
   const [previewImage, setPreviewImage] = useState<string | null>(null);
   const [file, setFile] = useState<File | null>(null);
   const [isSubmitting, setIsSubmitting] = useState(false);
@@ -71,34 +39,16 @@ export default function CreateMediaSosial() {
       name: '',
       imageId: '',
       iconUrl: '',
-      icon: ''
     };
-
-    setFile(null);
     setPreviewImage(null);
-    setSelectedSosmed('facebook');
+    setFile(null);
   };
 
   const handleSubmit = async () => {
     setIsSubmitting(true);
-
     try {
-      // ──────────────── ⭐ CASE 1: PAKAI ICON DEFAULT ────────────────
-      if (selectedSosmed !== 'custom') {
-        stateMediaSosial.create.form.imageId = null;
-        stateMediaSosial.create.form.icon = sosmedMap[selectedSosmed].src!;
-
-
-        await stateMediaSosial.create.create();
-        resetForm();
-        router.push('/admin/landing-page/profil/media-sosial');
-        return;
-      }
-
-      // ──────────────── ⭐ CASE 2: CUSTOM ICON → WAJIB UPLOAD ────────────────
       if (!file) {
-        toast.warn('Silakan upload icon custom terlebih dahulu');
-        return;
+        return toast.warn('Silakan pilih file gambar terlebih dahulu');
       }
 
       const res = await ApiFetch.api.fileStorage.create.post({
@@ -109,12 +59,10 @@ export default function CreateMediaSosial() {
       const uploaded = res.data?.data;
 
       if (!uploaded?.id) {
-        toast.error('Gagal mengunggah icon custom');
-        return;
+        return toast.error('Gagal mengunggah gambar, silakan coba lagi');
       }
 
       stateMediaSosial.create.form.imageId = uploaded.id;
-      stateMediaSosial.create.form.icon = null;
 
       await stateMediaSosial.create.create();
 
@@ -130,7 +78,6 @@ export default function CreateMediaSosial() {
 
   return (
     <Box px={{ base: 'sm', md: 'lg' }} py="md">
-      {/* Header */}
       <Group mb="md">
         <Button variant="subtle" onClick={() => router.back()} p="xs" radius="md">
           <IconArrowBack color={colors['blue-button']} size={24} />
@@ -149,110 +96,112 @@ export default function CreateMediaSosial() {
         style={{ border: '1px solid #e0e0e0' }}
       >
         <Stack gap="md">
-          {/* Select Sosmed */}
-          <SelectSosialMedia value={selectedSosmed} onChange={setSelectedSosmed} />
+          <Box>
+            <Text fw="bold" fz="sm" mb={6}>
+              Gambar Program Inovasi
+            </Text>
+            <Dropzone
+              onDrop={(files) => {
+                const selectedFile = files[0];
+                if (selectedFile) {
+                  setFile(selectedFile);
+                  setPreviewImage(URL.createObjectURL(selectedFile));
+                }
+              }}
+              onReject={() => toast.error('File tidak valid, gunakan format gambar')}
+              maxSize={5 * 1024 ** 2}
+              accept={{ 'image/*': ['.jpeg', '.jpg', '.png', '.webp'] }}
+              radius="md"
+              p="xl"
+            >
+              <Group justify="center" gap="xl" mih={180}>
+                <Dropzone.Accept>
+                  <IconUpload size={48} color={colors['blue-button']} stroke={1.5} />
+                </Dropzone.Accept>
+                <Dropzone.Reject>
+                  <IconX size={48} color="red" stroke={1.5} />
+                </Dropzone.Reject>
+                <Dropzone.Idle>
+                  <IconPhoto size={48} color="#868e96" stroke={1.5} />
+                </Dropzone.Idle>
+                <Stack gap="xs" align="center">
+                  <Text size="md" fw={500}>
+                    Seret gambar atau klik untuk memilih file
+                  </Text>
+                  <Text size="sm" c="dimmed">
+                  Maksimal 5MB, format gambar .png, .jpg, .jpeg, webp
+                  </Text>
+                </Stack>
+              </Group>
+            </Dropzone>
 
-          {/* Custom icon uploader */}
-          {selectedSosmed === 'custom' && (
-            <Box>
-              <Text fw="bold" fz="sm" mb={6}>
-                Upload Custom Icon
-              </Text>
+            {/* ✅ Preview gambar + tombol X */}
+            {previewImage && (
+              <Box mt="sm" pos="relative" style={{ textAlign: 'center' }}>
+                <Image
+                  src={previewImage}
+                  alt="Preview Gambar"
+                  radius="md"
+                  style={{
+                    maxHeight: 200,
+                    objectFit: 'contain',
+                    border: '1px solid #ddd',
+                  }}
+                  loading="lazy"
+                />
 
-              <Dropzone
-                onDrop={(files) => {
-                  const selectedFile = files[0];
-                  if (selectedFile) {
-                    setFile(selectedFile);
-                    setPreviewImage(URL.createObjectURL(selectedFile));
-                  }
-                }}
-                onReject={() => toast.error('File tidak valid')}
-                maxSize={5 * 1024 ** 2}
-                accept={{ 'image/*': ['.jpeg', '.jpg', '.png', '.webp'] }}
-                radius="md"
-                p="xl"
-              >
-                <Group justify="center" gap="xl" mih={180}>
-                  <Dropzone.Accept>
-                    <IconUpload size={48} color={colors['blue-button']} stroke={1.5} />
-                  </Dropzone.Accept>
-                  <Dropzone.Reject>
-                    <IconX size={48} color="red" stroke={1.5} />
-                  </Dropzone.Reject>
-                  <Dropzone.Idle>
-                    <IconPhoto size={48} color="#868e96" stroke={1.5} />
-                  </Dropzone.Idle>
+                {/* Tombol hapus (pojok kanan atas) */}
+                <ActionIcon
+                  variant="filled"
+                  color="red"
+                  radius="xl"
+                  size="sm"
+                  pos="absolute"
+                  top={5}
+                  right={5}
+                  onClick={() => {
+                    setPreviewImage(null);
+                    setFile(null);
+                  }}
+                  style={{
+                    boxShadow: '0 2px 6px rgba(0,0,0,0.15)',
+                  }}
+                >
+                  <IconX size={14} />
+                </ActionIcon>
+              </Box>
+            )}
+          </Box>
 
-                  <Stack align="center" gap="xs">
-                    <Text fw={500}>Seret gambar atau klik untuk pilih</Text>
-                    <Text size="sm" c="dimmed">
-                      Maksimal 5MB, format .png, .jpg, .jpeg, webp
-                    </Text>
-                  </Stack>
-                </Group>
-              </Dropzone>
-
-              {previewImage && (
-                <Box mt="sm" pos="relative" style={{ textAlign: 'center' }}>
-                  <Image
-                    src={previewImage}
-                    alt="Preview"
-                    radius="md"
-                    style={{
-                      maxHeight: 200,
-                      objectFit: 'contain',
-                      border: '1px solid #ddd',
-                    }}
-                  />
-
-                  <ActionIcon
-                    variant="filled"
-                    color="red"
-                    radius="xl"
-                    size="sm"
-                    pos="absolute"
-                    top={5}
-                    right={5}
-                    onClick={() => {
-                      setFile(null);
-                      setPreviewImage(null);
-                    }}
-                    style={{ boxShadow: '0 2px 6px rgba(0,0,0,0.15)' }}
-                  >
-                    <IconX size={14} />
-                  </ActionIcon>
-                </Box>
-              )}
-            </Box>
-          )}
-
-          {/* Input name */}
           <TextInput
-            label="Nama Media Sosial"
-            placeholder="Masukkan nama media sosial"
-            value={stateMediaSosial.create.form.name ?? ''}
+            label="Nama Media Sosial / Kontak"
+            placeholder="Masukkan nama media sosial atau kontak"
+            value={stateMediaSosial.create.form.name || ''}
             onChange={(e) => (stateMediaSosial.create.form.name = e.target.value)}
             required
           />
-
-          {/* Input link */}
           <TextInput
-            label="Link / Kontak"
-            placeholder="Masukkan link atau nomor"
-            value={stateMediaSosial.create.form.iconUrl ?? ''}
+            label="Link Media Sosial / Nomor Telepon"
+            placeholder="Masukkan link media sosial atau nomor telepon"
+            value={stateMediaSosial.create.form.iconUrl || ''}
             onChange={(e) => (stateMediaSosial.create.form.iconUrl = e.target.value)}
             required
           />
 
-          {/* Actions */}
           <Group justify="right">
-            <Button variant="outline" color="gray" radius="md" onClick={resetForm}>
+            <Button
+              variant="outline"
+              color="gray"
+              radius="md"
+              size="md"
+              onClick={resetForm}
+            >
               Reset
             </Button>
             <Button
-              radius="md"
               onClick={handleSubmit}
+              radius="md"
+              size="md"
               style={{
                 background: `linear-gradient(135deg, ${colors['blue-button']}, #4facfe)`,
                 color: '#fff',

src/app/admin/(dashboard)/landing-page/profil/media-sosial/page.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 'use client'
 import colors from '@/con/colors';
 import { Box, Button, Center, Group, Image, Pagination, Paper, Skeleton, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Text, Title } from '@mantine/core';
@@ -9,7 +8,6 @@ import { useState } from 'react';
 import { useProxy } from 'valtio/utils';
 import HeaderSearch from '../../../_com/header';
 import profileLandingPageState from '../../../_state/landing-page/profile';
-import { sosmedMap } from '../_lib/sosmed';
 
 function MediaSosial() {
   const [search, setSearch] = useState("");
@@ -31,14 +29,6 @@ function ListMediaSosial({ search }: { search: string }) {
   const stateMediaSosial = useProxy(profileLandingPageState.mediaSosial)
   const router = useRouter();
 
-  const getIconSource = (item: any) => {
-    if (item.image?.link) return item.image.link; 
-    if (item.icon && sosmedMap[item.icon as keyof typeof sosmedMap]?.src) {
-      return sosmedMap[item.icon as keyof typeof sosmedMap].src;
-    }
-    return null;
-  };
-
   const {
     data,
     page,
@@ -66,9 +56,9 @@ function ListMediaSosial({ search }: { search: string }) {
       <Paper withBorder bg={colors['white-1']} p={'lg'} shadow="md" radius="md">
         <Group justify="space-between" mb="md">
           <Title order={4}>Daftar Media Sosial</Title>
-          <Button leftSection={<IconPlus size={18} />} color="blue" variant="light" onClick={() => router.push('/admin/landing-page/profil/media-sosial/create')}>
-            Tambah Baru
-          </Button>
+            <Button leftSection={<IconPlus size={18} />} color="blue" variant="light" onClick={() => router.push('/admin/landing-page/profil/media-sosial/create')}>
+              Tambah Baru
+            </Button>
         </Group>
         <Box style={{ overflowX: "auto" }}>
           <Table highlightOnHover>
@@ -87,26 +77,13 @@ function ListMediaSosial({ search }: { search: string }) {
                     <TableTd style={{ width: '25%', }}>
                       <Text fw={500} truncate="end" lineClamp={1}>{item.name}</Text>
                     </TableTd>
-                    <TableTd style={{ width: '20%' }}>
-                      <Box w={50} h={50} style={{ borderRadius: 8, overflow: 'hidden' }}>
-
-                        {(() => {
-                          const src = getIconSource(item);
-
-                          if (src) {
-                            return (
-                              <Image
-                                loading="lazy"
-                                src={src}
-                                alt={item.name}
-                                fit={item.image?.link ? "cover" : "contain"}
-                              />
-                            );
-                          }
-
-                          return <Box bg={colors['blue-button']} w="100%" h="100%" />;
-                        })()}
-
+                    <TableTd style={{ width: '20%', }}>
+                      <Box w={50} h={50} style={{ borderRadius: 8, overflow: 'hidden', }}>
+                        {item.image?.link ? (
+                          <Image loading='lazy' src={item.image.link} alt={item.name} fit="cover" />
+                        ) : (
+                          <Box bg={colors['blue-button']} w="100%" h="100%" />
+                        )}
                       </Box>
                     </TableTd>
                     <TableTd style={{ width: '20%', }}>

src/app/admin/(dashboard)/user&role/user/page.tsx

@@ -93,7 +93,6 @@ function ListUser({ search }: { search: string }) {
     const success = await stateUser.update.submit({
       id: userId,
       roleId: newRoleId,
-
     });
 
     if (success) {
@@ -137,10 +136,9 @@ function ListUser({ search }: { search: string }) {
     }
   };
 
-  const filteredData = (data || []).filter((item) => {
-    return item.roleId !== "0" && item.roleId !== "1";
-  });
-
+  const filteredData = (data || []).filter(
+    (item) => item.roleId !== "0" // asumsikan id role SUPERADMIN = "0"
+  );
 
   if (loading || !data) {
     return (
@@ -185,7 +183,7 @@ function ListUser({ search }: { search: string }) {
                       <Select
                         placeholder="Pilih role"
                         data={stateRole.findMany.data
-                          .filter(r => r.id !== "0" && r.id !== "1") // ❌ Sembunyikan SUPERADMIN dan DEVELOPER
+                          .filter(r => r.id !== "0") // ❌ Sembunyikan SUPERADMIN
                           .map(r => ({
                             label: r.name,
                             value: r.id,

src/app/admin/layout.tsx

@@ -435,7 +435,6 @@ export default function Layout({ children }: { children: React.ReactNode }) {
   const [desktopOpened, { toggle: toggleDesktop }] = useDisclosure(true);
   const router = useRouter();
   const segments = useSelectedLayoutSegments().map((s) => _.lowerCase(s));
-  
 
   useEffect(() => {
     const fetchUser = async () => {

src/app/api/[[...slugs]]/_lib/landing_page/profile/media-sosial/create.ts

@@ -5,7 +5,6 @@ type FormCreate = {
   name: string;
   imageId: string;
   iconUrl: string;
-  icon: string;
 };
 
 export default async function mediaSosialCreate(context: Context) {
@@ -15,9 +14,8 @@ export default async function mediaSosialCreate(context: Context) {
     const result = await prisma.mediaSosial.create({
       data: {
         name: body.name,
-        imageId: body.imageId || null,
+        imageId: body.imageId,
         iconUrl: body.iconUrl,
-        icon: body.icon || null,
       },
       include: {
         image: true,
@@ -31,6 +29,8 @@ export default async function mediaSosialCreate(context: Context) {
     };
   } catch (error) {
     console.error("Error creating media sosial:", error);
-    throw new Error("Gagal membuat media sosial: " + (error as Error).message);
+    throw new Error(
+      "Gagal membuat media sosial: " + (error as Error).message
+    );
   }
 }

src/app/api/[[...slugs]]/_lib/landing_page/profile/media-sosial/index.ts

@@ -20,9 +20,8 @@ const MediaSosial = new Elysia({
   .post("/create", MediaSosialCreate, {
     body: t.Object({
       name: t.String(),
-      imageId: t.Union([t.String(), t.Null()]),
-      iconUrl: t.Union([t.String(), t.Null()]),
-      icon: t.Union([t.String(), t.Null()]),
+      imageId: t.String(),
+      iconUrl: t.String(),
     }),
   })
 
@@ -30,9 +29,8 @@ const MediaSosial = new Elysia({
   .put("/:id", MediaSosialUpdate, {
     body: t.Object({
       name: t.String(),
-      imageId: t.Optional(t.Union([t.String(), t.Null()])),
-      iconUrl: t.Optional(t.Union([t.String(), t.Null()])),
-      icon: t.Optional(t.Union([t.String(), t.Null()])),
+      imageId: t.Optional(t.String()),
+      iconUrl: t.Optional(t.String()),
     }),
   })
   // ✅ Delete

src/app/api/[[...slugs]]/_lib/landing_page/profile/media-sosial/updt.ts

@@ -6,7 +6,6 @@ type FormUpdateMediaSosial = {
   name?: string;
   imageId?: string;
   iconUrl?: string;
-  icon?: string;
 };
 
 export default async function mediaSosialUpdate(context: Context) {
@@ -21,29 +20,13 @@ export default async function mediaSosialUpdate(context: Context) {
     };
   }
 
-  // 🚨 Tambahkan validasi di sini
-  if (!body.name || body.name.trim().length < 3) {
-    return {
-      success: false,
-      message: "Nama media sosial minimal 3 karakter",
-    };
-  }
-
-  if (!body.iconUrl || body.iconUrl.trim().length < 3) {
-    return {
-      success: false,
-      message: "Icon URL minimal 3 karakter",
-    };
-  }
-
   try {
     const updated = await prisma.mediaSosial.update({
       where: { id },
       data: {
         name: body.name,
-        imageId: body.imageId || null, // pastikan null jika kosong
+        imageId: body.imageId,
         iconUrl: body.iconUrl,
-        icon: body.icon || null, // pastikan null jika kosong
       },
       include: {
         image: true,

src/app/api/[[...slugs]]/_lib/user/updt.ts

@@ -23,7 +23,7 @@ export default async function userUpdate(context: Context) {
 
     const currentUser = await prisma.user.findUnique({
       where: { id },
-      select: { roleId: true, isActive: true },
+      select: { roleId: true, isActive: true }
     });
 
     if (!currentUser) {
@@ -31,15 +31,7 @@ export default async function userUpdate(context: Context) {
     }
 
     const isRoleChanged = roleId && currentUser.roleId !== roleId;
-    const isActiveChanged =
-      isActive !== undefined && currentUser.isActive !== isActive;
-
-    // ✅ Jika role berubah, hapus semua akses menu yang ada
-    if (isRoleChanged) {
-      await prisma.userMenuAccess.deleteMany({
-        where: { userId: id }
-      });
-    }
+    const isActiveChanged = isActive !== undefined && currentUser.isActive !== isActive;
 
     // Update user
     const updatedUser = await prisma.user.update({
@@ -56,11 +48,10 @@ export default async function userUpdate(context: Context) {
         nomor: true,
         isActive: true,
         roleId: true,
-        role: { select: { name: true } },
-      },
+        role: { select: { name: true } }
+      }
     });
 
-    
     // ✅ HAPUS SEMUA SESI USER DI DATABASE
     if (isRoleChanged) {
       await prisma.userSession.deleteMany({ where: { userId: id } });
@@ -71,13 +62,11 @@ export default async function userUpdate(context: Context) {
       roleChanged: isRoleChanged,
       isActiveChanged,
       data: updatedUser,
-      message: isRoleChanged
+      message: isRoleChanged 
         ? `Role ${updatedUser.username} diubah. User akan logout otomatis.`
         : isActiveChanged
-        ? `${updatedUser.username} ${
-            isActive ? "diaktifkan" : "dinonaktifkan"
-          }.`
-        : "User berhasil diupdate",
+        ? `${updatedUser.username} ${isActive ? 'diaktifkan' : 'dinonaktifkan'}.`
+        : "User berhasil diupdate"
     };
   } catch (e: any) {
     console.error("❌ Error update user:", e);
@@ -86,4 +75,4 @@ export default async function userUpdate(context: Context) {
       message: "Gagal mengupdate user: " + (e.message || "Unknown error"),
     };
   }
-}
+}

src/app/api/[auth]/_lib/api_fetch_auth.ts

@@ -0,0 +1,144 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+// app/api/_lib/api_fetch_auth.ts
+
+// app/api/_lib/api_fetch_auth.ts
+
+export const apiFetchLogin = async ({ nomor }: { nomor: string }) => {
+  if (!nomor || nomor.replace(/\D/g, '').length < 10) {
+    throw new Error('Nomor tidak valid');
+  }
+
+  const cleanPhone = nomor.replace(/\D/g, '');
+
+  const response = await fetch("/api/login", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ nomor: cleanPhone }),
+    credentials: 'include'
+  });
+
+  // Pastikan respons bisa di-parse sebagai JSON
+  let data;
+  try {
+    data = await response.json();
+  } catch (e) {
+    console.error("Non-JSON response from /api/login:", await response.text());
+    throw new Error('Respons server tidak valid');
+  }
+
+  if (!response.ok) {
+    throw new Error(data.message || 'Gagal memproses login');
+  }
+
+  // Validasi minimal respons
+  if (typeof data.success !== 'boolean' || typeof data.isRegistered !== 'boolean') {
+    throw new Error('Respons tidak sesuai format');
+  }
+
+  if (data.success) {
+    if (data.isRegistered && !data.kodeId) {
+      throw new Error('Kode verifikasi tidak ditemukan untuk user terdaftar');
+    }
+    return data; // { success, isRegistered, kodeId? }
+  } else {
+    throw new Error(data.message || 'Login gagal');
+  }
+};
+
+export const apiFetchRegister = async ({
+  username,
+  nomor,
+}: {
+  username: string;
+  nomor: string;
+}) => {
+  const cleanPhone = nomor.replace(/\D/g, '');
+  if (cleanPhone.length < 10) throw new Error('Nomor tidak valid');
+
+  const response = await fetch("/api/register", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ username: username.trim(), nomor: cleanPhone }),
+    credentials: 'include',
+  });
+
+  const data = await response.json();
+  if (!response.ok) throw new Error(data.message || 'Gagal mengirim OTP');
+
+  return data;
+};
+
+export const apiFetchOtpData = async ({ kodeId }: { kodeId: string }) => {
+  if (!kodeId) {
+    throw new Error('Kode ID tidak valid');
+  }
+
+  const response = await fetch("/api/otp-data", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ kodeId }),
+  });
+
+  const data = await response.json();
+
+  if (!response.ok) {
+    throw new Error(data.message || 'Gagal memuat data OTP');
+  }
+
+  return data;
+};
+
+// Ganti endpoint ke verify-otp-login
+export const apiFetchVerifyOtp = async ({ nomor, otp, kodeId }: { nomor: string; otp: string; kodeId: string }) => {
+  const response = await fetch('/api/verify-otp-login', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ nomor, otp, kodeId }),
+  });
+  const data = await response.json();
+  return {
+    success: response.ok,
+    ...data,
+    status: response.status,
+  };
+};
+
+// Di dalam api_fetch_auth.ts
+
+export async function apiFetchUserMenuAccess(userId: string): Promise<{
+  success: boolean;
+  menuIds?: string[];
+  message?: string;
+}> {
+  try {
+    const res = await fetch(`/api/admin/user-menu-access/${userId}`, {
+      method: 'GET',
+      headers: { 'Content-Type': 'application/json' },
+    });
+
+    const data = await res.json();
+    return data;
+  } catch (error) {
+    console.error('API Fetch User Menu Access Error:', error);
+    return { success: false, message: 'Gagal memuat menu akses' };
+  }
+}
+
+export async function apiUpdateUserMenuAccess(
+  userId: string,
+  menuIds: string[]
+): Promise<{ success: boolean; message?: string }> {
+  try {
+    const res = await fetch('/api/admin/user-menu-access', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ userId, menuIds }),
+    });
+
+    const data = await res.json();
+    return data;
+  } catch (error) {
+    console.error('API Update User Menu Access Error:', error);
+    return { success: false, message: 'Gagal menyimpan menu akses' };
+  }
+}

src/app/api/[auth]/finalize-registration/route.ts

@@ -0,0 +1,149 @@
+// src/app/api/auth/finalize-registration/route.ts
+import prisma from "@/lib/prisma";
+import { NextResponse } from "next/server";
+import { sessionCreate } from "../_lib/session_create";
+
+// ✅ Gunakan STRING untuk roleId
+const DEFAULT_MENUS_BY_ROLE: Record<string, string[]> = {
+  "0": [
+    "Landing Page", "PPID", "Desa", "Kesehatan", "Keamanan",
+    "Ekonomi", "Inovasi", "Lingkungan", "Pendidikan", "User & Role"
+  ],
+  "1": [
+    "Landing Page", "PPID", "Desa", "Keamanan",
+    "Ekonomi", "Inovasi", "Lingkungan", "User & Role"
+  ],
+  "2": ["Landing Page", "Desa", "Ekonomi", "Inovasi", "Lingkungan"],
+  "3": ["Kesehatan"],
+  "4": ["Pendidikan"],
+};
+
+export async function POST(req: Request) {
+  try {
+    const { nomor, username, kodeId } = await req.json();
+    const cleanNomor = nomor.replace(/\D/g, "");
+
+    if (!cleanNomor || !username || !kodeId) {
+      return NextResponse.json(
+        { success: false, message: "Data tidak lengkap" },
+        { status: 400 }
+      );
+    }
+
+    // Verify OTP
+    const otpRecord = await prisma.kodeOtp.findUnique({ 
+      where: { id: kodeId },
+      select: { nomor: true, isActive: true }
+    });
+
+    if (!otpRecord?.isActive || otpRecord.nomor !== cleanNomor) {
+      return NextResponse.json(
+        { success: false, message: "OTP tidak valid" },
+        { status: 400 }
+      );
+    }
+
+    // Check duplicate username
+    if (await prisma.user.findFirst({ where: { username } })) {
+      return NextResponse.json(
+        { success: false, message: "Username sudah digunakan" },
+        { status: 409 }
+      );
+    }
+
+    // Check duplicate nomor
+    if (await prisma.user.findUnique({ where: { nomor: cleanNomor } })) {
+      return NextResponse.json(
+        { success: false, message: "Nomor sudah terdaftar" },
+        { status: 409 }
+      );
+    }
+
+    // 🔥 Tentukan roleId sebagai STRING
+    const targetRoleId = "2"; // ✅ Default ADMIN_DESA (roleId "2")
+
+    // Validasi role exists
+    const roleExists = await prisma.role.findUnique({
+      where: { id: targetRoleId },
+      select: { id: true }
+    });
+
+    if (!roleExists) {
+      return NextResponse.json(
+        { success: false, message: "Role tidak valid" },
+        { status: 400 }
+      );
+    }
+
+    // ✅ Create user (inactive, waiting approval)
+    const newUser = await prisma.user.create({
+      data: {
+        username,
+        nomor: cleanNomor,
+        roleId: targetRoleId,
+        isActive: false, // Waiting for admin approval
+      },
+    });
+
+    // ✅ Berikan akses menu default based on role
+    const menuIds = DEFAULT_MENUS_BY_ROLE[targetRoleId] || [];
+    if (menuIds.length > 0) {
+      await prisma.userMenuAccess.createMany({
+        data: menuIds.map(menuId => ({
+          userId: newUser.id,
+          menuId,
+        })),
+        skipDuplicates: true, // ✅ Avoid duplicate errors
+      });
+    }
+
+    // ✅ Mark OTP as used
+    await prisma.kodeOtp.update({
+      where: { id: kodeId },
+      data: { isActive: false },
+    });
+
+    // ✅ Create session token
+    const token = await sessionCreate({
+      sessionKey: process.env.BASE_SESSION_KEY!,
+      jwtSecret: process.env.BASE_TOKEN_KEY!,
+      exp: "30 day",
+      user: {
+        id: newUser.id,
+        nomor: newUser.nomor,
+        username: newUser.username,
+        roleId: newUser.roleId,
+        isActive: false, // User belum aktif
+      },
+      invalidatePrevious: false,
+    });
+
+    // ✅ PENTING: Return JSON response (bukan redirect)
+    const response = NextResponse.json({
+      success: true,
+      message: "Registrasi berhasil. Menunggu persetujuan admin.",
+      userId: newUser.id,
+    });
+
+    // ✅ Set session cookie
+    const cookieName = process.env.BASE_SESSION_KEY || 'session';
+    response.cookies.set(cookieName, token, {
+      httpOnly: true,
+      secure: process.env.NODE_ENV === "production",
+      sameSite: 'lax',
+      path: "/",
+      maxAge: 30 * 24 * 60 * 60, // 30 days
+    });
+
+    return response;
+
+  } catch (error) {
+    console.error("❌ Finalize Registration Error:", error);
+    return NextResponse.json(
+      { success: false, message: "Registrasi gagal. Silakan coba lagi." },
+      { status: 500 }
+    );
+  } finally {
+    await prisma.$disconnect();
+  }
+}

src/app/api/[auth]/me/route.ts

@@ -0,0 +1,59 @@
+// src/app/api/auth/me/route.ts
+import { NextResponse } from 'next/server';
+import { verifySession } from '../_lib/session_verify';
+import prisma from '@/lib/prisma';
+
+export async function GET() {
+  try {
+    const sessionUser = await verifySession();
+    if (!sessionUser) {
+      return NextResponse.json(
+        { success: false, message: "Unauthorized", user: null },
+        { status: 401 }
+      );
+    }
+
+    const [dbUser, menuAccess] = await Promise.all([
+      prisma.user.findUnique({
+        where: { id: sessionUser.id },
+        select: {
+          id: true,
+          username: true,
+          nomor: true,
+          roleId: true,   // STRING!
+          isActive: true, // BOOLEAN!
+        },
+      }),
+      prisma.userMenuAccess.findMany({
+        where: { userId: sessionUser.id },
+        select: { menuId: true },
+      }),
+    ]);
+
+    if (!dbUser) {
+      return NextResponse.json(
+        { success: false, message: "User not found", user: null },
+        { status: 404 }
+      );
+    }
+
+    return NextResponse.json({
+      success: true,
+      user: {
+        id: dbUser.id,
+        name: dbUser.username,
+        username: dbUser.username,
+        nomor: dbUser.nomor,
+        roleId: dbUser.roleId,     // STRING!
+        isActive: dbUser.isActive, // BOOLEAN!
+        menuIds: menuAccess.map(m => m.menuId),
+      },
+    });
+  } catch (error) {
+    console.error("❌ Error in /api/me:", error);
+    return NextResponse.json(
+      { success: false, message: "Internal server error", user: null },
+      { status: 500 }
+    );
+  }
+}

src/app/api/auth/finalize-registration/route.ts

@@ -1,7 +1,8 @@
 // src/app/api/auth/finalize-registration/route.ts
 import prisma from "@/lib/prisma";
 import { NextResponse } from "next/server";
-import { sessionCreate } from "../_lib/session_create";
+import { sessionCreate } from "../../[auth]/_lib/session_create";
+
 
 // ✅ Gunakan STRING untuk roleId
 const DEFAULT_MENUS_BY_ROLE: Record<string, string[]> = {

src/app/api/auth/me/route.ts

@@ -12,7 +12,6 @@ export async function GET() {
         { status: 401 }
       );
     }
-    
 
     const [dbUser, menuAccess] = await Promise.all([
       prisma.user.findUnique({

src/app/darmasaba/(pages)/ppid/daftar-informasi-publik/page.tsx

@@ -151,7 +151,7 @@ function Page() {
                               variant="light"
                               color="blue"
                               leftSection={<IconDeviceImacCog size={16} />}
-                              onClick={() => router.push(`/darmasaba/ppid/daftar-informasi-publik/${item.id}`)}
+                              onClick={() => router.push(`/darmasaba/ppid/daftar-informasi-publik-desa-darmasaba/${item.id}`)}
                             >
                               Detail
                             </Button>

src/app/darmasaba/(tambahan)/apbdes/lib/apbDesaProgress.tsx

@@ -1,8 +1,13 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+// src/app/admin/(dashboard)/landing-page/APBDes/APBDesProgress.tsx
 'use client';
 
-import colors from '@/con/colors';
 import { Box, Paper, Progress, Stack, Text, Title } from '@mantine/core';
-import { APBDesData } from './types';
+import { useProxy } from 'valtio/utils';
+import apbdes from '@/app/admin/(dashboard)/_state/landing-page/apbdes';
+import colors from '@/con/colors';
+
+
 
 function formatRupiah(value: number) {
   return new Intl.NumberFormat('id-ID', {
@@ -12,33 +17,31 @@ function formatRupiah(value: number) {
   }).format(value);
 }
 
-interface APBDesProgressProps {
-  apbdesData: APBDesData;
-}
+function APBDesProgress() {
+  const state = useProxy(apbdes);
+  const data = state.findMany.data || [];
 
-function APBDesProgress({ apbdesData }: APBDesProgressProps) {
-  // Return null if apbdesData is not available yet
-  if (!apbdesData) {
-    return null;
+  // Ambil APBDes pertama (misalnya, jika hanya satu tahun ditampilkan)
+  const apbdesItem = data[0]; // 👈 sesuaikan logika jika ada banyak APBDes
+
+  if (!apbdesItem) {
+    return (
+      <Box py="md" px={{ base: 'md', md: 100 }}>
+        <Text c="dimmed">Belum ada data APBDes untuk ditampilkan.</Text>
+      </Box>
+    );
   }
 
-  const items = apbdesData.items || [];
+  const items = apbdesItem.items || [];
   const sortedItems = [...items].sort((a, b) => a.kode.localeCompare(b.kode));
 
   // Kelompokkan berdasarkan tipe
   const pendapatanItems = sortedItems.filter(item => item.tipe === 'pendapatan');
   const belanjaItems = sortedItems.filter(item => item.tipe === 'belanja');
-  const pembiayaanItems = sortedItems.filter(item => item.tipe === 'pembiayaan');
-  
-  // Items without a type (should be filtered out from calculations)
-  const untypedItems = sortedItems.filter(item => !item.tipe);
-  
-  if (untypedItems.length > 0) {
-    console.warn(`Found ${untypedItems.length} items without a type. These will be excluded from calculations.`);
-  }
+  const pembiayaanItems = sortedItems.filter(item => item.tipe === 'pembiayaan'); // jika ada
 
   // Hitung total per kategori
-  const calcTotal = (items: { anggaran: number; realisasi: number }[]) => {
+  const calcTotal = (items: any[]) => {
     const anggaran = items.reduce((sum, item) => sum + item.anggaran, 0);
     const realisasi = items.reduce((sum, item) => sum + item.realisasi, 0);
     const persen = anggaran > 0 ? (realisasi / anggaran) * 100 : 0;
@@ -47,10 +50,10 @@ function APBDesProgress({ apbdesData }: APBDesProgressProps) {
 
   const pendapatan = calcTotal(pendapatanItems);
   const belanja = calcTotal(belanjaItems);
-  const pembiayaan = calcTotal(pembiayaanItems);
+  const pembiayaan = calcTotal(pembiayaanItems); // bisa kosong
 
   // Render satu progress bar
-  const renderProgress = (label: string, dataset: { realisasi: number; anggaran: number; persen: number }) => {
+  const renderProgress = (label: string, dataset: any) => {
     const isPembiayaan = label.includes('Pembiayaan');
 
     return (
@@ -68,8 +71,8 @@ function APBDesProgress({ apbdesData }: APBDesProgressProps) {
             root: { backgroundColor: '#d7e3f1' },
             section: {
               backgroundColor: isPembiayaan
-                ? 'green'
-                : colors['blue-button'],
+                ? 'green' // warna hijau untuk pembiayaan
+                : colors['blue-button'], // biru untuk pendapatan/belanja
               position: 'relative',
               '&::after': {
                 content: `'${dataset.persen.toFixed(2)}%'`,
@@ -99,7 +102,7 @@ function APBDesProgress({ apbdesData }: APBDesProgressProps) {
     >
       <Stack gap="lg">
         <Title order={4} c={colors['blue-button']} ta="center">
-          Grafik Pelaksanaan APBDes Tahun {apbdesData.tahun}
+          Grafik Pelaksanaan APBDes Tahun {apbdesItem.tahun}
         </Title>
 
         <Text ta="center" fw="bold" fz="sm" c="dimmed">
@@ -109,9 +112,97 @@ function APBDesProgress({ apbdesData }: APBDesProgressProps) {
         {renderProgress('Pendapatan Desa', pendapatan)}
         {renderProgress('Belanja Desa', belanja)}
         {renderProgress('Pembiayaan Desa', pembiayaan)}
+        {pembiayaanItems.length > 0 && renderProgress('Pembiayaan Desa', pembiayaan)}
       </Stack>
     </Paper>
   );
 }
 
-export default APBDesProgress;
+export default APBDesProgress;
+
+// /* eslint-disable @typescript-eslint/no-explicit-any */
+// 'use client';
+
+// import { Box, Paper, Stack, Text, Title } from '@mantine/core';
+// import { BarChart } from '@mantine/charts';
+// import { useProxy } from 'valtio/utils';
+// import apbdes from '@/app/admin/(dashboard)/_state/landing-page/apbdes';
+// import colors from '@/con/colors';
+
+// function APBDesProgress() {
+//   const state = useProxy(apbdes);
+//   const data = state.findMany.data || [];
+
+//   const apbdesItem = data[0];
+//   if (!apbdesItem) {
+//     return (
+//       <Box py="md" px={{ base: 'md', md: 100 }}>
+//         <Text c="dimmed">Belum ada data APBDes untuk ditampilkan.</Text>
+//       </Box>
+//     );
+//   }
+
+//   const items = apbdesItem.items || [];
+//   const sortedItems = [...items].sort((a, b) => a.kode.localeCompare(b.kode));
+
+//   const pendapatanItems = sortedItems.filter(i => i.tipe === 'pendapatan');
+//   const belanjaItems = sortedItems.filter(i => i.tipe === 'belanja');
+//   const pembiayaanItems = sortedItems.filter(i => i.tipe === 'pembiayaan');
+
+//   const total = (rows: any[]) => {
+//     const anggaran = rows.reduce((s, i) => s + i.anggaran, 0);
+//     const realisasi = rows.reduce((s, i) => s + i.realisasi, 0);
+//     return anggaran === 0 ? 0 : (realisasi / anggaran) * 100;
+//   };
+
+//   const chartData = [
+//     { name: 'Pendapatan', persen: total(pendapatanItems) },
+//     { name: 'Belanja', persen: total(belanjaItems) },
+//   ];
+
+//   if (pembiayaanItems.length > 0) {
+//     chartData.push({ name: 'Pembiayaan', persen: total(pembiayaanItems) });
+//   }
+
+//   return (
+//     <Paper
+//       mx={{ base: 'md', md: 100 }}
+//       p="xl"
+//       radius="md"
+//       shadow="sm"
+//       withBorder
+//       bg={colors['white-1']}
+//     >
+//       <Stack gap="lg">
+//         <Title order={4} c={colors['blue-button']} ta="center">
+//           Grafik Pelaksanaan APBDes Tahun {apbdesItem.tahun}
+//         </Title>
+
+//         <Text ta="center" fw="bold" fz="sm" c="dimmed">
+//           Persentase Realisasi (%) dari Anggaran
+//         </Text>
+
+//         <BarChart
+//           h={200}
+//           data={chartData}
+//           orientation="vertical"
+//           dataKey="name"
+//           barProps={{ radius: 6 }}
+//           series={[
+//             {
+//               name: 'persen',
+//               label: 'Persentase',
+//               color: colors['blue-button'],
+//             },
+//           ]}
+//           yAxisProps={{
+//             domain: [0, 100],
+//           }}
+//           valueFormatter={(v) => `${v.toFixed(1)}%`}
+//         />
+//       </Stack>
+//     </Paper>
+//   );
+// }
+
+// export default APBDesProgress;

src/app/darmasaba/(tambahan)/apbdes/lib/apbDesaTable.tsx

@@ -1,8 +1,30 @@
+// src/app/admin/(dashboard)/landing-page/APBDes/APBDesTable.tsx
 'use client';
 
 import { Box, Paper, Table, Text, Title, Badge, Group } from '@mantine/core';
+import { useProxy } from 'valtio/utils';
+import apbdes from '@/app/admin/(dashboard)/_state/landing-page/apbdes';
 import colors from '@/con/colors';
-import { APBDesData } from './types';
+
+interface APBDesItem {
+  id: string;
+  kode: string;
+  uraian: string;
+  anggaran: number;
+  realisasi: number;
+  selisih: number;
+  persentase: number;
+  level: number;
+  tipe: 'pendapatan' | 'belanja' | 'pembiayaan';
+}
+
+interface APBDesData {
+  id: string;
+  tahun: number;
+  items: APBDesItem[];
+  image?: { id: string; url: string } | null;
+  file?: { id: string; url: string } | null;
+}
 
 // Helper: Format Rupiah, tapi jika 0 → tampilkan '-'
 function formatRupiahOrEmpty(value: number): string {
@@ -29,12 +51,22 @@ function getIndent(level: number) {
   };
 }
 
-interface APBDesTableProps {
-  apbdesData: APBDesData;
-}
+function APBDesTable() {
+  const state = useProxy(apbdes);
+  const data = state.findMany.data || [];
 
-function APBDesTable({ apbdesData }: APBDesTableProps) {
-  const items = Array.isArray(apbdesData.items) ? apbdesData.items : [];
+  // Get the first APBDes item
+  const apbdesItem = data[0] as unknown as APBDesData | undefined;
+
+  if (!apbdesItem) {
+    return (
+      <Box py="md" px={{ base: 'md', md: 100 }}>
+        <Text c="dimmed">Belum ada data APBDes untuk ditampilkan.</Text>
+      </Box>
+    );
+  }
+
+  const items = Array.isArray(apbdesItem.items) ? apbdesItem.items : [];
   const sortedItems = [...items].sort((a, b) => a.kode.localeCompare(b.kode));
 
   // Calculate totals
@@ -44,13 +76,13 @@ function APBDesTable({ apbdesData }: APBDesTableProps) {
   const totalPersentase = totalAnggaran > 0 ? (totalRealisasi / totalAnggaran) * 100 : 0;
 
   return (
-    <Box pt={"xs"} pb="md" px={{ base: 'md', md: 100 }}>
+    <Box py="md" px={{ base: 'md', md: 100 }}>
       <Title order={4} c={colors['blue-button']} mb="sm">
-        Rincian APBDes Tahun {apbdesData.tahun}
+        Rincian APBDes Tahun {apbdesItem.tahun}
       </Title>
 
       <Paper withBorder radius="md" shadow="xs" p="md">
-        <Box style={{ overflowY: 'auto' }}>
+        <Box style={{overflowY: 'auto' }}>
           <Table withColumnBorders highlightOnHover>
             <Table.Thead bg="#2c5f78">
               <Table.Tr>
@@ -77,7 +109,9 @@ function APBDesTable({ apbdesData }: APBDesTableProps) {
                   <Table.Td style={getIndent(item.level)}>
                     <Group gap="xs" align="flex-start">
                       <Text fw={item.level === 1 ? 'bold' : 'normal'}>{item.kode}</Text>
-                      <Text fz="sm">{item.uraian}</Text>
+                      <Text fz="sm" >
+                        {item.uraian}
+                      </Text>
                     </Group>
                   </Table.Td>
                   <Table.Td ta="right">{formatRupiahOrEmpty(item.anggaran)}</Table.Td>

src/app/darmasaba/(tambahan)/apbdes/lib/types.ts

@@ -1,42 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-export type APBDesTipe = 'pendapatan' | 'belanja' | 'pembiayaan';
-
-export function isAPBDesTipe(tipe: string | null | undefined): tipe is APBDesTipe {
-  return tipe === 'pendapatan' || tipe === 'belanja' || tipe === 'pembiayaan';
-}
-
-export interface APBDesItem {
-  id: string;
-  kode: string;
-  uraian: string;
-  anggaran: number;
-  realisasi: number;
-  selisih: number;
-  persentase: number;
-  level: number;
-  tipe?: APBDesTipe | null;
-  // Additional fields from API
-  createdAt?: Date;
-  updatedAt?: Date;
-  deletedAt?: Date | null;
-  isActive?: boolean;
-  apbdesId?: string;
-}
-
-export interface APBDesData {
-  id: string;
-  tahun: number | null;
-  items: APBDesItem[];
-  image?: { id: string; url: string } | null;
-  file?: { id: string; url: string } | null;
-}
-
-export function transformAPBDesData(data: any): APBDesData {
-  return {
-    ...data,
-    items: data.items.map((item: any) => ({
-      ...item,
-      tipe: isAPBDesTipe(item.tipe) ? item.tipe : null
-    }))
-  };
-}

src/app/darmasaba/(tambahan)/apbdes/page.tsx

@@ -4,21 +4,19 @@
 import PendapatanAsliDesa from '@/app/admin/(dashboard)/_state/ekonomi/PADesa'
 import apbdes from '@/app/admin/(dashboard)/_state/landing-page/apbdes'
 import colors from '@/con/colors'
-import { ActionIcon, BackgroundImage, Box, Center, Container, Group, Loader, Select, SimpleGrid, Stack, Text, Title } from '@mantine/core'
+import { ActionIcon, BackgroundImage, Box, Center, Container, Group, Loader, SimpleGrid, Stack, Text, Title } from '@mantine/core'
 import { IconDownload } from '@tabler/icons-react'
 import { Link } from 'next-view-transitions'
 import { useEffect, useState } from 'react'
 import { useProxy } from 'valtio/utils'
 import BackButton from '../../(pages)/desa/layanan/_com/BackButto'
-import APBDesTable from './lib/apbDesaTable'
 import APBDesProgress from './lib/apbDesaProgress'
-import { transformAPBDesData } from './lib/types'
+import APBDesTable from './lib/apbDesaTable'
 
 function Page() {
   const state = useProxy(apbdes)
   const paDesaState = useProxy(PendapatanAsliDesa.ApbDesa)
   const [loading, setLoading] = useState(false)
-  const [selectedYear, setSelectedYear] = useState<string | null>(null)
   useEffect(() => {
     const loadData = async () => {
       try {
@@ -36,23 +34,6 @@ function Page() {
 
   const dataAPBDes = state.findMany.data || []
 
-  // Buat daftar tahun unik dari data
-  const years = Array.from(new Set(dataAPBDes.map((item: any) => item.tahun)))
-    .sort((a, b) => b - a) // urutkan descending
-    .map(year => ({ value: year.toString(), label: `Tahun ${year}` }))
-
-  // Pilih tahun pertama sebagai default jika belum ada yang dipilih
-  useEffect(() => {
-    if (years.length > 0 && !selectedYear) {
-      setSelectedYear(years[0].value)
-    }
-  }, [years, selectedYear])
-
-  // Transform and filter data based on selected year
-  const currentApbdes = dataAPBDes.length > 0
-    ? transformAPBDesData(dataAPBDes.find(item => item?.tahun?.toString() === selectedYear) || dataAPBDes[0])
-    : null
-
   return (
     <Stack pos="relative" bg={colors.Bg} py="xl" gap={32}>
       <Box px={{ base: 'md', md: 100 }}>
@@ -113,31 +94,8 @@ function Page() {
           ))}
         </SimpleGrid>
       )}
-      {/* 🔥 COMBOBOX UNTUK PILIH TAHUN */}
-      <Box px={{ base: 'md', md: 100 }}>
-        <Select
-          label="Pilih Tahun APBDes"
-          placeholder="Pilih tahun"
-          value={selectedYear}
-          onChange={setSelectedYear}
-          data={years}
-          w={{ base: '100%', sm: 200 }}
-          searchable
-          clearable
-          nothingFoundMessage="Tidak ada tahun tersedia"
-        />
-      </Box>
-      {/* ❗ Pass currentApbdes ke komponen anak */}
-      {currentApbdes ? (
-        <>
-          <APBDesTable apbdesData={currentApbdes} />
-          <APBDesProgress apbdesData={currentApbdes} />
-        </>
-      ) : (
-        <Box px={{ base: 'md', md: 100 }} py="md">
-          <Text c="dimmed">Tidak ada data APBDes untuk tahun yang dipilih.</Text>
-        </Box>
-      )}
+      <APBDesTable />
+      <APBDesProgress />
     </Stack>
   )
 }

src/app/darmasaba/_com/main-page/apbdes/index.tsx

@@ -1,11 +1,9 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable react-hooks/exhaustive-deps */
 'use client'
 import apbdes from '@/app/admin/(dashboard)/_state/landing-page/apbdes'
 import APBDesProgress from '@/app/darmasaba/(tambahan)/apbdes/lib/apbDesaProgress'
-import { transformAPBDesData } from '@/app/darmasaba/(tambahan)/apbdes/lib/types'
 import colors from '@/con/colors'
-import { ActionIcon, BackgroundImage, Box, Button, Center, Group, Loader, Select, SimpleGrid, Stack, Text } from '@mantine/core'
+import { ActionIcon, BackgroundImage, Box, Button, Center, Flex, Group, Loader, SimpleGrid, Stack, Text } from '@mantine/core'
 import { IconDownload } from '@tabler/icons-react'
 import Link from 'next/link'
 import { useEffect, useState } from 'react'
@@ -14,7 +12,6 @@ import { useProxy } from 'valtio/utils'
 function Apbdes() {
   const state = useProxy(apbdes)
   const [loading, setLoading] = useState(false)
-  const [selectedYear, setSelectedYear] = useState<string | null>(null)
 
   const textHeading = {
     title: 'APBDes',
@@ -35,24 +32,6 @@ function Apbdes() {
     loadData()
   }, [])
 
-  const dataAPBDes = state.findMany.data || []
-
-  const years = Array.from(new Set(dataAPBDes.map((item: any) => item.tahun)))
-    .sort((a, b) => b - a) // urutkan descending
-    .map(year => ({ value: year.toString(), label: `Tahun ${year}` }))
-
-  // Pilih tahun pertama sebagai default jika belum ada yang dipilih
-  useEffect(() => {
-    if (years.length > 0 && !selectedYear) {
-      setSelectedYear(years[0].value)
-    }
-  }, [years, selectedYear])
-
-  // Transform and filter data based on selected year
-  const currentApbdes = dataAPBDes.length > 0
-    ? transformAPBDesData(dataAPBDes.find(item => item?.tahun?.toString() === selectedYear) || dataAPBDes[0])
-    : null
-
   const data = (state.findMany.data || []).slice(0, 3)
 
   return (
@@ -81,30 +60,8 @@ function Apbdes() {
         </Button>
       </Group>
 
-      {/* 🔥 COMBOBOX UNTUK PILIH TAHUN */}
-      <Box px={{ base: 'md', md: 100 }}>
-        <Select
-          label="Pilih Tahun APBDes"
-          placeholder="Pilih tahun"
-          value={selectedYear}
-          onChange={setSelectedYear}
-          data={years}
-          w={{ base: '100%', sm: 200 }}
-          searchable
-          clearable
-          nothingFoundMessage="Tidak ada tahun tersedia"
-        />
-      </Box>
-
-      {currentApbdes ? (
-        <>
-          <APBDesProgress apbdesData={currentApbdes} />
-        </>
-      ) : (
-        <Box px={{ base: 'md', md: 100 }} py="md">
-          <Text c="dimmed">Tidak ada data APBDes untuk tahun yang dipilih.</Text>
-        </Box>
-      )}
+      {/* Chart */}
+      <APBDesProgress />
 
       <SimpleGrid mx={{ base: 'md', md: 100 }} cols={{ base: 1, sm: 3 }} spacing="lg" pb={"xl"}>
         {loading ? (
@@ -133,7 +90,7 @@ function Apbdes() {
               style={{ overflow: 'hidden' }}
             >
               <Box pos="absolute" inset={0} bg="rgba(0,0,0,0.45)" style={{ borderRadius: 16 }} />
-              <Stack gap={"xs"} justify="space-between" h="100%" p="xl" pos="relative">
+              <Stack justify="space-between" h="100%" p="xl" pos="relative">
                 <Text
                   c="white"
                   fw={600}
@@ -152,20 +109,7 @@ function Apbdes() {
                 >
                   {v.jumlah}
                 </Text>
-                <Center>
-                  <ActionIcon
-                    component={Link}
-                    href={v.file?.link || ''}
-                    radius="xl"
-                    size="xl"
-                    variant="gradient"
-                    gradient={{ from: '#1C6EA4', to: '#1C6EA4' }}
-                  >
-                    <IconDownload size={20} color="white" />
-                  </ActionIcon>
-
-                </Center>
-                {/* <Group justify="center">
+                <Group justify="center">
                   <ActionIcon
                     component={Link}
                     href={v.file?.link || ''}
@@ -174,18 +118,18 @@ function Apbdes() {
                     variant="gradient"
                     gradient={{ from: '#1C6EA4', to: '#1C6EA4' }}
                   >
-                    <Group align="center" gap="xs" px="md" py={6}>
-                      <IconDownload size={25} color="white" />
-                    </Group>
+                    <Flex align="center" gap="xs" px="md" py={6}>
+                      <IconDownload size={18} color="white" />
+                    </Flex>
                   </ActionIcon>
-                </Group> */}
+                </Group>
               </Stack>
             </BackgroundImage>
           ))
         )}
       </SimpleGrid>
 
-
+      
     </Stack>
   )
 }

src/app/darmasaba/_com/main-page/landing-page/SosmedView.tsx

@@ -1,9 +1,7 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { sosmedMap } from "@/app/admin/(dashboard)/landing-page/profil/_lib/sosmed";
-import colors from "@/con/colors";
-import { ActionIcon, Box, Card, Flex, Image, Text, Tooltip } from "@mantine/core";
+import { ActionIcon, Card, Flex, Image, Text, Tooltip } from "@mantine/core";
 import { Prisma } from "@prisma/client";
 import { useTransitionRouter } from "next-view-transitions";
+import { IconBrandInstagram, IconBrandFacebook, IconBrandTwitter, IconWorld } from "@tabler/icons-react";
 
 function SosmedView({
   data,
@@ -12,12 +10,17 @@ function SosmedView({
 }) {
   const router = useTransitionRouter();
 
-  const getIconSource = (item: any) => {
-    if (item.image?.link) return item.image.link;
-    if (item.icon && sosmedMap[item.icon as keyof typeof sosmedMap]?.src) {
-      return sosmedMap[item.icon as keyof typeof sosmedMap].src;
+  const fallbackIcon = (platform?: string) => {
+    switch (platform?.toLowerCase()) {
+      case "instagram":
+        return <IconBrandInstagram size={22} />;
+      case "facebook":
+        return <IconBrandFacebook size={22} />;
+      case "twitter":
+        return <IconBrandTwitter size={22} />;
+      default:
+        return <IconWorld size={22} />;
     }
-    return null;
   };
 
   return (
@@ -41,22 +44,18 @@ function SosmedView({
                 boxShadow: "0 0 12px rgba(28, 110, 164, 0.6)",
               }}
             >
-              {(() => {
-                const src = getIconSource(item);
-
-                if (src) {
-                  return (
-                    <Image
-                      loading="lazy"
-                      src={src}
-                      alt={item.name}
-                      fit={item.image?.link ? "cover" : "contain"}
-                    />
-                  );
-                }
-
-                return <Box bg={colors['blue-button']} w="100%" h="100%" />;
-              })()}
+              {item.image?.link ? (
+                <Image
+                  src={item.image.link}
+                  alt={item.name || "ikon"}
+                  w={24}
+                  h={24}
+                  fit="contain"
+                  loading="lazy"
+                />
+              ) : (
+                fallbackIcon(item.name)
+              )}
             </ActionIcon>
           </Tooltip>
         ))

src/app/darmasaba/_com/term-of-service.html

@@ -1,173 +0,0 @@
-<!DOCTYPE html>
-<html lang="id">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Syarat & Ketentuan Penggunaan HIPMI Badung Connect</title>
-    <style>
-        * {
-            margin: 0;
-            padding: 0;
-            box-sizing: border-box;
-        }
-
-        body {
-            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
-            line-height: 1.6;
-            color: #1e293b;
-            background-color: #f8fafc;
-        }
-
-        .container {
-            max-width: 800px;
-            margin: 0 auto;
-            padding: 40px 20px;
-            background-color: white;
-            min-height: 100vh;
-        }
-
-        h1 {
-            font-size: 2rem;
-            font-weight: 700;
-            color: #1e3a5f;
-            margin-bottom: 1.5rem;
-            line-height: 1.3;
-        }
-
-        h2 {
-            font-size: 1.5rem;
-            font-weight: 700;
-            color: #1e3a5f;
-            margin-top: 2.5rem;
-            margin-bottom: 1rem;
-        }
-
-        p {
-            margin-bottom: 1rem;
-            color: #334155;
-        }
-
-        strong {
-            font-weight: 600;
-            color: #1e293b;
-        }
-
-        ul {
-            margin-left: 1.5rem;
-            margin-bottom: 1.5rem;
-        }
-
-        li {
-            margin-bottom: 0.5rem;
-            color: #334155;
-        }
-
-        .intro {
-            margin-bottom: 2rem;
-            padding: 1.25rem;
-            background-color: #f1f5f9;
-            border-radius: 8px;
-            border-left: 4px solid #1e3a5f;
-        }
-
-        .footer {
-            margin-top: 3rem;
-            padding-top: 2rem;
-            border-top: 1px solid #e2e8f0;
-            text-align: center;
-            color: #64748b;
-            font-size: 0.875rem;
-        }
-
-        @media (max-width: 768px) {
-            .container {
-                padding: 24px 16px;
-            }
-
-            h1 {
-                font-size: 1.5rem;
-            }
-
-            h2 {
-                font-size: 1.25rem;
-                margin-top: 2rem;
-            }
-        }
-
-        @media (max-width: 480px) {
-            h1 {
-                font-size: 1.25rem;
-            }
-
-            h2 {
-                font-size: 1.125rem;
-            }
-
-            ul {
-                margin-left: 1.25rem;
-            }
-        }
-    </style>
-</head>
-<body>
-    <div class="container">
-        <h1>Syarat & Ketentuan Penggunaan HIPMI Badung Connect</h1>
-        
-        <div class="intro">
-            <p>Dengan menggunakan aplikasi <strong>HIPMI Badung Connect</strong> ("Aplikasi"), Anda setuju untuk mematuhi dan terikat oleh syarat dan ketentuan berikut. Jika Anda tidak setuju dengan ketentuan ini, harap jangan gunakan Aplikasi.</p>
-        </div>
-
-        <h2>1. Definisi</h2>
-        <p><strong>HIPMI Badung Connect</strong> adalah platform digital resmi untuk anggota Himpunan Pengusaha Muda Indonesia (HIPMI) Kabupaten Badung, yang bertujuan memfasilitasi jaringan, kolaborasi, dan pertumbuhan bisnis para pengusaha muda.</p>
-
-        <h2>2. Larangan Konten Tidak Pantas</h2>
-        <p>Anda <strong>dilarang keras</strong> memposting, mengirim, membagikan, atau mengunggah konten apa pun yang mengandung:</p>
-        <ul>
-            <li>Ujaran kebencian, diskriminasi, atau konten SARA (Suku, Agama, Ras, Antar-golongan)</li>
-            <li>Pornografi, konten seksual eksplisit, atau gambar tidak senonoh</li>
-            <li>Ancaman, pelecehan, bullying, atau perilaku melecehkan</li>
-            <li>Informasi palsu, hoaks, spam, atau konten menyesatkan</li>
-            <li>Konten ilegal, melanggar hukum, atau melanggar hak kekayaan intelektual pihak lain</li>
-            <li>Promosi narkoba, perjudian, atau aktivitas ilegal lainnya</li>
-        </ul>
-
-        <h2>3. Tanggung Jawab Pengguna</h2>
-        <p>Anda bertanggung jawab penuh atas setiap konten yang Anda unggah atau bagikan melalui fitur-fitur berikut:</p>
-        <ul>
-            <li>Profil (bio, foto, portofolio)</li>
-            <li>Forum diskusi</li>
-            <li>Chat pribadi atau grup</li>
-            <li>Lowongan kerja, investasi, dan donasi</li>
-        </ul>
-        <p>Konten yang melanggar ketentuan ini dapat dihapus kapan saja tanpa pemberitahuan.</p>
-
-        <h2>4. Tindakan terhadap Pelanggaran</h2>
-        <p>Jika kami menerima laporan atau menemukan konten yang melanggar ketentuan ini, kami akan:</p>
-        <ul>
-            <li>Segera menghapus konten tersebut</li>
-            <li>Memberikan peringatan atau memblokir akun pengguna</li>
-            <li>Dalam kasus berat, melaporkan ke pihak berwajib sesuai hukum yang berlaku</li>
-        </ul>
-        <p>Tim kami berkomitmen untuk menanggapi laporan konten tidak pantas <strong>dalam waktu 24 jam</strong>.</p>
-
-        <h2>5. Mekanisme Pelaporan</h2>
-        <p>Anda dapat melaporkan konten atau pengguna yang mencurigakan melalui:</p>
-        <ul>
-            <li>Tombol <strong>"Laporkan"</strong> di setiap posting forum atau pesan chat</li>
-            <li>Tombol <strong>"Blokir Pengguna"</strong> di profil pengguna</li>
-        </ul>
-        <p>Setiap laporan akan ditangani secara rahasia dan segera.</p>
-
-        <h2>6. Perubahan Ketentuan</h2>
-        <p>Kami berhak memperbarui Syarat & Ketentuan ini sewaktu-waktu. Versi terbaru akan dipublikasikan di halaman ini dengan tanggal revisi yang diperbarui.</p>
-
-        <h2>7. Kontak</h2>
-        <p>Jika Anda memiliki pertanyaan tentang ketentuan ini, silakan hubungi kami di:<br>
-        <strong>bip.baliinteraktifperkasa@gmail.com</strong></p>
-
-        <div class="footer">
-            © 2025 Bali Interaktif Perkasa. All rights reserved.
-        </div>
-    </div>
-</body>
-</html>

src/app/globals.css

@@ -1,105 +1,31 @@
 /* styles/globals.css */
-
-/* ===================================
-   1. IMPORT CSS LIBRARIES
-   =================================== */
-@import "@mantine/carousel/styles.css";
-@import "@mantine/dropzone/styles.css";
-@import "@mantine/charts/styles.css";
-@import "@mantine/dates/styles.css";
-@import "@mantine/tiptap/styles.css";
-@import "animate.css";
-@import "react-simple-toasts/dist/style.css";
-@import "react-simple-toasts/dist/theme/dark.css";
-@import "primereact/resources/themes/lara-light-blue/theme.css";
-@import "primereact/resources/primereact.min.css";
-@import "primeicons/primeicons.css";
-
-/* ===================================
-   2. FONT FACE - OPTIMIZED
-   =================================== */
 @font-face {
   font-family: 'San Francisco';
   src: url('/assets/fonts/font.otf') format('opentype');
   font-weight: normal;
   font-style: normal;
-  font-display: swap; /* ✅ TAMBAHKAN INI - Penting untuk PageSpeed! */
 }
 
-/* ===================================
-   3. RESET & BASE STYLES
-   =================================== */
-* {
-  margin: 0;
-  padding: 0;
-  box-sizing: border-box;
-}
-
-html {
-  -webkit-text-size-adjust: 100%; /* Prevent font scaling in landscape */
-  -moz-text-size-adjust: 100%;
-  text-size-adjust: 100%;
-}
-
-body {
-  margin: 0;
-  font-family: 'San Francisco', -apple-system, BlinkMacSystemFont, 'Segoe UI', 
-               Roboto, Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-/* ===================================
-   4. GLASS EFFECTS - OPTIMIZED
-   =================================== */
 .glass {
   background: rgba(255, 255, 255, 0.2);
-  backdrop-filter: blur(40px);
   -webkit-backdrop-filter: blur(40px);
+  backdrop-filter: blur(40px);
   position: fixed;
   z-index: 50;
   width: 100%;
   height: 100vh;
-  will-change: transform; /* ✅ Hardware acceleration */
 }
 
 .glass2 {
   background: rgba(255, 255, 255, 0.3);
-  backdrop-filter: blur(40px);
   -webkit-backdrop-filter: blur(40px);
+  backdrop-filter: blur(40px);
   position: fixed;
   z-index: 1;
-  will-change: transform; /* ✅ Hardware acceleration */
 }
 
 .glass3 {
   background: rgba(255, 255, 255, 0.3);
-  backdrop-filter: blur(40px);
   -webkit-backdrop-filter: blur(40px);
-  will-change: transform; /* ✅ Hardware acceleration */
+  backdrop-filter: blur(40px);
 }
-
-/* ===================================
-   5. PERFORMANCE OPTIMIZATION
-   =================================== */
-img, 
-picture, 
-video, 
-canvas, 
-svg {
-  display: block;
-  max-width: 100%;
-  height: auto;
-}
-
-/* Reduce motion for accessibility */
-@media (prefers-reduced-motion: reduce) {
-  *,
-  *::before,
-  *::after {
-    animation-duration: 0.01ms !important;
-    animation-iteration-count: 1 !important;
-    transition-duration: 0.01ms !important;
-    scroll-behavior: auto !important;
-  }
-}

src/app/layout.tsx

@@ -1,5 +1,20 @@
+// Import styles of packages that you've installed.
+// All packages except `@mantine/hooks` require styles imports
+import "@mantine/carousel/styles.css";
 import "@mantine/core/styles.css";
+import '@mantine/dropzone/styles.css';
+import "animate.css";
+import 'react-simple-toasts/dist/style.css';
+import 'react-simple-toasts/dist/theme/dark.css';
 import "./globals.css";
+import '@mantine/charts/styles.css';
+import '@mantine/dates/styles.css';
+import '@mantine/tiptap/styles.css';
+import "primereact/resources/themes/lara-light-blue/theme.css";
+import "primereact/resources/primereact.min.css";
+import "primeicons/primeicons.css";
+
+
 
 import LoadDataFirstClient from "@/app/darmasaba/_com/LoadDataFirstClient";
 import {
@@ -8,83 +23,19 @@ import {
   createTheme,
   mantineHtmlProps,
 } from "@mantine/core";
-import { Metadata, Viewport } from "next";
 import { ViewTransitions } from "next-view-transitions";
 import { ToastContainer } from "react-toastify";
 
-// ✅ Pisahkan viewport ke export tersendiri
-export const viewport: Viewport = {
-  width: "device-width",
-  initialScale: 1,
-  maximumScale: 5,
-};
-
-
-export const metadata: Metadata = {
-  // ✅ Tambahkan metadataBase
-  metadataBase: new URL("https://cld-dkr-staging-desa-darmasaba.wibudev.com"),
-  
-  title: {
-    default: "Desa Darmasaba",
-    template: "%s | Desa Darmasaba",
-  },
-  description: "Website resmi Desa Darmasaba, Kabupaten Badung, Bali. Informasi layanan publik, berita, dan profil desa.",
-  // ❌ HAPUS viewport dari sini
-  keywords: [
-    "desa darmasaba",
-    "darmasaba",
-    "badung",
-    "bali",
-    "desa",
-    "pemerintah desa",
-    "layanan publik",
-    "abang batan desa",
-  ],
-  authors: [{ name: "Pemerintah Desa Darmasaba" }],
-  creator: "Desa Darmasaba",
-  publisher: "Desa Darmasaba",
-  robots: {
-    index: true,
-    follow: true,
-    googleBot: {
-      index: true,
-      follow: true,
-      "max-video-preview": -1,
-      "max-image-preview": "large",
-      "max-snippet": -1,
-    },
-  },
-  icons: {
-    icon: "/assets/images/darmasaba-icon.png",
-    apple: "/assets/images/darmasaba-icon.png",
-  },
-  manifest: "/manifest.json",
-  openGraph: {
-    type: "website",
-    locale: "id_ID",
-    url: "https://cld-dkr-staging-desa-darmasaba.wibudev.com",
-    siteName: "Desa Darmasaba",
-    title: "Desa Darmasaba - Kabupaten Badung, Bali",
-    description: "Website resmi Desa Darmasaba, Kabupaten Badung, Bali. Informasi layanan publik, berita, dan profil desa.",
-    images: [
-      {
-        url: "/assets/images/darmasaba-icon.png",
-        width: 1200,
-        height: 630,
-        alt: "Desa Darmasaba",
-      },
-    ],
-  },
-  category: "government",
-  other: {
-    "msapplication-TileColor": "#ffffff",
-    "theme-color": "#ffffff",
-  },
+export const metadata = {
+  title: "Desa Darmasaba",
+  description: "Desa Darmasaba Kabupaten Badung",
 };
 
 const theme = createTheme({
-  fontFamily: "San Francisco, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, sans-serif",
-  fontFamilyMonospace: "SFMono-Regular, Menlo, Monaco, Consolas, monospace",
+  fontFamily:
+    "San Francisco, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica, Arial, sans-serif",
+  fontFamilyMonospace:
+    "SFMono-Regular, Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace",
   headings: { fontFamily: "San Francisco, sans-serif" },
 });
 
@@ -95,23 +46,26 @@ export default function RootLayout({
 }) {
   return (
     <ViewTransitions>
-      <html lang="id" {...mantineHtmlProps}>
+      <html lang="en" {...mantineHtmlProps}>
         <head>
-          <meta charSet="utf-8" />
           <ColorSchemeScript />
+          <link
+            rel="icon"
+            href="/assets/images/darmasaba-icon.png"
+            sizes="any"
+          />
         </head>
         <body>
           <MantineProvider theme={theme}>
             {children}
-            <LoadDataFirstClient />
-            <ToastContainer 
-              position="bottom-center" 
-              hideProgressBar 
-              style={{ zIndex: 9999 }} 
-            />
+
           </MantineProvider>
+          <ToastContainer position="bottom-center" hideProgressBar style={{
+          zIndex: 9999
+        }} />
         </body>
+        <LoadDataFirstClient />
       </html>
     </ViewTransitions>
   );
-}
+}

src/app/terms-of-service/page.tsx

@@ -1,102 +0,0 @@
-import { Box, Container, Divider, List, ListItem, Paper, Stack, Text, Title } from '@mantine/core';
-import React from 'react';
-
-function Page() {
-  return (
-    <Container size="md" py={40}>
-      <Stack gap="xl">
-        <Title order={1} size="h1" fw={700} c="blue.9">
-          Syarat & Ketentuan Penggunaan Admin Desa Darmasaba
-        </Title>
-
-        <Paper p="lg" radius="md" withBorder bg="gray.0" style={{ borderLeft: '4px solid #1e3a5f' }}>
-          <Text c="gray.8">
-            Dengan menggunakan website <Text component="span" fw={600}>Admin Desa Darmasaba</Text> (&quot;Website&quot;),
-            Anda setuju untuk mematuhi dan terikat oleh syarat dan ketentuan berikut. Jika Anda tidak setuju
-            dengan ketentuan ini, harap jangan gunakan Website.
-          </Text>
-        </Paper>
-
-        <Box>
-          <Title order={2} size="h2" fw={700} c="blue.9" mb="md">
-            1. Definisi
-          </Title>
-          <Text c="gray.7">
-            <Text component="span" fw={600}>Admin Desa Darmasaba</Text> adalah website resmi untuk Admin Desa Darmasaba, yang bertujuan
-            menambahkan, menghapus, dan mengedit konten desa ke dalam website.
-          </Text>
-        </Box>
-
-        <Box>
-          <Title order={2} size="h2" fw={700} c="blue.9" mb="md">
-            2. Larangan Konten Tidak Pantas
-          </Title>
-          <Text c="gray.7" mb="md">
-            Anda <Text component="span" fw={600}>dilarang keras</Text> menambahkan, menghapus, dan mengedit konten desa apa pun yang mengandung:
-          </Text>
-          <List spacing="xs" c="gray.7">
-            <ListItem>Ujaran kebencian, diskriminasi, atau konten SARA (Suku, Agama, Ras, Antar-golongan)</ListItem>
-            <ListItem>Pornografi, konten seksual eksplisit, atau gambar tidak senonoh</ListItem>
-            <ListItem>Ancaman, pelecehan, bullying, atau perilaku melecehkan</ListItem>
-            <ListItem>Informasi palsu, hoaks, spam, atau konten menyesatkan</ListItem>
-            <ListItem>Konten ilegal, melanggar hukum, atau melanggar hak kekayaan intelektual pihak lain</ListItem>
-            <ListItem>Promosi narkoba, perjudian, atau aktivitas ilegal lainnya</ListItem>
-          </List>
-        </Box>
-
-        <Box>
-          <Title order={2} size="h2" fw={700} c="blue.9" mb="md">
-            3. Tanggung Jawab Pengguna
-          </Title>
-          <List spacing="xs" c="gray.7">
-            <ListItem>Anda bertanggung jawab penuh atas setiap konten yang Anda unggah atau bagikan.</ListItem>
-            <ListItem>Konten yang melanggar ketentuan ini dapat dihapus kapan saja tanpa pemberitahuan.</ListItem>
-          </List>
-        </Box>
-
-        <Box>
-          <Title order={2} size="h2" fw={700} c="blue.9" mb="md">
-            4. Tindakan terhadap Pelanggaran
-          </Title>
-          <Text c="gray.7" mb="md">
-            Jika kami menerima laporan atau menemukan konten yang melanggar ketentuan ini, kami akan:
-          </Text>
-          <List spacing="xs" c="gray.7">
-            <ListItem>Segera menghapus konten tersebut</ListItem>
-            <ListItem>Menghapus akun pengguna</ListItem>
-            <ListItem>Dalam kasus berat, melaporkan ke pihak berwajib sesuai hukum yang berlaku</ListItem>
-          </List>
-        </Box>
-        <Box>
-          <Title order={2} size="h2" fw={700} c="blue.9" mb="md">
-            5. Perubahan Ketentuan
-          </Title>
-          <Text c="gray.7">
-            Kami berhak memperbarui Syarat & Ketentuan ini sewaktu-waktu. Versi terbaru akan dipublikasikan di
-            halaman ini dengan tanggal revisi yang diperbarui.
-          </Text>
-        </Box>
-
-        <Box>
-          <Title order={2} size="h2" fw={700} c="blue.9" mb="md">
-            6. Kontak
-          </Title>
-          <Text c="gray.7">
-            Jika Anda memiliki pertanyaan tentang ketentuan ini, silakan hubungi kami di:
-          </Text>
-          <Text c="gray.7" fw={600} mt="xs">
-            bip.baliinteraktifperkasa@gmail.com
-          </Text>
-        </Box>
-
-        <Divider my="xl" />
-
-        <Text ta="center" c="gray.6" size="sm">
-          © 2025 Bali Interaktif Perkasa. All rights reserved.
-        </Text>
-      </Stack>
-    </Container>
-  );
-}
-
-export default Page;

src/app/waiting-room/page.tsx

@@ -80,7 +80,7 @@ export default function WaitingRoom() {
 
           // Force a session refresh
           try {
-            const res = await fetch('/api/auth/refresh-session', {
+            const res = await fetch('/api/refresh-session', {
               method: 'POST',
               credentials: 'include'
             });