diff --git a/proyek-frontend/app/pages/form/khitan/starter.vue b/proyek-frontend/app/pages/form/khitan/starter.vue
index 74e57eb..c952abd 100644
--- a/proyek-frontend/app/pages/form/khitan/starter.vue
+++ b/proyek-frontend/app/pages/form/khitan/starter.vue
@@ -2,130 +2,197 @@
   <div class="min-h-screen bg-gray-50 py-10 px-6">
     <div class="max-w-5xl mx-auto bg-white rounded-2xl shadow-lg p-8">
       <h1 class="text-2xl font-bold text-center text-gray-800">
-        Form Undangan Khitan Starter
+        Form Undangan Khitan Basic
       </h1>
       <p class="text-center text-gray-500 text-sm mb-8">
-        Isi semua data berikut dengan lengkap dan benar.
+        Isi semua data dengan lengkap dan benar.
       </p>
 
       <!-- Data Pemesan -->
       <section class="mb-8">
-        <h2 class="font-semibold text-blue-600 mb-3 border-b pb-1">📋 Data Pemesan</h2>
+        <h2 class="font-semibold text-blue-600 mb-3 border-b pb-1">Data Pemesan</h2>
         <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
-          <input
-            v-model="form.nama_pemesan"
-            type="text"
-            placeholder="Nama Pemesan"
-            required
-            class="w-full border border-gray-300 rounded-lg px-3 py-2 focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition"
-          />
-          <input
-            v-model="form.email"
-            type="email"
-            placeholder="Email"
-            required
-            class="w-full border border-gray-300 rounded-lg px-3 py-2 focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition"
-          />
-          <input
-            v-model="form.no_tlpn"
-            type="text"
-            placeholder="No Telepon"
-            class="w-full border border-gray-300 rounded-lg px-3 py-2 focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition"
-          />
+          <!-- Nama Pemesan -->
+          <div class="relative">
+            <input v-model="form.nama_pemesan" type="text" placeholder=" " required
+              class="peer w-full border border-gray-300 rounded-lg px-2.5 pt-4 pb-1.5 text-sm focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition" />
+            <label class="absolute left-1 top-0 text-gray-400 text-xs transition-all
+               peer-placeholder-shown:top-4 peer-placeholder-shown:left-2 peer-placeholder-shown:text-gray-400 peer-placeholder-shown:text-sm
+               peer-focus:top-0 peer-focus:left-1 peer-focus:text-[10px] peer-focus:text-blue-500
+               peer-valid:top-0 peer-valid:left-1 peer-valid:text-[10px] peer-valid:text-gray-500">
+              Nama Pemesan
+            </label>
+          </div>
+
+          <!-- Email -->
+          <div class="relative">
+            <input v-model="form.email" type="email" placeholder=" " required
+              class="peer w-full border border-gray-300 rounded-lg px-2.5 pt-4 pb-1.5 text-sm focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition" />
+            <label class="absolute left-1 top-0 text-gray-400 text-xs transition-all
+               peer-placeholder-shown:top-4 peer-placeholder-shown:left-2 peer-placeholder-shown:text-gray-400 peer-placeholder-shown:text-sm
+               peer-focus:top-0 peer-focus:left-1 peer-focus:text-[10px] peer-focus:text-blue-500
+               peer-valid:top-0 peer-valid:left-1 peer-valid:text-[10px] peer-valid:text-gray-500">
+              Email
+            </label>
+          </div>
+
+          <!-- No Telepon -->
+          <div class="relative">
+            <input v-model="form.no_tlpn" type="text" placeholder=" " required
+              class="peer w-full border border-gray-300 rounded-lg px-2.5 pt-4 pb-1.5 text-sm focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition" />
+            <label class="absolute left-1 top-0 text-gray-400 text-xs transition-all
+               peer-placeholder-shown:top-4 peer-placeholder-shown:left-2 peer-placeholder-shown:text-gray-400 peer-placeholder-shown:text-sm
+               peer-focus:top-0 peer-focus:left-1 peer-focus:text-[10px] peer-focus:text-blue-500
+               peer-valid:top-0 peer-valid:left-1 peer-valid:text-[10px] peer-valid:text-gray-500">
+              No Telepon
+            </label>
+          </div>
         </div>
       </section>
 
       <!-- Data Anak -->
       <section class="mb-8">
