From 8fca750c2551221b9c4526427136236f21dfec97 Mon Sep 17 00:00:00 2001 From: rahmagustin Date: Sat, 7 Mar 2026 21:53:32 +0700 Subject: [PATCH] add information --- .../Controllers/Admin/BeritaController.php | 90 -------- .../Controllers/Admin/InformasiController.php | 120 ++++++++++ .../Admin/PengumumanController.php | 82 ------- app/Http/Controllers/BeritaController.php | 37 ++-- app/Http/Controllers/IndexController.php | 22 +- app/Http/Controllers/PengumumanController.php | 29 ++- app/Models/Berita.php | 28 --- app/Models/Informasi.php | 22 ++ ..._add_kepanjangan_to_kategori_tps_table.php | 25 --- ...63713_update_berita_table_to_informasi.php | 46 ++++ ...026_03_07_063935_drop_pengumuman_table.php | 17 ++ ...07_064318_rename_field_informasi_table.php | 32 +++ resources/views/admin/berita/create.blade.php | 89 -------- resources/views/admin/berita/edit.blade.php | 103 --------- resources/views/admin/berita/index.blade.php | 128 ----------- .../views/admin/informasi/create.blade.php | 100 +++++++++ .../views/admin/informasi/edit.blade.php | 131 +++++++++++ .../views/admin/informasi/index.blade.php | 151 +++++++++++++ .../views/admin/pengumuman/create.blade.php | 89 -------- .../views/admin/pengumuman/edit.blade.php | 103 --------- .../views/admin/pengumuman/index.blade.php | 128 ----------- resources/views/admin/template.blade.php | 10 +- resources/views/admin/tps/index.blade.php | 117 +++++----- resources/views/user/berita.blade.php | 46 ++-- resources/views/user/detail-berita.blade.php | 73 ++++--- .../views/user/detail-pengumuman.blade.php | 30 +-- resources/views/user/detail-tps.blade.php | 10 +- resources/views/user/index.blade.php | 205 +++++++++++++++++- resources/views/user/pengumuman.blade.php | 16 +- routes/web.php | 6 +- 30 files changed, 1055 insertions(+), 1030 deletions(-) delete mode 100644 app/Http/Controllers/Admin/BeritaController.php create mode 100644 app/Http/Controllers/Admin/InformasiController.php delete mode 100644 app/Http/Controllers/Admin/PengumumanController.php delete mode 100644 app/Models/Berita.php create mode 100644 app/Models/Informasi.php delete mode 100644 database/migrations/2026_03_04_143406_add_kepanjangan_to_kategori_tps_table.php create mode 100644 database/migrations/2026_03_07_063713_update_berita_table_to_informasi.php create mode 100644 database/migrations/2026_03_07_063935_drop_pengumuman_table.php create mode 100644 database/migrations/2026_03_07_064318_rename_field_informasi_table.php delete mode 100644 resources/views/admin/berita/create.blade.php delete mode 100644 resources/views/admin/berita/edit.blade.php delete mode 100644 resources/views/admin/berita/index.blade.php create mode 100644 resources/views/admin/informasi/create.blade.php create mode 100644 resources/views/admin/informasi/edit.blade.php create mode 100644 resources/views/admin/informasi/index.blade.php delete mode 100644 resources/views/admin/pengumuman/create.blade.php delete mode 100644 resources/views/admin/pengumuman/edit.blade.php delete mode 100644 resources/views/admin/pengumuman/index.blade.php diff --git a/app/Http/Controllers/Admin/BeritaController.php b/app/Http/Controllers/Admin/BeritaController.php deleted file mode 100644 index cc69cc1..0000000 --- a/app/Http/Controllers/Admin/BeritaController.php +++ /dev/null @@ -1,90 +0,0 @@ -get(); - return view('admin.berita.index', compact('berita')); - } - - // Form tambah berita - public function create() - { - return view('admin.berita.create'); - } - - // Simpan berita baru - public function store(Request $request) - { - $validator = Validator::make($request->all(), [ - 'judul_berita' => 'required|string|max:255', - 'isi_berita' => 'required|string', - 'tanggal_berita' => 'required|date', - 'gambar_berita' => 'nullable|image|mimes:jpeg,png,jpg,gif|max:2048', - ]); - - if ($validator->fails()) return redirect()->back()->withErrors($validator)->withInput(); - - $data = $request->only('judul_berita','isi_berita','tanggal_berita'); - - if ($request->hasFile('gambar_berita')) { - $data['gambar_berita'] = $request->file('gambar_berita')->store('berita', 'public'); - } - - Berita::create($data); - - return redirect()->route('admin.berita.index')->with('success','Berita berhasil ditambahkan.'); - } - - // Form edit berita - public function edit($id_berita) - { - $berita = Berita::findOrFail($id_berita); - return view('admin.berita.edit', compact('berita')); - } - - // Update berita - public function update(Request $request, $id_berita) - { - $berita = Berita::findOrFail($id_berita); - - $validator = Validator::make($request->all(), [ - 'judul_berita' => 'required|string|max:255', - 'isi_berita' => 'required|string', - 'tanggal_berita' => 'required|date', - 'gambar_berita' => 'nullable|image|mimes:jpeg,png,jpg,gif|max:2048', - ]); - - if ($validator->fails()) return redirect()->back()->withErrors($validator)->withInput(); - - $data = $request->only('judul_berita','isi_berita','tanggal_berita'); - - if ($request->hasFile('gambar_berita')) { - if ($berita->gambar_berita) Storage::disk('public')->delete($berita->gambar_berita); - $data['gambar_berita'] = $request->file('gambar_berita')->store('berita','public'); - } - - $berita->update($data); - - return redirect()->route('admin.berita.index')->with('success','Berita berhasil diperbarui.'); - } - - // Hapus berita - public function destroy($id_berita) - { - $berita = Berita::findOrFail($id_berita); - if ($berita->gambar_berita) Storage::disk('public')->delete($berita->gambar_berita); - $berita->delete(); - return redirect()->route('admin.berita.index')->with('success','Berita berhasil dihapus.'); - } -} diff --git a/app/Http/Controllers/Admin/InformasiController.php b/app/Http/Controllers/Admin/InformasiController.php new file mode 100644 index 0000000..8817d44 --- /dev/null +++ b/app/Http/Controllers/Admin/InformasiController.php @@ -0,0 +1,120 @@ +get(); + return view('admin.informasi.index', compact('informasi')); + } + + // Form tambah informasi + public function create() + { + return view('admin.informasi.create'); + } + + // Simpan informasi baru + public function store(Request $request) + { + $validator = Validator::make($request->all(), [ + 'kategori_informasi' => 'required|in:berita,pengumuman', + 'judul_informasi' => 'required|string|max:255', + 'isi_informasi' => 'required|string', + 'tanggal_informasi' => 'required|date', + 'gambar_informasi' => 'nullable|image|mimes:jpeg,png,jpg,gif|max:2048', + ]); + + if ($validator->fails()) { + return redirect()->back()->withErrors($validator)->withInput(); + } + + $data = $request->only( + 'kategori_informasi', + 'judul_informasi', + 'isi_informasi', + 'tanggal_informasi' + ); + + if ($request->hasFile('gambar_informasi')) { + $data['gambar_informasi'] = $request->file('gambar_informasi') + ->store('informasi', 'public'); + } + + Informasi::create($data); + + return redirect()->route('admin.informasi.index') + ->with('success','Informasi berhasil ditambahkan.'); + } + + // Form edit informasi + public function edit($id_informasi) + { + $informasi = Informasi::findOrFail($id_informasi); + return view('admin.informasi.edit', compact('informasi')); + } + + // Update informasi + public function update(Request $request, $id_informasi) + { + $informasi = Informasi::findOrFail($id_informasi); + + $validator = Validator::make($request->all(), [ + 'kategori_informasi' => 'required|in:berita,pengumuman', + 'judul_informasi' => 'required|string|max:255', + 'isi_informasi' => 'required|string', + 'tanggal_informasi' => 'required|date', + 'gambar_informasi' => 'nullable|image|mimes:jpeg,png,jpg,gif|max:2048', + ]); + + if ($validator->fails()) { + return redirect()->back()->withErrors($validator)->withInput(); + } + + $data = $request->only( + 'kategori_informasi', + 'judul_informasi', + 'isi_informasi', + 'tanggal_informasi' + ); + + if ($request->hasFile('gambar_informasi')) { + + if ($informasi->gambar_informasi) { + Storage::disk('public')->delete($informasi->gambar_informasi); + } + + $data['gambar_informasi'] = $request->file('gambar_informasi') + ->store('informasi','public'); + } + + $informasi->update($data); + + return redirect()->route('admin.informasi.index') + ->with('success','Informasi berhasil diperbarui.'); + } + + // Hapus informasi + public function destroy($id_informasi) + { + $informasi = Informasi::findOrFail($id_informasi); + + if ($informasi->gambar_informasi) { + Storage::disk('public')->delete($informasi->gambar_informasi); + } + + $informasi->delete(); + + return redirect()->route('admin.informasi.index') + ->with('success','Informasi berhasil dihapus.'); + } +} diff --git a/app/Http/Controllers/Admin/PengumumanController.php b/app/Http/Controllers/Admin/PengumumanController.php deleted file mode 100644 index c065303..0000000 --- a/app/Http/Controllers/Admin/PengumumanController.php +++ /dev/null @@ -1,82 +0,0 @@ -get(); - return view('admin.pengumuman.index', compact('pengumuman')); - } - - public function create() - { - return view('admin.pengumuman.create'); - } - - public function store(Request $request) - { - $validator = Validator::make($request->all(), [ - 'judul_pengumuman' => 'required|string|max:255', - 'isi_pengumuman' => 'required|string', - 'tanggal_pengumuman' => 'required|date', - 'gambar_pengumuman' => 'nullable|image|mimes:jpeg,png,jpg,gif|max:2048', - ]); - - if ($validator->fails()) return redirect()->back()->withErrors($validator)->withInput(); - - $data = $request->only('judul_pengumuman','isi_pengumuman','tanggal_pengumuman'); - - if ($request->hasFile('gambar_pengumuman')) { - $data['gambar_pengumuman'] = $request->file('gambar_pengumuman')->store('pengumuman', 'public'); - } - - Pengumuman::create($data); - return redirect()->route('admin.pengumuman.index')->with('success','Pengumuman berhasil ditambahkan.'); - } - - public function edit($id_pengumuman) - { - $pengumuman = Pengumuman::findOrFail($id_pengumuman); - return view('admin.pengumuman.edit', compact('pengumuman')); - } - - public function update(Request $request, $id_pengumuman) - { - $pengumuman = Pengumuman::findOrFail($id_pengumuman); - - $validator = Validator::make($request->all(), [ - 'judul_pengumuman' => 'required|string|max:255', - 'isi_pengumuman' => 'required|string', - 'tanggal_pengumuman' => 'required|date', - 'gambar_pengumuman' => 'nullable|image|mimes:jpeg,png,jpg,gif|max:2048', - ]); - - if ($validator->fails()) return redirect()->back()->withErrors($validator)->withInput(); - - $data = $request->only('judul_pengumuman','isi_pengumuman','tanggal_pengumuman'); - - if ($request->hasFile('gambar_pengumuman')) { - if ($pengumuman->gambar_pengumuman) Storage::disk('public')->delete($pengumuman->gambar_pengumuman); - $data['gambar_pengumuman'] = $request->file('gambar_pengumuman')->store('pengumuman','public'); - } - - $pengumuman->update($data); - return redirect()->route('admin.pengumuman.index')->with('success','Pengumuman berhasil diperbarui.'); - } - - public function destroy($id_pengumuman) - { - $pengumuman = Pengumuman::findOrFail($id_pengumuman); - if ($pengumuman->gambar_pengumuman) Storage::disk('public')->delete($pengumuman->gambar_pengumuman); - $pengumuman->delete(); - return redirect()->route('admin.pengumuman.index')->with('success','Pengumuman berhasil dihapus.'); - } -} diff --git a/app/Http/Controllers/BeritaController.php b/app/Http/Controllers/BeritaController.php index 85efc26..ae85848 100644 --- a/app/Http/Controllers/BeritaController.php +++ b/app/Http/Controllers/BeritaController.php @@ -4,46 +4,55 @@ use App\Http\Controllers\Controller; use Illuminate\Http\Request; -use App\Models\Berita; +use App\Models\Informasi; use Carbon\Carbon; class BeritaController extends Controller { + /** - * Tampilkan semua berita. + * Tampilkan semua berita */ public function index() { - // Ambil semua berita terbaru, urut dari tanggal terbaru - $berita = Berita::orderBy('tanggal_berita', 'desc')->paginate(6); // Pagination 6 per halaman + $berita = Informasi::where('kategori_informasi', 'berita') + ->orderBy('tanggal_informasi', 'desc') + ->paginate(6); return view('user.berita', compact('berita')); } + /** - * Tampilkan detail berita. + * Detail berita */ public function show($id) { - // Ambil berita berdasarkan ID - $berita = Berita::findOrFail($id); + $berita = Informasi::where('kategori_informasi', 'berita') + ->where('id_informasi', $id) + ->firstOrFail(); - // Ambil 5 berita terbaru selain yang sedang dibuka - $recentBerita = Berita::where('id_berita', '!=', $id) - ->orderBy('tanggal_berita', 'desc') - ->limit(5) - ->get(); + $recentBerita = Informasi::where('kategori_informasi', 'berita') + ->where('id_informasi', '!=', $id) + ->orderBy('tanggal_informasi', 'desc') + ->limit(5) + ->get(); return view('user.detail-berita', compact('berita', 'recentBerita')); } + /** - * Ambil 3 berita terbaru untuk slider di hero section + * Berita untuk hero slider */ public function hero() { - $beritaHero = Berita::orderBy('tanggal_berita', 'desc')->take(3)->get(); + $beritaHero = Informasi::where('kategori_informasi', 'berita') + ->orderBy('tanggal_informasi', 'desc') + ->take(3) + ->get(); return view('user.index', compact('beritaHero')); } + } diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php index c0a3ee6..6031de5 100644 --- a/app/Http/Controllers/IndexController.php +++ b/app/Http/Controllers/IndexController.php @@ -12,12 +12,22 @@ class IndexController extends Controller public function index() { $sampah = Sampah::orderBy('tahun', 'desc')->first(); - $kategoriTps = KategoriTps::orderBy('id_kategori_tps')->get(); - $lokasiTps = LokasiTps::all(); - $jumlahTps = LokasiTps::where('kategori_tps_id', '1')->count(); - $jumlahTps3r = LokasiTps::where('kategori_tps_id', '2')->count(); - $jumlahTpa = LokasiTps::where('kategori_tps_id', '3')->count(); - return view('user.index', compact('sampah', 'kategoriTps', 'lokasiTps', 'jumlahTps', 'jumlahTps3r', 'jumlahTpa')); + $kategoriTps = KategoriTps::orderBy('id_kategori_tps')->get(); + + $tps = LokasiTps::all(); // disamakan dengan yang dipakai di view + + $jumlahTps = LokasiTps::where('kategori_tps_id', 1)->count(); + $jumlahTps3r = LokasiTps::where('kategori_tps_id', 2)->count(); + $jumlahTpa = LokasiTps::where('kategori_tps_id', 3)->count(); + + return view('user.index', compact( + 'sampah', + 'kategoriTps', + 'tps', + 'jumlahTps', + 'jumlahTps3r', + 'jumlahTpa' + )); } } diff --git a/app/Http/Controllers/PengumumanController.php b/app/Http/Controllers/PengumumanController.php index e1a506d..60487ea 100644 --- a/app/Http/Controllers/PengumumanController.php +++ b/app/Http/Controllers/PengumumanController.php @@ -4,7 +4,7 @@ use App\Http\Controllers\Controller; use Illuminate\Http\Request; -use App\Models\Pengumuman; +use App\Models\Informasi; use Carbon\Carbon; class PengumumanController extends Controller @@ -12,28 +12,39 @@ class PengumumanController extends Controller public function index() { - $pengumuman = Pengumuman::orderBy('tanggal_pengumuman', 'desc')->paginate(6); // Pagination 6 per halaman + $pengumuman = Informasi::where('kategori_informasi','pengumuman') + ->orderBy('tanggal_informasi','desc') + ->paginate(6); return view('user.pengumuman', compact('pengumuman')); } + public function show($id) { + $pengumuman = Informasi::where('kategori_informasi','pengumuman') + ->where('id_informasi',$id) + ->firstOrFail(); - $pengumuman = Pengumuman::findOrFail($id); - $recentPengumuman = Pengumuman::where('id_pengumuman', '!=', $id) - ->orderBy('tanggal_pengumuman', 'desc') - ->limit(5) - ->get(); + $recentPengumuman = Informasi::where('kategori_informasi','pengumuman') + ->where('id_informasi','!=',$id) + ->orderBy('tanggal_informasi','desc') + ->limit(5) + ->get(); - return view('user.detail-pengumuman', compact('pengumuman', 'recentPengumuman')); + return view('user.detail-pengumuman', compact('pengumuman','recentPengumuman')); } + public function hero() { - $pengumumanHero = Pengumuman::orderBy('tanggal_pengumuman', 'desc')->take(3)->get(); + $pengumumanHero = Informasi::where('kategori_informasi','pengumuman') + ->orderBy('tanggal_informasi','desc') + ->take(3) + ->get(); return view('user.index', compact('pengumumanHero')); } + } diff --git a/app/Models/Berita.php b/app/Models/Berita.php deleted file mode 100644 index 0de45bd..0000000 --- a/app/Models/Berita.php +++ /dev/null @@ -1,28 +0,0 @@ -string('kepanjangan_kategori')->after('nama_kategori'); - }); - } - - public function down() - { - Schema::table('kategori_tps', function (Blueprint $table) { - $table->dropColumn('kepanjangan_kategori'); - }); - } -}; diff --git a/database/migrations/2026_03_07_063713_update_berita_table_to_informasi.php b/database/migrations/2026_03_07_063713_update_berita_table_to_informasi.php new file mode 100644 index 0000000..ea20476 --- /dev/null +++ b/database/migrations/2026_03_07_063713_update_berita_table_to_informasi.php @@ -0,0 +1,46 @@ + informasi + Schema::rename('berita', 'informasi'); + + Schema::table('informasi', function (Blueprint $table) { + + // ubah nama primary key + $table->renameColumn('id_berita', 'id_informasi'); + + // ubah nama kolom + $table->renameColumn('judul_berita', 'judul'); + $table->renameColumn('isi_berita', 'isi'); + $table->renameColumn('tanggal_berita', 'tanggal'); + $table->renameColumn('gambar_berita', 'gambar'); + + // tambah kategori + $table->enum('kategori', ['berita', 'pengumuman'])->after('judul'); + }); + } + + public function down() + { + Schema::rename('informasi', 'berita'); + + Schema::table('berita', function (Blueprint $table) { + + $table->renameColumn('id_informasi', 'id_berita'); + + $table->renameColumn('judul', 'judul_berita'); + $table->renameColumn('isi', 'isi_berita'); + $table->renameColumn('tanggal', 'tanggal_berita'); + $table->renameColumn('gambar', 'gambar_berita'); + + $table->dropColumn('kategori'); + }); + } +}; diff --git a/database/migrations/2026_03_07_063935_drop_pengumuman_table.php b/database/migrations/2026_03_07_063935_drop_pengumuman_table.php new file mode 100644 index 0000000..65cf18c --- /dev/null +++ b/database/migrations/2026_03_07_063935_drop_pengumuman_table.php @@ -0,0 +1,17 @@ +renameColumn('kategori', 'kategori_informasi'); + $table->renameColumn('judul', 'judul_informasi'); + $table->renameColumn('isi', 'isi_informasi'); + $table->renameColumn('tanggal', 'tanggal_informasi'); + $table->renameColumn('gambar', 'gambar_informasi'); + }); + } + + public function down() + { + Schema::table('informasi', function (Blueprint $table) { + + $table->renameColumn('kategori_informasi', 'kategori'); + $table->renameColumn('judul_informasi', 'judul'); + $table->renameColumn('isi_informasi', 'isi'); + $table->renameColumn('tanggal_informasi', 'tanggal'); + $table->renameColumn('gambar_informasi', 'gambar'); + }); + } +}; diff --git a/resources/views/admin/berita/create.blade.php b/resources/views/admin/berita/create.blade.php deleted file mode 100644 index 3f4a4a7..0000000 --- a/resources/views/admin/berita/create.blade.php +++ /dev/null @@ -1,89 +0,0 @@ -@extends('admin.template') - -@section('title', 'Tambah Berita') - -@section('content') -
-
-
-
-
- -

