From 9314cbaaae1d781d2090c91c08c4bf703b43f25f Mon Sep 17 00:00:00 2001
From: merdiano <merdan.m@gmail.com>
Date: Sat, 14 Sep 2019 19:39:29 +0500
Subject: [PATCH] working on category page

---
 app/Http/Controllers/PublicController.php     |  6 +--
 app/Http/routes.php                           |  9 ++++-
 .../Bilettm/Partials/CinemaItem.blade.php     |  2 +-
 .../Bilettm/Partials/EventItem.blade.php      | 33 ++++++++++++----
 .../Bilettm/Partials/ItemsList.blade.php      |  2 -
 .../Bilettm/Partials/MusicalItem.blade.php    |  2 +-
 .../Bilettm/Partials/TheaterItem.blade.php    |  2 +-
 .../views/Bilettm/Public/EventsPage.blade.php | 39 +++++++++++++++++++
 routes/breadcrumbs.php                        |  2 +-
 9 files changed, 79 insertions(+), 18 deletions(-)

diff --git a/app/Http/Controllers/PublicController.php b/app/Http/Controllers/PublicController.php
index 78581b9e..28b1db08 100644
--- a/app/Http/Controllers/PublicController.php
+++ b/app/Http/Controllers/PublicController.php
@@ -42,13 +42,13 @@ class PublicController extends Controller
         ]);
     }
 