-        <h2 class="font-semibold text-blue-600 mb-3 border-b pb-1">👦 Data Anak yang Dikhitan</h2>
-        <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
-          <input
-            v-model="form.form.nama_lengkap"
-            type="text"
-            placeholder="Nama Lengkap Anak"
-            class="w-full border border-gray-300 rounded-lg px-3 py-2 focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition"
-          />
-          <input
-            v-model="form.form.nama_bapak"
-            type="text"
-            placeholder="Nama Bapak"
-            class="w-full border border-gray-300 rounded-lg px-3 py-2 focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition"
-          />
-          <input
-            v-model="form.form.nama_ibu"
-            type="text"
-            placeholder="Nama Ibu"
-            class="w-full border border-gray-300 rounded-lg px-3 py-2 focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition"
-          />
+        <h2 class="font-semibold text-blue-600 mb-3 border-b pb-1">Data Anak yang Dikhitan</h2>
+        <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+          <template v-for="(field, i) in [
+            { model: 'nama_lengkap', label: 'Nama Lengkap' },
+            { model: 'nama_panggilan', label: 'Nama Panggilan' },
+            { model: 'nama_bapak', label: 'Nama Bapak' },
+            { model: 'nama_ibu', label: 'Nama Ibu' }
+          ]" :key="i">
+            <div class="relative">
+              <input v-model="form.form[field.model]" placeholder=" " required  class="peer w-full border border-gray-300 rounded-lg px-2.5 pt-4 pb-1.5 text-sm
+                 focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition" />
+              <label class="absolute left-2 text-gray-400 transition-all
+                 peer-placeholder-shown:top-4 peer-placeholder-shown:text-sm
+                 peer-focus:top-0 peer-focus:text-[10px] peer-focus:text-blue-500
+                 peer-valid:top-0 peer-valid:text-[10px] peer-valid:text-gray-500">
+                {{ field.label }}
+              </label>
+            </div>
+          </template>
         </div>
       </section>
 
       <!-- Detail Acara -->
       <section class="mb-8">
-        <h2 class="font-semibold text-blue-600 mb-3 border-b pb-1">📅 Detail Acara</h2>
-        <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-          <input
-            v-model="form.form.hari_tanggal_acara"
-            type="date"
-            placeholder="Hari & Tanggal Acara"
-            class="w-full border border-gray-300 rounded-lg px-3 py-2 focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition"
-          />
-          <input
-            v-model="form.form.waktu"
-            type="text"
-            placeholder="Waktu Acara"
-            class="w-full border border-gray-300 rounded-lg px-3 py-2 focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition"
-          />
+        <h2 class="font-semibold text-blue-600 mb-3 border-b pb-1">Detail Acara</h2>
+
+        <div class="grid grid-cols-1 md:grid-cols-2 gap-6 mb-6">
+          <!-- Hari & Tanggal -->
+          <div class="flex flex-col">
+            <label class="text-gray-600 text-sm font-medium mb-1">Hari & Tanggal Acara</label>
+            <input v-model="form.form.hari_tanggal_acara" type="date" required class="w-full border border-gray-300 rounded-lg px-3 py-2 text-sm
+               focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition" />
+          </div>
+
+          <!-- Waktu -->
+          <div class="flex flex-col">
+            <label class="text-gray-600 text-sm font-medium mb-1">Waktu Acara</label>
+            <input v-model="form.form.waktu" type="time" required class="w-full border border-gray-300 rounded-lg px-3 py-2 text-sm
+               focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition" />
+          </div>
         </div>
