Merge branch 'trunk'

This commit is contained in:
Noah Lancien 2026-05-05 16:30:13 +02:00
commit eb56433edd
14 changed files with 104 additions and 42 deletions

View file

@ -56,6 +56,14 @@ MAIL_PASSWORD=null
MAIL_FROM_ADDRESS="hello@example.com"
MAIL_FROM_NAME="${APP_NAME}"
MAIL_LIST_BREEDER=
MAIL_LIST_COMMITMENTS=
MAIL_LIST_EXPORT=
MAIL_LIST_FINANCE=
MAIL_LIST_INFO=
MAIL_LIST_PRESS=
MAIL_LIST_RESTAURATION=
VITE_APP_NAME="${APP_NAME}"
# TELESCOPE

View file

@ -49,34 +49,16 @@ enum ContactFormType: int
{
// phpcs:enable
return match ($this) {
self::collaborator => [],
self::breeder => [
'marie-charlotte.garnier@ldc.fr',
'dylan.chevalier@ldc.fr',
],
self::professional => null,
self::restauration => [
'rhd@ldc.fr',
],
self::export => [
'alexis.lambert@ldc.fr',
'bruno.lafon@ldc.fr',
],
self::finance => [
'david.eluaud@ldc.fr',
'malaury.offe@ldc.fr',
],
self::commitments => [
'claire-marie.gesland@ldc.fr',
],
self::product => [],
self::info => [
'blandine.durand-gratian@ldc.fr',
'malaury.offe@ldc.fr',
],
self::press => [
'communicationgroupe@ldc.fr',
],
self::breeder => config('mail.to.breeder'),
self::restauration => config('mail.to.restauration'),
self::export => config('mail.to.export'),
self::finance => config('mail.to.finance'),
self::commitments => config('mail.to.commitments'),
self::info => config('mail.to.info'),
self::press => config('mail.to.press'),
self::collaborator,
self::product,
self::professional => null
// phpcs:ignore Squiz.Commenting.InlineComment
}; //end match
}

View file

@ -67,7 +67,6 @@ class News extends Model implements TranslatableModel, LocalizedUrlRoutable, Sit
use HasFactory;
use HasTranslations;
use SoftDeletes;
use HasCache;
use HasUwilImages {
HasUwilImages::inertiaFill as traitInertiaFill;
}
@ -528,7 +527,7 @@ class News extends Model implements TranslatableModel, LocalizedUrlRoutable, Sit
'newsables',
'news_id',
'newsable_id'
);
)->using(Newsable::class);
}
/**
@ -544,6 +543,6 @@ class News extends Model implements TranslatableModel, LocalizedUrlRoutable, Sit
'newsables',
'news_id',
'newsable_id'
)->withTimestamps();
)->using(Newsable::class)->withTimestamps();
}
}

35
app/Models/Newsable.php Normal file
View file

@ -0,0 +1,35 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Relations\MorphPivot;
/**
* @property integer $id Id of the news.
* @property \App\Models\News $news_id Name of the news.
* @property \App\Models\NewsCategory|\App\Models\NewsTag $newsable_id Name of the category or tag.
* @property class-string<static> $newsable_type Class of the category or tag.
* @property-read \Carbon\Carbon $created_at Created date of the news.
* @property-read \Carbon\Carbon $updated_at Updated date of the news.
*/
class Newsable extends MorphPivot
{
/**
* The table associated with the model.
*
* @var string|null
*/
protected $table = 'newsables';
/**
* Perform any actions required after the model boots.
*
* @return void
*/
protected static function booted(): void
{
static::created(fn() => News::resetCache());
static::updated(fn() => News::resetCache());
static::deleted(fn() => News::resetCache());
}
}

View file

@ -114,4 +114,14 @@ return [
'name' => env('MAIL_FROM_NAME', 'Example'),
],
'to' => [
'breeder' => explode(',', env('MAIL_LIST_BREEDER')) ?? [],
'commitments' => explode(',', env('MAIL_LIST_COMMITMENTS')) ?? [],
'export' => explode(',', env('MAIL_LIST_EXPORT')) ?? [],
'finance' => explode(',', env('MAIL_LIST_FINANCE')) ?? [],
'info' => explode(',', env('MAIL_LIST_INFO')) ?? [],
'press' => explode(',', env('MAIL_LIST_PRESS')) ?? [],
'restauration' => explode(',', env('MAIL_LIST_RESTAURATION')) ?? [],
]
];

View file

