diff --git a/app/Http/Controllers/Fo/StaticPageController.php b/app/Http/Controllers/Fo/StaticPageController.php index daab53af..de45498a 100644 --- a/app/Http/Controllers/Fo/StaticPageController.php +++ b/app/Http/Controllers/Fo/StaticPageController.php @@ -24,10 +24,9 @@ class StaticPageController extends Controller /** * Legals page. * - * @param \App\Models\StaticPage $staticPageModel * @return \Illuminate\Contracts\View\View */ - public function legals(StaticPage $staticPageModel): \Illuminate\Contracts\View\View + public function legals(): \Illuminate\Contracts\View\View { $staticPageModel = StaticPage::getCachedStaticPage(StaticPageType::legals); return view('fo.pages.legals', ['staticPageModel' => $staticPageModel]); @@ -36,10 +35,9 @@ class StaticPageController extends Controller /** * Confidentiality page. * - * @param \App\Models\StaticPage $staticPageModel * @return \Illuminate\Contracts\View\View */ - public function policies(StaticPage $staticPageModel): \Illuminate\Contracts\View\View + public function policies(): \Illuminate\Contracts\View\View { $staticPageModel = StaticPage::getCachedStaticPage(StaticPageType::confidentiality); return view('fo.pages.legals', ['staticPageModel' => $staticPageModel]); @@ -48,24 +46,22 @@ class StaticPageController extends Controller /** * Sitemap page. * - * @param \App\Models\StaticPage $staticPage * @return \Illuminate\Contracts\View\View */ - public function sitemap(StaticPage $sitemap) + public function sitemap(): \Illuminate\Contracts\View\View { - $sitemap = StaticPage::query()->where('type', StaticPageType::sitemap)->first(); - $singlePages = SitemapHelper::getSinglePages(); + $staticPageModel = StaticPage::query()->where('type', StaticPageType::sitemap)->first(); + $singlePages = SitemapHelper::getSinglePages(); - return view('fo.pages.sitemap', ['staticPageModel' => $sitemap, 'singlePages' => $singlePages]); + return view('fo.pages.sitemap', ['staticPageModel' => $staticPageModel, 'singlePages' => $singlePages]); } /** * Rules page. * - * @param \App\Models\StaticPage $staticPage * @return \Illuminate\Contracts\View\View */ - public function rules(StaticPage $sitemap) + public function rules(): \Illuminate\Contracts\View\View { $rules = StaticPage::query()->where('type', StaticPageType::rules)->first(); @@ -75,10 +71,9 @@ class StaticPageController extends Controller /** * Termes and conditions selling page. * - * @param \App\Models\StaticPage $staticPageModel * @return \Illuminate\Contracts\View\View */ - public function selling(StaticPage $staticPageModel): \Illuminate\Contracts\View\View + public function selling(): \Illuminate\Contracts\View\View { $staticPageModel = StaticPage::getCachedStaticPage(StaticPageType::selling); return view('fo.pages.legals', ['staticPageModel' => $staticPageModel]); @@ -87,10 +82,9 @@ class StaticPageController extends Controller /** * Accessibility page. * - * @param \App\Models\StaticPage $staticPageModel * @return \Illuminate\Contracts\View\View */ - public function accessibility(StaticPage $staticPageModel): \Illuminate\Contracts\View\View + public function accessibility(): \Illuminate\Contracts\View\View { $staticPageModel = StaticPage::getCachedStaticPage(StaticPageType::accessibility); return view('fo.pages.legals', ['staticPageModel' => $staticPageModel]); @@ -99,10 +93,9 @@ class StaticPageController extends Controller /** * Recruitment page. * - * @param \App\Models\StaticPage $staticPageModel * @return \Illuminate\Contracts\View\View */ - public function recruitment(StaticPage $staticPageModel): \Illuminate\Contracts\View\View + public function recruitment(): \Illuminate\Contracts\View\View { $detect = new MobileDetect(); $staticPageModel = StaticPage::getCachedStaticPage(StaticPageType::recruitment); @@ -138,10 +131,9 @@ class StaticPageController extends Controller /** * Who are we page. * - * @param \App\Models\StaticPage $staticPageModel * @return \Illuminate\Contracts\View\View */ - public function story(StaticPage $staticPageModel): \Illuminate\Contracts\View\View + public function story(): \Illuminate\Contracts\View\View { $staticPageModel = StaticPage::getCachedStaticPage(StaticPageType::story); $keyNumberModels = KeyNumber::get5PublishedOrdered(); @@ -152,10 +144,9 @@ class StaticPageController extends Controller /** * Advertising saga page. * - * @param \App\Models\StaticPage $staticPageModel * @return \Illuminate\Contracts\View\View */ - public function saga(StaticPage $staticPageModel): \Illuminate\Contracts\View\View + public function saga(): \Illuminate\Contracts\View\View { $staticPageModel = StaticPage::getCachedStaticPage(StaticPageType::saga); $videoModels = Video::get6PublishedVideosOrderedWithProducts(); diff --git a/app/Http/Requests/Bo/StaticPages/UpdateStaticPageRequest.php b/app/Http/Requests/Bo/StaticPages/UpdateStaticPageRequest.php index e3c46025..d7d5f417 100644 --- a/app/Http/Requests/Bo/StaticPages/UpdateStaticPageRequest.php +++ b/app/Http/Requests/Bo/StaticPages/UpdateStaticPageRequest.php @@ -61,7 +61,9 @@ class UpdateStaticPageRequest extends UpdateMiniCrudRequest !$staticPageModel->type->equals(StaticPageType::recipes) && !$staticPageModel->type->equals(StaticPageType::recipe) && !$staticPageModel->type->equals(StaticPageType::products) && - !$staticPageModel->type->equals(StaticPageType::product) + !$staticPageModel->type->equals(StaticPageType::product) && + !$staticPageModel->type->equals(StaticPageType::sitemap) && + !$staticPageModel->type->equals(StaticPageType::rules) ) { $this->mergePicture('picture'); } @@ -99,7 +101,9 @@ class UpdateStaticPageRequest extends UpdateMiniCrudRequest !$staticPageModel->type->equals(StaticPageType::legals) && !$staticPageModel->type->equals(StaticPageType::confidentiality) && !$staticPageModel->type->equals(StaticPageType::selling) && - !$staticPageModel->type->equals(StaticPageType::accessibility) + !$staticPageModel->type->equals(StaticPageType::accessibility) && + !$staticPageModel->type->equals(StaticPageType::sitemap) && + !$staticPageModel->type->equals(StaticPageType::rules) ) { $rules = \array_merge( $rules, diff --git a/package-lock.json b/package-lock.json index 6be797da..dfe96869 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2844,9 +2844,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001664", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz", - "integrity": "sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==", + "version": "1.0.30001709", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001709.tgz", + "integrity": "sha512-NgL3vUTnDrPCZ3zTahp4fsugQ4dc7EKTSzwQDPEel6DMoMnfH2jhry9n2Zm8onbSR+f/QtKHFOA+iAQu4kbtWA==", "dev": true, "funding": [ { diff --git a/resources/views/bo/layouts/sidemenu.blade.php b/resources/views/bo/layouts/sidemenu.blade.php index 63872508..ddfac839 100644 --- a/resources/views/bo/layouts/sidemenu.blade.php +++ b/resources/views/bo/layouts/sidemenu.blade.php @@ -1147,7 +1147,7 @@ url()->current() === route('bo.static_pages.edit', $contactStaticPageModel->type->value()), ])> - {{ __($contactStaticPageModel->type->label()) }} + {{ $contactStaticPageModel->type->label() }} @endif {{-- LEGALS CGU --}} @@ -1166,7 +1166,7 @@ url()->current() === route('bo.static_pages.edit', $legalsStaticPageModel->type->value()), ])> - {{ __($legalsStaticPageModel->type->label()) }} + {{ $legalsStaticPageModel->type->label() }} @endif {{-- CONFIDENTIALITY --}} @@ -1189,7 +1189,7 @@ 'bo.static_pages.edit', $confidentialityStaticPageModel->type->value()), ])> - {{ __($confidentialityStaticPageModel->type->label()) }} + {{ $confidentialityStaticPageModel->type->label() }} @endif {{-- TERMS AND CONDITIONS --}} @@ -1208,7 +1208,7 @@ url()->current() === route('bo.static_pages.edit', $sellingStaticPageModel->type->value()), ])> - {{ __($sellingStaticPageModel->type->label()) }} + {{ $sellingStaticPageModel->type->label() }} @endif {{-- ACCESSIBILITY --}} @@ -1231,7 +1231,7 @@ 'bo.static_pages.edit', $accessibilityStaticPageModel->type->value()), ])> - {{ __($accessibilityStaticPageModel->type->label()) }} + {{ $accessibilityStaticPageModel->type->label() }} @endif {{-- SITEMAP --}} @@ -1254,7 +1254,30 @@ 'bo.static_pages.edit', $sitemapStaticPageModel->type->value()), ])> - {{ __($sitemapStaticPageModel->type->label()) }} + {{ $sitemapStaticPageModel->type->label() }} + + @endif + {{-- RULES --}} + @if (isset($rulesStaticPageModel)) + + url()->current() === + route( + 'bo.static_pages.edit', + $rulesStaticPageModel->type->value()), + ])> + + url()->current() === + route( + 'bo.static_pages.edit', + $rulesStaticPageModel->type->value()), + ])> + {{ $rulesStaticPageModel->type->label() }} @endif diff --git a/resources/views/bo/pages/static_pages/form.blade.php b/resources/views/bo/pages/static_pages/form.blade.php index 10db5136..6831c6f7 100644 --- a/resources/views/bo/pages/static_pages/form.blade.php +++ b/resources/views/bo/pages/static_pages/form.blade.php @@ -201,7 +201,9 @@ !$staticPageModel->type->equals(StaticPageType::legals) && !$staticPageModel->type->equals(StaticPageType::confidentiality) && !$staticPageModel->type->equals(StaticPageType::accessibility) && - !$staticPageModel->type->equals(StaticPageType::selling)) + !$staticPageModel->type->equals(StaticPageType::selling) && + !$staticPageModel->type->equals(StaticPageType::sitemap) && + !$staticPageModel->type->equals(StaticPageType::rules)) {{-- PICTURE SECTION --}}