-        <textarea
-          v-model="form.form.alamat"
-          rows="3"
-          placeholder="Alamat Acara"
-          class="w-full border border-gray-300 rounded-lg px-3 py-2 mt-3 focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition resize-none"
-        ></textarea>
+
+        <!-- Alamat -->
+        <div class="mt-6 relative">
+          <textarea v-model="form.form.alamat" rows="3" placeholder=" " required  class="peer w-full border border-gray-300 rounded-lg px-2.5 pt-5 pb-1.5 text-sm resize-none
+                   focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition"></textarea>
+          <label class="absolute left-2 text-gray-400 transition-all
+                 peer-placeholder-shown:top-4 peer-placeholder-shown:text-sm
+                 peer-focus:top-0 peer-focus:text-[10px] peer-focus:text-blue-500
+                 peer-valid:top-0 peer-valid:text-[10px] peer-valid:text-gray-500">
+            Alamat Acara
+          </label>
+        </div>
+
+        <!-- Link Google Maps -->
+        <div class="mt-4 relative">
+          <input v-model="form.form.link_gmaps" type="url" placeholder=" " required class="peer w-full border border-gray-300 rounded-lg px-2.5 pt-4 pb-1.5 text-sm
+               focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition" />
+          <label class="absolute left-1 top-0 text-gray-400 text-xs transition-all
+               peer-placeholder-shown:top-4 peer-placeholder-shown:left-2 peer-placeholder-shown:text-gray-400 peer-placeholder-shown:text-sm
+               peer-focus:top-0 peer-focus:left-1 peer-focus:text-[10px] peer-focus:text-blue-500
+               peer-valid:top-0 peer-valid:left-1 peer-valid:text-[10px] peer-valid:text-gray-500">
+            Link Google Maps
+          </label>
+        </div>
+      </section>
+
+      <!-- Hitung Mundur -->
+      <section class="mb-8">
+        <h2 class="font-semibold text-blue-600 mb-3 border-b pb-1">Hitung Mundur</h2>
+        <div class="relative">
+          <input v-model="form.form.hitung_mundur" type="datetime-local" placeholder=" "   class="peer w-full border border-gray-300 rounded-lg px-2.5 pt-4 pb-1.5 text-sm 
+             focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition" />
+          <label class="absolute left-2 text-gray-400 transition-all
+             peer-placeholder-shown:top-4 peer-placeholder-shown:text-sm
+             peer-focus:top-0 peer-focus:text-[10px] peer-focus:text-blue-500
+             peer-valid:top-0 peer-valid:text-[10px] peer-valid:text-gray-500">
+            Waktu Hitung Mundur
+          </label>
+        </div>
+      </section>
+
+      <!-- Rekening -->
+      <section class="mb-8">
+        <h2 class="font-semibold text-blue-600 mb-3 border-b pb-1">Rekening</h2>
+        <div class="relative">
+          <input v-model="form.form.rekening_1" type="text" placeholder=" " required  class="peer w-full border border-gray-300 rounded-lg px-2.5 pt-4 pb-1.5 text-sm
+             focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition" />
+          <label class="absolute left-2 text-gray-400 transition-all duration-200
+             peer-placeholder-shown:top-3.5 peer-placeholder-shown:text-sm
+             peer-focus:top-[-2px] peer-focus:text-[10px] peer-focus:text-blue-500
+             peer-valid:top-[-2px] peer-valid:text-[10px] peer-valid:text-gray-500">
+            Rekening 1
+          </label>
+        </div>
+      </section>
+
+      <!-- Musik -->
+      <section class="mb-8">
+        <h2 class="font-semibold text-blue-600 mb-3 border-b pb-1">Musik</h2>
+        <div class="relative">
+          <input v-model="form.form.link_music" type="text" placeholder=" " required class="peer w-full border border-gray-300 rounded-lg px-2.5 pt-4 pb-1.5 text-sm
+             focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition" />
+          <label class="absolute left-2 text-gray-400 transition-all duration-200
+             peer-placeholder-shown:top-3.5 peer-placeholder-shown:text-sm
+             peer-focus:top-[-2px] peer-focus:text-[10px] peer-focus:text-blue-500
+             peer-valid:top-[-2px] peer-valid:text-[10px] peer-valid:text-gray-500">
+            Link Musik (opsional)
+          </label>
+        </div>
+      </section>
+
+      <!-- Say Something -->
+      <section class="mb-8">
+        <h2 class="font-semibold text-blue-600 mb-3 border-b pb-1">Say Something</h2>
+        <textarea v-model="form.form.say_something" rows="4" placeholder="Kata-kata atau ucapan terima kasih..."
+          class="w-full border border-gray-300 rounded-lg px-3 py-2 focus:ring-2 focus:ring-blue-400 focus:border-blue-400 outline-none transition resize-none"></textarea>
       </section>
 
       <!-- Galeri Foto -->
       <section class="mb-8">
-        <h2 class="font-semibold text-blue-600 mb-3 border-b pb-1">🖼️ Galeri Foto</h2>
-        <div
-          class="border-2 border-dashed border-gray-300 rounded-xl p-8 flex flex-col justify-center items-center text-gray-400 hover:border-blue-400 hover:text-blue-500 transition"
-        >
-          <input
-            id="gallery"
-            type="file"
-            multiple
-            accept="image/*"
-            class="hidden"
-            @change="handleFileChange"
-          />
+        <h2 class="font-semibold text-blue-600 mb-3 border-b pb-1">Galeri Foto</h2>
+        <div class="border-2 border-dashed border-gray-300 rounded-xl p-8 flex flex-col justify-center items-center 
+                 text-gray-400 hover:border-blue-400 hover:text-blue-500 transition">
+          <input id="gallery" type="file" multiple accept="image/*" class="hidden" @change="handleFileChange" />
           <label v-if="!previews.length" for="gallery" class="cursor-pointer flex flex-col items-center">
             <span class="text-4xl font-bold">+</span>
