From f7cdeca2e6f13139dbfc449ec084962843f7a397 Mon Sep 17 00:00:00 2001
From: Irwan Cahyono <irwan.l.cahyono@gmail.com>
Date: Mon, 8 Jun 2026 09:05:48 +0700
Subject: [PATCH] api master

---
 .../{ => Master}/JenisKomoditasController.php |  2 +-
 routes/api.php                                | 22 +++++--------------
 2 files changed, 7 insertions(+), 17 deletions(-)
 rename app/Http/Controllers/Api/{ => Master}/JenisKomoditasController.php (98%)

diff --git a/app/Http/Controllers/Api/JenisKomoditasController.php b/app/Http/Controllers/Api/Master/JenisKomoditasController.php
similarity index 98%
rename from app/Http/Controllers/Api/JenisKomoditasController.php
rename to app/Http/Controllers/Api/Master/JenisKomoditasController.php
index b1823dc..edf60b7 100644
--- a/app/Http/Controllers/Api/JenisKomoditasController.php
+++ b/app/Http/Controllers/Api/Master/JenisKomoditasController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Api;
+namespace App\Http\Controllers\Api\Master;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
diff --git a/routes/api.php b/routes/api.php
index 7192f8f..3b60a65 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -50,23 +50,13 @@ Route::middleware('auth:sanctum')
     ->name('master.')
     ->prefix('master')
     ->group(function () {
-<<<<<<< Updated upstream
     
-    Route::apiResource('/jenis-komoditas', \App\Http\Controllers\Api\JenisKomoditasController::class);
-    Route::apiResource('/komoditas', \App\Http\Controllers\Api\KomoditasController::class)->only(['index', 'show']);
-
-    Route::apiResource('/provinsi', \App\Http\Controllers\Api\ProvinsiController::class)->only(['index', 'show']);
-    Route::apiResource('/kabupaten-kota', \App\Http\Controllers\Api\KabupatenKotaController::class)->only(['index', 'show']);
-    Route::apiResource('/kecamatan', \App\Http\Controllers\Api\KecamatanController::class)->only(['index', 'show']);
-    Route::apiResource('/desa-kelurahan', \App\Http\Controllers\Api\DesaKelurahanController::class)->only(['index', 'show']);
-=======
-        
-    Route::apiResource('/komoditas', \App\Http\Controllers\Master\Api\KomoditasController::class)->only(['index', 'show']);
-    Route::apiResource('/provinsi', \App\Http\Controllers\Master\Api\ProvinsiController::class)->only(['index', 'show']);
-    Route::apiResource('/kabupaten-kota', \App\Http\Controllers\Master\Api\KabupatenKotaController::class)->only(['index', 'show']);
-    Route::apiResource('/kecamatan', \App\Http\Controllers\Master\Api\KecamatanController::class)->only(['index', 'show']);
-    Route::apiResource('/desa-kelurahan', \App\Http\Controllers\Master\Api\DesaKelurahanController::class)->only(['index', 'show']);
->>>>>>> Stashed changes
+    Route::apiResource('/jenis-komoditas', \App\Http\Controllers\Api\Master\JenisKomoditasController::class);        
+    Route::apiResource('/komoditas', \App\Http\Controllers\Api\Master\KomoditasController::class)->only(['index', 'show']);
+    Route::apiResource('/provinsi', \App\Http\Controllers\Api\Master\ProvinsiController::class)->only(['index', 'show']);
+    Route::apiResource('/kabupaten-kota', \App\Http\Controllers\Api\Master\KabupatenKotaController::class)->only(['index', 'show']);
+    Route::apiResource('/kecamatan', \App\Http\Controllers\Api\Master\KecamatanController::class)->only(['index', 'show']);
+    Route::apiResource('/desa-kelurahan', \App\Http\Controllers\Api\Master\DesaKelurahanController::class)->only(['index', 'show']);
 });
 
 Route::middleware('auth:sanctum')