Tambah Berita

-

Form tambah data berita

- -
- @csrf - - {{-- JUDUL BERITA --}} -
- - - @error('judul_berita') - {{ $message }} - @enderror -
- - {{-- TANGGAL BERITA --}} -
- - - @error('tanggal_berita') - {{ $message }} - @enderror -
- - {{-- ISI BERITA --}} -
- - - @error('isi_berita') - {{ $message }} - @enderror -
- - {{-- GAMBAR BERITA --}} -
- - - -
- - - - -
- - @error('gambar_berita') - {{ $message }} - @enderror -
- - - Batal -
- -
-
-
-
-
-@endsection diff --git a/resources/views/admin/berita/edit.blade.php b/resources/views/admin/berita/edit.blade.php deleted file mode 100644 index 7d67206..0000000 --- a/resources/views/admin/berita/edit.blade.php +++ /dev/null @@ -1,103 +0,0 @@ -@extends('admin.template') - -@section('title', 'Edit Berita') - -@section('content') -
-
-
-
-
- -

Edit Berita

-

Form edit data berita

- -
- @csrf - @method('PUT') - - {{-- JUDUL BERITA --}} -
- - - @error('judul_berita') - {{ $message }} - @enderror -
- - {{-- TANGGAL BERITA --}} -
- - - @error('tanggal_berita') - {{ $message }} - @enderror -
- - {{-- ISI BERITA --}} -
- - - @error('isi_berita') - {{ $message }} - @enderror -
- - {{-- GAMBAR BERITA --}} -
- - - -
- - - - -
- - @error('gambar_berita') - {{ $message }} - @enderror - - {{-- PREVIEW GAMBAR LAMA --}} - @if ($berita->gambar_berita) -
- -
- @endif -
- - - Batal -
- -
-
-
-
-
-@endsection diff --git a/resources/views/admin/berita/index.blade.php b/resources/views/admin/berita/index.blade.php deleted file mode 100644 index 95ba16d..0000000 --- a/resources/views/admin/berita/index.blade.php +++ /dev/null @@ -1,128 +0,0 @@ -@extends('admin.template') - -@section('title', 'Data Berita') - -@section('content') - - -
-
-
-
-
-
-
-

