From c4caf84226acd0182fd35172514202a76695f3b1 Mon Sep 17 00:00:00 2001
From: aslan <aslan@aslan.ru>
Date: Tue, 5 Mar 2024 11:23:18 +0300
Subject: [PATCH] add rules message and active class to main menu

---
 app/Helpers/PositionHelper.php                |  1 -
 .../admin/Catalog/StoreFacultyRequest.php     | 21 ++++++++++++
 .../views/layouts/admin_layout.blade.php      | 32 +++++++++----------
 routes/pages.php                              |  4 +++
 4 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/app/Helpers/PositionHelper.php b/app/Helpers/PositionHelper.php
index 9564f73..5428fdb 100644
--- a/app/Helpers/PositionHelper.php
+++ b/app/Helpers/PositionHelper.php
@@ -10,6 +10,5 @@ class PositionHelper
     {
         $maxPosition = Faculty::max('position');
         return $maxPosition >= 254 ? 255 : $maxPosition + 1;
-
     }
 }
diff --git a/app/Http/Requests/admin/Catalog/StoreFacultyRequest.php b/app/Http/Requests/admin/Catalog/StoreFacultyRequest.php
index 975b53e..307cb0b 100644
--- a/app/Http/Requests/admin/Catalog/StoreFacultyRequest.php
+++ b/app/Http/Requests/admin/Catalog/StoreFacultyRequest.php
@@ -22,4 +22,25 @@ class StoreFacultyRequest extends FormRequest
             'educational_institution_id' => 'required|int|numeric|max:1000'
         ];
     }
+
+    public function messages(): array
+    {
+        return [
+            'position.required' => 'Поле позиция обязательно.',
+            'position.int' => 'Позиция должно быть целым числом.',
+            'position.numeric' => 'Позиция должно быть числом.',
+            'position.max' => 'Позиция не должен быть больше :max',
+            'name.required' => 'Поле название обязательно.',
+            'name.string' => 'Поле название должен быть строкой.',
+            'name.max' => 'Поле название не должен превышать :max символов.',
+            'name.unique' => 'Название уже занят.',
+            'description.string' => 'Поле описание должен быть строкой.',
+            'slug.string' => 'Поле URL должен быть строкой.',
+            'slug.max' => 'Поле URL не должен превышать :max символов.',
+            'educational_institution_id.required' => 'Поле учебное заведение обязательно.',
+            'educational_institution_id.int' => 'Учебное заведение должно быть целым числом.',
+            'educational_institution_id.numeric' => 'Учебное заведение должно быть числом.',
+            'educational_institution_id.max' => 'Поле учебное заведение не должен быть больше :max.',
+        ];
+    }
 }
diff --git a/resources/views/layouts/admin_layout.blade.php b/resources/views/layouts/admin_layout.blade.php
index 01317b2..a33716e 100644
--- a/resources/views/layouts/admin_layout.blade.php
+++ b/resources/views/layouts/admin_layout.blade.php
@@ -42,29 +42,29 @@
         </div>
     </header>
     <div class="row align-items-start">
-        <aside class="list-group col-2">
-            <ul>
-                <li class="list-group-item"><a href="{{ route('documents.index') }}">Документы</a></li>
-                <li class="list-group-item"><a href="{{ route('admissions.index') }}">Экран Приема</a></li>
-                <li class="list-group-item"><a href="{{ route('directions.index') }}">Направления</a></li>
+        <aside class="col-2">
+            <ul class="list-group ">
+                <li class="list-group-item {{ request()->is('admin/documents*') ? 'active' : '' }}"><a class="{{ request()->is('admin/documents*') ? 'link-light' : '' }}" href="{{ route('documents.index') }}">Документы</a></li>
+                <li class="list-group-item {{ request()->is('admin/admissions*') ? 'active' : '' }}"><a class="{{ request()->is('admin/admissions*') ? 'link-light' : '' }}" href="{{ route('admissions.index') }}">Экран Приема</a></li>
+                <li class="list-group-item {{ request()->is('admin/directions*') ? 'active' : '' }}"><a class="{{ request()->is('admin/directions*') ? 'link-light' : '' }}" href="{{ route('directions.index') }}">Направления</a></li>
                 @can('viewAny', Auth::user())
                     <li class="list-group-item"></li>
-                    <li class="list-group-item"><a href="{{ route('users.index') }}">Список администраторов</a></li>
+                    <li class="list-group-item {{ request()->is('admin/users*') ? 'active' : '' }}"><a class="{{ request()->is('admin/users*') ? 'link-light' : '' }}" href="{{ route('users.index') }}">Список администраторов</a></li>
                 @endcan
                 <li class="list-group-item"></li>
                 <li class="list-group-item">Справочники</li>
