diff --git a/app/Enums/Sections/PageSectionEnum.php b/app/Enums/Sections/PageSectionEnum.php index 1cd1bc2..7910060 100644 --- a/app/Enums/Sections/PageSectionEnum.php +++ b/app/Enums/Sections/PageSectionEnum.php @@ -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', ]; /** diff --git a/app/Http/Controllers/Fo/SiteController.php b/app/Http/Controllers/Fo/SiteController.php index 1f05f62..21875b5 100644 --- a/app/Http/Controllers/Fo/SiteController.php +++ b/app/Http/Controllers/Fo/SiteController.php @@ -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 + ]); } } diff --git a/app/Models/Section.php b/app/Models/Section.php index 1791451..2938946 100644 --- a/app/Models/Section.php +++ b/app/Models/Section.php @@ -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( diff --git a/resources/ts/bo/components/ImageInputComponent.vue b/resources/ts/bo/components/ImageInputComponent.vue index 445e887..f9aae93 100644 --- a/resources/ts/bo/components/ImageInputComponent.vue +++ b/resources/ts/bo/components/ImageInputComponent.vue @@ -112,7 +112,7 @@

- {{ $label }} {{ $required ?? false ? '*' : '' }} - +@if (!empty($label)) + @endif @php -$data = [ - 'name' => $name, - 'text' => old($name, $model->{$name} ?? $value ?? '') -]; + $data = [ + 'name' => $name, + 'text' => old($name, $model->{$name} ?? ($value ?? '')), + ]; @endphp
@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, + ]), ]) diff --git a/resources/views/fo/pages/legals.blade.php b/resources/views/fo/pages/legals.blade.php index 94f47b3..fc15bdb 100644 --- a/resources/views/fo/pages/legals.blade.php +++ b/resources/views/fo/pages/legals.blade.php @@ -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')
diff --git a/resources/views/fo/pages/site.blade.php b/resources/views/fo/pages/site.blade.php index 78bfe11..c08ff1c 100644 --- a/resources/views/fo/pages/site.blade.php +++ b/resources/views/fo/pages/site.blade.php @@ -222,8 +222,6 @@

{{ __('Les marques fabriquées ici') }}

- {{-- FIXME: en mobile, les logos défilent ? --}} - {{-- Swiper brands --}}
diff --git a/resources/views/fo/partials/.gitkeep b/resources/views/fo/partials/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/resources/views/modules/minicrud-form-inputs.blade.php b/resources/views/modules/minicrud-form-inputs.blade.php index 1981a30..ecb28c2 100644 --- a/resources/views/modules/minicrud-form-inputs.blade.php +++ b/resources/views/modules/minicrud-form-inputs.blade.php @@ -70,35 +70,33 @@ @break @case(intval(App\Enums\InputType::number->value)) -
-
-
-
- - - - @if (!empty($input['tooltip'])) - - - - @endif +
+
+
+ + + + @if (!empty($input['tooltip'])) + + + + @endif +
+
+
+ + @include('modules.input-error', [ + 'inputName' => "data.{$k}.value", + 'helperId' => "NumberHelp{$k}", + 'helper' => $input['helper'] ?? '', + ])
-
-
- - @include('modules.input-error', [ - 'inputName' => "data.{$k}.value", - 'helperId' => "NumberHelp{$k}", - 'helper' => $input['helper'] ?? '', - ]) -
-
-
-
+
+
@break @@ -115,7 +113,6 @@ 'model' => $model ?? null, 'helper' => __('crud.minicrud.text_warning') . - '. ' . __('validation.min.string', [ 'attribute' => $input['label'], 'min' => 3, diff --git a/routes/web-bo.php b/routes/web-bo.php index 8f5d961..36c15ba 100644 --- a/routes/web-bo.php +++ b/routes/web-bo.php @@ -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', [ diff --git a/routes/web-fo.php b/routes/web-fo.php index 295a0af..3b1b788 100644 --- a/routes/web-fo.php +++ b/routes/web-fo.php @@ -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'); });