Data Berita

-

- Daftar semua berita yang tersedia -

-
- - Tambah - -
- -
- - - - - - - - - - - - @foreach ($berita as $item) - - - - - - - - @endforeach - -
JudulGambarIsiTanggalAksi
{{ $item->judul_berita }} - @if ($item->gambar_berita) - Gambar Berita - @else - - - @endif - -
- {{ Str::limit($item->isi_berita, 150, '...') }} -
- 		{{ \Carbon\Carbon::parse($item->tanggal_berita)->format('d M Y') }} - - - -
- @csrf - @method('DELETE') - -
-
-
- -
-
-
-
-
- - - -@if (session('success')) - -@endif -@endsection diff --git a/resources/views/admin/informasi/create.blade.php b/resources/views/admin/informasi/create.blade.php new file mode 100644 index 0000000..68dbc20 --- /dev/null +++ b/resources/views/admin/informasi/create.blade.php @@ -0,0 +1,100 @@ +@extends('admin.template') + +@section('title', 'Tambah Informasi') + +@section('content') + +
+
+
+
+
+

Tambah Informasi

+

Form tambah data informasi

+ +
+ @csrf + + {{-- KATEGORI INFORMASI --}} +
+ + + + @error('kategori_informasi') + {{ $message }} + @enderror +
+ + {{-- JUDUL INFORMASI --}} +
+ + + + @error('judul_informasi') + {{ $message }} + @enderror +
+ + {{-- TANGGAL INFORMASI --}} +
+ + + + @error('tanggal_informasi') + {{ $message }} + @enderror +
+ + {{-- ISI INFORMASI --}} +
+ + + + @error('isi_informasi') + {{ $message }} + @enderror +
+ + {{-- GAMBAR INFORMASI --}} +
+ + + +
+ + + + +
+ + @error('gambar_informasi') + {{ $message }} + @enderror +
+ + + Batal +
+ +
+
+
+
+
+@endsection diff --git a/resources/views/admin/informasi/edit.blade.php b/resources/views/admin/informasi/edit.blade.php new file mode 100644 index 0000000..3263250 --- /dev/null +++ b/resources/views/admin/informasi/edit.blade.php @@ -0,0 +1,131 @@ +@extends('admin.template') + +@section('title', 'Edit Informasi') + +@section('content') + +
+
+
+
+
+

