diff --git a/app/Exports/RingkasanExport.php b/app/Exports/RingkasanExport.php
index d8ed659..64da7b5 100644
--- a/app/Exports/RingkasanExport.php
+++ b/app/Exports/RingkasanExport.php
@@ -2,80 +2,73 @@
 
 namespace App\Exports;
 
+use Illuminate\Support\Collection;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\WithTitle;
 use Maatwebsite\Excel\Concerns\WithStyles;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
 
-class RingkasanExport implements FromCollection, WithHeadings, WithTitle, WithStyles
+class RingkasanExport implements FromCollection, WithHeadings, WithStyles
 {
     private $data;
-    private $page;
 
-    public function __construct(iterable $data, $page = 1)
+    public function __construct(iterable $data)
     {
         $this->data = $data;
-        $this->page = $page;
     }
 
-
-    public function collection()
+    public function collection(): Collection
     {
-        $collection = collect();
-        $items = method_exists($this->data, 'items') ? $this->data->items() : $this->data;
+        $rows = collect();
 
-        foreach ($items as $item) {
-            $collection->push([
-                'Tanggal' => $item['tanggal'] ?? '-',
-                'Total Item Terjual' => $item['total_item_terjual'] ?? 0,
-                'Total Berat' => $item['total_berat'] ?? 0,
-                'Total Pendapatan' => $item['total_pendapatan'] ?? 0,
-                'Detail Sales' => $this->formatSalesData($item['sales'] ?? []),
+        foreach ($this->data as $item) {
+            $tanggal = $item['tanggal'] ?? '-';
+            $totalItem = $item['total_item'] ?? 0;
+            $totalBerat = $item['total_berat'] ?? '0 g';
+            $totalPendapatan = $item['total_pendapatan'] ?? 'Rp 0';
+
+            // Tambahkan detail sales per baris
+            foreach ($item['sales'] ?? [] as $sale) {
+                $rows->push([
+                    'Tanggal'       => $tanggal,
+                    'Nama Sales'    => $sale['nama'] ?? 'Sales Tidak Dikenal',
+                    'Item Terjual'  => $sale['item_terjual'] ?? 0,
+                    'Berat'         => $sale['berat'] ?? '-',
+                    'Pendapatan'    => $sale['pendapatan'] ?? '-',
+                ]);
+            }
+
+            // Tambahkan baris total
+            $rows->push([
+                'Tanggal'       => $tanggal,
+                'Nama Sales'    => 'TOTAL',
+                'Item Terjual'  => $totalItem,
+                'Berat'         => $totalBerat,
+                'Pendapatan'    => $totalPendapatan,
             ]);
+
+            // Tambahkan baris kosong biar rapi
+            $rows->push(['Tanggal' => '', 'Nama Sales' => '', 'Item Terjual' => '', 'Berat' => '', 'Pendapatan' => '']);
         }
 
-        return $collection;
+        return $rows;
     }
 
     public function headings(): array
     {
         return [
             'Tanggal',
-            'Total Item Terjual',
-            'Total Berat',
-            'Total Pendapatan',
-            'Detail Sales'
+            'Nama Sales',
+            'Item Terjual',
+            'Berat',
+            'Pendapatan',
         ];
     }
 
-    public function title(): string
-    {
-        return "Ringkasan Halaman {$this->page}";
-    }
-
     public function styles(Worksheet $sheet)
     {
         return [
-            1 => ['font' => ['bold' => true]],
+            1 => ['font' => ['bold' => true]], // Header bold
         ];
     }
-
-    private function formatSalesData($sales): string
-    {
-        if (empty($sales)) {
-            return '-';
-        }
-
-        $formatted = [];
-        foreach ($sales as $sale) {
-            $nama = $sale['nama'] ?? 'Sales Tidak Dikenal';
-            $itemTerjual = $sale['item_terjual'] ?? 0;
-            $pendapatan = $sale['pendapatan'] ?? '-';
-
-            $formatted[] = "{$nama}: {$itemTerjual} item, {$pendapatan}";
-        }
-
-        return implode('; ', $formatted);
-    }
 }
diff --git a/app/Http/Controllers/FotoSementaraController.php b/app/Http/Controllers/FotoSementaraController.php
index 339ad6d..b04b8c3 100644
--- a/app/Http/Controllers/FotoSementaraController.php
+++ b/app/Http/Controllers/FotoSementaraController.php
@@ -10,8 +10,12 @@ class FotoSementaraController extends Controller
 {
     public function upload(Request $request)
     {
+        $user = $request->user();
+        if (!$user) {
+            return response()->json(['message' => 'Unauthorized'], 401);
+        }
+
         $request->validate([
-            'id_user' => 'required|exists:users,id',
             'foto'      => 'required|image|mimes:jpg,jpeg,png|max:2048',
         ]);
 
@@ -19,15 +23,20 @@ class FotoSementaraController extends Controller
         $url = asset('storage/' . $path);
 
         $foto = FotoSementara::create([
-            'id_user' => $request->id_user,
+            'id_user' => $user->id,
             'url'       => $url,
         ]);
 
         return response()->json($foto, 201);
     }
 
-    public function hapus($id)
+    public function hapus(Request $request, int $id)
     {
+        $user = $request->user();
+        if (!$user) {
+            return response()->json(['message' => 'Unauthorized'], 401);
+        }
+
         $foto = FotoSementara::findOrFail($id);
 
         // Extract the relative path from the URL
@@ -42,18 +51,25 @@ class FotoSementaraController extends Controller
         return response()->json(['message' => 'Foto berhasil dihapus']);
     }
 
-    public function getAll($user_id)
+    public function getAll(Request $request)
     {
-        $data = FotoSementara::where('id_user', $user_id);
-        if (!$data->exists()) {
-            return response()->json(['message' => 'Tidak ada foto ditemukan'], 404);
+        $user = $request->user();
+        if (!$user) {
+            return response()->json(['message' => 'Unauthorized'], 401);
         }
+
+        $data = FotoSementara::where('id_user', $user->id)->get();
         return response()->json($data);
     }
     
-    public function reset($user_id)
+    public function reset(Request $request)
     {
-        FotoSementara::where('id_user', $user_id)->delete();
+        $user = $request->user();
+        if (!$user) {
+            return response()->json(['message' => 'Unauthorized'], 401);
+        }
+
+        FotoSementara::where('id_user', $user->id)->delete();
         return response()->json(['message' => 'Foto sementara berhasil direset']);
     }
 }
diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php
index 1ec7f7c..44d431e 100644
--- a/app/Http/Controllers/ItemController.php
+++ b/app/Http/Controllers/ItemController.php
@@ -31,6 +31,8 @@ class ItemController extends Controller
 
         $item = Item::create($validated);
 
+        $item->load('nampan');
+
         return response()->json([
             'message' => 'Item berhasil dibuat',
             'data' => $item
diff --git a/app/Http/Controllers/ProdukController.php b/app/Http/Controllers/ProdukController.php
index 7100b10..681189a 100644
--- a/app/Http/Controllers/ProdukController.php
+++ b/app/Http/Controllers/ProdukController.php
@@ -26,63 +26,56 @@ class ProdukController extends Controller
      */
     public function store(Request $request)
     {
-        $validated = $request->validate([
-            'nama' => 'required|string|max:100',
-            'id_kategori' => 'required|exists:kategoris,id',
-            'berat' => 'required|numeric',
-            'kadar' => 'required|integer',
-            'harga_per_gram' => 'required|numeric',
-            'harga_jual' => 'required|numeric',
-            'id_user' => 'nullable|exists:users,id',
-        ],
-        [
-            'nama.required' => 'Nama produk harus diisi.',
-            'id_kategori' => 'Kategori tidak valid.',
-            'berat.required' => 'Berat harus diisi.',
-            'kadar.required' => 'Kadar harus diisi',
-            'harga_per_gram.required' => 'Harga per gram harus diisi',
-            'harga_jual.required' => 'Harga jual harus diisi'
-        ]);
+        $user = $request->user();
+        if (!$user) {
+            return response()->json(['message' => 'Unauthorized'], 401);
+        }
+
+        $validated = $request->validate(
+            [
+                'nama'          => 'required|string|max:100',
+                'id_kategori'   => 'required|exists:kategoris,id',
+                'berat'         => 'required|numeric',
+                'kadar'         => 'required|integer',
+                'harga_per_gram' => 'required|numeric',
+                'harga_jual'    => 'required|numeric',
+            ],
+            [
+                'nama.required'         => 'Nama produk harus diisi.',
+                'id_kategori'           => 'Kategori tidak valid.',
+                'berat.required'        => 'Berat harus diisi.',
+                'kadar.required'        => 'Kadar harus diisi.',
+                'harga_per_gram.required' => 'Harga per gram harus diisi.',
+                'harga_jual.required'   => 'Harga jual harus diisi.'
+            ]
+        );
 
         DB::beginTransaction();
         try {
-            // Create produk
-            $produk = Produk::create([
-                'nama' => $validated['nama'],
-                'id_kategori' => $validated['id_kategori'],
-                'berat' => $validated['berat'],
-                'kadar' => $validated['kadar'],
-                'harga_per_gram' => $validated['harga_per_gram'],
-                'harga_jual' => $validated['harga_jual'],
-            ]);
+            $produk = Produk::create($validated);
 
-            // Pindahkan foto sementara ke foto permanen jika ada
-            if (isset($validated['id_user'])) {
-                $fotoSementara = FotoSementara::where('id_user', $validated['id_user'])->get();
+            $fotoSementara = FotoSementara::where('id_user', $user->id)->get();
 
-                foreach ($fotoSementara as $fs) {
-                    Foto::create([
-                        'id_produk' => $produk->id,
-                        'url' => $fs->url
-                    ]);
+            foreach ($fotoSementara as $fs) {
+                Foto::create([
+                    'id_produk' => $produk->id,
+                    'url'       => $fs->url
+                ]);
 
-                    // Hapus foto sementara setelah dipindah
-                    $fs->delete();
-                }
+                $fs->delete();
             }
 
             DB::commit();
 
             return response()->json([
                 'message' => 'Produk berhasil dibuat',
-                'data' => $produk->load('foto')
+                'data'    => $produk->load('foto')
             ], 201);
-
         } catch (\Exception $e) {
             DB::rollback();
             return response()->json([
                 'message' => 'Gagal membuat produk',
-                'error' => $e->getMessage()
+                'error'   => $e->getMessage()
             ], 500);
         }
     }
@@ -96,29 +89,55 @@ class ProdukController extends Controller
         return response()->json($produk);
     }
 
+    /**
+     * Get the specified resource to edit.
+     */
+    public function edit(Request $request, int $id)
+    {
+        $user = $request->user();
+        if (!$user) {
+            return response()->json(['message' => 'Unauthorized'], 401);
+        }
+
+        $produk = Produk::with('foto', 'kategori')->findOrFail($id);
+        $foto_sementara = [];
+        foreach ($produk->foto as $foto) {
+            $foto_sementara[] = FotoSementara::create([
+                'id_user' => $user->id,
+                'url'     => $foto->url
+            ]);
+        }
+        return response()->json($produk);
+    }
+
     /**
      * Update the specified resource in storage.
      */
     public function update(Request $request, int $id)
     {
-        $validated = $request->validate([
-            'nama' => 'required|string|max:100',
-            'id_kategori' => 'required|exists:kategoris,id',
-            'berat' => 'required|numeric',
-            'kadar' => 'required|integer',
-            'harga_per_gram' => 'required|numeric',
-            'harga_jual' => 'required|numeric',
-            'id_user' => 'nullable|exists:users,id', // untuk mengambil foto sementara baru
-            'hapus_foto_lama' => 'nullable|boolean', // flag untuk menghapus foto lama
-        ],
-        [
-            'nama.required' => 'Nama produk harus diisi.',
-            'id_kategori' => 'Kategori tidak valid.',
-            'berat.required' => 'Berat harus diisi.',
-            'kadar.required' => 'Kadar harus diisi',
-            'harga_per_gram.required' => 'Harga per gram harus diisi',
-            'harga_jual.required' => 'Harga jual harus diisi'
-        ]);
+        $user = $request->user();
+        if (!$user) {
+            return response()->json(['message' => 'Unauthorized'], 401);
+        }
+
+        $validated = $request->validate(
+            [
+                'nama' => 'required|string|max:100',
+                'id_kategori' => 'required|exists:kategoris,id',
+                'berat' => 'required|numeric',
+                'kadar' => 'required|integer',
+                'harga_per_gram' => 'required|numeric',
+                'harga_jual' => 'required|numeric',
+            ],
+            [
+                'nama.required' => 'Nama produk harus diisi.',
+                'id_kategori' => 'Kategori tidak valid.',
+                'berat.required' => 'Berat harus diisi.',
+                'kadar.required' => 'Kadar harus diisi',
+                'harga_per_gram.required' => 'Harga per gram harus diisi',
+                'harga_jual.required' => 'Harga jual harus diisi',
+            ]
+        );
 
         DB::beginTransaction();
         try {
@@ -134,31 +153,29 @@ class ProdukController extends Controller
                 'harga_jual' => $validated['harga_jual'],
             ]);
 
-            // Hapus foto lama jika diminta
-            if (isset($validated['hapus_foto_lama']) && $validated['hapus_foto_lama']) {
-                foreach ($produk->foto as $foto) {
-                    // Hapus file fisik
+            // Hapus foto lama
+            foreach ($produk->foto as $foto) {
+                // Hapus file fisik jika memungkinkan
+                try {
                     $relativePath = str_replace(asset('storage') . '/', '', $foto->url);
                     if (Storage::disk('public')->exists($relativePath)) {
                         Storage::disk('public')->delete($relativePath);
                     }
-                    $foto->delete();
+                } catch (\Exception $e) {
+                    // Maklum Pak, soalnya kadang url aja, ga ada file fisiknya #Bagas
                 }
+                $foto->delete();
             }
 
-            // Tambahkan foto baru dari foto sementara jika ada
-            if (isset($validated['id_user'])) {
-                $fotoSementara = FotoSementara::where('id_user', $validated['id_user'])->get();
+            $fotoSementara = FotoSementara::where('id_user', $user->id)->get();
 
-                foreach ($fotoSementara as $fs) {
-                    Foto::create([
-                        'id_produk' => $produk->id,
-                        'url' => $fs->url
-                    ]);
+            foreach ($fotoSementara as $fs) {
+                Foto::create([
+                    'id_produk' => $produk->id,
+                    'url' => $fs->url
+                ]);
 
-                    // Hapus foto sementara setelah dipindah
-                    $fs->delete();
-                }
+                $fs->delete();
             }
 
             DB::commit();
@@ -167,7 +184,6 @@ class ProdukController extends Controller
                 'message' => 'Produk berhasil diubah',
                 'data' => $produk->load('foto')
             ], 200);
-
         } catch (\Exception $e) {
             DB::rollback();
             return response()->json([
@@ -203,7 +219,6 @@ class ProdukController extends Controller
             return response()->json([
                 'message' => 'Produk berhasil dihapus.'
             ], 200);
-
         } catch (\Exception $e) {
             DB::rollback();
             return response()->json([
diff --git a/resources/js/components/BrankasList.vue b/resources/js/components/BrankasList.vue
index fa165f0..9c3fd4a 100644
--- a/resources/js/components/BrankasList.vue
+++ b/resources/js/components/BrankasList.vue
@@ -1,4 +1,3 @@
-// brankas list
 <template>
   <div v-if="loading" class="flex justify-center items-center h-screen">
     <div class="animate-spin rounded-full h-8 w-8 border-b-2 border-C"></div>
diff --git a/resources/js/components/CreateItemModal.vue b/resources/js/components/CreateItemModal.vue
index 701e54a..fc40955 100644
--- a/resources/js/components/CreateItemModal.vue
+++ b/resources/js/components/CreateItemModal.vue
@@ -1,9 +1,9 @@
 <template>
   <Modal :active="isOpen" size="md" @close="handleClose" clickOutside="false">
     <div class="p-6">
-      <h3 class="text-lg font-semibold text-gray-900 mb-4">Item {{ product?.nama }}</h3>
-
+      
       <div v-if="!success">
+        <h3 class="text-lg font-semibold text-gray-900 mb-4">Item {{ product?.nama }}</h3>
         <div class="mb-4">
           <label class="block text-gray-700 mb-2">Pilih Nampan</label>
           <InputSelect v-model="selectedNampan" :options="positionListOptions" :disabled="loading" />
@@ -31,21 +31,22 @@
       <!-- Success State -->
       <div v-else>
         <div class="text-center">
-          <div class="w-16 h-16 bg-green-100 rounded-full flex items-center justify-center mx-auto mb-4">
-            <svg class="w-8 h-8 text-green-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7">
-              </path>
-            </svg>
+          <h4 class="text-lg font-semibold text-gray-900 mb-2">Item Berhasil Dibuat!</h4>
+          
+          <!-- QR Code -->
+          <div class="flex justify-center mb-4">
+            <div class="p-2 border border-gray-300 rounded-lg">
+              <img :src="qrCodeUrl" alt="QR Code" class="w-36 h-36" />
+            </div>
           </div>
 
-          <h4 class="text-lg font-semibold text-gray-900 mb-2">Item Berhasil Dibuat!</h4>
-          <p class="text-gray-600 mb-2">
-            Item dari produk "<strong>{{ product?.nama }}</strong>" telah ditambahkan ke {{
-              selectedNampanName }}.
-          </p>
-          <p class="text-sm text-gray-500 mb-6">
-            ID Item: <strong>{{ createdItem.id }}</strong>
-          </p>
+          <!-- Item Info -->
+          <div class="text-center text-gray-700 font-medium mb-1">
+            {{ createdItem?.kode_item }}
+          </div>
+          <div class="text-center text-gray-500 text-sm mb-6">
+            {{ product?.nama }} - {{ createdItem?.nampan?.nama || 'Brankas' }}
+          </div>
 
           <div class="flex flex-row justify-between gap-3">
             <button @click="handleClose"
@@ -53,9 +54,8 @@
               Selesai
             </button>
             <button @click="printItem"
-              class="flex-1 px-6 py-2 bg-C hover:bg-B text-D rounded-lg transition-colors opacity-50 cursor-not-allowed"
-              disabled>
-              Print
+              class="flex-1 px-6 py-2 bg-C hover:bg-B text-D rounded-lg transition-colors">
+              <i class="fas fa-print mr-1"></i>Print
             </button>
             <button @click="addNewItem"
               class="flex-1 px-6 py-2 bg-C hover:bg-B text-D rounded-lg transition-colors">
@@ -99,15 +99,15 @@ const success = ref(false);
 const loading = ref(false);
 const createdItem = ref(null);
 
-// Computed
-const selectedNampanName = computed(() => {
-  if (!selectedNampan.value) return 'Brankas';
-
-  console.log("Selected nampan ID:", selectedNampan.value);
-  const nampan = nampanList.value.find(n => n.id === Number(selectedNampan.value));
-  console.log("All nampan:", nampanList.value);
-  console.log("Selected nampan:", nampan);
-  return nampan ? nampan.nama : 'Brankas';
+// QR Code generator - berdasarkan logika dari brankas list
+const qrCodeUrl = computed(() => {
+  if (createdItem.value && props.product) {
+    const itemId = createdItem.value.id || createdItem.value.kode_item;
+    const productName = props.product.nama.replace(/\s/g, "");
+    const data = `ITM-${itemId}-${productName}`;
+    return `https://api.qrserver.com/v1/create-qr-code/?size=150x150&data=${encodeURIComponent(data)}`;
+  }
+  return "";
 });
 
 // Methods
@@ -156,6 +156,7 @@ const createItem = async () => {
     createdItem.value = response.data.data
     console.log('Item created:', createdItem);
 
+    loadNampanList();
   } catch (error) {
     console.error('Error creating item:', error);
     alert('Gagal membuat item: ' + (error.response?.data?.message || error.message));
@@ -167,10 +168,52 @@ const createItem = async () => {
 const addNewItem = () => {
   success.value = false;
   selectedNampan.value = '';
+  createdItem.value = null;
 };
 
+// Fungsi print berdasarkan logika dari brankas list
 const printItem = () => {
-  alert('Wak waw');
+  if (qrCodeUrl.value && createdItem.value && props.product) {
+    const printWindow = window.open('', '_blank');
+    const itemCode = createdItem.value.kode_item || createdItem.value.id;
+    
+    printWindow.document.write(`
+      <html>
+        <head>
+          <title>Print QR Code - ${itemCode}</title>
+          <style>
+            body { 
+              font-family: Arial, sans-serif; 
+              text-align: center; 
+              padding: 20px; 
+            }
+            .qr-container { 
+              border: 2px solid #ccc; 
+              padding: 20px; 
+              display: inline-block; 
+              margin: 20px;
+            }
+            .item-info {
+              margin-top: 10px;
+              font-size: 14px;
+            }
+          </style>
+        </head>
+        <body>
+          <div class="qr-container">
+            <img src="${qrCodeUrl.value}" alt="QR Code" style="width: 200px; height: 200px;" />
+            <div class="item-info">
+              <div style="font-weight: bold; margin-bottom: 5px;">${itemCode}</div>
+              <div>${props.product.nama}</div>
+              <div style="color: #666; margin-top: 5px;">${props.product.berat}g</div>
+            </div>
+          </div>
+        </body>
+      </html>
+    `);
+    printWindow.document.close();
+    printWindow.print();
+  }
 };
 
 const handleClose = () => {
@@ -178,6 +221,7 @@ const handleClose = () => {
   selectedNampan.value = '';
   success.value = false;
   loading.value = false;
+  createdItem.value = null;
 
   emit('close');
 };
@@ -188,8 +232,9 @@ watch(() => props.isOpen, (newValue) => {
     selectedNampan.value = '';
     success.value = false;
     loading.value = false;
+    createdItem.value = null;
 
     loadNampanList();
   }
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/js/components/TrayList.vue b/resources/js/components/TrayList.vue
index df77c0b..171d99c 100644
--- a/resources/js/components/TrayList.vue
+++ b/resources/js/components/TrayList.vue
@@ -49,23 +49,33 @@
         </div>
 
         <!-- Isi Card (Max tinggi 3 item + scroll kalau lebih) -->
-        <div v-if="tray.items && tray.items.length" class="space-y-2 flex-1 overflow-y-auto h-[160px] pr-1">
-          <div v-for="item in tray.items" :key="item.id"
-            class="flex justify-between items-center border border-C rounded-lg p-2 cursor-pointer hover:bg-gray-50"
-            @click="openMovePopup(item)">
-            <div class="flex items-center gap-3">
-              <img v-if="item.produk.foto && item.produk.foto.length > 0" :src="item.produk.foto[0].url"
-                alt="foto produk" class="size-12 object-cover rounded" />
-              <div class="text-D">
-                <p class="text-sm">{{ item.produk.nama }}</p>
-                <p class="text-sm font-medium">{{ item.kode_item }}</p>
-              </div>
-            </div>
-            <div class="flex items-center gap-2">
-              <span class="font-medium">{{ item.produk.berat }}g</span>
-            </div>
-          </div>
-        </div>
+        <div
+  v-if="tray.items && tray.items.length"
+  class="space-y-2 flex-1 overflow-y-auto max-h-[168px] pr-1"
+>
+  <div
+    v-for="item in tray.items"
+    :key="item.id"
+    class="flex justify-between items-center border border-C rounded-lg p-2 cursor-pointer hover:bg-gray-50"
+    @click="openMovePopup(item)"
+  >
+    <div class="flex items-center gap-3">
+      <img
+        v-if="item.produk.foto && item.produk.foto.length > 0"
+        :src="item.produk.foto[0].url"
+        alt="foto produk"
+        class="size-12 object-cover rounded"
+      />
+      <div class="text-D">
+        <p class="text-sm">{{ item.produk.nama }}</p>
+        <p class="text-sm font-medium">{{ item.kode_item }}</p>
+      </div>
+    </div>
+    <div class="flex items-center gap-2">
+      <span class="font-medium">{{ item.produk.berat }}g</span>
+    </div>
+  </div>
+</div>
 
         <!-- Kalau kosong -->
         <div v-else class="text-gray-400 text-center py-4 flex-1">
diff --git a/resources/js/pages/EditProduk.vue b/resources/js/pages/EditProduk.vue
index ceeb753..1d8cd70 100644
--- a/resources/js/pages/EditProduk.vue
+++ b/resources/js/pages/EditProduk.vue
@@ -97,7 +97,8 @@
                                     class="w-full h-full object-cover"
                                 />
                                 <button
-                                    @click="removeImage(image.id)"
+                                    @click.prevent="removeImage(image.id)"
+                                    type="button"
                                     :disabled="uploadLoading"
                                     class="absolute -top-2 -right-2 bg-red-500 text-white rounded-full w-6 h-6 flex items-center justify-center text-sm font-bold shadow-lg hover:bg-red-600 transition-colors disabled:bg-gray-400"
                                 >
@@ -224,6 +225,7 @@ import mainLayout from "../layouts/mainLayout.vue";
 import InputField from "../components/InputField.vue";
 import InputSelect from "../components/InputSelect.vue";
 import CreateItemModal from "../components/CreateItemModal.vue";
+import { errorMessages } from "@vue/compiler-core";
 
 const route = useRoute();
 const router = useRouter();
@@ -249,7 +251,6 @@ const fileInput = ref(null);
 
 const openItemModal = ref(false);
 const editedProduct = ref(null);
-const userId = ref(1); // TODO: ambil dari auth
 
 const isFormValid = computed(() => {
     return (
@@ -280,12 +281,14 @@ const loadKategori = async () => {
 };
 
 const loadProduk = async () => {
-    const response = await axios.get(`/api/produk/${productId}`, {
+    const response = await axios.get(`/api/produk/edit/${productId}`, {
         headers: {
             Authorization: `Bearer ${localStorage.getItem("token")}`,
         },
     });
     const produk = response.data;
+    console.log(produk);
+    
     form.value = {
         nama: produk.nama,
         id_kategori: produk.id_kategori,
@@ -294,7 +297,22 @@ const loadProduk = async () => {
         harga_per_gram: produk.harga_per_gram,
         harga_jual: produk.harga_jual,
     };
-    uploadedImages.value = produk.foto || [];
+};
+
+const loadFoto = async () => {
+    try {
+        const response = await axios.get(`/api/foto`, {
+            headers: {
+                Authorization: `Bearer ${localStorage.getItem("token")}`,
+            },
+        });
+        uploadedImages.value = response.data;
+        console.log(uploadedImages.value);
+    } catch (e) {
+        console.error(e);
+        
+        uploadError.value = "Gagal memuat foto";
+    }
 };
 
 const triggerFileInput = () => {
@@ -317,35 +335,65 @@ const handleDrop = (e) => {
 };
 
 const uploadFiles = async (files) => {
-    uploadError.value = "";
-    const validFiles = files.filter(
-        (file) =>
-            ["image/jpeg", "image/jpg", "image/png"].includes(file.type) &&
-            file.size <= 2 * 1024 * 1024
-    );
-    if (!validFiles.length) return;
-    uploadLoading.value = true;
-    try {
-        for (const file of validFiles) {
-            const formData = new FormData();
-            formData.append("foto", file);
-            formData.append("id_user", userId.value);
-            const res = await axios.post("/api/foto/upload", formData, {
-                headers: {
-                    Authorization: `Bearer ${localStorage.getItem("token")}`,
-                    "Content-Type": "multipart/form-data",
-                },
-            });
-            uploadedImages.value.push(res.data);
-        }
-    } finally {
-        uploadLoading.value = false;
+  uploadError.value = '';
+
+  if (uploadedImages.value.length + files.length > 6) {
+    uploadError.value = 'Maksimal 6 foto yang dapat diupload';
+    return;
+  }
+
+  const validFiles = files.filter(file => {
+    const isValidType = ['image/jpeg', 'image/jpg', 'image/png'].includes(file.type);
+    const isValidSize = file.size <= 2 * 1024 * 1024;
+
+    if (!isValidType) {
+      uploadError.value = 'Format file harus JPG, JPEG, atau PNG';
+      return false;
     }
+
+    if (!isValidSize) {
+      uploadError.value = 'Ukuran file maksimal 2MB';
+      return false;
+    }
+
+    return true;
+  });
+
+  if (validFiles.length === 0) return;
+
+  uploadLoading.value = true;
+
+  try {
+    for (const file of validFiles) {
+      const formData = new FormData();
+      formData.append('foto', file);
+
+      const response = await axios.post('/api/foto', formData, {
+        headers: {
+          Authorization: `Bearer ${localStorage.getItem("token")}`,
+          'Content-Type': 'multipart/form-data',
+
+        },
+      });
+
+      uploadedImages.value.push(response.data);
+    }
+
+    if (fileInput.value) {
+      fileInput.value.value = '';
+    }
+
+  } catch (error) {
+    console.error('Upload error:', error);
+    uploadError.value = error.response?.data?.message || 'Gagal mengupload foto';
+  } finally {
+    uploadLoading.value = false;
+  }
 };
 
 const removeImage = async (id) => {
     try {
-        await axios.delete(`/api/foto/hapus/${id}`, {
+        await axios.delete(`/api/foto/${id}`, {
             headers: {
                 Authorization: `Bearer ${localStorage.getItem("token")}`,
             },
@@ -360,21 +408,16 @@ const submitForm = async () => {
     loading.value = true;
     try {
         await axios.put(
-            `/api/produk/${productId}`,
-            {
-                ...form.value,
-                id_user: userId.value,
-            },
+            `/api/produk/${productId}`,form.value,
             {
                 headers: {
                     Authorization: `Bearer ${localStorage.getItem("token")}`,
                 },
             }
         );
-        alert("Produk berhasil diupdate!");
         router.push("/produk");
     } catch (err) {
-        alert("Gagal update produk!");
+        errorMessages.value = err.response?.data?.message || "Gagal menyimpan produk";
         console.error(err);
     } finally {
         loading.value = false;
@@ -389,8 +432,10 @@ const back = () => {
     router.push("/produk");
 };
 
-onMounted(() => {
-    loadKategori();
-    loadProduk();
+onMounted(async () => {
+    await loadKategori();
+    await loadProduk();
+    loadFoto();
 });
+
 </script>
diff --git a/resources/js/pages/InputProduk.vue b/resources/js/pages/InputProduk.vue
index 3bec931..50851a5 100644
--- a/resources/js/pages/InputProduk.vue
+++ b/resources/js/pages/InputProduk.vue
@@ -1,11 +1,7 @@
 <template>
   <mainLayout>
     <!-- Modal Buat Item - Sekarang menggunakan komponen terpisah -->
-    <CreateItemModal 
-      :isOpen="openItemModal"
-      :product="createdProduct"
-      @close="closeItemModal"
-    />
+    <CreateItemModal :isOpen="openItemModal" :product="createdProduct" @close="closeItemModal" />
     <div class="p-6">
       <p class="font-serif italic text-[25px] text-D">Produk Baru</p>
 
@@ -168,8 +164,6 @@ const uploadedImages = ref([]);
 const isDragging = ref(false);
 const uploadError = ref('');
 const fileInput = ref(null);
-// TODO: Logika autentikasi user
-const userId = ref(1);
 
 const openItemModal = ref(false);
 const createdProduct = ref(null);
@@ -192,22 +186,24 @@ const calculateHargaJual = () => {
   }
 };
 
-const loadExistingPhotos = async () => {
+const loadFoto = async () => {
+  loading.value = true;
+
   try {
-    const response = await axios.get(`/api/foto/${userId.value}`, {
+    const response = await axios.get(`/api/foto`, {
       headers: {
         Authorization: `Bearer ${localStorage.getItem("token")}`,
       },
     });
-    if (response.data && Array.isArray(response.data)) {
-      uploadedImages.value = response.data;
-    }
-  } catch (error) {
-    if (error.response?.status !== 404) {
-      console.error('Error loading existing photos:', error);
-    }
+    uploadedImages.value = response.data;
+    console.log(uploadedImages.value);
+  } catch (e) {
+    console.error(e);
+
+    uploadError.value = "Gagal memuat foto";
   }
-};
+  loading.value = false;
+}
 
 const openCreateItemModal = (product) => {
   createdProduct.value = product;
@@ -275,12 +271,11 @@ const uploadFiles = async (files) => {
     for (const file of validFiles) {
       const formData = new FormData();
       formData.append('foto', file);
-      formData.append('id_user', userId.value);
 
-      const response = await axios.post('/api/foto/upload', formData, {
+      const response = await axios.post('/api/foto', formData, {
         headers: {
-        Authorization: `Bearer ${localStorage.getItem("token")}`,
-        'Content-Type': 'multipart/form-data',
+          Authorization: `Bearer ${localStorage.getItem("token")}`,
+          'Content-Type': 'multipart/form-data',
 
         },
       });
@@ -300,20 +295,17 @@ const uploadFiles = async (files) => {
   }
 };
 
-const removeImage = async (imageId) => {
-  try {
-    await axios.delete(`/api/foto/hapus/${imageId}`, {
-      headers: {
-        Authorization: `Bearer ${localStorage.getItem("token")}`,
-      },
-    })
-;
-    uploadedImages.value = uploadedImages.value.filter(img => img.id !== imageId);
-    uploadError.value = '';
-  } catch (error) {
-    console.error('Delete error:', error);
-    uploadError.value = 'Gagal menghapus foto';
-  }
+const removeImage = async (id) => {
+    try {
+        await axios.delete(`/api/foto/${id}`, {
+            headers: {
+                Authorization: `Bearer ${localStorage.getItem("token")}`,
+            },
+        });
+        uploadedImages.value = uploadedImages.value.filter((i) => i.id !== id);
+    } catch {
+        uploadError.value = "Gagal menghapus foto";
+    }
 };
 
 const submitForm = async (addItem) => {
@@ -325,13 +317,13 @@ const submitForm = async (addItem) => {
   loading.value = true;
 
   try {
-    const response = await axios.post('/api/produk', {
-      ...form.value,
-      id_user: userId.value,
-      headers: {
-        Authorization: `Bearer ${localStorage.getItem("token")}`,
-      },
-    });
+    const response = await axios.post('/api/produk', form.value,
+      {
+        headers: {
+          Authorization: `Bearer ${localStorage.getItem("token")}`,
+        },
+      }
+    );
 
     const createdProductData = response.data.data;
 
@@ -380,7 +372,7 @@ const resetForm = async () => {
     harga_per_gram: 0,
     harga_jual: 0,
   };
-  try { 
+  try {
     await axios.delete(`/api/foto/reset/${userId.value}`, {
       headers: {
         Authorization: `Bearer ${localStorage.getItem("token")}`,
@@ -402,7 +394,7 @@ const back = () => {
 };
 
 onMounted(() => {
-  loadExistingPhotos();
+  loadFoto();
   loadKategori();
 });
 </script>
diff --git a/routes/web.php b/routes/web.php
index dcca87d..1dcd6ea 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -32,10 +32,11 @@ Route::prefix('api')->group(function () {
         Route::delete('kosongkan-nampan', [NampanController::class, 'kosongkan']);
 
         // Foto Sementara
-        Route::post('foto/upload', [FotoSementaraController::class, 'upload']);
-        Route::delete('foto/hapus/{id}', [FotoSementaraController::class, 'hapus']);
-        Route::get('foto/{user_id}', [FotoSementaraController::class, 'getAll']);
-        Route::delete('foto/reset/{user_id}', [FotoSementaraController::class, 'reset']);
+        Route::get('foto', [FotoSementaraController::class, 'getAll']);
+        Route::post('foto', [FotoSementaraController::class, 'upload']);
+        Route::delete('foto/{id}', [FotoSementaraController::class, 'hapus']);
+        Route::get('produk/edit/{id}', [ProdukController::class, 'edit']);
+        Route::delete('foto/all', [FotoSementaraController::class, 'reset']);
 
         // Laporan
         Route::prefix('laporan')->group(function () {