ilmedova
/
Attendize
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fixes category filters sorts

This commit is contained in:
merdiano 2019-10-11 21:26:24 +05:00
parent a7d5118d3c 2fd4665a40
commit e7f73c5fe9
12 changed files with 173 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/EventCheckoutController.php
View File

@ -790,8 +790,8 @@ class EventCheckoutController extends Controller
return view('Public.ViewEvent.Embedded.EventPageViewOrder', $data);
}
// return view('Bilettm.ViewEvent.ViewOrderPage', $data);
return view('Public.ViewEvent.EventPageViewOrder', $data);
return view('Bilettm.ViewEvent.ViewOrderPage', $data);
// return view('Public.ViewEvent.EventPageViewOrder', $data);
}
/**

134
public/assets/stylesheet/custom.css
View File

@ -330,13 +330,22 @@ article.u-block-hover img {
#kinoteator-tab1 .owl-next, .movie-items-group .owl-next {
background-image: url(../images/icons/right.png);
background-size: 56px !important;
transition-property: opacity;
transition-duration: .3s;
width: 56px;
border: none !important; }
#kinoteator-tab1 .owl-prev, .movie-items-group .owl-prev {
background-image: url(../images/icons/left.png);
background-size: 56px !important;
transition-property: opacity;
transition-duration: .3s;
width: 56px;
border: none !important; }
#kinoteator-tab1 .owl-prev:hover, .movie-items-group .owl-prev:hover, #kinoteator-tab1 .owl-next:hover, .movie-items-group .owl-next:hover{
opacity: .5;
}
#kinoteator-tab1 .owl-prev:hover, #kinoteator-tab1 .owl-next:hover, .movie-items-group .owl-prev:hover, .movie-items-group .owl-next:hover {
border: 1px solid #7e7e7e; }
#kinoteator-tab1 .owl-prev:hover span, #kinoteator-tab1 .owl-next:hover span, .movie-items-group .owl-prev:hover span, .movie-items-group .owl-next:hover span {
@ -392,13 +401,20 @@ article.u-block-hover img {
#konserty-tab1 .owl-next {
background-image: url(../images/icons/w-right.png);
background-size: 56px !important;
transition-property: opacity;
transition-duration: .3s;
width: 56px;
border: none !important; }
#konserty-tab1 .owl-prev {
background-image: url(../images/icons/w-left.png);
background-size: 56px !important;
transition-property: opacity;
transition-duration: .3s;
width: 56px;
border: none !important; }
#konserty-tab1 .owl-prev:hover, #konserty-tab1 .owl-next:hover{
opacity: .5;
}
#konserty-tab1 .owl-prev:hover, #konserty-tab1 .owl-next:hover {
border: 1px solid rgba(255, 255, 255, 0.5); }
#konserty-tab1 .owl-prev:hover span, #konserty-tab1 .owl-next:hover span {
@ -509,10 +525,12 @@ img.d2-img {
text-align: center; }
.overlay-details h2.title {
font-size: 40px;
font-weight: bold;
line-height: 40px;
margin-bottom: 20px;}
.big-cinema-item-col6 .overlay-details h2.title {
font-size: 60px;
font-weight: bold;
line-height: 60px;
margin-bottom: 20px;}
@media only screen and (max-width: 1600px) {
@ -702,11 +720,18 @@ img.d2-img {
background-image: url(../images/icons/t-left.png) !important;
background-color: transparent !important;
background-repeat: no-repeat;
background-size: 20px; }
background-size: 20px;
transition-property: opacity;
transition-duration: .3s;}
#carousel-09-1 .js-prev::before {
content: unset;
color: #ffffff;
font-size: 40px; }
#carousel-09-1 .js-prev:hover{
opacity: .7;
}
#carousel-09-1 .js-next {
left: calc(100% - 46px) !important;
top: 50% !important;
@ -714,11 +739,18 @@ img.d2-img {
background-image: url(../images/icons/t-right.png) !important;
background-color: transparent !important;
background-repeat: no-repeat;
background-size: 20px; }
background-size: 20px;
transition-property: opacity;
transition-duration: .3s;}
#carousel-09-1 .js-next::before {
content: unset;
color: #ffffff;
font-size: 40px; }
#carousel-09-1 .js-next:hover{
opacity: .7;
}
#carousel-09-1 .js-slide a {
margin-right: 0;
position: relative !important; }
@ -1820,4 +1852,102 @@ input.reserved-seats ~ label svg {
.calendar-form td.selected{
background-color: red;
}
.filter-menu a.dropdown-item{
text-align: center;
padding-right: 0;
transition-property: opacity;
transition-duration: .3s;
}
.filter-menu a.dropdown-item:last-child{
border-bottom: none;
}
.filter-menu a.dropdown-item:hover{
background-color: unset;
opacity: .7;
text-decoration: none;
}
.filter-menu{
padding: 10px;
}
.red_button:hover{
background-color: #db635b;
text-decoration: none;
}
.red_button:focus{
text-decoration: none;
background-color: #ff4159;
}
.breadcrumbs-ul li, .breadcrumbs-ul li a{
font-size: 16px !important;
}
.big-cinema-item-col6 .overlay-details p{
font-size: 24px;
line-height: 30px;
}
.overlay-details-bottom-part a.share svg, .overlay-details-bottom-part a.like svg{
width: 20px;
}
.big-cinema-item-col6 .overlay-details-bottom-part a.share svg, .big-cinema-item-col6 .overlay-details-bottom-part a.like svg{
width: 40px;
}
.big-cinema-item-col6 .overlay-details .overlay-details-bottom-part span.cost{
font-size: 30px;
}
.it-detail p, .it-detail{
color: #000000;
font-size: 20px;
}
.nav.nav-pills.details-page .tablinks:hover{
color: #ffffff
}
.nav.nav-pills.details-page .tablinks.active{
color: #ffffff;
background-color: #d43d34;
border-color: #d43d34;
}
#myTabContent .tabcontent{
display: none;
}
.tickets_table_wrap tr.checkout input[type=submit]{
width: 100%;
color: #ffffff;
background-color: #d33d33;
height: fit-content;
font-size: 20px;
padding: 12px 60px;
border-radius: 5px;
margin-right: 0;
transition-property: background-color;
transition-duration: .2s;
border: #d33d33;
}
.tickets_table_wrap tr.checkout input[type=submit]:hover{
background-color: #db635b;
text-decoration: none;
}
.tickets_table_wrap tr.checkout input[type=submit]:active{
background-color: #d33d33;
}
.tickets_table_wrap tr.checkout input[type=submit]:focus{
box-shadow: none !important;
}

2
public/vendor/gijgo/gijgo.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
resources/views/Bilettm/EventsList/cinema.blade.php
View File

@ -30,4 +30,4 @@
</div>
</div>
</article>
</div>
</div>

6
resources/views/Bilettm/EventsList/subCategoryList.blade.php
View File

@ -6,10 +6,10 @@
<div class="container">
<div class="row kinoteator tab-part">
<div class="tab-header d-flex justify-content-between col-12">
<h2>{{$category->title}}</h2>
<div style="height: 5px; margin-left: 5px; position: absolute; bottom: 10px; width: 100px; background-color: rgba(211,61,51,1)"></div>
<h2 class="font-weight-bold">{{$category->title}}</h2>
<div style="height: 5px; margin-left: 5px; position: absolute; bottom: 0; width: 100px; background-color: rgba(211,61,51,1)"></div>
</div>
<div class="tab-ozi col-12">
<div class="tab-ozi col-12 pt-3">
<!-- Tab panes -->
<div class="tab-content">
<div class="container">

2
resources/views/Bilettm/Layouts/BilettmLayout.blade.php
View File

@ -58,7 +58,7 @@
$('document').ready(function(){
$('#top-header-submit').click(function(){
$('#main-header-search-form').submit();
})
});
});
</script>
@if(session()->get('message'))

4
resources/views/Bilettm/Partials/BreadCrumbs.blade.php
View File

@ -2,7 +2,7 @@
<section class="page-breadcrumbs">
<div class="container">
<div class="row">
<ul style="padding-left: 15px">
<ul style="padding-left: 15px" class="breadcrumbs-ul">
@foreach ($breadcrumbs as $breadcrumb)
@if ($breadcrumb->url && !$loop->last)
<li>
@ -12,7 +12,7 @@
<i class="fa fa-caret-right"></i>
</li>
@else
<li class="page-name">
<li class="page-name" style="color: #7f7f7f">
{{ $breadcrumb->title }}
</li>
@endif

2
resources/views/Bilettm/Partials/CinemaItem.blade.php
View File

@ -3,7 +3,7 @@
<img class="d-flex align-items-end" src="{{asset($event->image_url ?? '#')}}">
</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 smalll">
<div class="overlay-details">
<h2 class="title">{{$event->title}}</h2>
<h4 class="date">В кино с {{$event->start_date->formatLocalized('%d %B')}} </h4>
@if(isset($size))

2
resources/views/Bilettm/Public/AddEventForm.blade.php
View File

@ -3,7 +3,7 @@
<h4 class="font-weight-bold">Добавить событие</h4>
<div style="height: 5px; position: absolute; bottom: 15px; width: 100px; background-color: rgba(211,61,51,1)"></div>
<div class="">
<a class="modal-send" style="float: right" href="">Send</a>
<a class="modal-send red_button" style="float: right" href="">Send</a>
<span style="float: right; font-size: 12px" class="text-right font-weight-bold">*Required field(s)</span>
</div>
</div>

8
resources/views/Bilettm/ViewEvent/EventPage.blade.php
View File

@ -10,7 +10,7 @@
@endsection
@section('content')
{{\DaveJamesMiller\Breadcrumbs\Facades\Breadcrumbs::render('event',$event)}}
<section style="margin-top: 30px; margin-bottom: 100px">
<section style="margin-top: 30px; margin-bottom: 50px">
<div class="container">
<div class="row m-0">
<div class="col-10">
@ -20,7 +20,7 @@
<h2 class="main-title">«{{$event->title}}»</h2>
<div class="main-title-bottom-line"></div>
</div>
<div class="col-12 p-0" style="padding-left: 10px !important;">
<div class="col-12 p-0 it-detail" style="padding-left: 10px !important;">
@if($event->images->count())
<img style="width: 450px" class="details-image" alt="{{$event->title}}" src="{{config('attendize.cdn_url_user_assets').'/'.$event->images->first()['image_path']}}" property="image">
{{--<img src="assets/assets/img/teator/tall6.png" style="width: 450px" class="details-image">--}}
@ -49,11 +49,11 @@
</div>
</div>
</section>
<section id="location" class="container p0">
<section id="location" class="container p0" style="margin-bottom: 50px">
<div class="row">
<div class="col-md-12">
<div class="google-maps content">
<iframe frameborder="0" style="border:0;"
<iframe frameborder="0" style="border:0; width: 100%; height: 200px"
src="https://maps.google.com/maps?f=q&amp;source=s_q&amp;hl=en&amp;geocode=&amp;q={{$event->map_address}}&amp;aq=0&amp;oq={{$event->map_address}}&amp;sll=28.659344,-81.187888&amp;sspn=0.128789,0.264187&amp;ie=UTF8&amp;hq={{$event->map_address}}&amp;t=m&amp;z=15&amp;iwloc=A&amp;output=embed">
</iframe>

30
resources/views/Bilettm/ViewEvent/Partials/TicketSchedule.blade.php
View File

@ -11,10 +11,10 @@
<h4 class="date-small-title">Дата проведения</h4>
<div class="date-box-wrap">
<ul class="nav nav-pills">
<ul class="nav nav-pills details-page">
@foreach($ticket_dates as $date =>$ticket)
<li><a class="active" href="#{{$date}}">{{$date}}</a></li>
<li><a class="tablinks" style="cursor: pointer" onclick="openContent(event, '{{$date}}')">{{$date}}</a></li>
@endforeach
</ul>
@ -26,7 +26,7 @@
<div class="tab-content" id="myTabContent">
@foreach($ticket_dates as $date =>$tickets)
<div class="tab-pane fade show active" id="{{$date}}" role="tabpanel" aria-labelledby="{{$date}}-tab">
<div class="tab-pane fade show active tabcontent" id="{{$date}}" role="tabpanel" aria-labelledby="{{$date}}-tab">
<div class="tickets_table_wrap">
{!! Form::open(['url' => route('postValidateTickets', ['event_id' => $event->id]), 'class' => 'ajax']) !!}
<table class="table">
@ -95,12 +95,12 @@
@endforeach
<tr>
<td colspan="3" style="text-align: center">
<td colspan="4" style="text-align: center">
@lang("Public_ViewEvent.below_tickets")
</td>
</tr>
<tr class="checkout">
<td colspan="3">
<td colspan="4">
@if(!$is_free_event)
<div class="hidden-xs pull-left">
@if($event->enable_offline_payments)
@ -130,4 +130,22 @@
</div>
@endif
@endif
</div>
</div>
@section('after_scripts')
<script>
function openContent(evt, cityName) {
var i, tabcontent, tablinks;
tabcontent = document.getElementsByClassName("tabcontent");
for (i = 0; i < tabcontent.length; i++) {
tabcontent[i].style.display = "none";
}
tablinks = document.getElementsByClassName("tablinks");
for (i = 0; i < tablinks.length; i++) {
tablinks[i].className = tablinks[i].className.replace(" active", "");
}
document.getElementById(cityName).style.display = "block";
evt.currentTarget.className += " active";
}
</script>
@endsection

2
resources/views/Bilettm/ViewEvent/Partials/ViewOrderSection.blade.php
View File

@ -13,7 +13,7 @@
</h2>
</div>
</div>
{{--Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ab commodi consequatur dignissimos impedit officia omnis porro quas repellat rerum vitae.--}}
<div class="row">
<div class="col-md-12">
<div class="content event_view_order">