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

Merge remote-tracking branch 'origin/issue-48' into php-stan-issues-48-57

Browse source
This commit is contained in:
Noah Lancien 2024-01-26 13:03:07 +01:00
commit ffdd886ddc
7 changed files with 41 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Middleware/SecureHeaders.php
View file

@ -59,7 +59,10 @@ class SecureHeaders
config('app.debug') ? "https://{$host}:4443" : '',
'https://yl.s-web.fr',
]) . ';',
"img-src * https://yl.s-web.fr data: blob:;",
"img-src 'self' data: blob: " . implode(' ', [
// * VITE DEV
config('app.debug') ? "https://{$host}:4443" : ''
]) . ';',
'frame-src ' . implode(' ', [
'https://www.google.com/recaptcha/',
'https://recaptcha.google.com/recaptcha/',

2
resources/sass/fo/fo.scss
View file

@ -4,8 +4,8 @@
@import './utilities/variables';
// * VENDOR
@import './vendor/ckEditorContent';
@import './vendor/bootstrap';
@import './vendor/ckEditorContent';
@import "./vendor/cookie-notice";
@import "./vendor/swiper";

14
resources/sass/fo/vendor/_ckEditorContent.scss vendored
View file

@ -13,6 +13,20 @@
@import "bootstrap/scss/mixins";
@import "bootstrap/scss/root";
@import "bootstrap/scss/reboot";
// * CK CONTENT overload pour créa
h2 {
width: fit-content;
padding: 0.2rem 1.5rem;
margin-top: 0.5rem;
color: $body-bg;
font-family: 'Readex Pro', sans-serif !important;
hyphens: auto;
overflow-wrap: break-word;
@include input-shape($body-color);
}
}
/*

8
resources/views/fo/pages/home.blade.php
View file

@ -49,7 +49,9 @@
<span class="f-readex-pro fs-6 fw-semibold">{{ __('au fil de l\'année') }}</span>
<span class="f-sheldon fs-1 mb-3 mt-1">{{ $seasonalSectionsModel->title }}</span>
</h2>
{!! clean($seasonalSectionsModel->text) !!}
<div class="ck-content">
{!! clean($seasonalSectionsModel->text) !!}
</div>
</div>
</div>
<div class="seasonal-sections-image bg-agis-white col-12 col-xl-6 position-relative mx-xl-0 mx-auto w-auto p-4">
@ -74,7 +76,9 @@
</div>
<div class="col-12 col-md-6">
<div class="description-paragraph d-flex flex-column justify-content-center align-items-start h-100">
{!! clean($homepageModel->presentation_content) !!}
<div class="ck-content">
{!! clean($homepageModel->presentation_content) !!}
</div>
<a class="btn btn-primary fw-bold mt-1" href="{{ route('fo.explorer') }}">{{ __('> En savoir +') }}</a>
</div>
</div>

4
resources/views/fo/pages/news/show.blade.php
View file

@ -34,7 +34,9 @@
<div class="news-single-content mx-auto mt-3">
<p class="fs-7 fw-semibold text-center">{{ $newsModel->subtitle }}</p>
<br>
{!! clean($newsModel->content) !!}
<div class="ck-content">
{!! clean($newsModel->content) !!}
</div>
</div>
</div>
<div class="row pb-5">

12
resources/views/fo/pages/products/show.blade.php
View file

@ -57,7 +57,11 @@
</div>
{{-- DESCRIPTION --}}
<div class="text-lg-center col-12 col-lg-9 mx-lg-auto px-3 text-justify">{!! clean($productModel->description) !!}</div>
<div class="text-lg-center col-12 col-lg-9 mx-lg-auto px-3 text-justify">
<div class="ck-content">
{!! clean($productModel->description) !!}
</div>
</div>
{{-- PICTOS --}}
@if (!empty($productModel->commitments))
@ -89,7 +93,11 @@
<div class="col-12 mt-4">
<img class="picto-img float-start me-3 mt-3" src="{{ Vite::asset($productModel->cooking_mode->picture()) }}"
title="{{ $productModel->cooking_mode->label() }}" alt="{{ $productModel->cooking_mode->alt() }}">
<div class="cooking-advice text-justify">{!! clean($productModel->cooking_advice) !!}</div>
<div class="cooking-advice text-justify">
<div class="ck-content">
{!! clean($productModel->cooking_advice) !!}
</div>
</div>
</div>
</section>
</div>

4
resources/views/fo/pages/ranges/show.blade.php
View file

@ -23,7 +23,9 @@
<p class="highlight black f-readex-pro m-0 mb-2 px-3 text-white">
{{ Str::of($rangeModel->tagline)->ucFirst() }}
</p>
{!! clean($rangeModel->description) !!}
<div class="ck-content">
{!! clean($rangeModel->description) !!}
</div>
</div>
<div class="col-12 col-xl-6 m-xl-0 my-4">
<div class="d-flex justify-content-center">