Edit Informasi

+

Form edit data informasi

+ +
+ @csrf + @method('PUT') + + {{-- KATEGORI INFORMASI --}} +
+ + + + @error('kategori_informasi') + {{ $message }} + @enderror +
+ + {{-- JUDUL INFORMASI --}} +
+ + + + @error('judul_informasi') + {{ $message }} + @enderror +
+ + {{-- TANGGAL INFORMASI --}} +
+ + + + @error('tanggal_informasi') + {{ $message }} + @enderror +
+ + {{-- ISI INFORMASI --}} +
+ + + + @error('isi_informasi') + {{ $message }} + @enderror +
+ + {{-- GAMBAR INFORMASI --}} +
+ + + +
+ + + + +
+ + @error('gambar_informasi') + {{ $message }} + @enderror + + {{-- PREVIEW GAMBAR LAMA --}} + @if ($informasi->gambar_informasi) +
+ +
+ @endif +
+ + + Batal + +
+ +
+
+
+
+ +
+@endsection diff --git a/resources/views/admin/informasi/index.blade.php b/resources/views/admin/informasi/index.blade.php new file mode 100644 index 0000000..85d44af --- /dev/null +++ b/resources/views/admin/informasi/index.blade.php @@ -0,0 +1,151 @@ +@extends('admin.template') + +@section('title', 'Data Informasi') + +@section('content') + + + +
+
+
+
+
+
+
+