-                <li class="list-group-item"><a href="{{ route('educational_institutions.index') }}">Учебные
+                <li class="list-group-item {{ request()->is('admin/educational_institutions*') ? 'active' : '' }}"><a class="{{ request()->is('admin/educational_institutions*') ? 'link-light' : '' }}" href="{{ route('educational_institutions.index') }}">Учебные
                         заведения</a></li>
-                <li class="list-group-item"><a href="{{ route('faculties.index') }}">Факультеты</a></li>
-                <li class="list-group-item"><a href="{{ route('departments.index') }}">Кафедры</a></li>
+                <li class="list-group-item {{ request()->is('admin/faculties*') ? 'active' : '' }}"><a class="{{ request()->is('admin/faculties*') ? 'link-light' : '' }}" href="{{ route('faculties.index') }}">Факультеты</a></li>
+                <li class="list-group-item {{ request()->is('admin/departments*') ? 'active' : '' }}"><a class="{{ request()->is('admin/departments*') ? 'link-light' : '' }}" href="{{ route('departments.index') }}">Кафедры</a></li>
 
-                <li class="list-group-item"><a href="{{ route('entrance_examinations.index') }}">Вступ. экзамены</a></li>
-                <li class="list-group-item"><a href="{{ route('education_levels.index') }}">Уровни образования</a></li>
-                <li class="list-group-item"><a href="{{ route('education_forms.index') }}">Формы образования</a></li>
-                <li class="list-group-item"><a href="{{ route('examination_types.index') }}">Типы Экзаменов</a></li>
-                <li class="list-group-item"><a href="{{ route('subjects.index') }}">Предметы</a></li>
-                <li class="list-group-item"><a href="{{ route('subject_types.index') }}">Типы Предметов</a></li>
-                <li class="list-group-item"><a href="{{ route('direction_profiles.index') }}">Профили подготовки</a></li>
+                <li class="list-group-item {{ request()->is('admin/entrance_examinations*') ? 'active' : '' }}"><a class="{{ request()->is('admin/entrance_examinations*') ? 'link-light' : '' }}" href="{{ route('entrance_examinations.index') }}">Вступ. экзамены</a></li>
+                <li class="list-group-item {{ request()->is('admin/education_levels*') ? 'active' : '' }}"><a class="{{ request()->is('admin/education_levels*') ? 'link-light' : '' }}" href="{{ route('education_levels.index') }}">Уровни образования</a></li>
+                <li class="list-group-item {{ request()->is('admin/education_forms*') ? 'active' : '' }}"><a class="{{ request()->is('admin/education_forms*') ? 'link-light' : '' }}" href="{{ route('education_forms.index') }}">Формы образования</a></li>
+                <li class="list-group-item {{ request()->is('admin/examination_types*') ? 'active' : '' }}"><a class="{{ request()->is('admin/examination_types*') ? 'link-light' : '' }}" href="{{ route('examination_types.index') }}">Типы Экзаменов</a></li>
+                <li class="list-group-item {{ request()->is('admin/subjects*') ? 'active' : '' }}"><a class="{{ request()->is('admin/subjects*') ? 'link-light' : '' }}" href="{{ route('subjects.index') }}">Предметы</a></li>
+                <li class="list-group-item {{ request()->is('admin/subject_types*') ? 'active' : '' }}"><a class="{{ request()->is('admin/subject_types*') ? 'link-light' : '' }}" href="{{ route('subject_types.index') }}">Типы Предметов</a></li>
+                <li class="list-group-item {{ request()->is('admin/direction_profiles*') ? 'active' : '' }}"><a class="{{ request()->is('admin/direction_profiles*') ? 'link-light' : '' }}" href="{{ route('direction_profiles.index') }}">Профили подготовки</a></li>
             </ul>
         </aside>
         <main class="col-10">@yield('content')</main>
diff --git a/routes/pages.php b/routes/pages.php
index 344ebca..42165b0 100644
--- a/routes/pages.php
+++ b/routes/pages.php
@@ -11,6 +11,10 @@ Route::get('/magistr', function () {
     return view('new-design.magistr');
 })->name('magistr');
 
+Route::get('/home', function () {
+    return view('new-design.bakalavr-special');
+})->name('home');
+
 Route::get('/', function () {
     return view('new-design.bakalavr-special');
 })->name('bakalavr-special');