-            <span class="text-sm mt-2">Pilih Foto (maks. 2, JPEG/PNG, maks. 2MB)</span>
+            <span class="text-sm mt-2">Pilih Foto (maks. 4, JPEG/PNG, maks. 2MB)</span>
           </label>
-          <div v-else class="grid grid-cols-2 gap-4">
-            <div
-              v-for="(src, i) in previews"
-              :key="i"
-              class="relative group"
-            >
-              <img
-                :src="src"
-                class="w-24 h-24 object-cover rounded-lg border shadow"
-              />
-              <button
-                @click="removeFile(i)"
-                class="absolute -top-2 -right-2 bg-red-500 text-white rounded-full w-5 h-5 flex items-center justify-center text-xs opacity-0 group-hover:opacity-100 transition"
-                title="Hapus foto"
-              >
+          <div v-else class="grid grid-cols-2 sm:grid-cols-4 gap-4">
+            <div v-for="(src, i) in previews" :key="i" class="relative group">
+              <img :src="src" class="w-24 h-24 object-cover rounded-lg border shadow" />
+              <button @click="removeFile(i)" class="absolute -top-2 -right-2 bg-red-500 text-white rounded-full w-5 h-5 
+                       flex items-center justify-center text-xs opacity-0 group-hover:opacity-100 transition"
+                title="Hapus foto">
                 ✕
               </button>
             </div>
-            <label
-              v-if="previews.length < 2"
-              for="gallery"
-              class="cursor-pointer flex flex-col items-center justify-center w-24 h-24 border-2 border-dashed border-gray-300 rounded-lg text-gray-400 hover:border-blue-400 hover:text-blue-500 transition"
-            >
+            <label v-if="previews.length < 4" for="gallery" class="cursor-pointer flex flex-col items-center justify-center w-24 h-24 
+                     border-2 border-dashed border-gray-300 rounded-lg text-gray-400 
+                     hover:border-blue-400 hover:text-blue-500 transition">
               <span class="text-3xl font-bold">+</span>
             </label>
           </div>
@@ -134,16 +201,10 @@
 
       <!-- Tombol -->
       <div class="text-end mt-6">
-        <button
-          @click="batal"
-          class="bg-gray-600 text-white font-semibold px-6 py-2 rounded-lg transition mr-2"
-        >
+        <button @click="batal" class="bg-gray-600 text-white font-semibold px-6 py-2 rounded-lg transition mr-2">
           Batal
         </button>
-        <button
-          @click="konfirmasi"
-          class="bg-blue-700 text-white font-semibold px-6 py-2 rounded-lg transition"
-        >
+        <button @click="konfirmasi" class="bg-blue-700 text-white font-semibold px-6 py-2 rounded-lg transition">
           Konfirmasi
         </button>
       </div>
@@ -154,6 +215,7 @@
 <script setup>
 import { ref } from 'vue'
 import { useRouter } from 'vue-router'
+import Swal from 'sweetalert2'
 
 const router = useRouter()
 
@@ -163,11 +225,17 @@ const form = ref({
   no_tlpn: '',
   form: {
     nama_lengkap: '',
+    nama_panggilan: '',
     nama_bapak: '',
     nama_ibu: '',
     hari_tanggal_acara: '',
     waktu: '',
-    alamat: ''
+    alamat: '',
+    link_gmaps: '',
+    say_something: '',
+    hitung_mundur: '',
+    rekening_1: '',
+    link_music: ''
   },
   foto: []
 })