Data Informasi

+

+ Daftar semua berita dan pengumuman +

+
+ + + Tambah + +
+ +
+ + + + + + + + + + + + + @foreach ($informasi as $item) + + + + + + + + + + + + + + + + @endforeach + + +
KategoriJudulGambarTanggalAksi
+ @if ($item->kategori_informasi == 'berita') + + @elseif ($item->kategori_informasi == 'pengumuman') + + @endif + {{ $item->judul_informasi }} + @if ($item->gambar_informasi) + Gambar Informasi + @else + - + @endif + + {{ \Carbon\Carbon::parse($item->tanggal_informasi)->format('d-m-Y') }} + + + + + + +
+ @csrf + @method('DELETE') + + +
+ +
+
+ +
+
+
+
+
+ + + + @if (session('success')) + + @endif + +@endsection diff --git a/resources/views/admin/pengumuman/create.blade.php b/resources/views/admin/pengumuman/create.blade.php deleted file mode 100644 index d987494..0000000 --- a/resources/views/admin/pengumuman/create.blade.php +++ /dev/null @@ -1,89 +0,0 @@ -@extends('admin.template') - -@section('title', 'Tambah Pengumuman') - -@section('content') -
-
-
-
-
- -

Tambah Pengumuman

-

Form tambah data pengumuman

