diff --git a/app/Models/DynamicPage.php b/app/Models/DynamicPage.php index d8aa046b..ce6524e1 100644 --- a/app/Models/DynamicPage.php +++ b/app/Models/DynamicPage.php @@ -109,10 +109,8 @@ class DynamicPage extends Model implements TranslatableModel { static::creating(function (self $model) { self::manageFields($model); - // Set id_key from slug or title when the dynamic page is root. - $model->id_key = isset($model->slug) && !empty($model->slug) - ? $model->slug - : Str::slug($model->title); + // Set id_key from title. + $model->id_key = Str::slug($model->title); }); static::updating(function (self $model) { self::manageFields($model); @@ -254,9 +252,10 @@ class DynamicPage extends Model implements TranslatableModel */ public static function assertRootIsUnique(self $model): void { - $oldDynamicPageRoot = self::getModelsCached()->where('isRoot', true)->first(); + $oldDynamicPageRoot = self::getModelsCached()->where('id', '!=', $model->getKey())->where('isRoot', true)->first(); if ($oldDynamicPageRoot) { - $oldDynamicPageRoot->isRoot = false; + $oldDynamicPageRoot->publish = PageStatusEnum::unpublished; + $oldDynamicPageRoot->isRoot = false; $oldDynamicPageRoot->saveQuietly(); } } diff --git a/database/factories/DynamicPageFactory.php b/database/factories/DynamicPageFactory.php index b00337bc..8d63ca21 100644 --- a/database/factories/DynamicPageFactory.php +++ b/database/factories/DynamicPageFactory.php @@ -2,6 +2,7 @@ namespace Database\Factories; +use Carbon\Carbon; use App\Enums\DynamicFieldTypes; use App\Enums\DynamicPages\PageStatusEnum; use App\Models\DynamicPage; @@ -19,18 +20,21 @@ class DynamicPageFactory extends Factory public function definition(): array { $title = fake()->unique()->word(); + $slug = Str::slug($title); $configModel = fake()->randomElement(PageConfig::all()); $status = fake()->randomElement(PageStatusEnum::cases()); + $pageHome = DynamicPage::query()->where('isRoot', true)->firstOrFail(); return [ - 'id_key' => Str::slug($title), - 'title' => $title, - 'slug' => Str::slug($title), - 'content' => self::getDataFromConfig($configModel), - 'page_id' => null, - 'config_id' => $configModel->getKey(), - 'status' => $status, - 'isLocked' => fake()->boolean(50), + 'id_key' => $slug, + 'title' => $title, + 'slug' => $slug, + 'content' => self::getDataFromConfig($configModel), + 'page_id' => $pageHome->getKey(), + 'config_id' => $configModel->getKey(), + 'status' => $status, + 'isLocked' => fake()->boolean(25), + 'deleted_at' => fake()->boolean(25) ? Carbon::now() : null, ]; } diff --git a/database/factories/NewsFactory.php b/database/factories/NewsFactory.php index a2891efb..96b0ea35 100644 --- a/database/factories/NewsFactory.php +++ b/database/factories/NewsFactory.php @@ -28,7 +28,6 @@ class NewsFactory extends Factory 'status' => collect(NewsStatusEnum::cases())->random(), 'picture_alt' => fake()->sentence(6, true), 'picture_title' => fake()->sentence(6, true), - 'picture' => 'temp.jpg', ]; } } diff --git a/database/factories/PageConfigFactory.php b/database/factories/PageConfigFactory.php index 85397b4f..92e2fc91 100644 --- a/database/factories/PageConfigFactory.php +++ b/database/factories/PageConfigFactory.php @@ -43,7 +43,6 @@ class PageConfigFactory extends Factory ], ]; } - return $data; } } diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 8746d6e5..49a4ba61 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -13,9 +13,14 @@ class DatabaseSeeder extends Seeder */ public function run(): void { + // Set locale to the fallback. + app()->setLocale(config('app.fallback_locale')); + + // Call seeders. $this->call([ PageConfigSeeder::class, DynamicPageSeeder::class, + NewsCategorySeeder::class, NewsSeeder::class, CompanySeeder::class, ]); diff --git a/database/seeders/DynamicPageSeeder.php b/database/seeders/DynamicPageSeeder.php index b1c49e25..adcb3c9a 100644 --- a/database/seeders/DynamicPageSeeder.php +++ b/database/seeders/DynamicPageSeeder.php @@ -2,6 +2,7 @@ namespace Database\Seeders; +use App\Enums\DynamicPages\PageStatusEnum; use App\Enums\DynamicFieldTypes; use App\Models\DynamicPage; use Illuminate\Database\Seeder; @@ -17,23 +18,59 @@ class DynamicPageSeeder extends Seeder */ public function run(): void { - DynamicPage::factory(10)->make() - ->each(function ($model) { - $content = $model->content; - // Config factories add just one depth of children. - foreach ($model->content as $key => $value) { - $prefix = sprintf("%s_", DynamicFieldTypes::image->name); - if (Str::startsWith($key, $prefix)) { - $content[$key] = FileHelper::storeFile( - $model, - new \SplFileInfo(\resource_path( - '../database/factories/assets/dynamic-pages/100x100.jpg' - )) - ); - } + // Mandatory dynamic pages. + $titleHome = "Accueil"; + $dynamicPageModel = new DynamicPage; + $dynamicPageModel->id_key = Str::slug($titleHome); + $dynamicPageModel->slug = ""; + $dynamicPageModel->title = $titleHome; + $dynamicPageModel->content = []; + $dynamicPageModel->status = PageStatusEnum::published; + $dynamicPageModel->isLocked = true; + $dynamicPageModel->isRoot = true; + $dynamicPageModel->saveOrFail(); + + $titlePrivacyPolicy = "Politique de confidentialité"; + $slugPrivacyPolicy = Str::slug($titlePrivacyPolicy); + $dynamicPageModel = new DynamicPage; + $dynamicPageModel->id_key = $slugPrivacyPolicy; + $dynamicPageModel->slug = $slugPrivacyPolicy; + $dynamicPageModel->title = $titlePrivacyPolicy; + $dynamicPageModel->content = []; + $dynamicPageModel->status = PageStatusEnum::published; + $dynamicPageModel->isLocked = true; + $dynamicPageModel->isRoot = false; + $dynamicPageModel->saveOrFail(); + + $titleLegalNotice = "Mentions légales"; + $slugLegalNotice = Str::slug($titleLegalNotice); + $dynamicPageModel = new DynamicPage; + $dynamicPageModel->id_key = $slugLegalNotice; + $dynamicPageModel->slug = $slugLegalNotice; + $dynamicPageModel->title = $titleLegalNotice; + $dynamicPageModel->content = []; + $dynamicPageModel->status = PageStatusEnum::published; + $dynamicPageModel->isLocked = true; + $dynamicPageModel->isRoot = false; + $dynamicPageModel->saveOrFail(); + + // Fake dynamic pages. + DynamicPage::factory(20)->make()->each(function ($model) { + $content = $model->content; + // Config factories add just one depth of children. + foreach ($model->content as $key => $value) { + $prefix = sprintf("%s_", DynamicFieldTypes::image->name); + if (Str::startsWith($key, $prefix)) { + $content[$key] = FileHelper::storeFile( + $model, + new \SplFileInfo(\resource_path( + '../database/factories/assets/dynamic-pages/100x100.jpg' + )) + ); } - $model->content = $content; - $model->saveOrFail(); - }); + } + $model->content = $content; + $model->saveOrFail(); + }); } } diff --git a/database/seeders/NewsSeeder.php b/database/seeders/NewsSeeder.php index 33290ae4..ff4dd47f 100644 --- a/database/seeders/NewsSeeder.php +++ b/database/seeders/NewsSeeder.php @@ -16,15 +16,19 @@ class NewsSeeder extends Seeder */ public function run(): void { - $categoriesIds = NewsCategory::pluck('id'); - News::factory(10)->create()->each(function (News $news) use ($categoriesIds) { + News::factory(10)->make()->each(function (News $news) { $news->picture = FileHelper::storeFile( $news, - new \SplFileInfo( - resource_path('../database/factories/assets/news/525x295.jpg') - ) + new \SplFileInfo(resource_path( + '../database/factories/assets/news/525x295.jpg' + )) ); - $news->save(); + $news->saveOrFail(); + }); + + // News relation. + $categoriesIds = NewsCategory::pluck('id'); + News::query()->get()->map(function (News $news) use ($categoriesIds) { $news->categories()->attach( $categoriesIds->random(rand(1, 3))->all() ); diff --git a/lang/fr/front.php b/lang/fr/front.php index b72d97d1..d20c87c8 100644 --- a/lang/fr/front.php +++ b/lang/fr/front.php @@ -51,7 +51,7 @@ return [ 'are_you_breeder_and_join_us' => 'Vous êtes éleveur de volailles ou souhaitez le devenir, et nous rejoindre ? ', 'describe_your_project' => 'Décrivez-nous votre projet le plus précisément possible afin que nous puissions orienter votre demande vers l’interlocuteur adéquat.', 'info_personal_data' => 'Les informations recueillies à partir de ce formulaire sont traitées par le Responsable de Traitement pour donner suite à votre demande de contact. Pour connaître vos droits, vous pouvez consulter', - 'confidentiality' => 'la Charte de confidentialité', + 'confidentiality' => 'la politique de confidentialité', 'other_product_information' => 'Vous souhaitez une information ou avez une remarque sur nos produits ? Dirigez-vous directement sur le site de la marque concernée (rubriques Contact ou Service Consommateurs). Si la marque ou le produit ne possède pas de site web, merci d’adresser votre demande par voie postale à l’adresse du site mentionnée sur l’emballage.', 'inputs' => [ 'breedtype' => [ diff --git a/lang/fr/validation.php b/lang/fr/validation.php index 49147fac..3f67c1fa 100644 --- a/lang/fr/validation.php +++ b/lang/fr/validation.php @@ -240,7 +240,7 @@ return [ "validation" => "validation", "reference" => "référence", "locked" => "vérouillé", - "root" => "page racine (accueil)", + "root" => "page racine", "field" => "champs", "key" => "clé", "slug" => "chemin d'accès", diff --git a/resources/ts/back/Pages/DynamicPages/Form.tsx b/resources/ts/back/Pages/DynamicPages/Form.tsx index ed8e90c0..dd19cbf3 100644 --- a/resources/ts/back/Pages/DynamicPages/Form.tsx +++ b/resources/ts/back/Pages/DynamicPages/Form.tsx @@ -62,6 +62,7 @@ export default function Form({ const enumDynamicPageStatus = usePage().props.enumDynamicPageStatus as LaravelEnum; const dynamicPageModels = usePage().props.dynamicPageModels as DynamicPageModel[]; const [selectedGroup, setSelectedGroup] = useState(null); + const isConceptor = userModel.role === enumUserRole.conceptor.value; const pageConfigModels = usePage().props.pageConfigModels as Array; // Models filtered based on the presence of the locale. @@ -211,23 +212,25 @@ export default function Form({ value={data.title} setData={setData} /> - + {(!data?.isLocked || isConceptor) && ( + + )} -
- { - setSelectedGroup(null); - setData("page_id", null); - setData("slug", ""); - // @ts-ignore - setData(name, value); - }} - /> -
- setSelectedGroup((value !== null) ? (value as DynamicPageModel).title[locale] : null)} - disabled={data.isRoot} - /> - + {isConceptor && ( +
+ { + setSelectedGroup(null); + setData("page_id", null); + setData("slug", ""); + // @ts-ignore + setData(name, value); + }} + /> +
+ )} + {!data?.isRoot && ( + <> + setSelectedGroup((value !== null) ? (value as DynamicPageModel).title[locale] : null)} + disabled={data.isRoot} + /> + + + )}
- {userModel.role === enumUserRole.conceptor.value && + {isConceptor && Number(data.config_id) !== defaultConfigId && ( @@ -390,7 +399,7 @@ export default function Form({ /> )} - {userModel.role === enumUserRole.conceptor.value && ( + {isConceptor && ( diff --git a/resources/views/back/layouts/head.blade.php b/resources/views/back/layouts/head.blade.php index e45c4a73..9c39ce38 100644 --- a/resources/views/back/layouts/head.blade.php +++ b/resources/views/back/layouts/head.blade.php @@ -35,7 +35,7 @@ - @routes(nonce: $nonce) + @routes(nonce: $nonce ?? '') @if (app()->hasDebugModeEnabled()) @viteReactRefresh @endif diff --git a/resources/views/front/breadcrumbs/breadcrumb-layout.blade.php b/resources/views/front/breadcrumbs/breadcrumb-layout.blade.php index d7b818b3..5571cc04 100644 --- a/resources/views/front/breadcrumbs/breadcrumb-layout.blade.php +++ b/resources/views/front/breadcrumbs/breadcrumb-layout.blade.php @@ -1,4 +1,4 @@ -@if ($breadcrumbs->isNotEmpty() && request()->route()->getName() !== 'front.dynamic-pages.accueil.' . app()->getLocale()) +@if ($breadcrumbs->isNotEmpty() && request()->path() !== "/")