diff --git a/app/Http/Controllers/PublicController.php b/app/Http/Controllers/PublicController.php index f0ac97c0..196ee278 100644 --- a/app/Http/Controllers/PublicController.php +++ b/app/Http/Controllers/PublicController.php @@ -18,7 +18,7 @@ class PublicController extends Controller public function showHomePage(){ $cinema = Event::cinema()->onLive()->take(11)->get(); -// dd($cinema); +// todo join image $theatre = Event::theatre()->onLive()->take(6)->get(); $musical = Event::musical()->onLive()->take(8)->get(); $sliders = Slider::where('active',1)->get(); diff --git a/app/Models/Event.php b/app/Models/Event.php index d2e61d5c..ead51b50 100644 --- a/app/Models/Event.php +++ b/app/Models/Event.php @@ -462,19 +462,20 @@ ICSTemplate; public function scopeCinema($query){ - return $query->where('event_image_position','cinema'); + return $query->where('event_image_position','cinema')->with('images'); } public function scopeTheatre($query){ - return $query->where('event_image_position','theatre'); + return $query->where('event_image_position','theatre')->with('images'); } public function scopeMusical($query){ - return $query->where('event_image_position','musical'); + return $query->where('event_image_position','musical')->with('images'); } public function scopeOnLive($query){ - $query->whereDate('end_date','>',Carbon::now('Asia/Ashgabat')); + $query->whereDate('end_date','>',Carbon::now(config('app.timezone','Asia/Ashgabat'))); return $query->where('is_live',1); } + } diff --git a/public/assets/stylesheet/custom.css b/public/assets/stylesheet/custom.css index 3c075d36..6ae3cdd0 100644 --- a/public/assets/stylesheet/custom.css +++ b/public/assets/stylesheet/custom.css @@ -41,7 +41,7 @@ #navBar a.nav-link { color: #ffffff !important; - font-size: 15px; + font-size: 12px; padding: 5px 0 !important; transition-property: opacity; transition-duration: .2s; } @@ -62,6 +62,10 @@ article > .u-block-hover__additional--partially-slide-up { #bilet-menu-id li { margin: 0 !important; } + #bilet-menu-id li.diam-sim:last-child{ + display: none; + } + #navBar .search-panel { padding: 0; } #navBar .search-panel input { @@ -1563,3 +1567,67 @@ input.reserved-seats ~ label svg { fill: #db635b; } /*# sourceMappingURL=custom.css.map */ + +#date-click-content{ + display: none; +} + +#date-click-content.show-content{ + display: block; +} + +.ui-datepicker-prev.ui-corner-all, .ui-datepicker-next.ui-corner-all{ + margin-right: 0 !important; + border: 1px solid #000000; + border-radius: 5px; +} + +.ui-datepicker-prev.ui-corner-all i, .ui-datepicker-next.ui-corner-all i{ + font-size: 24px; + font-weight: bold; +} + +.ui-datepicker-header{ + border-bottom: none !important; +} + +#datepickerInline a{ + margin-right: 0 !important; +} + +.ui-datepicker-calendar{ + border-collapse: collapse; + border-spacing: 0 !important; + margin-top: 15px !important; +} + +.ui-datepicker-calendar thead{ + background-color: #d33d33; +} + +#datepickerInline thead span{ + color: #ffffff; +} + +.ui-datepicker-calendar tbody td{ + border: 1px solid #e8e9ec; +} + +.ui-datepicker-days-cell-over.ui-datepicker-current-day.ui-datepicker-today{ + background-color: #d33d33 !important; + color: #000000; +} + +.u-datepicker-v1 .ui-datepicker-calendar td a:hover{ + background-color: #d33d33; + border: none; +} + +.u-datepicker-v1 .ui-datepicker-calendar td a.ui-state-active{ + background-color: transparent; + border: none; +} + +.ui-datepicker-next.ui-corner-all:hover, .ui-datepicker-prev.ui-corner-all:hover{ + border: 1px solid #000000; +} \ No newline at end of file diff --git a/resources/views/Bilettm/Layouts/BilettmLayout.blade.php b/resources/views/Bilettm/Layouts/BilettmLayout.blade.php index 22d77372..307b65a0 100644 --- a/resources/views/Bilettm/Layouts/BilettmLayout.blade.php +++ b/resources/views/Bilettm/Layouts/BilettmLayout.blade.php @@ -17,27 +17,54 @@ @yield('after_styles') @stack('after_styles') + + - +
@include('Bilettm.Partials.PublicHeader') - @yield('content') + @yield('content')2 @include('Bilettm.Partials.PublicFooter')
+ + + + @yield('after_scripts') @stack('after_scripts') + + + + + + + + + + \ No newline at end of file diff --git a/resources/views/Bilettm/Partials/FilterMenu.blade.php b/resources/views/Bilettm/Partials/FilterMenu.blade.php index 1ad2f14f..46cb9f44 100644 --- a/resources/views/Bilettm/Partials/FilterMenu.blade.php +++ b/resources/views/Bilettm/Partials/FilterMenu.blade.php @@ -16,11 +16,15 @@
  • - -
    - DLink 1 - DLink 2 - DLink 3 + Дата +
    +
    +
    + +
    + +
    +
    • diff --git a/resources/views/Bilettm/Partials/HomeMusical.blade.php b/resources/views/Bilettm/Partials/HomeMusical.blade.php index f9af9fe3..d154c440 100644 --- a/resources/views/Bilettm/Partials/HomeMusical.blade.php +++ b/resources/views/Bilettm/Partials/HomeMusical.blade.php @@ -1,62 +1,58 @@ -
    -
    -
    -
    -

    Концерты

    -
    - Посмотреть все -
    -
    - - - -