- -
- @csrf - - {{-- JUDUL PENGUMUMAN --}} -
- - - @error('judul_pengumuman') - {{ $message }} - @enderror -
- - {{-- TANGGAL PENGUMUMAN --}} -
- - - @error('tanggal_pengumuman') - {{ $message }} - @enderror -
- - {{-- ISI PENGUMUMAN --}} -
- - - @error('isi_pengumuman') - {{ $message }} - @enderror -
- - {{-- GAMBAR PENGUMUMAN --}} -
- - - -
- - - - -
- - @error('gambar_pengumuman') - {{ $message }} - @enderror -
- - - Batal -
- -
-
-
-
-
-@endsection diff --git a/resources/views/admin/pengumuman/edit.blade.php b/resources/views/admin/pengumuman/edit.blade.php deleted file mode 100644 index 2a7b50a..0000000 --- a/resources/views/admin/pengumuman/edit.blade.php +++ /dev/null @@ -1,103 +0,0 @@ -@extends('admin.template') - -@section('title', 'Edit Pengumuman') - -@section('content') -
-
-
-
-
- -

Edit Pengumuman

-

Form edit data pengumuman

- -
- @csrf - @method('PUT') - - {{-- JUDUL PENGUMUMAN --}} -
- - - @error('judul_pengumuman') - {{ $message }} - @enderror -
- - {{-- TANGGAL PENGUMUMAN --}} -
- - - @error('tanggal_pengumuman') - {{ $message }} - @enderror -
- - {{-- ISI PENGUMUMAN --}} -
- - - @error('isi_pengumuman') - {{ $message }} - @enderror -
- - {{-- GAMBAR PENGUMUMAN --}} -
- - - -
- - - - -
- - @error('gambar_pengumuman') - {{ $message }} - @enderror - - {{-- PREVIEW GAMBAR LAMA --}} - @if ($pengumuman->gambar_pengumuman) -
- -
- @endif -
- - - Batal -
- -
-
-
-
-
-@endsection diff --git a/resources/views/admin/pengumuman/index.blade.php b/resources/views/admin/pengumuman/index.blade.php deleted file mode 100644 index 14bf998..0000000 --- a/resources/views/admin/pengumuman/index.blade.php +++ /dev/null @@ -1,128 +0,0 @@ -@extends('admin.template') - -@section('title', 'Data Pengumuman') - -@section('content') - - -
-
-
-
-
-
-
-

