diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 3c529406..c2e3c50b 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -7,7 +7,7 @@ use App\Models\Category; use App\Models\Subscription; use App\Models\User_sub; use App\Models\UserMaterial; -use Illuminate\Support\Facades\DB; + use App\Models\Topheaderadv; use App\Models\Material; use App\Models\Order; @@ -31,12 +31,15 @@ class HomeController extends Controller */ public function index(){ - $materials = DB::table('materials')->paginate(6); + + $materials = Material::orderBy('created_at','desc') + ->paginate(6); $topheaderadvers = Topheaderadv::inRandomOrder()->get(); $topheaderadvs = $topheaderadvers[0]; $title = 'TurkmenTV'; $keywords = 'TurkmenTV'; $meta_description = 'TurkmenTV'; + return view('main')->with([ 'cat' => "", 'materials' => $materials, @@ -56,8 +59,8 @@ class HomeController extends Controller $topheaderadvs = $topheaderadvers[0]; if($cat_id != 0){ - $cat = Category::findOrFail($cat_id); - $materials = Material::paginate(6); + $cat = Category:: findOrFail($cat_id); + $materials = $cat->materials(); } else{ @@ -66,14 +69,16 @@ class HomeController extends Controller } switch ($sort){ case 'rate': - $materials = Material::orderBy('like','DESC')->paginate(6); + $materials->orderBy('like','DESC'); break; case 'date': - $materials = Material::orderBy('created_at','ASC')->paginate(6); + $materials->orderBy('created_at','ASC'); break; case 'all': - $materials = Material::orderBy('created_at','DESC')->paginate(6); + $materials->orderBy('created_at','DESC'); } + $materials = $materials->paginate(6); + //dd($materials); return view('main')->with([ 'cat' => $cat, 'materials' => $materials, diff --git a/resources/views/main.blade.php b/resources/views/main.blade.php index 2e92dc73..1c4acde6 100644 --- a/resources/views/main.blade.php +++ b/resources/views/main.blade.php @@ -25,26 +25,10 @@