clean & fixes

This commit is contained in:
Alexis Gousseau 2024-03-13 12:28:17 +01:00
parent 0b93f0b0b3
commit bb4c6d5f70
12 changed files with 89 additions and 91 deletions

View file

@ -44,35 +44,35 @@ enum PageSectionEnum: int
* @phpstan-ignore-next-line
*/
private const LABELS = [
self::home_missions->name => 'Nos Missions',
self::home_ambition->name => 'Notre Ambition',
self::home_team->name => 'L\'équipe VOLENA',
self::home_life->name => 'La vie chez VOLENA',
self::unveil_pole->name => 'Le Pôle Volena',
self::unveil_local->name => 'Notre Filière Locale',
self::unveil_sites->name => 'Nos Sites',
self::unveil_history->name => 'Histoire',
self::unveil_commitments->name => 'Engagements',
self::hire_life->name => 'Vie de l\'Entreprise',
self::hire_formation->name => 'Alternance et Formation',
self::hire_grow->name => 'Fiers d\'évoluer ensemble',
self::hire_parity->name => 'Parité',
self::hire_find->name => 'On se retrouve',
self::commit_ambition->name => 'Ambition',
self::commit_breeding->name => 'Elever Durablement',
self::commit_living->name => 'Mieux vivre',
self::home_missions->name => 'Nos Missions',
self::home_ambition->name => 'Notre Ambition',
self::home_team->name => 'L\'équipe VOLENA',
self::home_life->name => 'La vie chez VOLENA',
self::unveil_pole->name => 'Le Pôle Volena',
self::unveil_local->name => 'Notre Filière Locale',
self::unveil_sites->name => 'Nos Sites',
self::unveil_history->name => 'Histoire',
self::unveil_commitments->name => 'Engagements',
self::hire_life->name => 'Vie de l\'Entreprise',
self::hire_formation->name => 'Alternance et Formation',
self::hire_grow->name => 'Fiers d\'évoluer ensemble',
self::hire_parity->name => 'Parité',
self::hire_find->name => 'On se retrouve',
self::commit_ambition->name => 'Ambition',
self::commit_breeding->name => 'Elever Durablement',
self::commit_living->name => 'Mieux vivre',
self::commit_respect_earth->name => 'Respecter la terre',
self::commit_feed->name => 'Bien nourrir',
self::commit_commitments->name => 'Engagements',
self::move_life->name => 'Vie de l\'Entreprise',
self::move_commitments->name => 'Engagements',
self::produce_local->name => 'Large Gamme Locale',
self::produce_gms->name => 'Retrouvez en GMS',
self::produce_rhd->name => 'RHD',
self::produce_export->name => 'Export',
self::produce_quality->name => 'Qualité',
self::produce_linking->name => 'Liens',
self::listening_study->name => 'On étudie',
self::commit_feed->name => 'Bien nourrir',
self::commit_commitments->name => 'Engagements',
self::move_life->name => 'Vie de l\'Entreprise',
self::move_commitments->name => 'Engagements',
self::produce_local->name => 'Large Gamme Locale',
self::produce_gms->name => 'Retrouvez en GMS',
self::produce_rhd->name => 'RHD',
self::produce_export->name => 'Export',
self::produce_quality->name => 'Qualité',
self::produce_linking->name => 'Liens',
self::listening_study->name => 'On étudie',
];
/**

View file

@ -2,32 +2,28 @@
namespace App\Http\Controllers\Fo;
use App\Enums\Slides\SliderTypeEnum;
use App\Enums\StaticPageType;
use App\Http\Controllers\Controller;
use App\Models\News;
use App\Models\Section;
use App\Models\Site;
use App\Models\Slide;
use App\Models\StaticPage;
use App\Models\Strip;
class SiteController extends Controller
{
/**
* Display a listing of the resource.
*
* @param \App\Models\Site $site
* @return \Illuminate\Contracts\View\View
*/
public function show(Site $site): \Illuminate\Contracts\View\View
{
$siteModel = $site;
if ($siteModel->order === Site::query()->max('order')) {
if ($site->order === Site::query()->max('order')) {
$nextSiteModel = Site::query()->orderBy('order')->first();
} else {
$nextSiteModel = Site::query()->orderBy('order')->where('order', '>', $siteModel->order)->first();
$nextSiteModel = Site::query()->orderBy('order')->where('order', '>', $site->order)->first();
}
return view('fo.pages.site', compact('siteModel', 'nextSiteModel'));
return view('fo.pages.site', [
'siteModel' => $site,
'nextSiteModel' => $nextSiteModel
]);
}
}

View file