-    public function events(Request $request){
+    public function showEvents($cat_id = null,Request $request){
         $date = $request->get('date');
-        $cat_id = $request->get('category');
+        //$cat_id = $request->get('cat_id');
 
         $e_query = Event::onLive();
         $nav_query = Category::select('id','title_tm','title_ru','parent_id')
-            ->orderBy();
+            ->orderBy('lft','asc');
 
         $active_id = -1;
 
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 2ff09eb5..8ea03c7e 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -124,9 +124,14 @@ Route::group(
         /**
          * Events by category
          */
-        Route::get('/{cat_id}/{cat_slug?}', [
+        Route::get('/{cat_id?}/{cat_slug?}', [
             'as'   => 'showCategoryEventsPage',
-            'uses' => 'PublicController@showCategoryEvents',
+            'uses' => 'PublicController@showEvents',
+        ]);
+
+        Route::post('/{cat_id?}/{cat_slug?}', [
+            'as'   => 'postEventsPage',
+            'uses' => 'PublicController@showEvents',
         ]);
     });
     Route::group(['prefix' => 'e'], function () {
diff --git a/resources/views/Bilettm/Partials/CinemaItem.blade.php b/resources/views/Bilettm/Partials/CinemaItem.blade.php
index 5ceccc1b..1e60807f 100644
--- a/resources/views/Bilettm/Partials/CinemaItem.blade.php
+++ b/resources/views/Bilettm/Partials/CinemaItem.blade.php
@@ -1,7 +1,7 @@
 @if(!empty($event))
 <article class="u-block-hover">
     <div class="g-bg-cover">
-        <img class="d-flex align-items-end" src="{{$event->images->first()->image_path ?? '#'}}">
+        <img class="d-flex align-items-end" src="{{asset($event->images->first()->image_path ?? '#')}}">
     </div>
     <div class="u-block-hover__additional--partially-slide-up h-100 text-center g-z-index-1 mt-auto" style="background-image: url({{asset('assets/images/overlay/1.svg')}})">
         <div class="overlay-details">
diff --git a/resources/views/Bilettm/Partials/EventItem.blade.php b/resources/views/Bilettm/Partials/EventItem.blade.php
index 2d8d78e1..3f3da50f 100644
--- a/resources/views/Bilettm/Partials/EventItem.blade.php
+++ b/resources/views/Bilettm/Partials/EventItem.blade.php
@@ -1,7 +1,26 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: merdan
- * Date: 9/10/2019
- * Time: 18:29
- */
\ No newline at end of file
+<div class="container film">
+    <div class="row">
+        <div class="col-md-3 col-3 col-lg-3">
+            <img class="film_img" src="{{asset($event->images->first()->image_path ?? '#')}}"/>
+        </div>
+        <div class="col-md-6 col-lg-6 col-6">
+            <div class="film_op">
+                <div class="date">
+                    <img src="{{asset('assets/images/icons/eticket.svg')}}">
+                    <div class="day">
+                        <h4>{{$event->start_date->format('d.m.Y')}}</h4>
+                        <h6>{{$event->end_date->format('d.m.Y')}}</h6>
+                    </div>
+                </div>
+                <h2 class="film_name"><a href="{{$event->event_url}}">{{$event->title}}</a></h2>
+                <div id="desc">
+                    {!! Markdown::parse($event->description) !!}
+                </div>
+                <div class="buy_and_salary">
+                    <span class="cost">Цена ot: {{$event->starting_ticket_price}} TMT</span>
+                    <a class="btn btn-danger buy_button" href="{{$event->event_url}}">Купить</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/Bilettm/Partials/ItemsList.blade.php b/resources/views/Bilettm/Partials/ItemsList.blade.php
index dc557ab0..eea7837d 100644
--- a/resources/views/Bilettm/Partials/ItemsList.blade.php
+++ b/resources/views/Bilettm/Partials/ItemsList.blade.php
@@ -134,7 +134,6 @@
             </div>
         </div>
 
-
         <div class="container film">
             <div class="row">
                 <div class="col-md-3 col-3 col-lg-3">
@@ -217,7 +216,6 @@
         </div>
 
 
-
         <div class="container film">
             <div class="row">
                 <div class="col-md-9 col-lg-9 col-sm-9 col-9">
diff --git a/resources/views/Bilettm/Partials/MusicalItem.blade.php b/resources/views/Bilettm/Partials/MusicalItem.blade.php
index 2538f31d..dfcbf489 100644
--- a/resources/views/Bilettm/Partials/MusicalItem.blade.php
+++ b/resources/views/Bilettm/Partials/MusicalItem.blade.php
@@ -1,7 +1,7 @@
 <div class="col-3">
     <article class="u-block-hover">
         <div class="g-bg-cover">
-            <img class="d-flex align-items-end" src="{{$event->images->first()->image_path ?? '#'}}" style="border-radius: 5px">
+            <img class="d-flex align-items-end" src="{{asset($event->images->first()->image_path ?? '#')}}" style="border-radius: 5px">
         </div>
         <div class="u-block-hover__additional--partially-slide-up h-100 text-center g-z-index-1 mt-auto" style="background-image: url({{asset('assets/images/bg/konserty-item.png')}})">
             <div class="overlay-details smalll">
diff --git a/resources/views/Bilettm/Partials/TheaterItem.blade.php b/resources/views/Bilettm/Partials/TheaterItem.blade.php
index 24899a86..6d6df739 100644
--- a/resources/views/Bilettm/Partials/TheaterItem.blade.php
+++ b/resources/views/Bilettm/Partials/TheaterItem.blade.php
@@ -1,6 +1,6 @@
 <div class="js-slide">
     <a class="d-block" href="{{$event->event_url}}">
-        <img class="img-fluid w-100" src="{{$event->images->first()->image_path ?? '#'}}">
+        <img class="img-fluid w-100" src="{{asset($event->images->first()->image_path ?? '#')}}">
         <div class="teator-overlay">
             <div class="texts-wrapper" style="color: #ffffff">
                 <span class="">{{$event->start_date->format('H:s, d.m.Y')}}</span>
diff --git a/resources/views/Bilettm/Public/EventsPage.blade.php b/resources/views/Bilettm/Public/EventsPage.blade.php
index 8626955f..7a9bc6a1 100644
--- a/resources/views/Bilettm/Public/EventsPage.blade.php
+++ b/resources/views/Bilettm/Public/EventsPage.blade.php
@@ -1,6 +1,45 @@
 @extends('Bilettm.Layouts.BilettmLayout')
 @section('content')
+    {{\DaveJamesMiller\Breadcrumbs\Facades\Breadcrumbs::render('category',$category??null)}}
+    <!-- Films Opisanie Buttons section -->
+    <section id='cat_and_buttons'>
+        <div class="container">
+            <div class="row">
+                <div class="col-md-4 col-lg-4 col-4">
+
+                    <select id='vybor_select' >
+                        <option class="cat_op" >На этой недели</option>
+                        <option class="cat_op">Исполнители</option>
+                        <option class="cat_op">Мероприятие</option>
+                        <option class="cat_op">Концерты</option>
+                    </select>
+                </div>
+                <div class="col-md-8 col-lg-8 col-8">
+                    <div id='cat_buts'>
+                        @foreach($navigation as $nav)
+                            <a class=" btn btn-danger active_cat_but cat_but" href="{{$nav->url}}">{{$nav->title}}</a>
+                        @endforeach
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
+    <section id='opisanie_section'>
     @foreach($events as $event)
         @include('Bilettm.Partials.EventItem')
     @endforeach
+        <div class="container film">
+            <div class="row">
+                <div class="col-md-9 col-lg-9 col-sm-9 col-9">
+                    <div class="pagination_blk">
+                        <span>Видно на странице - 5/48</span>
+                        <div class="arrows_block">
+                            <a  class='arrows' id='left_arrow' href="#"><img src="{{asset('assets/images/icons/left.png')}}"></a>
+                            <a class='arrows' id='right_arrow' href="#"><img src="{{asset('assets/images/icons/right.png')}}"></a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </section>
 @endsection
\ No newline at end of file
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php
index 2a073b7d..8bae2035 100644
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -12,7 +12,7 @@ Breadcrumbs::for('home', function ($trail) {
 
 Breadcrumbs::for('category', function ($trail,$category){
     $trail->parent('home');
-    $trail->push($category->name, route('category', $category->id));
+    $trail->push($category->name ?? "Events", $category->url ?? '#');
 });
 
 Breadcrumbs::for('event',function($trail, $event){