From 090a42348517bd58d8b009d81136c86c05484348 Mon Sep 17 00:00:00 2001
From: nylaaptr <naylawardhani488@gmail.com>
Date: Wed, 15 Jul 2026 23:57:58 +0700
Subject: [PATCH] update kode

---
 app/Http/Controllers/AuthController.php       | 13 +++---
 app/Http/Controllers/ChatbotController.php    |  4 --
 app/Http/Controllers/DokumenController.php    |  2 +-
 app/Http/Controllers/MonitoringController.php |  2 +-
 app/Http/Controllers/UserController.php       | 15 +++++--
 resources/views/admin/tambah-rumah.blade.php  | 43 ++++++++++++++++---
 resources/views/detail-pemesanan.blade.php    | 24 ++++++-----
 resources/views/form-pemesanan.blade.php      |  2 +-
 resources/views/halaman-notifikasi.blade.php  |  5 +--
 resources/views/halaman-profil.blade.php      |  9 ++--
 resources/views/login.blade.php               |  2 +-
 routes/web.php                                | 11 +----
 12 files changed, 80 insertions(+), 52 deletions(-)

diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 575ab63..5ff1d77 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -48,7 +48,7 @@ public function login(Request $request)
                 return redirect()->route('admin.welcome');
             }
 
-            return redirect()->route('halaman-katalog');
+            return redirect()->route('welcome');
         }
 
         return back()->withErrors([
@@ -67,16 +67,14 @@ public function redirectToGoogle()
     public function handleGoogleCallback()
     {
         try {
-
             $googleUser = Socialite::driver('google')->user();
-
             $user = User::where('email_user', $googleUser->email)->first();
-
             if (!$user) {
 
                 $user = User::create([
                     'nama_user' => $googleUser->name,
                     'email_user' => $googleUser->email,
+                    'no_hp' => null,
                     'password_user' => bcrypt('google-login'),
                     'role_user' => 'customer',
                     'google_id' => $googleUser->id,
@@ -102,12 +100,11 @@ public function handleGoogleCallback()
                 'tipe' => 'login'
             ]);
 
-            return redirect()->route('halaman-katalog');
+            return redirect()->route('welcome');
 
         } catch (\Exception $e) {
-
-            return redirect()->route('login')->with('error', 'Login Google gagal.');
-        }
+    dd($e->getMessage());
+}
     }
 
     // =========================
diff --git a/app/Http/Controllers/ChatbotController.php b/app/Http/Controllers/ChatbotController.php
index db8e892..f2f86c0 100644
--- a/app/Http/Controllers/ChatbotController.php
+++ b/app/Http/Controllers/ChatbotController.php
@@ -131,13 +131,9 @@ public function kirim(Request $request)
         $apiKey = env('GROQ_API_KEY');
 
         if (!$apiKey) {
-
             return response()->json([
-
                 'reply' => 'API key tidak ditemukan!',
-
                 'options' => [],
-
                 'properti' => []
             ]);
         }
diff --git a/app/Http/Controllers/DokumenController.php b/app/Http/Controllers/DokumenController.php
index 91493f4..1a61798 100644
--- a/app/Http/Controllers/DokumenController.php
+++ b/app/Http/Controllers/DokumenController.php
@@ -141,7 +141,7 @@ public function approveBukti($id)
 
     /**
      * ======================================
-     * ADMIN - TOLAK BUKTI
+     * ADMIN - TOLAK BUKTI PEMBAYARAN
      * ======================================
      */
     public function rejectBukti($id)
diff --git a/app/Http/Controllers/MonitoringController.php b/app/Http/Controllers/MonitoringController.php
index 1738f9b..301b676 100644
--- a/app/Http/Controllers/MonitoringController.php
+++ b/app/Http/Controllers/MonitoringController.php
@@ -264,7 +264,7 @@ public function update(Request $request, $id)
 
             // KHUSUS PELUNASAN
             if (
-                strtolower($request->progres) == 'pelunasan' &&
+                strtolower($request->tahap_saat_ini) == 'pelunasan' &&
                 $request->status != 'Selesai'
             ) {
 
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index fb19183..ffb5208 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -54,14 +54,21 @@ public function destroy($id)
     public function updateProfile(Request $request)
     {
         $request->validate([
-            'name' => 'required|string|max:255',
-            'email' => 'required|email|max:255'
+            'nama_user'     => 'required|string|max:255',
+            'email_user'    => 'required|email|max:255',
+            'no_hp'         => 'nullable|string|max:20',
+            'password_user' => 'nullable|min:8',
         ]);
 
         $user = Auth::user();
 
-        $user->name = $request->name;
-        $user->email = $request->email;
+        $user->nama_user = $request->nama_user;
+        $user->email_user = $request->email_user;
+        $user->no_hp = $request->no_hp;
+
+        if ($request->filled('password_user')) {
+            $user->password_user = Hash::make($request->password_user);
+        }
 
         $user->save();
 
diff --git a/resources/views/admin/tambah-rumah.blade.php b/resources/views/admin/tambah-rumah.blade.php
index be76a3a..3b4b873 100644
--- a/resources/views/admin/tambah-rumah.blade.php
+++ b/resources/views/admin/tambah-rumah.blade.php
@@ -501,6 +501,24 @@
             border-color: #4a90b7;
         }
 
+
+        .btn-delete-preview{
+            position:absolute;
+            top:8px;
+            right:8px;
+            width:30px;
+            height:30px;
+            border:none;
+            border-radius:50%;
+            background:#dc3545;
+            color:#fff;
+            cursor:pointer;
+        }
+
+        .btn-delete-preview:hover{
+            background:#bb2d3b;
+        }
+
         .img-modal {
             display: none;
             position: fixed;
@@ -965,9 +983,9 @@ class="form-control"
                         multiple>
                     </div>
 
-                    <button type="button" onclick="cekFile()">
+                    <!-- <button type="button" onclick="cekFile()">
                         Cek File
-                    </button>
+                    </button> -->
 
                     <!-- Tombol -->
                     <div class="form-actions">
@@ -1010,22 +1028,34 @@ function cekFile() {
 
             function renderPreview() {
                 container.innerHTML = '';
+
+                // Update isi input file
+                const dataTransfer = new DataTransfer();
+
+                fileBuffer.forEach(file => {
+                    dataTransfer.items.add(file);
+                });
+
+                fileInput.files = dataTransfer.files;
                 fileBuffer.forEach((file, index) => {
                     const reader = new FileReader();
-                    reader.onload = function (e) {
+                    reader.onload = function(e){
+
                         const wrapper = document.createElement('div');
                         wrapper.classList.add('preview-item');
+
                         const img = document.createElement('img');
                         img.src = e.target.result;
                         img.classList.add('preview-img');
-
                         img.onclick = () => openModal(e.target.result);
 
                         const delBtn = document.createElement('button');
-                        delBtn.innerText = '×';
+                        delBtn.type = 'button';
+                        delBtn.classList.add('btn-delete-preview');
+                        delBtn.innerHTML = '<i class="fas fa-trash"></i>';
 
                         delBtn.onclick = () => {
-                            fileBuffer.splice(index, 1);
+                            fileBuffer.splice(index,1);
                             renderPreview();
                         };
 
@@ -1033,6 +1063,7 @@ function renderPreview() {
                         wrapper.appendChild(delBtn);
 
                         container.appendChild(wrapper);
+
                     };
 
                     reader.readAsDataURL(file);
diff --git a/resources/views/detail-pemesanan.blade.php b/resources/views/detail-pemesanan.blade.php
index 329ca50..f643a71 100644
--- a/resources/views/detail-pemesanan.blade.php
+++ b/resources/views/detail-pemesanan.blade.php
@@ -778,23 +778,15 @@ class="profile-avatar"
                         elseif ($index == $currentIndex) {
 
                             if ($pemesanan->status == 'Selesai') {
-
                                 $class = 'done';
-
                             }
                             elseif ($pemesanan->status == 'Ditolak') {
-
                                 $class = 'rejected';
-
                             }
                             else {
-
                                 $class = 'active';
-
                             }
-
                         }
-
                     @endphp
 
                     <div class="timeline-step {{ $class }}">
@@ -844,8 +836,10 @@ class="profile-avatar"
                             @endif
 
                             {{-- Tombol Invoice --}}
-                            @if($step['title'] == 'Pelunasan Pembayaran')
-
+                            @if(
+                                $step['title'] == 'Pelunasan Pembayaran'
+                                && $currentIndex >= $index
+                            )
                                 <div style="margin-top:10px;">
                                     <a href="{{ route('invoice', $pemesanan->transaksi->id_transaksi) }}"
                                     class="btn-invoice">
@@ -854,6 +848,16 @@ class="btn-invoice">
                                     </a>
                                 </div>
                             @endif
+                            <!-- @if($step['title'] == 'Pelunasan Pembayaran')
+
+                                <div style="margin-top:10px;">
+                                    <a href="{{ route('invoice', $pemesanan->transaksi->id_transaksi) }}"
+                                    class="btn-invoice">
+                                        <i class="fas fa-file-invoice"></i>
+                                        Lihat Invoice
+                                    </a>
+                                </div>
+                            @endif -->
                         </div>
 
                         <!-- TANGGAL / STATUS -->
diff --git a/resources/views/form-pemesanan.blade.php b/resources/views/form-pemesanan.blade.php
index 0f7ffde..342bc90 100644
--- a/resources/views/form-pemesanan.blade.php
+++ b/resources/views/form-pemesanan.blade.php
@@ -1254,7 +1254,7 @@ class="form-control"
                         <span class="payment-detail-label">Nomor Rekening</span>
 
                         <span class="payment-detail-value rekening-highlight">
-                            1234567890
+                            1430033363555
 
                             <button type="button"
                                 class="copy-btn"
diff --git a/resources/views/halaman-notifikasi.blade.php b/resources/views/halaman-notifikasi.blade.php
index ae40980..8b34797 100644
--- a/resources/views/halaman-notifikasi.blade.php
+++ b/resources/views/halaman-notifikasi.blade.php
@@ -684,7 +684,7 @@ class="profile-avatar"
 
 }
 
-$link = '#';
+$link = '';
 
 /* =====================================================
    AMBIL DATA DASAR
@@ -721,13 +721,12 @@ class="profile-avatar"
     $pemesanan = \App\Models\Pemesanan::find($dokumen->id_pemesanan);
 
     if ($dokumen->status_verifikasi == 'ditolak') {
-
         $link = route('form-pemesanan', $dokumen->id_pemesanan);
 
     } else {
-
         $link = route('detail-pemesanan', $dokumen->id_pemesanan);
     }
+    
 
 /* =====================================================
    MONITORING / TAHAP LAIN → DETAIL PEMESANAN
diff --git a/resources/views/halaman-profil.blade.php b/resources/views/halaman-profil.blade.php
index 6d8b0bc..24a398f 100644
--- a/resources/views/halaman-profil.blade.php
+++ b/resources/views/halaman-profil.blade.php
@@ -775,9 +775,12 @@ class="profile-avatar-img">
                                 value="{{ $user->email_user }}" class="form-input">
                         </div>
 
-                        <div class="info-item full">
-                            <span class="info-label">Alamat</span>
-                            <textarea name="alamat" class="form-input">{{ $user->alamat }}</textarea>
+                        <div class="info-item">
+                            <span class="info-label">Password</span>
+                            <input type="password"
+                                value="********"
+                                class="form-input"
+                                disabled>
                         </div>
                     </div>
                 </div>
diff --git a/resources/views/login.blade.php b/resources/views/login.blade.php
index ea88887..7274401 100644
--- a/resources/views/login.blade.php
+++ b/resources/views/login.blade.php
@@ -542,7 +542,7 @@ class="form-control password-input @error('password') is-invalid @enderror"
                     <span>atau</span>
                 </div>
 
-                <a href="{{ route('google.login') }}" class="btn btn-light w-100"
+                <a href="{{ route('google.welcome') }}" class="btn btn-light w-100"
                 style="
                     border:2px solid #e2e8f0;
                     padding:14px;
diff --git a/routes/web.php b/routes/web.php
index 98eee3c..ec07230 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -20,7 +20,6 @@
 use Illuminate\Support\Facades\Storage;
 use App\Mail\NotifikasiEmail;
 use App\Models\LeadEmail;
-use App\Http\Controllers\Auth\GoogleController;
 
 /*
 |--------------------------------------------------------------------------
@@ -198,10 +197,6 @@
 |--------------------------------------------------------------------------
 */
 
-// LOGIN GOOGLE
-Route::get('/auth/google', [GoogleController::class, 'redirect'])->name('google.login');
-Route::get('/auth/google/callback', [GoogleController::class, 'callback']);
-
 Route::get('/login', [AuthController::class, 'index'])->name('login');
 Route::post('/login', [AuthController::class, 'login'])->name('login.proses');
 Route::post('/logout', [AuthController::class, 'logout'])->name('logout');
@@ -322,7 +317,7 @@ function ($id) {
 
 // EMAILLL
 Route::get('/auth/google', [AuthController::class, 'redirectToGoogle'])
-    ->name('google.login');
+    ->name('google.welcome');
 
 Route::get('/auth/google/callback', [AuthController::class, 'handleGoogleCallback'])
     ->name('google.callback');
@@ -1694,9 +1689,5 @@ function($message) use ($user){
                 'pesan' => 'Ini email dari sistem 🚀'
             ])
         );
-
         return 'Email terkirim!';
-
     });
-
-