From a9445b2bf5f6eaa5fee9703099fbfba97392cd9a Mon Sep 17 00:00:00 2001 From: merdiano Date: Mon, 10 Dec 2018 12:32:53 +0500 Subject: [PATCH] Initial starts to Main page devs --- app/Http/Controllers/PublicController.php | 42 +++ app/Http/routes.php | 21 +- composer.json | 23 +- .../views/Public/CategoryEventsPage.blade.php | 14 + resources/views/Public/HomePage.blade.php | 311 ++++++++++++++++++ .../Public/Layouts/HomePageLayout.blade.php | 43 +++ .../Public/Partials/PublicContent.blade.php | 60 ++++ .../Public/Partials/PublicFooter.blade.php | 167 ++++++++++ .../Public/Partials/PublicHeader.blade.php | 137 ++++++++ 9 files changed, 802 insertions(+), 16 deletions(-) create mode 100644 app/Http/Controllers/PublicController.php create mode 100644 resources/views/Public/CategoryEventsPage.blade.php create mode 100644 resources/views/Public/HomePage.blade.php create mode 100644 resources/views/Public/Layouts/HomePageLayout.blade.php create mode 100644 resources/views/Public/Partials/PublicContent.blade.php create mode 100644 resources/views/Public/Partials/PublicFooter.blade.php create mode 100644 resources/views/Public/Partials/PublicHeader.blade.php diff --git a/app/Http/Controllers/PublicController.php b/app/Http/Controllers/PublicController.php new file mode 100644 index 00000000..40bd6b79 --- /dev/null +++ b/app/Http/Controllers/PublicController.php @@ -0,0 +1,42 @@ +data = ['categories'=>Category::pluck(trans('Category.category_title'),'id'), + 'category_id'=>'']; + } + + public function showHomePage(){ + $events = Event::where('end_date', '>', Carbon::now()) + ->take(10) + ->get(); + $this->data['events'] = $events; + return view('Public.HomePage', $this->data); + } + + public function showCategoryEvents($category_id){ + $events = Event::where('end_date', '>', Carbon::now()) + ->where('category_id',$category_id) + ->take(10) + ->get(); + $this->data['events'] = $events; + $this->data['category_id']= $category_id; +// print_r($this->data); + return view('Public.CategoryEventsPage', $this->data); + } +} \ No newline at end of file diff --git a/app/Http/routes.php b/app/Http/routes.php index 62a377bc..b0a6923e 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -120,6 +120,15 @@ Route::group( /* * Public event page routes */ + Route::group(['prefix' => 'category'], function () { + /** + * Events by category + */ + Route::get('/{category_id}', [ + 'as' => 'showCategoryEventsPage', + 'uses' => 'PublicController@showCategoryEvents', + ]); + }); Route::group(['prefix' => 'e'], function () { /* @@ -694,12 +703,12 @@ Route::group( ]); }); }); - - Route::get('/', function () { - return Redirect::route('showSelectOrganiser'); - // I prefer it that way: - // return Redirect::route('showOrganiserHome', ["organiser_id"=>1]); - }); + Route::get('/','PublicController@showHomePage'); +// Route::get('/', function () { +// return Redirect::route('showSelectOrganiser'); +// // I prefer it that way: +// // return Redirect::route('showOrganiserHome', ["organiser_id"=>1]); +// }); Route::get('/terms_and_conditions', [ 'as' => 'termsAndConditions', diff --git a/composer.json b/composer.json index d388108c..f234cd07 100755 --- a/composer.json +++ b/composer.json @@ -20,24 +20,27 @@ "illuminate/support": "~5.6", "intervention/image": "~2.4", "laracasts/utilities": "~2.1", - "laravel/framework": "~5.6", - "laravel/socialite": "~3.0", "laravelcollective/html": "~5.6", "league/flysystem-aws-s3-v3": "~1.0", "maatwebsite/excel": "~2.1", "maxhoffmann/parsedown-laravel": "dev-master", - "mcamara/laravel-localization": "~1.2", - "mews/purifier": "~2.0", "milon/barcode": "~5.3", - "nitmedia/wkhtml2pdf": "dev-master", - "omnipay/common": "~3", - "omnipay/dummy": "~3", - "omnipay/paypal": "~3", - "omnipay/stripe": "~3", "php-http/curl-client": "^1.7", "php-http/message": "^1.6", "predis/predis": "~1.1", - "vinelab/http": "~1.5" + "vinelab/http": "~1.5", + "laravel/framework": "~5.6", + "mcamara/laravel-localization": "~1.2", + "mews/purifier": "~2.0", + "nitmedia/wkhtml2pdf": "dev-master", + + "laravel/socialite": "~3.0", + "omnipay/common": "~3", + "omnipay/dummy": "~3", + "omnipay/paypal": "~3", + "omnipay/stripe": "~3" + + }, "require-dev": { "phpunit/phpunit": "7.3.*", diff --git a/resources/views/Public/CategoryEventsPage.blade.php b/resources/views/Public/CategoryEventsPage.blade.php new file mode 100644 index 00000000..66d14520 --- /dev/null +++ b/resources/views/Public/CategoryEventsPage.blade.php @@ -0,0 +1,14 @@ +@extends('Public.Layouts.HomePageLayout') +@section('head') + +@stop +@section('content') + @include('Public.Partials.PublicHeader') + + @include('Public.Partials.PublicContent') + + @include('Public.Partials.PublicFooter') +@stop +@section('foot') + +@stop \ No newline at end of file diff --git a/resources/views/Public/HomePage.blade.php b/resources/views/Public/HomePage.blade.php new file mode 100644 index 00000000..d9c86b72 --- /dev/null +++ b/resources/views/Public/HomePage.blade.php @@ -0,0 +1,311 @@ +@extends('Public.Layouts.HomePageLayout') +@section('head') + {!!HTML::style('assets/out/revolution-slider/revolution/css/layers.css')!!} + {!!HTML::style('assets/out/revolution-slider/revolution/css/settings.css')!!} + {!!HTML::style('assets/out/revolution-slider/revolution/css/navigation.css')!!} + {!!HTML::style('assets/out/icon-material/material-icons.css')!!} + +@stop +@section('content') + @include('Public.Partials.PublicHeader') + +
+
+ + +
+
+ + @include('Public.Partials.PublicContent') + + @include('Public.Partials.PublicFooter') +@stop +@section('foot') + {!!HTML::script('assets/out/revolution-slider/revolution/js/jquery.themepunch.tools.min.js')!!} + {!!HTML::script('assets/out/revolution-slider/revolution/js/jquery.themepunch.revolution.min.js')!!} + {!!HTML::script('assets/out/revolution-slider/revolution/js/extensions/revolution.extension.actions.min.js')!!} + {!!HTML::script('assets/out/revolution-slider/revolution/js/extensions/revolution.extension.layeranimation.min.js')!!} + {!!HTML::script('assets/out/revolution-slider/revolution/js/extensions/revolution.extension.navigation.min.js')!!} + {!!HTML::script('assets/out/revolution-slider/revolution/js/extensions/revolution.extension.parallax.min.js')!!} + {!!HTML::script('assets/out/revolution-slider/revolution/js/extensions/revolution.extension.slideanims.min.js')!!} + +@stop \ No newline at end of file diff --git a/resources/views/Public/Layouts/HomePageLayout.blade.php b/resources/views/Public/Layouts/HomePageLayout.blade.php new file mode 100644 index 00000000..0d3cccd1 --- /dev/null +++ b/resources/views/Public/Layouts/HomePageLayout.blade.php @@ -0,0 +1,43 @@ + + + + Bilet Tm + + + + + + + + + + + + {!!HTML::style('assets/out/bootstrap/bootstrap.min.css')!!} + + {!!HTML::style('assets/out/icon-awesome/css/font-awesome.min.css')!!} + {!!HTML::style('assets/out/icon-line/css/simple-line-icons.css')!!} + {!!HTML::style('assets/out/icon-hs/style.css')!!} + {!!HTML::style('assets/out/hs-megamenu/src/hs.megamenu.css')!!} + + + {!!HTML::style('assets/css/styles.op-agency.css')!!} + {!!HTML::style('assets/out/icon-material/material-icons.css')!!} + @yield('head') + + +
+ @yield('content') +
+ + {!!HTML::script('assets/out/jquery/jquery.min.js')!!} + {!!HTML::script('assets/out/jquery-migrate/jquery-migrate.min.js')!!} + {!!HTML::script('assets/out/popper.min.js')!!} + {!!HTML::script('assets/out/bootstrap/bootstrap.min.js')!!} + {!!HTML::script('assets/out/hs-megamenu/src/hs.megamenu.js')!!} + {!!HTML::script('assets/out/js/custom.js')!!} + @yield('foot') + \ No newline at end of file diff --git a/resources/views/Public/Partials/PublicContent.blade.php b/resources/views/Public/Partials/PublicContent.blade.php new file mode 100644 index 00000000..f6a94723 --- /dev/null +++ b/resources/views/Public/Partials/PublicContent.blade.php @@ -0,0 +1,60 @@ +
+
+
+ +
+
+
    +
  • + +
    • +
  • + +
    • +
+
+
+
+
+
+
+
+ Image Description +
+
    +
  • 20 Ноября 19:00, Пт
    • +
+

+ Дэдпул 2 +

+
    +
  • Кинотеатр Ватан
    • +
+
    +
  • 60 TMT
    • +
+
+
+
+ + + + +
+
\ No newline at end of file diff --git a/resources/views/Public/Partials/PublicFooter.blade.php b/resources/views/Public/Partials/PublicFooter.blade.php new file mode 100644 index 00000000..234a68e0 --- /dev/null +++ b/resources/views/Public/Partials/PublicFooter.blade.php @@ -0,0 +1,167 @@ + \ No newline at end of file diff --git a/resources/views/Public/Partials/PublicHeader.blade.php b/resources/views/Public/Partials/PublicHeader.blade.php new file mode 100644 index 00000000..8a1f28d7 --- /dev/null +++ b/resources/views/Public/Partials/PublicHeader.blade.php @@ -0,0 +1,137 @@ +
+
+
+
+ + + +
+ +
+
+ +
+
+
+
+
+ +
+
\ No newline at end of file