Data Pengumuman

-

- Daftar semua pengumuman yang tersedia -

-
- - Tambah - -
- -
- - - - - - - - - - - - @foreach ($pengumuman as $item) - - - - - - - - @endforeach - -
JudulGambarIsiTanggalAksi
{{ $item->judul_pengumuman }} - @if ($item->gambar_pengumuman) - Gambar Pengumuman - @else - - - @endif - -
- {{ Str::limit($item->isi_pengumuman, 150, '...') }} -
- 		{{ \Carbon\Carbon::parse($item->tanggal_pengumuman)->format('d M Y') }} - - - -
- @csrf - @method('DELETE') - -
-
-
- -
-
-
-
-
- - - -@if (session('success')) - -@endif -@endsection diff --git a/resources/views/admin/template.blade.php b/resources/views/admin/template.blade.php index d2c00a8..059eeba 100644 --- a/resources/views/admin/template.blade.php +++ b/resources/views/admin/template.blade.php @@ -119,18 +119,18 @@ Kelola Aduan -
  • - +
  • + - Kelola Berita + Kelola Informasi
    • -
  • + {{--
  • Kelola Pengumuman -
    • + --}} diff --git a/resources/views/admin/tps/index.blade.php b/resources/views/admin/tps/index.blade.php index f4a9cbc..2675edf 100644 --- a/resources/views/admin/tps/index.blade.php +++ b/resources/views/admin/tps/index.blade.php @@ -22,68 +22,69 @@
    - - - - - - - - - - - - @forelse ($tps as $item) - - - - + + + + + + + + + + @forelse ($tps as $item) + + + + - - - - @empty - - - - @endforelse - -
    Nama TPSKategoriFotoStatusAksi
    {{ $item->nama_tps }} - {{ $item->kategori->nama_kategori ?? '-' }} - - @if ($item->foto_tps) - Foto TPS +
    Nama TPSKategoriFotoStatusAksi
    {{ $item->nama_tps }} + {{ $item->kategori->nama_kategori ?? '-' }} + + @if ($item->foto_tps) + Foto TPS - @else - - - @endif - - @if ($item->status_tps == 'Aktif') - - @elseif ($item->status_tps == 'Tidak Aktif') - - @else - - @endif - - - - -
    - @csrf - @method('DELETE') - -
    -
    - Data TPS belum tersedia -
    + @else + - + @endif + + + @if ($item->status_tps == 'Aktif') + + @elseif ($item->status_tps == 'Tidak Aktif') + + @else + + @endif + + + + + +
    + @csrf + @method('DELETE') + +
    + + + @empty + + + Data TPS belum tersedia + + + @endforelse + +
    diff --git a/resources/views/user/berita.blade.php b/resources/views/user/berita.blade.php index c58210c..3d47703 100644 --- a/resources/views/user/berita.blade.php +++ b/resources/views/user/berita.blade.php @@ -7,6 +7,7 @@

    Berita

    +
    -
    + + -
    @@ -26,43 +27,60 @@
    - @if ($item->gambar_berita) - {{ $item->judul_berita }} + + @if ($item->gambar_informasi) + {{ $item->judul_informasi }} @else - default + default @endif +
    +

    -

    +

    - - {{ Str::limit($item->judul_berita, 30) }} + + {{ Str::limit($item->judul_informasi, 40) }}

    +
    +

    - {{ Str::limit(strip_tags($item->isi_berita), 120, '...') }} + {{ Str::limit(strip_tags($item->isi_informasi), 120, '...') }}

    +
    -
    +
    + @empty -

    Belum ada berita tersedia.

    + +
    +

    Belum ada berita tersedia.

    +
    @endforelse + +
    + {{ $berita->links() }} +
    + + -
    + @endsection diff --git a/resources/views/user/detail-berita.blade.php b/resources/views/user/detail-berita.blade.php index 7dc909e..a8b4929 100644 --- a/resources/views/user/detail-berita.blade.php +++ b/resources/views/user/detail-berita.blade.php @@ -1,12 +1,13 @@ @extends('user.template') -@section('title', $berita->judul_berita) +@section('title', $berita->judul_informasi) @section('content')

    Detail Berita

    +
    -
    + +
    -
    - @if ($berita->gambar_berita) - {{ $berita->judul_berita }} + + @if ($berita->gambar_informasi) + {{ $berita->judul_informasi }} @else - default + default @endif +
    -

    {{ $berita->judul_berita }}

    + +

    + {{ $berita->judul_informasi }} +

    +
      +
    • {{ $berita->author ?? 'Admin' }}
      • +
    • -
    -
    +
    +
    - {!! $berita->isi_berita !!} -
    + {!! $berita->isi_informasi !!} +
    - +
    +
    - - +
    +

    Berita Lainnya

    @foreach ($recentBerita as $recent)
    - @if ($recent->gambar_berita) - {{ $recent->judul_berita }} + + @if ($recent->gambar_informasi) + {{ $recent->judul_informasi }} @else - default + @endif + +
    +

    - - {{ Str::limit($recent->judul_berita, 50) }} + + {{ Str::limit($recent->judul_informasi, 50) }}

    -
    +
    @endforeach -
    +
    +
    - + diff --git a/resources/views/user/detail-pengumuman.blade.php b/resources/views/user/detail-pengumuman.blade.php index b05f3f1..849accc 100644 --- a/resources/views/user/detail-pengumuman.blade.php +++ b/resources/views/user/detail-pengumuman.blade.php @@ -1,6 +1,6 @@ @extends('user.template') -@section('title', $pengumuman->judul_pengumuman) +@section('title', $pengumuman->judul_informasi) @section('content') @@ -29,15 +29,15 @@
    - @if ($pengumuman->gambar_pengumuman) - {{ $pengumuman->judul_pengumuman }} + @if ($pengumuman->gambar_informasi) + {{ $pengumuman->judul_informasi }} @else default @endif
    -

    {{ $pengumuman->judul_pengumuman }}

    +

    {{ $pengumuman->judul_informasi }}

      @@ -47,8 +47,8 @@
    • -
      • @@ -56,7 +56,7 @@
    - {!! $pengumuman->isi_pengumuman !!} + {!! $pengumuman->isi_informasi !!}
    @@ -77,20 +77,20 @@ @foreach ($recentPengumuman as $recent)
    - @if ($recent->gambar_pengumuman) - {{ $recent->judul_pengumuman }} + @if ($recent->gambar_informasi) + {{ $recent->judul_informasi }} @else default @endif

    - - {{ Str::limit($recent->judul_pengumuman, 50) }} + + {{ Str::limit($recent->judul_informasi, 50) }}

    -
    diff --git a/resources/views/user/detail-tps.blade.php b/resources/views/user/detail-tps.blade.php index 7125947..8c4eef1 100644 --- a/resources/views/user/detail-tps.blade.php +++ b/resources/views/user/detail-tps.blade.php @@ -5,8 +5,8 @@ @section('content') @php - function toDMS($decimal, $type = 'lat') { - $direction = $decimal < 0 +function toDMS($decimal, $type = 'lat') { + $direction = $decimal < 0 ? ($type === 'lat' ? 'LS' : 'BB') : ($type === 'lat' ? 'LU' : 'BT'); @@ -21,9 +21,9 @@ function toDMS($decimal, $type = 'lat') { @endphp
    -
    -

    Detail TPS

    -
    + + + + + +
    +
    +
    +
    +
    + Temukan TPS terdekat dari lokasi Anda saat ini +
    + +
    + +
    +
    +
    +
    + + +
    diff --git a/resources/views/user/pengumuman.blade.php b/resources/views/user/pengumuman.blade.php index f518980..99701dc 100644 --- a/resources/views/user/pengumuman.blade.php +++ b/resources/views/user/pengumuman.blade.php @@ -26,30 +26,30 @@
    - @if ($item->gambar_pengumuman) - {{ $item->judul_pengumuman }} + @if ($item->gambar_informasi) + {{ $item->judul_informasi }} @else default @endif

    -

    - - {{ Str::limit($item->judul_pengumuman, 30) }} + + {{ Str::limit($item->judul_informasi, 30) }}

    - {{ Str::limit(strip_tags($item->isi_pengumuman), 120, '...') }} + {{ Str::limit(strip_tags($item->isi_informasi), 120, '...') }}

    diff --git a/routes/web.php b/routes/web.php index 7bb05a3..c3e5463 100644 --- a/routes/web.php +++ b/routes/web.php @@ -16,8 +16,7 @@ use App\Http\Controllers\Admin\KategoriTpsController; use App\Http\Controllers\Admin\SampahController; use App\Http\Controllers\Admin\AduanController as AdminAduanController; -use App\Http\Controllers\Admin\BeritaController as AdminBeritaController; -use App\Http\Controllers\Admin\PengumumanController as AdminPengumumanController; +use App\Http\Controllers\Admin\InformasiController; use App\Http\Controllers\Admin\ProfilController; /* @@ -79,8 +78,7 @@ Route::post('/aduan/{id}/tanggapi', [AdminAduanController::class, 'tanggapi'])->name('aduan.tanggapi'); Route::delete('/aduan/{id}', [AdminAduanController::class, 'destroy'])->name('aduan.destroy'); - Route::resource('berita', AdminBeritaController::class)->except(['show']); - Route::resource('pengumuman', AdminPengumumanController::class)->except(['show']); + Route::resource('informasi', InformasiController::class)->except(['show']); // PROFIL Route::get('/profil', [ProfilController::class, 'index'])->name('profil');