@@ -176,27 +244,25 @@ const previews = ref([])
 
 const handleFileChange = (e) => {
   const files = Array.from(e.target.files)
-  const totalFiles = form.value.foto.length + files.length
-
-  if (totalFiles > 2) {
-    alert('Maksimal 2 foto!')
+  const total = form.value.foto.length + files.length
+  if (total > 4) {
+    Swal.fire('Maksimal 4 foto!', '', 'warning')
     e.target.value = ''
     return
   }
 
   files.forEach(file => {
     if (file.size > 2 * 1024 * 1024) {
-      alert(`File ${file.name} terlalu besar! Maksimal 2MB.`)
+      Swal.fire(`${file.name} terlalu besar! Maks 2MB.`, '', 'error')
       return
     }
     if (!['image/jpeg', 'image/png', 'image/jpg'].includes(file.type)) {
-      alert(`File ${file.name} harus berupa JPEG atau PNG!`)
+      Swal.fire(`${file.name} harus JPEG/PNG.`, '', 'error')
       return
     }
     form.value.foto.push(file)
     previews.value.push(URL.createObjectURL(file))
   })
-
   e.target.value = ''
 }
 
@@ -206,17 +272,17 @@ const removeFile = (index) => {
 }
 
 const konfirmasi = async () => {
-  try {
-    if (!form.value.nama_pemesan || !form.value.email) {
-      alert('Harap isi semua kolom wajib (Nama Pemesan, Email)!')
-      return
-    }
+  if (!form.value.nama_pemesan || !form.value.email) {
+    Swal.fire('Harap isi Nama Pemesan dan Email!', '', 'warning')
+    return
+  }
 
+  try {
     const data = new FormData()
     data.append('nama_pemesan', form.value.nama_pemesan)
     data.append('email', form.value.email)
     data.append('no_tlpn', form.value.no_tlpn)
-    data.append('template_slug', 'undangan-khitan-starter')
+    data.append('template_slug', 'undangan-khitan-basic')
 
     for (const [key, value] of Object.entries(form.value.form)) {
       data.append(`form[${key}]`, value)
@@ -235,23 +301,77 @@ const konfirmasi = async () => {
 
     if (!res.ok) {
       if (res.status === 422) {
-        const errors = result.errors || {}
-        const errorMessages = Object.values(errors).flat().join('\n')
-        throw new Error(errorMessages || result.message || 'Validasi gagal')
-      }
-      if (res.status === 404) {
-        throw new Error(result.message || 'Template tidak ditemukan')
+        throw new Error(Object.values(result.errors || {}).flat().join('\n'))
       }
       throw new Error(result.message || 'Gagal mengirim data')
     }
 
-    alert(result.message || 'Data berhasil disimpan!')
+    await Swal.fire({
+      title: 'Berhasil!',
+      text: result.message || 'Data undangan berhasil disimpan.',
+      icon: 'success',
+      confirmButtonText: 'Lanjut ke WhatsApp',
+      confirmButtonColor: '#2563eb',
+      background: '#f9fafb',
+      color: '#111827',
+    })
+
+    // Kirim ke WhatsApp Admin
+    const adminNumber = '62895333053398'
+    const pesan = `
+Halo Admin 
+Ada pesanan baru untuk *Undangan Khitan Basic* 
+
+*Data Pemesan*
+- Nama: ${form.value.nama_pemesan}
+- Email: ${form.value.email}
+- No. Telepon: ${form.value.no_tlpn}
+
+*Data Anak*
+- Nama Lengkap: ${form.value.form.nama_lengkap || '-'}
+- Nama Panggilan: ${form.value.form.nama_panggilan || '-'}
+- Bapak: ${form.value.form.nama_bapak || '-'}
+- Ibu: ${form.value.form.nama_ibu || '-'}
+
+*Detail Acara*
+- Tanggal: ${form.value.form.hari_tanggal_acara || '-'}
+- Waktu: ${form.value.form.waktu || '-'}
+- Alamat: ${form.value.form.alamat || '-'}
+- Gmaps: ${form.value.form.link_gmaps || '-'}
+
+*Hitung Mundur*: ${form.value.form.hitung_mundur || '-'}
+
+*Say Something*: 
+${form.value.form.say_something || '-'}
+
+*Rekening 1*: ${form.value.form.rekening_1 || '-'}
+
+*Musik*: ${form.value.form.link_music || '-'}
+
+Terima kasih 
+`
+
+    const waUrl = `https://wa.me/${adminNumber}?text=${encodeURIComponent(pesan)}`
+    window.open(waUrl, '_blank')
+
     router.push('/')
   } catch (err) {
     console.error(err)
-    alert('Terjadi kesalahan: ' + err.message)
+    Swal.fire('Gagal!', err.message || 'Terjadi kesalahan saat menyimpan.', 'error')
   }
 }
 
-const batal = () => router.back()
-</script>
+const batal = () => {
+  Swal.fire({
+    title: 'Batalkan?',
+    text: 'Perubahan yang belum disimpan akan hilang.',
+    icon: 'warning',
+    showCancelButton: true,
+    confirmButtonColor: '#d33',
+    cancelButtonColor: '#6b7280',
+    confirmButtonText: 'Ya, Batalkan'
+  }).then(result => {
+    if (result.isConfirmed) router.back()
+  })
+}
+</script>
\ No newline at end of file