@ -279,8 +279,13 @@ class Section extends Model
/**
* Get MiniCrud bloc for commit_respect_earth section.
*
* @param array $data
* @param string $content
* @param array $data
* @param string $content
* @param string $img
* @param string $imgAlt
* @param string $imgTitle
* @param integer $width
* @param integer $height
* @return array
*/
public static function getCommitRespectEarthBloc(

View file

@ -112,7 +112,7 @@
</p>
<img
v-if="intValue"
class="img-fluid"
class="w-fit img-fluid"
:src="intValue"
:alt="__('Image placeholder')"
:aria-describedby="`PreviewHelp${intId}`"

View file

@ -18,5 +18,6 @@ const sassSafelist = [
/^cn-.*/,
// Other
/^text-bubble-.*/,
/^swiper-.*/
];
export { sassSafelist };

View file

@ -10,23 +10,26 @@
$model || The model we're creating/editing || Model class || OPTIONNAL || null
--}}
@if(!empty($label))
<label for="{{ $id }}" class="col-form-label">
<b>{{ $label }} {{ $required ?? false ? '*' : '' }}</b>
</label>
@if (!empty($label))
<label class="col-form-label" for="{{ $id }}">
<b>{{ $label }} {{ $required ?? false ? '*' : '' }}</b>
</label>
@endif
@php
$data = [
'name' => $name,
'text' => old($name, $model->{$name} ?? $value ?? '')
];
$data = [
'name' => $name,
'text' => old($name, $model->{$name} ?? ($value ?? '')),
];
@endphp
<div class="ck-editor" data-json='@json($data)'></div>
@include('modules.input-error', [
'inputName' => $name,
'helperId' => "{$id}Help",
'helper' => $helper ?? __('crud.minicrud.text_warning') . '. ' . __('validation.min.string', [
'attribute' => $input['label'],
'min' => 15
]),
'helper' =>
$helper ??
__('crud.minicrud.text_warning') .
__('validation.min.string', [
'attribute' => $input['label'],
'min' => 15,
]),
])

View file

@ -2,8 +2,7 @@
@section('title', __($staticPageModel->seo_title))
@section('description', __($staticPageModel->seo_description))
@section('breadcrumb',
request()->route()->getName())
@section('breadcrumb', request()->route()->getName())
@section('content')
<div class="container">

View file

@ -222,8 +222,6 @@
<p class="text-primary text-lg-start fw-bold fs-3 text-center">{{ __('Les marques fabriquées ici') }}</p>
</div>
<div class="col-12 col-lg-6">
{{-- FIXME: en mobile, les logos défilent ? --}}
{{-- Swiper brands --}}
<div class="swiper swiper-sites-brands h-fit overflow-visible" id="swiper-sites-brands">
<div class="swiper-wrapper h-fit">

View file

@ -70,35 +70,33 @@
@break
@case(intval(App\Enums\InputType::number->value))
<div class="row">
<div class="col">
<fieldset class="mb-3 border p-3">
<div class="d-flex justify-content-start align-items-center mb-2 flex-row">
<legend class="m-0 w-auto">
<label class="col-form-label" for="number{{ $k }}">
<b>{{ $input['label'] }}</b>
</label>
</legend>
@if (!empty($input['tooltip']))
<span class="ms-1" data-bs-toggle="tooltip" data-bs-html="true" title="{{ $input['tooltip'] }}">
<i class="fa fa-question-circle"></i>
</span>
@endif
<div class="col-12 col-md-6">
<fieldset class="mb-3 border p-3">
<div class="d-flex justify-content-start align-items-center mb-2 flex-row">
<legend class="m-0 w-auto">
<label class="col-form-label" for="number{{ $k }}">
<b>{{ $input['label'] }}</b>
</label>
</legend>
@if (!empty($input['tooltip']))
<span class="ms-1" data-bs-toggle="tooltip" data-bs-html="true" title="{{ $input['tooltip'] }}">
<i class="fa fa-question-circle"></i>
</span>
@endif
</div>
<div class="row mb-3">
<div class="form-group">
<input class="form-control" id="number{{ $k }}" name="data[{{ $k }}][value]" type="number"
value="{{ old("data.{$k}.value") ?? ($input['value'] ?? '') }}" aria-describedby="NumberHelp{{ $k }}"
step="0.01" placeholder="{{ $input['label'] }}" @if (!isset($input['required']) or $input['required']) required @endif>
@include('modules.input-error', [
'inputName' => "data.{$k}.value",
'helperId' => "NumberHelp{$k}",
'helper' => $input['helper'] ?? '',
])
</div>
<div class="row mb-3">
<div class="form-group">
<input class="form-control" id="number{{ $k }}" name="data[{{ $k }}][value]" type="number"
value="{{ old("data.{$k}.value") ?? ($input['value'] ?? '') }}" aria-describedby="NumberHelp{{ $k }}"
step="0.01" placeholder="{{ $input['label'] }}" @if (!isset($input['required']) or $input['required']) required @endif>
@include('modules.input-error', [
'inputName' => "data.{$k}.value",
'helperId' => "NumberHelp{$k}",
'helper' => $input['helper'] ?? '',
])
</div>
</div>
</fieldset>
</div>
</div>
</fieldset>
</div>
@break
@ -115,7 +113,6 @@
'model' => $model ?? null,
'helper' =>
__('crud.minicrud.text_warning') .
'. ' .
__('validation.min.string', [
'attribute' => $input['label'],
'min' => 3,

View file

@ -47,7 +47,7 @@ Route::prefix('bo')
UserController::class, 'duplicate'
])->name('users.duplicate');
// * StaticPages
// * STATIC PAGES.
Route::resource('pages', StaticPageController::class)
->names([
'index' => 'static_pages.index',
@ -89,7 +89,7 @@ Route::prefix('bo')
LogoController::class, 'duplicate'
])->name('logos.duplicate');
// * HISTORICAL MILESTONES
// * HISTORICAL MILESTONES.
Route::resource('historicalmilestones', HistoricalMilestoneController::class)->except('show')
->parameters(['historicalmilestones' => 'historical_milestone']);
Route::get('/historicalmilestones/{historical_milestone}/duplicate', [

View file

@ -24,6 +24,5 @@ Route::middleware(['throttle:credentials'])->name('fo.')->group(function () {
// * Iframe cookies
Route::get('/frame/{frame}', function (string $frame) {
return view('fo.modules.frame', ['frame' => $frame]);
})
->where('frame', '[a-z]+')->name('frame');
})->where('frame', '[a-z]+')->name('frame');
});