From 4476e5361a55bae46cc413faae51209dab8a48bc Mon Sep 17 00:00:00 2001 From: E31232303evimr <158023512+E31232303evimr@users.noreply.github.com> Date: Sun, 24 May 2026 15:08:40 +0700 Subject: [PATCH] all fix --- .../Controllers/User/DiagnosaController.php | 7 +-- resources/views/layouts/user-app.blade.php | 12 ++-- .../user/artikel/detail-budidaya.blade.php | 60 ++++++++----------- resources/views/user/diagnosa/pdf.blade.php | 22 +++++-- 4 files changed, 53 insertions(+), 48 deletions(-) diff --git a/app/Http/Controllers/User/DiagnosaController.php b/app/Http/Controllers/User/DiagnosaController.php index 0f24816..4be4542 100644 --- a/app/Http/Controllers/User/DiagnosaController.php +++ b/app/Http/Controllers/User/DiagnosaController.php @@ -21,12 +21,11 @@ public function index() public function proses(Request $request) { $request->validate([ - 'gejala' => 'required|array|min:1', + 'gejala' => 'required|array|min:3', ], [ - 'gejala.required' => 'Pilih minimal 1 gejala!', - 'gejala.min' => 'Pilih minimal 1 gejala!', + 'gejala.required' => 'Pilih minimal 3 gejala!', + 'gejala.min' => 'Pilih minimal 3 gejala!', ]); - $gejalaInput = $request->gejala; // Ambil semua rule yang relevan diff --git a/resources/views/layouts/user-app.blade.php b/resources/views/layouts/user-app.blade.php index b83072d..ddf9310 100644 --- a/resources/views/layouts/user-app.blade.php +++ b/resources/views/layouts/user-app.blade.php @@ -49,14 +49,18 @@ .badge-pulse { animation: pulse 2s cubic-bezier(0.4, 0, 0.6, 1) infinite; } @media (max-width: 1023px) { .sidebar-desktop { display: none !important; } - .main-content { margin-left: 0 !important; } + .main-content { margin-left: 0 !important; width: 100% !important; max-width: 100% !important; } .header-bar { left: 0 !important; } } + @media (min-width: 1024px) { + .main-content { margin-left: 16rem; } + .header-bar { left: 16rem; } + } @stack('styles') - +
@@ -303,11 +307,11 @@ class="w-full flex items-center px-4 py-3 rounded-xl hover:bg-gray-700 {{ reques -
+
+ style="transition: left 0.3s cubic-bezier(0.4, 0, 0.2, 1);">
diff --git a/resources/views/user/artikel/detail-budidaya.blade.php b/resources/views/user/artikel/detail-budidaya.blade.php index c42de70..4e48513 100644 --- a/resources/views/user/artikel/detail-budidaya.blade.php +++ b/resources/views/user/artikel/detail-budidaya.blade.php @@ -205,6 +205,17 @@ display: none; } + @media (max-width: 1023px) { + .accordion-body { padding: 0 12px 16px 12px !important; } + .accordion-trigger { padding: 12px 12px !important; } + .section-header { padding: 14px 12px !important; } + .budidaya-wrap { overflow-x: hidden; } + .article-title { font-size: 1.1rem !important; } + .hero-img-wrap { height: 180px !important; } + .sidebar-card { padding: 16px 12px !important; } + .hero-card > div:last-child { padding: 16px 12px !important; } + } + .accordion-body.open { display: block; animation: fadeSlideIn .25s ease; @@ -418,12 +429,12 @@ @section('content') -
+
{{-- ══════════════════════════════════ KONTEN UTAMA ══════════════════════════════════ --}} -
+
{{-- Header Artikel --}}
@@ -537,41 +548,18 @@ ══════════════════════════════════ --}}
- {{-- Info Artikel --}} - - - @if($artikel->file_pdf) - - - - - - Download PDF - - @endif + {{-- Download PDF --}} + @if($artikel->file_pdf) +
+ + + + + + Download PDF +
+ @endif {{-- Navigasi --}}
diff --git a/resources/views/user/diagnosa/pdf.blade.php b/resources/views/user/diagnosa/pdf.blade.php index afb300d..ebdf05e 100644 --- a/resources/views/user/diagnosa/pdf.blade.php +++ b/resources/views/user/diagnosa/pdf.blade.php @@ -109,7 +109,7 @@
- Penyakit Terdeteksi + {{ ($riwayat->penyakit?->kategori === 'Hama') ? 'Hama Terdeteksi' : 'Penyakit Terdeteksi' }} @if($riwayat->penyakit?->tingkat_bahaya) @php $bc = match($riwayat->penyakit->tingkat_bahaya) { @@ -160,7 +160,7 @@ {{-- Tentang Penyakit --}} @if($riwayat->penyakit?->deskripsi_singkat)
-
Tentang Penyakit
+
Tentang {{ ($riwayat->penyakit?->kategori === 'Hama') ? 'Hama' : 'Penyakit' }}
{{ $riwayat->penyakit->deskripsi_singkat }}
@endif @@ -213,7 +213,15 @@ {{-- Semua Kemungkinan Penyakit --}} @if($riwayat->hasil_diagnosa && count($riwayat->hasil_diagnosa) > 1)
-
Semua Kemungkinan Penyakit
+ @php + $kategoriListPdf = collect($riwayat->hasil_diagnosa) + ->map(fn($h) => \App\Models\MasterPenyakit::find($h['id_penyakit'])?->kategori) + ->filter()->unique()->values(); + $labelPdf = $kategoriListPdf->count() > 1 + ? 'Semua Kemungkinan Hama & Penyakit' + : 'Semua Kemungkinan ' . ($kategoriListPdf->first() ?? 'Penyakit'); + @endphp +
{{ $labelPdf }}
@@ -225,9 +233,15 @@ @foreach($riwayat->hasil_diagnosa as $index => $hasil) + @php $penyakitPdf = \App\Models\MasterPenyakit::find($hasil['id_penyakit']); @endphp - +
{{ $index + 1 }}{{ $hasil['nama_penyakit'] }} + {{ $hasil['nama_penyakit'] }} + @if($penyakitPdf?->nama_latin) +
{{ $penyakitPdf->nama_latin }} + @endif + 		{{ $hasil['persentase'] }}%