From 66939b70f75e113bc50f7a5e1b73714607cddc9b Mon Sep 17 00:00:00 2001 From: Alexis Gousseau Date: Tue, 25 Nov 2025 11:50:44 +0100 Subject: [PATCH 1/3] fix: :bug: save files sent from dynamic pages --- app/Models/DynamicPage.php | 6 ++++-- app/Traits/Models/HasUwilImages.php | 9 +-------- .../front/pages/known-us/our-governance.blade.php | 2 +- resources/views/front/pages/nous-connaitre.blade.php | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/app/Models/DynamicPage.php b/app/Models/DynamicPage.php index 38579ee4..d4688ce1 100644 --- a/app/Models/DynamicPage.php +++ b/app/Models/DynamicPage.php @@ -138,8 +138,10 @@ class DynamicPage extends Model implements TranslatableModel ->map(function ($value, $key) { // Check the pattern of the key and the type of value. if ( - Str::startsWith($key, DynamicFieldTypes::image->name . '_') && - $value instanceof UploadedFile + ( + Str::startsWith($key, DynamicFieldTypes::image->name . '_') + || Str::startsWith($key, DynamicFieldTypes::file->name . '_') + ) && $value instanceof UploadedFile ) { return FileHelper::storeFile($this, $value); } diff --git a/app/Traits/Models/HasUwilImages.php b/app/Traits/Models/HasUwilImages.php index 594c4366..6d22d6de 100644 --- a/app/Traits/Models/HasUwilImages.php +++ b/app/Traits/Models/HasUwilImages.php @@ -11,7 +11,6 @@ use Uwil\LaravelCommon\Helpers\ToolboxHelper; trait HasUwilImages { - /** * LES CAS TRAITÉ ET NON TRAITÉ * traité : @@ -30,8 +29,7 @@ trait HasUwilImages * */ - - protected const UPDATE_ACTION = 'update'; + protected const UPDATE_ACTION = 'update'; protected const FORCE_DELETE_ACTION = 'forceDelete'; protected const WYSIWYG = "wysiwyg"; @@ -60,9 +58,6 @@ trait HasUwilImages }); } - - - /** * Get the field that are images, from the array in the model * @@ -330,7 +325,6 @@ trait HasUwilImages } } - /** * Fills the model with attributes, handling uploaded files and nested arrays. * @@ -338,7 +332,6 @@ trait HasUwilImages * and applies the transformed data to the model using `fill()`. * * @param array $attributes The attributes to fill the model with. - * * @return void */ public function inertiaFill(array $attributes): void diff --git a/resources/views/components/front/pages/known-us/our-governance.blade.php b/resources/views/components/front/pages/known-us/our-governance.blade.php index 35ab44a0..40862a0f 100644 --- a/resources/views/components/front/pages/known-us/our-governance.blade.php +++ b/resources/views/components/front/pages/known-us/our-governance.blade.php @@ -30,7 +30,7 @@ {!! $governance['wysiwyg_content'] !!} diff --git a/resources/views/front/pages/nous-connaitre.blade.php b/resources/views/front/pages/nous-connaitre.blade.php index fa1b6f46..726924c7 100644 --- a/resources/views/front/pages/nous-connaitre.blade.php +++ b/resources/views/front/pages/nous-connaitre.blade.php @@ -19,7 +19,7 @@ ]; @endphp {{-- TODO: adapter la liste des pages engagements avec id_key quand elles seront prêtes --}} - + From b9d4d406e8b126020b815a140b586523dac15e08 Mon Sep 17 00:00:00 2001 From: Alexis Gousseau Date: Tue, 25 Nov 2025 13:11:57 +0100 Subject: [PATCH 2/3] fix: :bug: compartmentalizes dynamic-pages routes to their respective locale --- app/Helpers/RouteHelper.php | 13 ++- .../Back/DynamicPageController.php | 4 +- app/Models/DynamicPage.php | 8 +- .../DynamicPageRouteServiceProvider.php | 110 +++++++++++------- .../front/pages/join-us/visit-us.blade.php | 2 +- .../pages/known-us/our-organisation.blade.php | 2 +- .../views/front/layouts/header.blade.php | 110 +++++++++--------- .../views/front/layouts/mobile-menu.blade.php | 28 ++--- 8 files changed, 160 insertions(+), 117 deletions(-) diff --git a/app/Helpers/RouteHelper.php b/app/Helpers/RouteHelper.php index 234e6c2f..0b51d8e0 100644 --- a/app/Helpers/RouteHelper.php +++ b/app/Helpers/RouteHelper.php @@ -13,13 +13,18 @@ class RouteHelper extends Controller * If the route exists, it returns the corresponding URL using the route helper. * Otherwise, it returns a "#" as a fallback. * - * @param string $routeName The name of the route to check. + * @param string $routeName The name of the route to check. + * @param string|null $locale The target locale to get the route. * @return string The route URL if it exists, or "#" otherwise. */ - public static function routeNameChecker(string $routeName): string + public static function routeNameChecker(string $routeName, string|null $locale = null): string { - if (\Illuminate\Support\Facades\Route::has($routeName)) { - return route($routeName); + if (is_null($locale)) { + $locale = app()->getLocale(); + } + $definitiveRouteName = sprintf("$routeName.%s", $locale); + if (\Illuminate\Support\Facades\Route::has($definitiveRouteName)) { + return route($definitiveRouteName); } return "#"; } diff --git a/app/Http/Controllers/Back/DynamicPageController.php b/app/Http/Controllers/Back/DynamicPageController.php index f21313e0..36ea6ae1 100644 --- a/app/Http/Controllers/Back/DynamicPageController.php +++ b/app/Http/Controllers/Back/DynamicPageController.php @@ -78,7 +78,7 @@ class DynamicPageController extends Controller */ public function create(DynamicPage $dynamic_page): \Inertia\Response { - $dynamicPageModels = DynamicPage::getPublishedDynamicPages(); + $dynamicPageModels = DynamicPage::getDynamicPages(); $pageConfigModels = PageConfig::getPublishedPageConfigs(); return Inertia::render('DynamicPages/Create', [ 'data' => CommonResource::make($dynamic_page), @@ -135,7 +135,7 @@ class DynamicPageController extends Controller public function edit(DynamicPage $dynamic_page): \Inertia\Response { $dynamicPageModel = $dynamic_page->load(['parentPage', 'config']); - $dynamicPageModels = DynamicPage::getPublishedDynamicPages() + $dynamicPageModels = DynamicPage::getDynamicPages() ->filter(fn ($model) => $model->getKey() !== $dynamic_page->getKey()) ->values(); $pageConfigModels = PageConfig::getPublishedPageConfigs(); diff --git a/app/Models/DynamicPage.php b/app/Models/DynamicPage.php index d4688ce1..75db20e0 100644 --- a/app/Models/DynamicPage.php +++ b/app/Models/DynamicPage.php @@ -276,8 +276,8 @@ class DynamicPage extends Model implements TranslatableModel */ public static function resetCache(): void { - Cache::forget('publishedDynamicPages'); - self::getPublishedDynamicPages(); + Cache::forget('dynamicPages'); + self::getDynamicPages(); } /** @@ -285,9 +285,9 @@ class DynamicPage extends Model implements TranslatableModel * * @return \Illuminate\Database\Eloquent\Collection */ - public static function getPublishedDynamicPages(): \Illuminate\Database\Eloquent\Collection + public static function getDynamicPages(): \Illuminate\Database\Eloquent\Collection { - return Cache::remember('publishedDynamicPages', 86400, function () { + return Cache::remember('dynamicPages', 86400, function () { return self::query() ->with(['parentPage', 'childPages', 'config']) ->get(); diff --git a/app/Providers/DynamicPageRouteServiceProvider.php b/app/Providers/DynamicPageRouteServiceProvider.php index 9f6eb1ad..6f909f95 100644 --- a/app/Providers/DynamicPageRouteServiceProvider.php +++ b/app/Providers/DynamicPageRouteServiceProvider.php @@ -3,10 +3,11 @@ namespace App\Providers; use App\Enums\DynamicPages\PageStatusEnum; -use Illuminate\Support\ServiceProvider; -use Illuminate\Support\Facades\Route; use App\Models\DynamicPage; +use Illuminate\Database\Eloquent\Collection; +use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Schema; +use Illuminate\Support\ServiceProvider; use Mcamara\LaravelLocalization\Facades\LaravelLocalization; use Mcamara\LaravelLocalization\Middleware\LaravelLocalizationRoutes; @@ -19,64 +20,95 @@ class DynamicPageRouteServiceProvider extends ServiceProvider */ public function boot(): void { + // Assert that a specific table in the database. if (!Schema::hasTable('dynamic_pages')) { return; } - Route::group([ - 'prefix' => LaravelLocalization::setLocale(), - 'middleware' => ['web', LaravelLocalizationRoutes::class], - ], function () { - $dynamicPageModels = DynamicPage::getPublishedDynamicPages(); - DynamicPage::getPublishedDynamicPages() - ->load('parentPage') - ->map(function (DynamicPage $dynamicPageModel) use ($dynamicPageModels) { - foreach ($dynamicPageModel->getTranslations("slug") as $locale => $slug) { - $segments = self::buildFullUrlFromGroups($dynamicPageModel, $dynamicPageModels->keyBy('id'), $locale); - $segmentsSlug = $segments ? implode('.', $segments) . "." : ""; - $segmentsPath = implode('/', $segments); - $definitivePath = sprintf("%s/%s", sprintf("/%s", $segmentsPath), $slug); - Route::get($definitivePath, function () use ($dynamicPageModel) { - return view($dynamicPageModel->getView(), compact('dynamicPageModel')); - })->name(sprintf("front.dynamic-pages.%s", $dynamicPageModel->id_key)); - } - }); - }); + + // Load all published dynamic pages with each parent page relationship. + $dynamicPageModels = DynamicPage::getDynamicPages() + ->where('status', PageStatusEnum::published) + ->load('parentPage'); + + // Get all locales supported defined in the config. + $supportedLocales = LaravelLocalization::getSupportedLanguagesKeys(); + + // Get the default locale defined in the project. + $defaultLocale = LaravelLocalization::getDefaultLocale(); + + // Loop on all locales to generate all routes scoped to their locale. + foreach ($supportedLocales as $locale) { + // Detects whether a prefix should be added or not. + $prefix = $locale === $defaultLocale ? '' : $locale; + + Route::group([ + // Set the prefix according to the locale. + 'prefix' => $prefix, + // Set custom middlewares. + 'middleware' => ['web'], + ], function () use ($locale, $dynamicPageModels) { + foreach ($dynamicPageModels as $dynamicPageModel) { + $slug = $dynamicPageModel->getTranslation('slug', $locale); + + // If no slug for the locale → skip. + if (!$slug) continue; + + // Retrieves the parent segments for this locale. + $segments = $this->buildFullUrlFromGroups( + $dynamicPageModel, + $dynamicPageModels->keyBy('id'), + $locale + ); + + // If a parent does not have a slug in this locale → skip. + if ($segments === null) continue; + + $segmentsPath = implode('/', $segments); + $finalPath = $segmentsPath ? "/{$segmentsPath}/{$slug}" : "/{$slug}"; + + Route::get($finalPath, function () use ($dynamicPageModel, $locale) { + app()->setLocale($locale); + LaravelLocalization::setLocale($locale); + return view($dynamicPageModel->getView(), compact('dynamicPageModel')); + })->name("front.dynamic-pages.{$dynamicPageModel->id_key}.{$locale}"); + } + }); + } } /** - * Get all segments from parent pages. + * Returns the parent segments for the locale or null if a parent does not have a slug. * * @param \App\Models\DynamicPage $page * @param \Illuminate\Database\Eloquent\Collection $groupsKeyedById * @param string $locale - * @return array + * @return array|null */ - private function buildFullUrlFromGroups( - DynamicPage $page, - \Illuminate\Database\Eloquent\Collection $groupsKeyedById, - string $locale = 'fr' - ): array { + private function buildFullUrlFromGroups(DynamicPage $page, Collection $groupsKeyedById, string $locale): ?array + { $segments = []; - - // On part du page_id du DynamicPage. + + // Start at page_id of the DynamicPage. $parentPageId = $page->page_id ?? ($page->parentPage->id ?? null); // Browse all relationships. while ($parentPageId) { /** @var \App\Models\DynamicPage|null $parentPage */ $parentPage = $groupsKeyedById->find($parentPageId); - if (!$parentPage) { - break; + + if (!$parentPage || !$parentPage->status->equals(PageStatusEnum::published)) { + return null; + } + + $slug = $parentPage->getTranslation('slug', $locale); + + if (empty($slug)) { + return null; } // Save parentPage slug if it is published. - if ($parentPage->status->equals(PageStatusEnum::published)) { - $slug = $parentPage->getTranslation('slug', $locale) ?? null; - if ($slug) { - array_unshift($segments, $slug); - } - } - + array_unshift($segments, $slug); + // Continue to move up even if the parentPage is not published. $parentPageId = $parentPage->page_id; } //end while diff --git a/resources/views/components/front/pages/join-us/visit-us.blade.php b/resources/views/components/front/pages/join-us/visit-us.blade.php index 401dff5b..d33ebe6a 100644 --- a/resources/views/components/front/pages/join-us/visit-us.blade.php +++ b/resources/views/components/front/pages/join-us/visit-us.blade.php @@ -58,7 +58,7 @@
diff --git a/resources/views/components/front/pages/known-us/our-organisation.blade.php b/resources/views/components/front/pages/known-us/our-organisation.blade.php index 65113ae5..317eb1d9 100644 --- a/resources/views/components/front/pages/known-us/our-organisation.blade.php +++ b/resources/views/components/front/pages/known-us/our-organisation.blade.php @@ -15,7 +15,7 @@
@foreach($dynamicPageModel->childPages as $childPage) @endforeach
diff --git a/resources/views/front/layouts/header.blade.php b/resources/views/front/layouts/header.blade.php index 19483616..434b2150 100644 --- a/resources/views/front/layouts/header.blade.php +++ b/resources/views/front/layouts/header.blade.php @@ -3,59 +3,65 @@