alex_chevski/eatvio-infra
1
0
Fork 0
forked from eatvio/eatvio-infra
Code Pull Requests Activity

Merge pull request 'main' (#9) from eatvio/eatvio:main into main

Browse Source 
Reviewed-on: apoloz/eatvio#9
This commit is contained in:
apoloz
2023-12-25 14:02:54 +00:00
parent 088bf51201 2965f20fc9
commit 16eb0cc984
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/livewire/recipe/comment/create.blade.php
View File

@@ -21,7 +21,7 @@
<input wire:model="isChecked" wire:click="$set('grade',0)" type="radio" name="rate" id="rate-0"
value="1" hidden>
</div>
<button wire:click.prevent="save" type="button" class="btn btn-primary">Оставь отзыв</button>
<button wire:click.prevent="save" type="button" class="l-btn l-btn-primary">Оставь отзыв</button>
</div>

18
resources/views/livewire/recipe/create.blade.php
View File

@@ -51,11 +51,11 @@
Тип записи
</div>
<div class="diary__stats-tablist" role="tablist" aria-labelledby="label">
<button class="btn" role="tab" type="button" id="tab-1"
<button class="l-btn" role="tab" type="button" id="tab-1"
wire:click="toggleStateRow('ingredient')"
aria-selected="{{ $state_row['ingredient'] }}"
aria-controls="tabpanel-1">Рецепт</button>
<button class="btn" role="tab" type="button" id="tab-2"
<button class="l-btn" role="tab" type="button" id="tab-2"
wire:click="toggleStateRow('article')" aria-selected="{{ $state_row['article'] }}"
aria-controls="tabpanel-2" tabindex="-1">Cтатья</button>
</div>
@@ -147,7 +147,7 @@
<td>
<button wire:click="removeIngredient({{ $k }})"
type="button"
class="diet__form-add btn btn-primary">-</button>
class="diet__form-add l-btn l-btn-primary">-</button>
</td>
</tr>
@endforeach
@@ -176,7 +176,7 @@
<option value="to_taste">по вкусу</option>
</select>
<button wire:click="addIngredient" type="button"
class="btn btn-primary icon-plus"></button>
class="l-btn l-btn-primary icon-plus"></button>
</div>
<button type="button" class="icon-gear"></button>
</div>
@@ -272,9 +272,9 @@
id="step[{{ $i }}][description]" placeholder="Введите описание шага"></textarea>
<div class="diet__form-column">
<button type="button" wire:click="removeStep({{ $i }})"
class="diet__form-add btn {{ $i == 0 ? 'btn-gray' : 'btn-primary' }}"
class="diet__form-add l-btn {{ $i == 0 ? 'l-btn-gray' : 'l-btn-primary' }}"
@disabled($i == 0)>-</button>
<button type="button" wire:click="addStep" class="diet__form-add btn btn-primary"
<button type="button" wire:click="addStep" class="diet__form-add l-btn l-btn-primary"
data-bs-original-title="Добавить шаг">+</button>
</div>
</div>
@@ -376,11 +376,11 @@
</div> --}}
<div class="diet__container">
<div class="diet__btns">
<button wire:click="draft" class="diet__btn btn btn-gray"
<button wire:click="draft" class="diet__btn l-btn l-btn-gray"
type="button">{{ __('recipe.to_drafts') }}</button>
<button wire:click="preview" class="diet__btn btn btn-gray"
<button wire:click="preview" class="diet__btn l-btn l-btn-gray"
type="button">{{ __('recipe.preview') }}</button>
<button wire:click="publish" class="diet__btn btn btn-primary"
<button wire:click="publish" class="diet__btn l-btn l-btn-primary"
type="submit">{{ __('recipe.publish') }}</button>
</div>
</div>

20
resources/views/livewire/recipe/edit.blade.php
View File

@@ -58,11 +58,11 @@
</div>
<div class="diary__stats-tablist" role="tablist" aria-labelledby="label">
<button class="btn" role="tab" type="button" id="tab-1"
<button class="l-btn" role="tab" type="button" id="tab-1"
wire:click="toggleStateRow('ingredient')"
aria-selected="{{ $state_row['ingredient'] }}"
aria-controls="tabpanel-1">Рецепт</button>
<button class="btn" role="tab" type="button" id="tab-2"
<button class="l-btn" role="tab" type="button" id="tab-2"
wire:click="toggleStateRow('article')" aria-selected="{{ $state_row['article'] }}"
aria-controls="tabpanel-2" tabindex="-1">Cтатья</button>
</div>
@@ -169,7 +169,7 @@
<input wire:model="ingredients.0.portion" class="input"
placeholder="Порция" required="" type="number">
<button wire:click="addIngredient" type="button"
class="btn btn-primary icon-plus"></button>
class="l-btn l-btn-primary icon-plus"></button>
</div>
</div>
</div>
@@ -205,11 +205,11 @@
type="number">
@if ($k == count($ingredients) - 1)
<button wire:click="addIngredient" type="button"
class="btn btn-primary icon-plus"></button>
class="l-btn l-btn-primary icon-plus"></button>
@endif
</div>
<button wire:click="removeIngredient({{ $k }})" type="button"
class="btn btn-danger">x</button>
class="l-btn l-btn-danger">x</button>
</div>
</div>
</div>
@@ -332,8 +332,8 @@
rows="5">{{ $steps[$i]['description'] ?? '' }}</textarea>
<div class="diet__form-column">
<button type="button" wire:click="removeStep({{ $i }})"
class="diet__form-add btn btn-primary" @disabled($i == 0)>-</button>
<button type="button" wire:click="addStep" class="diet__form-add btn btn-primary"
class="diet__form-add l-btn l-btn-primary" @disabled($i == 0)>-</button>
<button type="button" wire:click="addStep" class="diet__form-add l-btn l-btn-primary"
data-bs-toggle="tooltip" data-bs-placement="left" title=""
data-bs-original-title="Добавить шаг">+</button>
</div>
@@ -356,11 +356,11 @@
</div>
<div class="diet__btns">
<button wire:click="draft" type="button"
class="diet__btn btn btn-gray">{{ __('recipe.to_drafts') }}</button>
class="diet__btn l-btn l-btn-gray">{{ __('recipe.to_drafts') }}</button>
<button type="button" wire:click="preview"
class="diet__btn btn btn-gray">{{ __('recipe.preview') }}</button>
class="diet__btn l-btn l-btn-gray">{{ __('recipe.preview') }}</button>
<button type="button" wire:click="publish"
class="diet__btn btn btn-primary">{{ __('recipe.publish') }}</button>
class="diet__btn l-btn l-btn-primary">{{ __('recipe.publish') }}</button>
</div>
<div class="container mb-5 p-0 --mw-1000">

2
resources/views/recipe/show.blade.php
View File

@@ -58,7 +58,7 @@
<ul class="announcement__actions-list">
<li class="announcement__actions-item">
<a href="{{route('recipe.edit', ['recipe' => $recipe->id], false)}}" class="announcement__action">Редактировать</a>
<a href="{{route('recipe.edit', ['recipe' => $recipe], false)}}" class="announcement__action">Редактировать</a>
</li>
<li class="announcement__actions-item">
<button type="button" class="announcement__action">О рекламодателе</button>