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

Merge branch 'develop' into trunk

Browse source
This commit is contained in:
Vincent BRIDIER 2024-07-18 10:05:34 +02:00
commit bfcffbb223
No known key found for this signature in database
GPG key ID: 8571BFA20420D512
9 changed files with 1479 additions and 1993 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Requests/Bo/Recipes/StoreRecipeRequest.php
View file

@ -75,7 +75,7 @@ class StoreRecipeRequest extends FormRequest
'difficulty' => ['required', new Enum(DifficultyEnum::class)],
'cooking_mode' => [
'required_with:cooking_time',
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed
function ($attribute, $value, $fail) {
if ($this->cooking_time == 0 and $value != 0) {
$fail(\trans(":attribute doit être à :enumValue quand temps de cuisson est à 0.", [
@ -97,7 +97,7 @@ class StoreRecipeRequest extends FormRequest
'preparation_time' => 'required|numeric|min:1|max:1440',
'status' => 'required|boolean',
'products' => [
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed
'present', 'array', function ($attribute, array $value, $fail) {
if (count($value) < 1 || count($value) > 3) {
$fail(\trans('Vous devez associer 1 à 3 produits.'));
@ -108,7 +108,7 @@ class StoreRecipeRequest extends FormRequest
'products.*.value' => 'required|exists:products,id',
'products.*.label' => 'required|string',
'recipes' => [
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed
'present', 'array', function ($attribute, array $value, $fail) {
if (count($value) > 3) {
$fail(\trans('Vous devez associer au maximum 3 recettes.'));

2
app/Http/Requests/Fo/Contact/ContactRequest.php
View file

@ -30,7 +30,7 @@ class ContactRequest extends FormRequest
return [
'civility' => [
'required',
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed
// phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundBeforeLastUsed
function ($attribute, $value, $fail) {
if (!in_array($value, CivilityEnum::toValues())) {
$fail(__('Veuillez choisir entre :values', [

3429
composer.lock generated
View file

File diff suppressed because it is too large Load diff

10
package-lock.json generated
View file

@ -1,5 +1,5 @@
{
"name": "lionor",
"name": "srcs",
"lockfileVersion": 3,
"requires": true,
"packages": {
@ -11,7 +11,7 @@
"@fortawesome/free-regular-svg-icons": "latest",
"@fortawesome/free-solid-svg-icons": "latest",
"@fortawesome/vue-fontawesome": "^3.0.3",
"@ldc-web/cookie-notice": "^6.0.1",
"@ldc-web/cookie-notice": "^6.0.3",
"@rushstack/eslint-patch": "^1.3.2",
"@sipec/vue3-tags-input": "^3.0.4",
"@types/bootstrap": "^5.2.7",
@ -2435,9 +2435,9 @@
}
},
"node_modules/@ldc-web/cookie-notice": {
"version": "6.0.1",
"resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-6.0.1.tgz",
"integrity": "sha1-cpqBtzjutcgrzXCcyoAVsv9oBpo=",
"version": "6.0.3",
"resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-6.0.3.tgz",
"integrity": "sha1-mW2DD+8ipWkmvKhZ3m9h5wemAHI=",
"dev": true
},
"node_modules/@nodelib/fs.scandir": {

2
package.json
View file

@ -18,7 +18,7 @@
"@fortawesome/free-regular-svg-icons": "latest",
"@fortawesome/free-solid-svg-icons": "latest",
"@fortawesome/vue-fontawesome": "^3.0.3",
"@ldc-web/cookie-notice": "^6.0.1",
"@ldc-web/cookie-notice": "^6.0.3",
"@rushstack/eslint-patch": "^1.3.2",
"@sipec/vue3-tags-input": "^3.0.4",
"@types/bootstrap": "^5.2.7",

2
resources/lang/en/cookie-notice.php
View file

@ -1,6 +1,6 @@
<?php
// * Version 3.0.8
// * Version 6.0.3
// phpcs:disable
return [
'button_customize_cookies' => 'Customize cookies',

2
resources/lang/fr/cookie-notice.php
View file

@ -1,6 +1,6 @@
<?php
// * Version 3.0.8
// * Version 6.0.3
// phpcs:disable
return [
'button_customize_cookies' => 'Personnaliser les cookies',

10
resources/views/vendor/cn-cookies.blade.php vendored
View file

@ -16,19 +16,23 @@ $strings = (object)[
'button_toggle_cookie' => __('cookie-notice.button_toggle_cookie'),
'button_forbid_all' => Str::upper(__('cookie-notice.button_forbid_all')),
'button_allow_all' => Str::upper(__('cookie-notice.button_allow_all')),
'button_allow' => __('cookie-notice.button_allow'),
'button_customize' => Str::upper(__('cookie-notice.button_customize')),
'button_forbid_all_title' => __('cookie-notice.button_forbid_all_title'),
'button_allow_all_title' => __('cookie-notice.button_allow_all_title'),
'button_validate_and_close' => Str::upper(__('cookie-notice.button_validate_and_close')),
'banner_title' => __('cookie-notice.banner_title', ['site_name' => $site_name]),
'banner_text' => __('cookie-notice.banner_text'),
'banner_text' => sprintf(
"%s<br><br>%s",
__('cookie-notice.banner_text'),
"<a href='/politique-de-donnees-personnelles'>Charte de confidentialité</a>"
),
'panel_content' => __('cookie-notice.panel_content'),
'picture_cookie_title' => __('cookie-notice.picture_cookie_title'),
'navigation_title' => __('cookie-notice.navigation_title'),
'privacy_policy' => __('cookie-notice.privacy_policy'),
];
$cookieInline = function ($translations, $cookieName, $text, $subtext = '') {
return <<<SCRIPT
(() => {
@ -65,7 +69,7 @@ $cookieInline = function ($translations, $cookieName, $text, $subtext = '') {
const childBtn = document.createElement("button");
childBtn.classList.add("btn", "btn-outline-primary", "rounded-2", "fs-6", "fw-bold", "ms-3", "px-4", "py-3");
childBtn.textContent = '{$translations->button_allow}';
childBtn.textContent = '{$translations->button_allow_all}';
cookieActivate.appendChild(childSpan);
cookieActivate.appendChild(childBtn);

9
resources/views/vendor/cookie-notice-templates/standard.blade.php vendored
View file

@ -33,15 +33,16 @@
<span>{!! nl2br(e($strings->banner_title)) !!}</span>
</div>
<div class="cn-banner-para-p">
<p>{!! nl2br(e($strings->banner_text)) !!}</p>
<a href="{{ route('policies') }}">{{ $strings->privacy_policy }}</a>
<p>{!! clean($strings->banner_text) !!}</p>
</div>
</div>
</div>
{{-- 2ND PAGE CUSTOMIZE PANEL --}}
<div class="cn-modal-container d-none">
{{-- COOKIES LIST --}}
<ul id="cn-modal-list"></ul>
<div class="cn-modal-wrapper">
{{-- COOKIES LIST --}}
<ul id="cn-modal-list"></ul>
</div>
</div>
</div>
{{-- NAV BAR --}}