github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-12 15:26:17 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reworked recipe card (fixes #543)

Browse Source
This commit is contained in:
Bernd Bestel 2020-02-04 19:48:00 +01:00
parent fcfe62f4d3
commit a5277224f5
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
1 changed files with 86 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
views/recipes.blade.php
View File

@ -129,6 +129,7 @@
@if($selectedRecipe !== null)
<div class="col-xs-12 col-md-6">
<div id="selectedRecipeCard" class="card">
<div class="card-header card-header-fullscreen">
<i class="fas fa-cocktail"></i> {{ $selectedRecipe->name }}&nbsp;&nbsp;
<a id="selectedRecipeConsumeButton" class="btn btn-sm btn-outline-success py-0 hide-when-embedded hide-on-fullscreen-card @if(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $selectedRecipe->id)->need_fulfilled == 0) disabled @endif" href="#" data-toggle="tooltip" title="{{ $__t('Consume all ingredients needed by this recipe') }}" data-recipe-id="{{ $selectedRecipe->id }}" data-recipe-name="{{ $selectedRecipe->name }}">
@ -147,8 +148,9 @@
<i class="fas fa-expand-arrows-alt"></i>
</a>
</div>
<div id="selectedRecipeCard" class="card">
<div class="card-body mb-0 pb-0">
<div class="row">
<div class="col-4">
@include('components.numberpicker', array(
@ -179,30 +181,25 @@
</div>
@endif
</div>
</div>
<!-- Subrecipes first -->
@foreach($selectedRecipeSubRecipes as $selectedRecipeSubRecipe)
<div class="card-body">
<h3 class="mb-0">{{ $selectedRecipeSubRecipe->name }}</h3>
</div>
<h3 class="mb-2">{{ $selectedRecipeSubRecipe->name }}</h3>
@if(!empty($selectedRecipeSubRecipe->picture_file_name))
<p class="w-75 mx-auto txt-center"><img src="{{ $U('/api/files/recipepictures/' . base64_encode($selectedRecipeSubRecipe->picture_file_name) . '?force_serve_as=picture&best_fit_width=400') }}" class="img-fluid img-thumbnail lazy"></p>
<p class="w-75 mx-auto text-center"><img src="{{ $U('/api/files/recipepictures/' . base64_encode($selectedRecipeSubRecipe->picture_file_name) . '?force_serve_as=picture&best_fit_width=400') }}" class="img-fluid img-thumbnail lazy"></p>
@endif
@php $selectedRecipeSubRecipePositionsFiltered = FindAllObjectsInArrayByPropertyValue($selectedRecipeSubRecipesPositions, 'child_recipe_id', $selectedRecipeSubRecipe->id); @endphp
@if(count($selectedRecipeSubRecipePositionsFiltered) > 0)
<div class="card-body">
<h5 class="mb-0">{{ $__t('Ingredients') }}</h5>
</div>
<ul class="list-group list-group-flush">
@php $lastGroup = 'undefined'; @endphp
@foreach($selectedRecipeSubRecipePositionsFiltered as $selectedRecipePosition)
@if($lastGroup != $selectedRecipePosition->ingredient_group)
<h5 class="mb-2 mt-2 ml-4"><strong>{{ $selectedRecipePosition->ingredient_group }}</strong></h5>
@endif
<li class="list-group-item">
<li class="list-group-item px-0">
@php
$product = FindObjectInArrayByPropertyValue($products, 'id', $selectedRecipePosition->product_id);
$productQuConversions = FindAllObjectsInArrayByPropertyValue($quantityUnitConversionsResolved, 'product_id', $product->id);
@ -234,11 +231,10 @@
@endforeach
</ul>
@endif
@if(!empty($selectedRecipeSubRecipe->description))
<div class="card-body">
<h5>{{ $__t('Preparation') }}</h5>
<h5 class="mt-4">{{ $__t('Preparation') }}</h5>
{!! $selectedRecipeSubRecipe->description !!}
</div>
@endif
@endforeach
@ -248,16 +244,14 @@
@endif
@if($selectedRecipePositionsResolved->count() > 0)
<div class="card-body">
<h5 class="mb-0">{{ $__t('Ingredients') }}</h5>
</div>
<ul class="list-group list-group-flush">
@php $lastGroup = 'undefined'; @endphp
@foreach($selectedRecipePositionsResolved as $selectedRecipePosition)
@if($lastGroup != $selectedRecipePosition->ingredient_group)
<h5 class="mb-2 mt-2 ml-4"><strong>{{ $selectedRecipePosition->ingredient_group }}</strong></h5>
@endif
<li class="list-group-item">
<li class="list-group-item px-0">
@php
$product = FindObjectInArrayByPropertyValue($products, 'id', $selectedRecipePosition->product_id);
$productQuConversions = FindAllObjectsInArrayByPropertyValue($quantityUnitConversionsResolved, 'product_id', $product->id);
@ -289,14 +283,14 @@
@endforeach
</ul>
@endif
@if(!empty($selectedRecipe->description))
<div class="card-body">
<h5>{{ $__t('Preparation') }}</h5>
<h5 class="mt-4">{{ $__t('Preparation') }}</h5>
{!! $selectedRecipe->description !!}
</div>
@endif
</div>
</div>
</div>
@endif
</div>