diff --git a/app/Enums/StaticPageType.php b/app/Enums/StaticPageType.php index 17735c1..388da85 100644 --- a/app/Enums/StaticPageType.php +++ b/app/Enums/StaticPageType.php @@ -8,18 +8,16 @@ enum StaticPageType: int { use BaseEnum; - case contact = 1; - case legals = 2; - case rules = 3; - case confidentiality = 4; + case legals = 1; + case rules = 2; + case confidentiality = 3; /** * Optionnal labels definition. */ private const LABELS = [ - self::contact->name => 'Contact', self::legals->name => 'Mentions légales', self::rules->name => 'Règlement', - self::confidentiality->name => 'Charte de confidentialité', + self::confidentiality->name => 'Charte de confidentialité' ]; } diff --git a/app/Http/Controllers/Bo/Auth/LoginController.php b/app/Http/Controllers/Bo/Auth/LoginController.php index 314f43e..7c9aad3 100644 --- a/app/Http/Controllers/Bo/Auth/LoginController.php +++ b/app/Http/Controllers/Bo/Auth/LoginController.php @@ -40,7 +40,7 @@ class LoginController extends Controller */ public function showLoginForm(): View { - return view('bo.auth.login'); + return view('back::auth.login'); } /** diff --git a/app/Http/Controllers/Bo/GainViewController.php b/app/Http/Controllers/Bo/GainViewController.php index 95a15c9..17cebca 100644 --- a/app/Http/Controllers/Bo/GainViewController.php +++ b/app/Http/Controllers/Bo/GainViewController.php @@ -36,7 +36,7 @@ class GainViewController extends Controller $searchFields = \sprintf( '%s, %s ...', trans('validation.attributes.name'), - trans('validation.attributes.file_name'), + trans('validation.custom.file_name'), ); /** Sort columns with a query */ diff --git a/app/Http/Controllers/Bo/PrizesController.php b/app/Http/Controllers/Bo/PrizesController.php index 6d1f719..a12b8be 100644 --- a/app/Http/Controllers/Bo/PrizesController.php +++ b/app/Http/Controllers/Bo/PrizesController.php @@ -22,7 +22,7 @@ class PrizesController extends Controller public function index(Request $request): \Illuminate\Contracts\View\View { /** @var \Illuminate\Database\Eloquent\Builder $prizeModels */ - $prizeModels = Prize::query(); + $prizeModels = Prize::query()->with('gainView'); /** @var string $search Search field */ $search = $request->search; @@ -37,8 +37,8 @@ class PrizesController extends Controller } $searchFields = \sprintf( '%s, %s ...', - Str::ucfirst(__('validation.attributes.label_one')), - __('validation.attributes.label_many'), + Str::ucfirst(__('validation.custom.label_one')), + __('validation.custom.label_many'), ); /** Sort columns with a query */ diff --git a/app/Http/Controllers/Bo/ProductsController.php b/app/Http/Controllers/Bo/ProductsController.php index 4d0ea50..271fd8d 100644 --- a/app/Http/Controllers/Bo/ProductsController.php +++ b/app/Http/Controllers/Bo/ProductsController.php @@ -39,8 +39,8 @@ class ProductsController extends Controller $searchFields = \sprintf( '%s, %s, %s ...', Str::ucfirst(__('validation.attributes.name')), - __('validation.attributes.no_art'), - __('validation.attributes.ean_code'), + __('validation.custom.no_art'), + __('validation.custom.ean_code'), ); /** Sort columns with a query */ diff --git a/database/seeders/StaticPageSeeder.php b/database/seeders/StaticPageSeeder.php index eb60d6c..6752f52 100644 --- a/database/seeders/StaticPageSeeder.php +++ b/database/seeders/StaticPageSeeder.php @@ -17,13 +17,13 @@ class StaticPageSeeder extends Seeder { StaticPage::query()->updateOrCreate( [ - 'type' => StaticPageType::contact, + 'type' => StaticPageType::confidentiality, ], [ - 'seo_title' => 'Seo title pour la page contactez nous', - 'seo_description' => 'Seo description pour la page contactez nous', - 'title' => 'Contactez-nous', - 'type' => StaticPageType::contact, + 'seo_title' => 'Seo title pour la page de confidentialité', + 'seo_description' => 'Seo description pour la page de confidentialité', + 'title' => 'Page de confidentialitée', + 'type' => StaticPageType::confidentiality, 'content' => \clean(\fake()->randomHtml(6, 7)), ] ); diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php index cb2ebd6..77e4b68 100644 --- a/resources/lang/fr/validation.php +++ b/resources/lang/fr/validation.php @@ -214,6 +214,7 @@ return [ 'username' => 'nom d\'utilisateur', 'year' => 'année', ], + 'ean' => 'Le champ :attribute doit être un code EAN valide (7, 8 ou 13 chiffres)', 'custom' => [ 'of_the' => [ 'male' => 'du ', diff --git a/resources/views/layouts/nav-list.blade.php b/resources/views/layouts/nav-list.blade.php index 7969996..6fdbea2 100644 --- a/resources/views/layouts/nav-list.blade.php +++ b/resources/views/layouts/nav-list.blade.php @@ -9,36 +9,45 @@ @superadmin @@ -46,52 +55,56 @@ @admin @endadmin @superadmin @@ -100,7 +113,7 @@ @canAny(['isConceptor', 'viewAny'], \App\Models\User::class)