@ -23,6 +23,13 @@ data:
MAIL_ENCRYPTION: "${APP_MAIL_ENCRYPTION}"
MAIL_FROM_ADDRESS: "${APP_MAIL_FROM_ADDRESS}"
MAIL_FROM_NAME: "${APP_APP_NAME}"
MAIL_LIST_BREEDER: "${APP_MAIL_LIST_BREEDER}"
MAIL_LIST_COMMITMENTS: "${APP_MAIL_LIST_COMMITMENTS}"
MAIL_LIST_EXPORT: "${APP_MAIL_LIST_EXPORT}"
MAIL_LIST_FINANCE: "${APP_MAIL_LIST_FINANCE}"
MAIL_LIST_INFO: "${APP_MAIL_LIST_INFO}"
MAIL_LIST_PRESS: "${APP_MAIL_LIST_PRESS}"
MAIL_LIST_RESTAURATION: "${APP_MAIL_LIST_RESTAURATION}"
SENTRY_LARAVEL_DSN: "${APP_SENTRY_LARAVEL_DSN}"
TELESCOPE_ENABLED: "${APP_TELESCOPE_ENABLED}"
CRM_ENDPOINT: "${APP_CRM_ENDPOINT}"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View file

@ -24,10 +24,16 @@
'image' => [
['url' => $item['image_visual']]
],
'button' => !empty($item['list_button']) ? [
'url' => \App\Models\Document::getAccessModel($item['list_button'][0]['model_document']),
'target' => '_blank',
'title' => $item['list_button'][0]['string_label'],
] : null,
'button_icon' => !empty($item['list_button']) ? 'btn__icon_dl' : null
];
})->toArray();
@endphp
<x-front.text-block
<x-front.text-block
:textBlock="[
'bg' => '0',
'title' => $business['string_title'],

View file

@ -3,7 +3,7 @@
@if ($document->is_issuu)
<x-front.sections.accordion.document-accordion :document='$document' />
@else
<a class="posts-list__item list-item-doc" href="{{ $document['path'] }}" title="{{ $document['name'] }}"
<a class="posts-list__item list-item-doc" href="/{{ $document['path'] }}" title="{{ $document['name'] }}"
download="" style="opacity: 1; transition: 250ms;">
{{ $document['name'] }}
</a>

View file

@ -171,7 +171,7 @@
</a>
@else
<a class="header__logo" href="/" title="logo">
<img src="/assets/img/logo_en.png" alt="Logo">
<img src="{{ Vite::asset('resources/assets/images/front/logo-en.png') }}" alt="Logo">
</a>
@endif
</div>

View file

@ -3,7 +3,13 @@
<div class="header__mobile-nav-button">
<span class="header__mobile-nav-button-element"></span>
</div>
<a class="header__mobile-logo" href="/" title="logo"><img src="/assets/img/logo.png" alt="Logo" /></a>
<a class="header__mobile-logo" href="/" title="logo">
@if (app()->getLocale() === 'fr')
<img src="/assets/img/logo.png" alt="Logo" />
@else
<img src="{{ Vite::asset('resources/assets/images/front/logo-en.png') }}" alt="Logo" />
@endif
</a>
<div class="header__mobile-icon-block">
<div class="header__search-btn"></div>
<div class="header__search header-search sub-menu">
@ -32,7 +38,13 @@
<div class="mobile-menu__wrapper">
<div class="mobile-menu__top">
<div class="mobile-menu__close"></div>
<div class="mobile-menu__logo"><img src="/assets/img/logo.png" alt="Logo" /></div>
<div class="mobile-menu__logo">
@if (app()->getLocale() === 'fr')
<img src="/assets/img/logo.png" alt="Logo" />
@else
<img src="{{ Vite::asset('resources/assets/images/front/logo-en.png') }}" alt="Logo" />
@endif
</div>
</div>
<div class="mobile-menu__block mobile-menu__block_main">
<ul data-menu="main" class="mobile-menu__level">

View file

@ -1,11 +1,12 @@
{{-- blade-formatter-disable --}}
@php
$site_name = str(config('app.name'))->ucFirst();
$logo_picture_url = '/assets/img/logo.png';
// $logo_picture_url = Vite::asset('resources/assets/images/legaulois-logo.png');
$logo_title_text = __('Logo du site :name', ['name' => $site_name]);
$logo_alt_text = __('Logo :name', ['name' => $site_name]);
$site_name = str(config('app.name'))->ucFirst();
$logo_picture_url = app()->getLocale() === 'fr' ?
'/assets/img/logo.png' :
Vite::asset('resources/assets/images/front/logo-en.png');
$logo_title_text = __('Logo du site :name', ['name' => $site_name]);
$logo_alt_text = __('Logo :name', ['name' => $site_name]);
$strings = (object)[
'modal_title' => __('cookie-notice.modal_title'),

View file

@ -5,6 +5,7 @@ import path from "path";
import react from '@vitejs/plugin-react';
import eslint from 'vite-plugin-eslint';
import stylelint from "vite-plugin-stylelint";
import glob from "glob";
const env = loadEnv("r", process.cwd(), "");
const debugMode = env["APP_DEBUG"] === "true";
@ -17,7 +18,8 @@ export default defineConfig({
'resources/ts/back/app.tsx',
'resources/sass/back/app.scss',
// FRONT
'resources/ts/front/app.ts'
'resources/ts/front/app.ts',
...glob.sync('resources/assets/images/front/**/*.{jpg,png,jpeg}'),
],
refresh: true,
}),