From 3c5cb3a4cf11040076ad4af0aba7190d4412edc1 Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 18 Feb 2020 17:13:32 +0500 Subject: [PATCH] mobile version event detail page --- app/Http/Controllers/PublicController.php | 15 ++--- resources/lang/en/ClientSide.php | 2 +- resources/lang/ru/ClientSide.php | 2 +- resources/lang/tk/ClientSide.php | 2 +- .../Partials/FilterMenu.blade.php | 0 .../EventsList/subCategoryList.blade.php | 2 +- .../desktop/Layouts/EventsLayout.blade.php | 2 +- .../desktop/Pages/AddEventResult.blade.php | 2 +- .../mobile/Layouts/EventsLayout.blade.php | 41 ------------ .../mobile/Pages/AddEventResult.blade.php | 4 ++ .../mobile/Pages/CategoryEventsPage.blade.php | 62 +++++++++++-------- .../views/mobile/Pages/EventPage.blade.php | 60 ++++++++++++++++++ .../views/mobile/Pages/EventsPage.blade.php | 44 +++++++++++++ .../mobile/Pages/SearchResults.blade.php | 37 +++++++++++ routes/breadcrumbs.php | 4 ++ 15 files changed, 198 insertions(+), 81 deletions(-) rename resources/views/{desktop => Shared}/Partials/FilterMenu.blade.php (100%) delete mode 100644 resources/views/mobile/Layouts/EventsLayout.blade.php create mode 100644 resources/views/mobile/Pages/AddEventResult.blade.php create mode 100644 resources/views/mobile/Pages/EventPage.blade.php create mode 100644 resources/views/mobile/Pages/EventsPage.blade.php create mode 100644 resources/views/mobile/Pages/SearchResults.blade.php diff --git a/app/Http/Controllers/PublicController.php b/app/Http/Controllers/PublicController.php index 688c822b..6b1a29ae 100644 --- a/app/Http/Controllers/PublicController.php +++ b/app/Http/Controllers/PublicController.php @@ -72,8 +72,7 @@ class PublicController extends Controller }) ->get(); - - return view("desktop.Pages.EventsPage")->with($data); + return $this->render("Pages.EventsPage",$data); } public function showSubCategoryEvents($cat_id){ @@ -89,7 +88,7 @@ class PublicController extends Controller ->orderBy($order['field'],$order['order']) ->paginate(16); - return view("desktop.Pages.CategoryEventsPage")->with($data); + return $this->render("Pages.CategoryEventsPage",$data); } private function sorts_filters(){ @@ -119,12 +118,10 @@ class PublicController extends Controller ->orWhere('title_tk','like',"%{$query}%") ->paginate(10); - return view('desktop.Pages.SearchResults') - ->with([ - 'events' => $events, - 'query' => $query - ]); - + return $this->render('Pages.SearchResults',[ + 'events' => $events, + 'query' => $query + ]); } public function postAddEvent(AddEventRequest $request){ diff --git a/resources/lang/en/ClientSide.php b/resources/lang/en/ClientSide.php index a2ab4b12..1d311bc6 100644 --- a/resources/lang/en/ClientSide.php +++ b/resources/lang/en/ClientSide.php @@ -49,7 +49,7 @@ return [ 'onDate' => '13 September', 'onTime' => '19:00, Friday', 'title' => '"Spider Man"', - 'description' => 'Peter Parker and his friends go on a summer vacation to Europe. However, friends are unlikely to rest - Peter will have to agree to help Nick Fury uncover the secret of creatures that cause natural disasters and destruction throughout the continent.', + 'description' => 'Description.', 'shown' => 'Shown on page', //PublicFooter.blade.php diff --git a/resources/lang/ru/ClientSide.php b/resources/lang/ru/ClientSide.php index 008a4612..e3139a87 100644 --- a/resources/lang/ru/ClientSide.php +++ b/resources/lang/ru/ClientSide.php @@ -48,7 +48,7 @@ return [ 'onDate' => '13 сентября', 'onTime' => '19:00, пятница', 'title' => '"Человек-паук Вдали от дома"', - 'description' => 'Питер Паркер вместе с друзьями отправляется на летние каникулы в Европу. Однако отдохнуть приятелям вряд ли удастся — Питеру придется согласиться помочь Нику Фьюри раскрыть тайну существ, вызывающих стихийные бедствия и разрушения по всему континенту.', + 'description' => 'Описание', 'shown' => 'Видно на странице', //PublicFooter.blade.php diff --git a/resources/lang/tk/ClientSide.php b/resources/lang/tk/ClientSide.php index 6d13ac92..f18d125c 100644 --- a/resources/lang/tk/ClientSide.php +++ b/resources/lang/tk/ClientSide.php @@ -48,7 +48,7 @@ return [ 'onDate' => '13 Sentýabr', 'onTime' => '19:00, Anna', 'title' => '"Möý Adam"', - 'description' => 'Piter Parker we onung dostlary.', + 'description' => 'Mazmuny', 'shown' => 'Sahypada bar', //PublicFooterBlade.php diff --git a/resources/views/desktop/Partials/FilterMenu.blade.php b/resources/views/Shared/Partials/FilterMenu.blade.php similarity index 100% rename from resources/views/desktop/Partials/FilterMenu.blade.php rename to resources/views/Shared/Partials/FilterMenu.blade.php diff --git a/resources/views/desktop/EventsList/subCategoryList.blade.php b/resources/views/desktop/EventsList/subCategoryList.blade.php index 54af4566..86225cd6 100644 --- a/resources/views/desktop/EventsList/subCategoryList.blade.php +++ b/resources/views/desktop/EventsList/subCategoryList.blade.php @@ -1,7 +1,7 @@ @extends('Shared.Layouts.BilettmLayout') @section('content') {{\DaveJamesMiller\Breadcrumbs\Facades\Breadcrumbs::render('category',$category)}} - @include("desktop.Partials.FilterMenu") + @include("Shared.Partials.FilterMenu")
diff --git a/resources/views/desktop/Layouts/EventsLayout.blade.php b/resources/views/desktop/Layouts/EventsLayout.blade.php index 4c47e9e7..1f393647 100644 --- a/resources/views/desktop/Layouts/EventsLayout.blade.php +++ b/resources/views/desktop/Layouts/EventsLayout.blade.php @@ -6,7 +6,7 @@ @section('content') {{\DaveJamesMiller\Breadcrumbs\Facades\Breadcrumbs::render('category',$category)}} - @include("desktop.Partials.FilterMenu") + @include("Shared.Partials.FilterMenu") @yield('inner_content') diff --git a/resources/views/desktop/Pages/AddEventResult.blade.php b/resources/views/desktop/Pages/AddEventResult.blade.php index f0626a7b..0628df7a 100644 --- a/resources/views/desktop/Pages/AddEventResult.blade.php +++ b/resources/views/desktop/Pages/AddEventResult.blade.php @@ -1,4 +1,4 @@ -@extends('Shared.Layouts.BilettmLayout') +@extends('Shared.Layouts.BilettmLayout',['folder'=>'desktop']) @section('content') {{\DaveJamesMiller\Breadcrumbs\Facades\Breadcrumbs::render('add_event')}} @endsection diff --git a/resources/views/mobile/Layouts/EventsLayout.blade.php b/resources/views/mobile/Layouts/EventsLayout.blade.php deleted file mode 100644 index 08b232c1..00000000 --- a/resources/views/mobile/Layouts/EventsLayout.blade.php +++ /dev/null @@ -1,41 +0,0 @@ -@extends('Shared.Layouts.BilettmLayout',['folder' => 'mobile']) - -@section('after_styles') - -@endsection - -@section('content') - {{\DaveJamesMiller\Breadcrumbs\Facades\Breadcrumbs::render('category',$category)}} - @include("desktop.Partials.FilterMenu") - - @yield('inner_content') - -@endsection -@push('after_styles') - -@endpush -@section('after_scripts') - - - - -@endsection diff --git a/resources/views/mobile/Pages/AddEventResult.blade.php b/resources/views/mobile/Pages/AddEventResult.blade.php new file mode 100644 index 00000000..5929c30a --- /dev/null +++ b/resources/views/mobile/Pages/AddEventResult.blade.php @@ -0,0 +1,4 @@ +@extends('Shared.Layouts.BilettmLayout',['folder'=>'mobile']) +@section('content') + {{\DaveJamesMiller\Breadcrumbs\Facades\Breadcrumbs::render('add_event')}} +@endsection diff --git a/resources/views/mobile/Pages/CategoryEventsPage.blade.php b/resources/views/mobile/Pages/CategoryEventsPage.blade.php index 56fdca9a..0161deef 100644 --- a/resources/views/mobile/Pages/CategoryEventsPage.blade.php +++ b/resources/views/mobile/Pages/CategoryEventsPage.blade.php @@ -1,29 +1,41 @@ -@extends("mobile.Layouts.EventsLayout") -@section('inner_content') -
-
-
-
-

{{$category->title}}

-
-
-
- -
-
-
- @foreach($events as $event) - @include("desktop.EventsList.{$category->view_type}") - @endforeach -
-
- {{$events->appends(['sort'=>$sort,'start'=>$start,'end'=>$end])->links()}} -
-
-
- +@extends('Shared.Layouts.BilettmLayout',['folder' => 'mobile']) +@section('after_styles') + +@endsection +@section('content') + +
+
+
+
+
{{$category->title}} +
+
+ @include("Shared.Partials.FilterMenu") +
-
+ +
+ {{$events->appends(['sort'=>$sort,'start'=>$start,'end'=>$end])->links()}} +
+
+@endsection +@section('after_scripts') + + + + @endsection diff --git a/resources/views/mobile/Pages/EventPage.blade.php b/resources/views/mobile/Pages/EventPage.blade.php new file mode 100644 index 00000000..5fde6b5d --- /dev/null +++ b/resources/views/mobile/Pages/EventPage.blade.php @@ -0,0 +1,60 @@ +@extends('Shared.Layouts.BilettmLayout',['folder' => 'mobile']) +@section('after_styles') + + + + + @if($event->images->count()) + + @endif + + +@endsection +@section('content') +
+
+
+
+

«{{$event->title}}» +
+

+
+
+
+
+
+
+
+
+ {{$event->title}} +

@lang('ClientSide.description'): {!! Markdown::parse($event->description) !!}

+

{{$event->venue->venue_name}}

+ @include('desktop.Partials.Schedule') +
+
+
+
+
+
+
+
+
+
+
+
+@endsection + +@section('after_scripts') + + +@endsection diff --git a/resources/views/mobile/Pages/EventsPage.blade.php b/resources/views/mobile/Pages/EventsPage.blade.php new file mode 100644 index 00000000..3c41309f --- /dev/null +++ b/resources/views/mobile/Pages/EventsPage.blade.php @@ -0,0 +1,44 @@ +@extends('Shared.Layouts.BilettmLayout',['folder' => 'mobile']) +@section('after_styles') + +@endsection +@section('content') + @foreach($sub_cats as $cat) + +
+
+
+
+
{{$cat->title}} +
+
+ +{{-- {{__("ClientSide.rep")}}--}} +
+ @include("Shared.Partials.FilterMenu") + +
+
+ +
+ + @endforeach + +@endsection +@section('after_scripts') + + + + +@endsection diff --git a/resources/views/mobile/Pages/SearchResults.blade.php b/resources/views/mobile/Pages/SearchResults.blade.php new file mode 100644 index 00000000..883a2dae --- /dev/null +++ b/resources/views/mobile/Pages/SearchResults.blade.php @@ -0,0 +1,37 @@ +@extends('Shared.Layouts.BilettmLayout',['folder' => 'mobile']) +@section('content') +
+
+
+
+

{{$query}}

+
+
+
+ + + + + +
+
+
+
+ @foreach($events as $event) + @include('mobile.Partials.EventListItem') + @endforeach + {{$events->links('vendor.pagination.simple-bootstrap-4')}} +
+
+
+
+ +
+
+
+
+@endsection diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index eb0515f9..6a8f4fe4 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -35,3 +35,7 @@ Breadcrumbs::for('search',function($trail){ $trail->push(trans('ClientSide.results'));//'Результат поиска' }); +Breadcrumbs::for('add_event',function($trail){ + $trail->parent('home'); + $trail->push('+ ДОБАВИТЬ СОБЫТИЕ'); +});