forge-joniko/ldc-volena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/issue-55' into re7-fixes

Browse source
This commit is contained in:
Noah Lancien 2024-07-25 10:40:41 +02:00
commit a072b82904
4 changed files with 30 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.env.example
View file

@ -61,6 +61,9 @@ VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
# Sentry
SENTRY_LARAVEL_DSN=
# Matomo
MATOMO_SITE_ID=id
# MAILS
MAIL_CONTACT_REMARK="equipe.web@ldc.fr"
MAIL_CONTACT_SPONSORING="equipe.web@ldc.fr"

4
app/Http/Requests/Bo/Sections/UpdateSectionRequest.php
View file

@ -36,7 +36,9 @@ class UpdateSectionRequest extends UpdateMiniCrudRequest
/** @var \App\Models\Section|null $section */
$section = $this->route('section');
if ($section) {
if ($section->section !== \App\Enums\Sections\PageSectionEnum::hire_grow) {
if (
$section->section !== \App\Enums\Sections\PageSectionEnum::hire_grow
) {
$rules = \array_merge($rules, [
'text' => 'present',
]);

2
database/migrations/2024_06_21_145915_qa_section.php
View file

@ -4,9 +4,7 @@ use App\Enums\Sections\PageSectionEnum;
use App\Lib\Helpers\FileStorageHelper;
use App\Models\Section;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{

48
resources/views/fo/pages/produce/show.blade.php
View file

@ -41,7 +41,7 @@
</div>
</section>
{{-- GMS --}}
<section class="border-top-curved-tertiary-light">
{{-- <section class="border-top-curved-tertiary-light">
<div class="bg-tertiary-light overflow-hidden pb-5">
<div class="container text-center">
<h2 class="fw-bold text-primary mb-3">{{ $gmsSection->h2_title }}</h2>
@ -50,21 +50,21 @@
<div class="ck-content">
{!! clean($gmsSection->text) !!}
</div>
</div>
</div> --}}
{{-- PART 1 --}}
@include('fo.pages.produce.banner-elements', [
{{-- @include('fo.pages.produce.banner-elements', [
'partName' => 'de_la_partie1',
'data' => $gmsSection->data,
'itemMax' => 3,
])
]) --}}
{{-- PART 2 --}}
@include('fo.pages.produce.banner-elements', [
{{-- @include('fo.pages.produce.banner-elements', [
'partName' => 'de_la_partie2',
'data' => $gmsSection->data,
'itemMax' => 3,
])
]) --}}
{{-- PART 3 --}}
@include('fo.pages.produce.banner-elements', [
{{-- @include('fo.pages.produce.banner-elements', [
'partName' => 'de_la_partie3',
'data' => $gmsSection->data,
'itemMax' => 1,
@ -72,15 +72,15 @@
</div>
</div>
</div>
</section>
</section> --}}
{{-- RHD --}}
<section class="border-top-curved-upper-tertiary-light">
{{-- <section class="border-top-curved-upper-tertiary-light">
<div class="overflow-hidden bg-white pb-5">
<div class="container text-center">
<h2 class="fw-bold text-primary mb-3">{{ $rhdSection->h2_title }}</h2>
<div class="row justify-content-center">
<div class="row justify-content-center"> --}}
{{-- PART 1 --}}
@include('fo.pages.produce.banner-elements', [
{{-- @include('fo.pages.produce.banner-elements', [
'partName' => 'de_la_partie1',
'data' => $rhdSection->data,
'itemMax' => 10,
@ -92,9 +92,9 @@
</div>
<div class="col-md-8 mb-3">
<button class="btn btn-primary rounded-pill">{{ __('LDC restauration') }}</button>
</div>
</div> --}}
{{-- PART 2 --}}
<div class="col-md-8 mb-3">
{{-- <div class="col-md-8 mb-3">
<div class="row w-100 bg-nine rounded-4 mx-auto p-4">
<div class="col-4 d-none d-md-flex flex-column justify-content-center align-items-start">
<h3 class="h3 text-primary fw-bold text-uppercase m-0">{{ __('le saviez-vous ?') }}</h3>
@ -116,9 +116,9 @@
</div>
</div>
</div>
</section>
</section> --}}
{{-- EXPORT --}}
<section class="border-top-curved-primary">
{{-- <section class="border-top-curved-primary">
<div class="bg-primary overflow-hidden pb-5 text-white">
<div class="container text-center">
<h2 class="fw-bold mb-3">{{ $exportSection->h2_title }}</h2>
@ -131,25 +131,25 @@
</div>
</div>
</div>
</section>
</section> --}}
{{-- QUALITY --}}
<section class="border-top-curved-upper-primary">
{{-- <section class="border-top-curved-upper-primary"> --}}
<div class="overflow-hidden bg-white pb-5">
<div class="container">
<div class="row justify-content-center gx-5">
<div class="col-md-8 mb-3 text-center">
<h2 class="fw-bold mb-3">{{ $qualitySection->h2_title }}</h2>
{{-- @include('fo.pages.produce.banner-elements', [
'partName' => 'de_la_partie1',
'data' => $qualitySection->data,
'itemMax' => 1,
])
<div class="ck-content">{!! clean($qualitySection->text) !!}</div>
@if ($qualitySection->data['bloc_button__on_vous_explique_comment_lire_cetteetiquette']['value'])
<a class="btn btn-primary rounded-pill mt-3" href="https://www.etiquettebienetreanimal.fr/"
target="_blank">{{ __('On vous explique comment lire cette étiquette') }}</a>
@endif
@endif --}}
</div>
@include('fo.pages.produce.banner-elements', [
'partName' => 'de_la_partie1',
'data' => $qualitySection->data,
'itemMax' => 1,
])
<div class="col-md-8 mb-3 text-center">
<div class="bg-tertiary-light rounded-4 my-3 p-4">
<div class="ck-content">{!! clean($qualitySection->data['bloc_text_de_la_partie2_content']['value']) !!}</div>
@ -193,5 +193,5 @@
</div>
</div>
</div>
</section>
{{-- </section> --}}
@endsection