Merge branch 'eatvio-main'

This commit is contained in:
2023-12-26 12:13:49 +03:00
2 changed files with 61 additions and 88 deletions

View File

@@ -1,90 +1,81 @@
<div class="">
@php
$positivComments = $plan->positiveComments();
$positivComments = $plan->positiveComments();
$negativeComments = $plan->negativeComments();
$negativeComments = $plan->negativeComments();
$positiveCommmentsCount = $positivComments->count();
$positiveCommmentsCount = $positivComments->count();
$negativeCommentsCount = $negativeComments->count();
$negativeCommentsCount = $negativeComments->count();
@endphp
<div class="reviews__tabs tabs">
<div class="tablist" role="tablist" aria-labelledby="label">
<button wire:click='toggleTabpanelState("positive")' class="tab" role="tab" type="button" id="tab-1"
aria-selected="{{ $tabpanelState['positive'] ? 'true' : 'false' }}"
aria-controls="tabpanel-1">Положительные {{ $positiveCommmentsCount }}</button>
<button wire:click='toggleTabpanelState("negative")' class="tab" role="tab" type="button" id="tab-2" aria-selected="{{$tabpanelState['negative'] ? 'true' : 'false'}}"
aria-controls="tabpanel-2" tabindex="-1">Негативные {{ $negativeCommentsCount }}</button>
<button wire:click='toggleTabpanelState("positive")' class="tab" role="tab" type="button" id="tab-1" aria-selected="{{ $tabpanelState['positive'] ? 'true' : 'false' }}" aria-controls="tabpanel-1">Положительные {{ $positiveCommmentsCount }}</button>
<button wire:click='toggleTabpanelState("negative")' class="tab" role="tab" type="button" id="tab-2" aria-selected="{{$tabpanelState['negative'] ? 'true' : 'false'}}" aria-controls="tabpanel-2" tabindex="-1">Негативные {{ $negativeCommentsCount }}</button>
</div>
<div @class([
'tabpanel',
'tabpanel--hidden' => $tabpanelState['negative']
]) role="tabpanel" id="tabpanel-1" tabindex="0" aria-labelledby="tab-1">
<div @class([ 'tabpanel' , 'tabpanel--hidden'=> $tabpanelState['negative']
]) role="tabpanel" id="tabpanel-1" tabindex="0" aria-labelledby="tab-1">
<div class="reviews__items">
@foreach ($positivComments->get() as $comment)
<div class="reviews__items">
<div class="review">
<div class="review__thumb">
<img src="{{ $comment->author->profile_photo_url }}" class="cover-image" alt="user">
<div class="review">
<div class="review__thumb">
<img src="{{ $comment->author->profile_photo_url }}" class="cover-image" alt="user">
</div>
<div class="review__content">
<div class="review__name">
{{ $comment->author->name }}
</div>
<div class="review__content">
<div class="review__name">
{{ $comment->author->name }}
</div>
<blockquote class="review__quote">
{{ $comment->body }}
</blockquote>
<blockquote class="review__quote">
{{ $comment->body }}
</blockquote>
</div>
<div class="review__info">
<div class="review__programm">
{{ $plan->name }}
</div>
<div class="review__info">
<div class="review__programm">
{{ $plan->name }}
</div>
<div class="review__rate icon-star">
{{ $comment->grade }}
</div>
<livewire:plan.comment.upvote :wire:key="$comment->id" :comment="$comment"></liviwire:plan.comment.upvote>
<div class="review__rate icon-star">
{{ $comment->grade }}
</div>
<livewire:plan.comment.upvote :wire:key="$comment->id" :comment="$comment" />
</div>
</div>
@endforeach
@endforeach
</div>
</div>
<div @class([
'tabpanel',
'tabpanel--hidden' => $tabpanelState['positive']
]) role="tabpanel" id="tabpanel-2" tabindex="0" aria-labelledby="tab-1">
<div @class([ 'tabpanel' , 'tabpanel--hidden'=> $tabpanelState['positive']
]) role="tabpanel" id="tabpanel-2" tabindex="0" aria-labelledby="tab-1">
<div class="reviews__items">
@foreach ($negativeComments->get() as $comment)
<div class="reviews__items">
<div class="review">
<div class="review__thumb">
<img src="{{ $comment->author->profile_photo_url }}" class="cover-image" alt="user">
<div class="review">
<div class="review__thumb">
<img src="{{ $comment->author->profile_photo_url }}" class="cover-image" alt="user">
</div>
<div class="review__content">
<div class="review__name">
{{ $comment->author->name }}
</div>
<div class="review__content">
<div class="review__name">
{{ $comment->author->name }}
</div>
<blockquote class="review__quote">
{{ $comment->body }}
</blockquote>
<blockquote class="review__quote">
{{ $comment->body }}
</blockquote>
</div>
<div class="review__info">
<div class="review__programm">
{{ $plan->name }}
</div>
<div class="review__info">
<div class="review__programm">
{{ $plan->name }}
</div>
<div class="review__rate icon-star">
{{ $comment->grade }}
</div>
<livewire:plan.comment.upvote :wire:key="$comment->id" :comment="$comment"></liviwire:plan.comment.upvote>
<div class="review__rate icon-star">
{{ $comment->grade }}
</div>
<livewire:plan.comment.upvote :wire:key="$comment->id" :comment="$comment" />
</div>
</div>
@endforeach
@endforeach
</div>
</div>
</div>
</div>

View File

@@ -19,46 +19,28 @@
</div>
</div>
<button type="button" wire:click="like"
class="announcement__details-btn icon-heart {{ $plan->isLiked() ? 'active-icon-heart' : '' }}"></button>
<button type="button" wire:click="like" class="announcement__details-btn icon-heart {{ $plan->isLiked() ? 'active-icon-heart' : '' }}"></button>
</div>
<p class="announcement__desc">
{{ $plan->details }}
</p>
@php
$planTypeSvgClasses = ['slim' => '#SlimBig', 'fit' => '#FitBig', 'wellness' => '#WellnessBig', 'behavior' => '#BehaviorBig'];
@endphp
<div class="person__checklist">
@if ($plan->type['slim'] === true)
@foreach($planTypeSvgClasses as $type => $svgCssClass)
@if (isset($plan->type[$type]) && $plan->type[$type] === true)
<svg width="40" height="60">
<use xlink:href="#SlimBig"></use>
<use xlink:href="{{ $svgCssClass }}"></use>
</svg>
@endif
@if ($plan->type['fit'] === true)
<svg width="40" height="60">
<use xlink:href="#FitBig"></use>
</svg>
@endif
@if ($plan->type['wellness'] === true)
<svg width="40" height="60">
<use xlink:href="#WellnessBig"></use>
</svg>
@endif
@if ($plan->type['behavior'] === true)
<svg width="40" height="60">
<use xlink:href="#BehaviorBig"></use>
</svg>
@endif
@endif
@endforeach
</div>
<div class="announcement__footer">
<a href="#plan-comment-textarea" class="announcement__footer-action icon-message-square">Комментировать</a>
<button type="button" wire:click="like"
class="announcement__footer-action icon-heart {{ $plan->isLiked() ? 'announcement__footer-action-liked' : '' }}">Нравится</button>
<button type="button" wire:click="like" class="announcement__footer-action icon-heart {{ $plan->isLiked() ? 'announcement__footer-action-liked' : '' }}">Нравится</button>
<button type="button" class="announcement__footer-action icon-share">Поделится</button>
</div>
</div>