Merge branch 'penggabung' into branch-achi

app/Http/Controllers/AudioAdminController.php

@@ -21,19 +21,19 @@ public function store(Request $request)
             'gambar_sampul' => 'required|file|image|max:2200',
             'caption' => 'required',
             'judul' => 'required',
-            'konten' => 'required|mimes:audio/mpeg,mpga,mp3,wav,aac',
+            'konten' => 'required',
         ]);
         // dump($request);
         // sampul
         $extThumb = $request->gambar_sampul->getClientOriginalExtension();
         $pathThumb = "sampul-".time().".".$extThumb;
         $pathStore = $request->gambar_sampul->move(public_path('../audioProd/thumb'), $pathThumb);
 
-        // konten audio
-        $konten = $request->file('konten');
-        $audioname = $konten->getClientOriginalName();
-        $audiopath = $konten->storeAs('konten', $audioname);
-        $pathStore = $request->konten->move(public_path('../audioProd/fileaudio'), $audiopath);
+        // // konten audio
+        // $konten = $request->file('konten');
+        // $audioname = $konten->getClientOriginalName();
+        // $audiopath = $konten->storeAs('konten', $audioname);
+        // $pathStore = $request->konten->move(public_path('../audioProd/fileaudio'), $audiopath);
 /*
         $audio_sampul = $request->audio_sampul;
         $new_audio_sampul = time() . ' - ' . $audio_sampul->getClientOriginalName();
@@ -44,7 +44,7 @@ public function store(Request $request)
         AudioAdmin::create([
             "gambar_sampul" => $pathThumb,
             "judul" => $request["judul"],
-            "konten" => $audioname,
+            "konten" => $request["konten"],
             "caption" => $request["caption"],
         ]);
 
@@ -69,9 +69,9 @@ public function edit($id) {
 
     public function update($id, Request $request) {
         $request->validate([
-            'gambar_sampul' => 'required|file|image|max:2200',
+            'gambar_sampul' => 'mimes:jpeg,jpg,png|max:2200',
             'judul' => 'required',
-            'konten' => 'nullable|audio', 
+            'konten' => 'required', 
             'caption' => 'required'
         ]);
 
@@ -93,16 +93,16 @@ public function update($id, Request $request) {
                 "text_sampul" => ["text-sampul"],
                 "judul" => $request["judul"],
                 "slug" => $request["slug"],
-                "konten" => $new_konten,
+                "konten" => $request["konten"],
                 "caption" => $request["caption"],
             ];
         } else {
             $audio_data = [
-                "gambar-sampul" => $new_picture["gambar-sampul"],
+                // "gambar-sampul" => $new_audio_sampul,
                 "text_sampul" => $request["text_sampul"],
                 "judul" => $request["judul"],
                 "slug" => $request["slug"],
-                "konten" => $new_konten,
+                "konten" => $request["konten"],
                 "caption" => $request["caption"]
             ];
         }

app/Http/Controllers/CeritaAdminController.php

@@ -0,0 +1,137 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Models\CeritaAdmin;
+use App\Models\DescriptionAdmin;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\mb_strimwidth;
+
+class CeritaAdminController extends Controller
+{
+    public function index()
+    {
+        $tulis_ceritas = CeritaAdmin::all();
+        $descriptions = DescriptionAdmin::first()->get();
+        return view('admin.tuliscerita.list', compact('tulis_ceritas', 'descriptions'));
+    }
+    public function create()
+    {
+        return view('admin.tuliscerita.add');
+    }
+    public function store(Request $request)
+    {
+        $this->validate($request,[
+            'nama' => 'required',
+            'nomor_telepon' => 'required',
+            'email' => 'required',
+            'judul' => 'required',
+            'ringkasan' => 'required',
+            'file' => 'mimes:pdf|max:2048',
+            'foto' => 'mimes:jpeg,jpg,png|max:2200'
+        ]);
+
+        $foto = $request->foto;
+        $new_foto = time() . ' - ' . $foto->getClientOriginalName();
+        $file = $request->file;
+        $new_file = time() . ' - ' . $file->getClientOriginalName();
+
+        $tulis_ceritas =new CeritaAdmin;
+        $tulis_ceritas->nama = $request->nama;
+        $tulis_ceritas->nomor_telepon =  $request->nomor_telepon;
+        $tulis_ceritas->email = $request->email;
+        $tulis_ceritas->judul = $request->judul;
+        $tulis_ceritas->ringkasan = $request->ringkasan;
+        $tulis_ceritas->foto = $new_foto;
+        $tulis_ceritas->file = $new_file;
+
+        // dd($tulis_ceritas);
+
+        $foto->move(public_path('../public/ceritaProd/sampul/'), $new_foto);  
+        $file->move(public_path('../public/ceritaProd/file/'), $new_file);        
+        $tulis_ceritas->save();
+
+        return redirect('/admin/list-tuliscerita')->with('success', 'Cerita Berhasil Ditambahkan!');
+    }
+
+    public function edit($id) {
+        $tulis_ceritas = CeritaAdmin::findOrFail($id);
+        return view('admin.tuliscerita.edit',compact('tulis_ceritas'));
+    }
+    public function update($id, Request $request) {
+        $request->validate([
+            'nama' => 'required',
+            'nomor_telepon' => 'required',
+            'email' => 'required',
+            'judul' => 'required',
+            'ringkasan' => 'required',
+            'file' => 'mimes:pdf,xlx,csv|max:2048',
+            'foto' => 'mimes:jpeg,jpg,png|max:2200',
+        ]);
+
+        $tulis_ceritas = CeritaAdmin::findorfail($id);
+        if ($request->has('foto')) {
+            File::delete("../ceritaProd/sampul/".$tulis_ceritas->foto);
+            $foto = $request->foto;
+            $new_foto = time() . ' - ' . $foto->getClientOriginalName();
+            $foto->move('ceritaProd/sampul/', $new_foto);
+            $tulis_ceritas_data = [
+                "nama" => $request["nama"],
+                "nomor_telepon" => $request["nomor_telepon"],
+                "email" => $request["email"],
+                "judul" => $request["judul"],
+                "ringkasan" => $request["ringkasan"],
+                "foto" => $new_foto,
+            ];
+        } elseif ($request->has('file')){
+            File::delete("../ceritaProd/file/".$tulis_ceritas->file);
+            $file = $request->file;
+            $new_file = time() . ' - ' . $file->getClientOriginalName();
+            $file->move('ceritaProd/file/', $new_file);
+            $tulis_ceritas_data = [
+                "nama" => $request["nama"],
+                "nomor_telepon" => $request["nomor_telepon"],
+                "email" => $request["email"],
+                "judul" => $request["judul"],
+                "ringkasan" => $request["ringkasan"],
+                "file" => $new_file,
+            ];
+        } else {
+            $tulis_ceritas_data = [
+                "nama" => $request["nama"],
+                "nomor_telepon" => $request["nomor_telepon"],
+                "email" => $request["email"],
+                "judul" => $request["judul"],
+                "ringkasan" => $request["ringkasan"],
+            ];
+        }
+
+        $tulis_ceritas->update($tulis_ceritas_data);
+
+        return redirect('/admin/list-tuliscerita')->with('success', 'Cerita Berhasil Diedit!');
+    }
+    public function destroy($id) {
+        $submission = DB::table('tulis_ceritas')->where('id', $id)->delete($id);
+        return redirect('/admin/list-tuliscerita')->with('success', 'Submission successfully deleted!');
+    }
+    public function edit_desc($id)
+    {
+        $descriptions = DescriptionAdmin::findOrFail($id);
+        return view('admin.tuliscerita.editdesc', compact('descriptions'));
+    }
+    public function update_desc($id, Request $request)
+    {
+        $request->validate([
+            'desc_tuliscerita' => 'required',
+        ]);
+
+
+        $descriptions = DescriptionAdmin::findOrFail($id);
+        $descriptions_data = ["desc_tuliscerita" => $request["desc_tuliscerita"]];
+        $descriptions->update($descriptions_data);
+
+        return redirect('/admin/list-tuliscerita')->with('success', 'Deskripsi Berhasil Diupdate!');
+    }
+}

app/Http/Controllers/CeritaController.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Models\DescriptionAdmin;
+use App\Models\Cerita;
+use App\Models\Tulis_cerita;
+
+class CeritaController extends Controller
+{
+    //
+    public function index()
+    {
+        $tulis_ceritas = Cerita::orderBy('id', 'desc')->get();
+        $descriptions = DescriptionAdmin::first()->get();
+        return view('cerita.index', compact('tulis_ceritas', 'descriptions'));
+    }
+    public function show($id)
+    {
+            $tulis_ceritas = Tulis_cerita::where('id', $id)
+                    ->orderBy('id', 'desc')
+                    ->get();
+            // dd($tulis_ceritas);
+            return view('cerita.detail', compact('tulis_ceritas'));
+    }
+
+}

app/Http/Controllers/DataController.php

@@ -17,4 +17,8 @@ public function peta(){
     public function banksampah(){
         return view('data.banksampah');
     }
+
+    public function progressio(){
+        return view('data.progresio');
+    }
 }

app/Http/Controllers/KampungkerenAdminController.php

@@ -21,6 +21,7 @@ public function store(Request $request)
             'judul' => 'required',
             'foto' => 'required',
             'caption' => 'required',
+            'warna' => 'required',  
         ]);
 
         $files = [];
@@ -31,7 +32,8 @@ public function store(Request $request)
                 $files[] = [
                     'judul' => $request->judul,
                     'foto' => $foto,
-                    'caption' => $request->caption
+                    'caption' => $request->caption,
+                    'warna' => $request->warna,
                 ];
             }
         }

app/Http/Controllers/KampungkerenController.php

@@ -11,7 +11,7 @@ class KampungkerenController extends Controller
     public function index()
     {
         $descriptions = DescriptionAdmin::first()->get();
-        $kampungkeren = Kampungkeren::orderBy('id', 'desc')->paginate(5);
+        $kampungkeren = Kampungkeren::orderBy('id', 'desc')->paginate(6);
         return view('kampungkeren.index', compact('kampungkeren', 'descriptions'));
     }
 }

app/Http/Controllers/SearchController.php

@@ -1,12 +1,13 @@
 <?php
 
 namespace App\Http\Controllers;
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use App\Models\ArticleAdmin;
-use App\Models\AudioAdmin;
 use App\Models\FotoAdmin;
+use App\Models\AudioAdmin;
 use App\Models\VideoAdmin;
+use App\Models\CeritaAdmin;
+use App\Models\ArticleAdmin;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
 
 
 class SearchController extends Controller
@@ -15,22 +16,25 @@ public function search(Request $request)
     {
         $keyword = $request->search;
         $artikel = ArticleAdmin::where('judul', 'like', "%" . $keyword . "%")
-        ->where('status', 'published')
-        ->paginate(3)
+        ->orWhere('text_sampul', 'like', "%" . $keyword . "%")
+        ->paginate()
         // ->take(3)
         // ->get()
         ;
         $audios = AudioAdmin::where('judul', 'like', "%" . $keyword . "%")
+        ->orWhere('caption', 'like', "%" . $keyword . "%")
         ->paginate()
         // ->take(3)
         // ->get()
         ;
         $fotos = FotoAdmin::where('judul', 'like', "%" . $keyword . "%")
+        ->orWhere('caption', 'like', "%" . $keyword . "%")
         ->paginate()
         // ->take(3)
         // ->get()
         ;
         $videos = VideoAdmin::where('judul', 'like', "%" . $keyword . "%")
+        ->orWhere('caption', 'like', "%" . $keyword . "%")
         ->paginate()
         // ->take(3)
         // ->get()
@@ -41,7 +45,7 @@ public function search(Request $request)
     public function searchartikel(Request $request)
     {
         $keyword = $request->searchartikel;
-        $artikel = ArticleAdmin::where('judul', 'like', "%" . $keyword . "%")->where('status', 'published')->paginate(3);
+        $artikel = ArticleAdmin::where('judul', 'like', "%" . $keyword . "%")->paginate(3);
         return view('artikel.artikelsearch', compact('artikel'));
     }
 
@@ -65,4 +69,12 @@ public function searchvideo(Request $request)
         $videos = VideoAdmin::where('judul', 'like', "%" . $keyword . "%")->paginate(3);
         return view('video.videosearch', compact('videos'));
     }
+    public function searchcerita(Request $request)
+    {
+        $keyword = $request->searchcerita;
+        $tulis_ceritas = CeritaAdmin::where('judul', 'like', "%" . $keyword . "%")
+        ->orWhere('ringkasan', 'like', "%" . $keyword . "%")
+        ->paginate(2);
+        return view('cerita.searchcerita', compact('tulis_ceritas'))->with('i', (request()->input('page', 1) - 1) * 5);
+    }
 }