adding logic in views

for view faculty
add rules message and active class to main menu
2024-03-05 16:31:27 +03:00 · 2024-03-05 14:29:18 +03:00 · 2024-03-05 11:23:18 +03:00 · 2024-03-04 17:25:06 +03:00 · 2024-03-04 17:24:12 +03:00 · 2024-03-04 15:28:23 +03:00
24 changed files with 800 additions and 156 deletions
--- a/README.md
+++ b/README.md
@ -20,7 +20,6 @@ git clone http://172.17.254.104/aslan/applicant-site.git
 cd applicant-site
 make setup
 ```
-2255

 ## Project start local

--- a/app/Enums/FacultyEnum.php
+++ b/app/Enums/FacultyEnum.php
@ -0,0 +1,10 @@
+<?php
+
+namespace App\Enums;
+
+enum FacultyEnum: int
+{
+    case InfBez = 1;
+    case Spo = 2;
+    case Magistracy = 3;
+}
--- a/app/Helpers/PositionHelper.php
+++ b/app/Helpers/PositionHelper.php
@ -0,0 +1,14 @@
+<?php
+
+namespace App\Helpers;
+
+use App\Models\Faculty;
+
+class PositionHelper
+{
+    public static function faculty()
+    {
+        $maxPosition = Faculty::max('position');
+        return $maxPosition >= 254 ? 255 : $maxPosition + 1;
+    }
+}
--- a/app/Http/Controllers/admin/Catalog/FacultyController.php
+++ b/app/Http/Controllers/admin/Catalog/FacultyController.php
@ -11,6 +11,7 @@ use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
 use Illuminate\Foundation\Application;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Str;

 class FacultyController extends Controller
 {
@ -30,11 +31,12 @@ class FacultyController extends Controller
    {
        $validated = $request->validated();

+        $slug = $validated['slug'] === null ? Str::slug($validated['name']) : $validated['slug'];
        $faculty = new Faculty();
        $faculty->name = $validated['name'];
        $faculty->description = $validated['description'];
        $faculty->position = $validated['position'];
-        $faculty->slug = $validated['slug'];
+        $faculty->slug = $slug;
        $faculty->educational_institution_id = $validated['educational_institution_id'];
        $faculty->save();

--- a/app/Http/Controllers/admin/PageController.php
+++ b/app/Http/Controllers/admin/PageController.php
@ -2,11 +2,15 @@

 namespace App\Http\Controllers\admin;

+use App\Enums\FacultyEnum;
 use App\Http\Controllers\Controller;
 use App\Models\Admission;
+use App\Models\Direction;
+use App\Models\Faculty;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;
 use Illuminate\Foundation\Application;
+use Illuminate\Support\Facades\DB;

 class PageController extends Controller
 {
@ -15,4 +19,30 @@ class PageController extends Controller
        $admissions = Admission::all()->sortBy('position');
        return view('menu.reception-screen', compact('admissions'));
    }
+
+    public function directions()
+    {
+//        $directions = DB::table('faculties')
+//            ->join('departments', 'faculties.id', '=', 'departments.faculty_id')
+//            ->join('directions', 'departments.id', '=', 'directions.department_id')
+//            ->select('faculties.name as faculties.name', 'directions.name', 'directions.id')
+//            ->groupBy('faculties.name')
+//            ->get();
+        $faculties = Faculty::all();
+//        $infBez = $faculties->find(FacultyEnum::InfBez->value);
+//        $query = `select faculties.name, directions.name, directions.id
+//FROM faculties
+//join departments on faculties.id = departments.faculty_id
+//join directions on departments.id = directions.department_id`;
+//        $directions = DB::($query);
+//        foreach ($faculties as $faculty) {
+//            foreach ($faculty->departments as $department) {
+//                foreach ($department->directions as $direction) {
+//
+//                }
+//            }
+//
+//        }
+        return view('new-design.bakalavr-special', compact('faculties'));
+    }
 }
--- a/app/Http/Requests/admin/Catalog/StoreFacultyRequest.php
+++ b/app/Http/Requests/admin/Catalog/StoreFacultyRequest.php
@ -17,9 +17,30 @@ class StoreFacultyRequest extends FormRequest
        return [
            'position' => 'required|int|numeric|max:255',
            'name' => 'required|string|max:255|unique:faculties,name',
-            'description' => 'string',
-            'slug' => 'required|string|max:255|unique:faculties,slug',
+            'description' => 'nullable|string',
+            'slug' => 'nullable|string|max:255',
            '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.',
+        ];
+    }
 }
--- a/composer.json
+++ b/composer.json
@ -9,25 +9,26 @@
    "license": "MIT",
    "require": {
        "php": "^8.3",
+        "fakerphp/faker": "^1.23.1",
        "guzzlehttp/guzzle": "^7.8.1",
        "imangazaliev/didom": "^2.0.1",
-        "laravel/framework": "^10.43.0",
+        "laravel/framework": "^10.44.0",
        "laravel/sanctum": "^3.3.3",
        "laravel/tinker": "^2.9.0",
        "laravel/ui": "^4.4.0",
        "laravelcollective/html": "^6.4.1",
        "league/flysystem": "^3.24.0",
-        "fakerphp/faker": "^1.23.1"
+        "twbs/bootstrap": "5.2.3"
    },
    "require-dev": {
-        "laravel/breeze": "^1.28.1",
-        "laravel/pint": "^1.13.10",
-        "laravel/sail": "^1.27.3",
+        "laravel/breeze": "^1.28.2",
+        "laravel/pint": "^1.13.11",
+        "laravel/sail": "^1.27.4",
        "mockery/mockery": "^1.6.7",
        "nunomaduro/collision": "^7.10.0",
        "phpunit/phpunit": "^10.5.10",
-        "spatie/laravel-ignition": "^2.4.1",
-        "barryvdh/laravel-ide-helper": "^2.13.0",
+        "spatie/laravel-ignition": "^2.4.2",
+        "barryvdh/laravel-ide-helper": "^2.15.1",
        "squizlabs/php_codesniffer": "^3.8.1",
        "phpstan/phpstan": "^1.10.57"
    },
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "5cf86f441bf56b881a8a88e4cd9e4af6",
+    "content-hash": "508caf2079a4111080260230b4ab3370",
    "packages": [
        {
            "name": "brick/math",
@ -4035,16 +4035,16 @@
        },
        {
            "name": "symfony/http-kernel",
-            "version": "v6.4.4",
+            "version": "v6.4.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "7a186f64a7f02787c04e8476538624d6aa888e42"
+                "reference": "f6947cb939d8efee137797382cb4db1af653ef75"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/7a186f64a7f02787c04e8476538624d6aa888e42",
-                "reference": "7a186f64a7f02787c04e8476538624d6aa888e42",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f6947cb939d8efee137797382cb4db1af653ef75",
+                "reference": "f6947cb939d8efee137797382cb4db1af653ef75",
                "shasum": ""
            },
            "require": {
@ -4128,7 +4128,7 @@
            "description": "Provides a structured process for converting a Request into a Response",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v6.4.4"
+                "source": "https://github.com/symfony/http-kernel/tree/v6.4.5"
            },
            "funding": [
                {
@ -4144,7 +4144,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-02-27T06:32:13+00:00"
+            "time": "2024-03-04T21:00:47+00:00"
        },
        {
            "name": "symfony/mailer",
@ -5084,16 +5084,16 @@
        },
        {
            "name": "symfony/routing",
-            "version": "v6.4.3",
+            "version": "v6.4.5",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/routing.git",
-                "reference": "3b2957ad54902f0f544df83e3d58b38d7e8e5842"
+                "reference": "7fe30068e207d9c31c0138501ab40358eb2d49a4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/3b2957ad54902f0f544df83e3d58b38d7e8e5842",
-                "reference": "3b2957ad54902f0f544df83e3d58b38d7e8e5842",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/7fe30068e207d9c31c0138501ab40358eb2d49a4",
+                "reference": "7fe30068e207d9c31c0138501ab40358eb2d49a4",
                "shasum": ""
            },
            "require": {
@ -5147,7 +5147,7 @@
                "url"
            ],
            "support": {
-                "source": "https://github.com/symfony/routing/tree/v6.4.3"
+                "source": "https://github.com/symfony/routing/tree/v6.4.5"
            },
            "funding": [
                {
@ -5163,7 +5163,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-30T13:55:02+00:00"
+            "time": "2024-02-27T12:33:30+00:00"
        },
        {
            "name": "symfony/service-contracts",
@ -5718,6 +5718,56 @@
            },
            "time": "2023-12-08T13:03:43+00:00"
        },
+        {
+            "name": "twbs/bootstrap",
+            "version": "v5.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/twbs/bootstrap.git",
+                "reference": "cb021439c683d9805e2864c58095b92d405e9b11"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/twbs/bootstrap/zipball/cb021439c683d9805e2864c58095b92d405e9b11",
+                "reference": "cb021439c683d9805e2864c58095b92d405e9b11",
+                "shasum": ""
+            },
+            "replace": {
+                "twitter/bootstrap": "self.version"
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mark Otto",
+                    "email": "markdotto@gmail.com"
+                },
+                {
+                    "name": "Jacob Thornton",
+                    "email": "jacobthornton@gmail.com"
+                }
+            ],
+            "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
+            "homepage": "https://getbootstrap.com/",
+            "keywords": [
+                "JS",
+                "css",
+                "framework",
+                "front-end",
+                "mobile-first",
+                "responsive",
+                "sass",
+                "web"
+            ],
+            "support": {
+                "issues": "https://github.com/twbs/bootstrap/issues",
+                "source": "https://github.com/twbs/bootstrap/tree/v5.2.3"
+            },
+            "time": "2022-11-21T18:19:01+00:00"
+        },
        {
            "name": "vlucas/phpdotenv",
            "version": "v5.6.0",
--- a/config/app.php
+++ b/config/app.php
@ -83,7 +83,7 @@ return [
    |
    */

-    'locale' => 'en',
+    'locale' => 'ru',

    /*
    |--------------------------------------------------------------------------
@ -96,7 +96,7 @@ return [
    |
    */

-    'fallback_locale' => 'en',
+    'fallback_locale' => 'ru',

    /*
    |--------------------------------------------------------------------------
@ -109,7 +109,7 @@ return [
    |
    */

-    'faker_locale' => 'en_US',
+    'faker_locale' => 'ru_RU',

    /*
    |--------------------------------------------------------------------------
--- a/lang/en/auth.php
+++ b/lang/en/auth.php
@ -0,0 +1,20 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used during authentication for various
+    | messages that we need to display to the user. You are free to modify
+    | these language lines according to your application's requirements.
+    |
+    */
+
+    'failed' => 'These credentials do not match our records.',
+    'password' => 'The provided password is incorrect.',
+    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+
+];
--- a/lang/en/pagination.php
+++ b/lang/en/pagination.php
@ -0,0 +1,19 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Pagination Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used by the paginator library to build
+    | the simple pagination links. You are free to change them to anything
+    | you want to customize your views to better match your application.
+    |
+    */
+
+    'previous' => '&laquo; Previous',
+    'next' => 'Next &raquo;',
+
+];
--- a/lang/en/passwords.php
+++ b/lang/en/passwords.php
@ -0,0 +1,22 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    'reset' => 'Your password has been reset.',
+    'sent' => 'We have emailed your password reset link.',
+    'throttled' => 'Please wait before retrying.',
+    'token' => 'This password reset token is invalid.',
+    'user' => "We can't find a user with that email address.",
+
+];
--- a/lang/en/requests.php
+++ b/lang/en/requests.php
@ -0,0 +1,6 @@
+<?php
+
+return [
+    'required' => 'Поле :attribute обязательно.',
+    'unique' => ':attribute уже занят.',
+];
--- a/lang/en/tooltips.php
+++ b/lang/en/tooltips.php
@ -0,0 +1,5 @@
+<?php
+
+return [
+    'position' => '2',
+];
--- a/lang/en/validation.php
+++ b/lang/en/validation.php
@ -0,0 +1,193 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | as the size rules. Feel free to tweak each of these messages here.
+    |
+    */
+
+    'accepted' => 'The :attribute field must be accepted.',
+    'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
+    'active_url' => 'The :attribute field must be a valid URL.',
+    'after' => 'The :attribute field must be a date after :date.',
+    'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
+    'alpha' => 'The :attribute field must only contain letters.',
+    'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
+    'alpha_num' => 'The :attribute field must only contain letters and numbers.',
+    'array' => 'The :attribute field must be an array.',
+    'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
+    'before' => 'The :attribute field must be a date before :date.',
+    'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
+    'between' => [
+        'array' => 'The :attribute field must have between :min and :max items.',
+        'file' => 'The :attribute field must be between :min and :max kilobytes.',
+        'numeric' => 'The :attribute field must be between :min and :max.',
+        'string' => 'The :attribute field must be between :min and :max characters.',
+    ],
+    'boolean' => 'The :attribute field must be true or false.',
+    'can' => 'The :attribute field contains an unauthorized value.',
+    'confirmed' => 'The :attribute field confirmation does not match.',
+    'current_password' => 'The password is incorrect.',
+    'date' => 'The :attribute field must be a valid date.',
+    'date_equals' => 'The :attribute field must be a date equal to :date.',
+    'date_format' => 'The :attribute field must match the format :format.',
+    'decimal' => 'The :attribute field must have :decimal decimal places.',
+    'declined' => 'The :attribute field must be declined.',
+    'declined_if' => 'The :attribute field must be declined when :other is :value.',
+    'different' => 'The :attribute field and :other must be different.',
+    'digits' => 'The :attribute field must be :digits digits.',
+    'digits_between' => 'The :attribute field must be between :min and :max digits.',
+    'dimensions' => 'The :attribute field has invalid image dimensions.',
+    'distinct' => 'The :attribute field has a duplicate value.',
+    'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
+    'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
+    'email' => 'The :attribute field must be a valid email address.',
+    'ends_with' => 'The :attribute field must end with one of the following: :values.',
+    'enum' => 'The selected :attribute is invalid.',
+    'exists' => 'The selected :attribute is invalid.',
+    'extensions' => 'The :attribute field must have one of the following extensions: :values.',
+    'file' => 'The :attribute field must be a file.',
+    'filled' => 'The :attribute field must have a value.',
+    'gt' => [
+        'array' => 'The :attribute field must have more than :value items.',
+        'file' => 'The :attribute field must be greater than :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than :value.',
+        'string' => 'The :attribute field must be greater than :value characters.',
+    ],
+    'gte' => [
+        'array' => 'The :attribute field must have :value items or more.',
+        'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be greater than or equal to :value.',
+        'string' => 'The :attribute field must be greater than or equal to :value characters.',
+    ],
+    'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
+    'image' => 'The :attribute field must be an image.',
+    'in' => 'The selected :attribute is invalid.',
+    'in_array' => 'The :attribute field must exist in :other.',
+    'integer' => 'The :attribute field must be an integer.',
+    'ip' => 'The :attribute field must be a valid IP address.',
+    'ipv4' => 'The :attribute field must be a valid IPv4 address.',
+    'ipv6' => 'The :attribute field must be a valid IPv6 address.',
+    'json' => 'The :attribute field must be a valid JSON string.',
+    'lowercase' => 'The :attribute field must be lowercase.',
+    'lt' => [
+        'array' => 'The :attribute field must have less than :value items.',
+        'file' => 'The :attribute field must be less than :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than :value.',
+        'string' => 'The :attribute field must be less than :value characters.',
+    ],
+    'lte' => [
+        'array' => 'The :attribute field must not have more than :value items.',
+        'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
+        'numeric' => 'The :attribute field must be less than or equal to :value.',
+        'string' => 'The :attribute field must be less than or equal to :value characters.',
+    ],
+    'mac_address' => 'The :attribute field must be a valid MAC address.',
+    'max' => [
+        'array' => 'The :attribute field must not have more than :max items.',
+        'file' => 'The :attribute field must not be greater than :max kilobytes.',
+        'numeric' => 'The :attribute field must not be greater than :max.',
+        'string' => 'The :attribute field must not be greater than :max characters.',
+    ],
+    'max_digits' => 'The :attribute field must not have more than :max digits.',
+    'mimes' => 'The :attribute field must be a file of type: :values.',
+    'mimetypes' => 'The :attribute field must be a file of type: :values.',
+    'min' => [
+        'array' => 'The :attribute field must have at least :min items.',
+        'file' => 'The :attribute field must be at least :min kilobytes.',
+        'numeric' => 'The :attribute field must be at least :min.',
+        'string' => 'The :attribute field must be at least :min characters.',
+    ],
+    'min_digits' => 'The :attribute field must have at least :min digits.',
+    'missing' => 'The :attribute field must be missing.',
+    'missing_if' => 'The :attribute field must be missing when :other is :value.',
+    'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
+    'missing_with' => 'The :attribute field must be missing when :values is present.',
+    'missing_with_all' => 'The :attribute field must be missing when :values are present.',
+    'multiple_of' => 'The :attribute field must be a multiple of :value.',
+    'not_in' => 'The selected :attribute is invalid.',
+    'not_regex' => 'The :attribute field format is invalid.',
+    'numeric' => 'The :attribute field must be a number.',
+    'password' => [
+        'letters' => 'The :attribute field must contain at least one letter.',
+        'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
+        'numbers' => 'The :attribute field must contain at least one number.',
+        'symbols' => 'The :attribute field must contain at least one symbol.',
+        'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
+    ],
+    'present' => 'The :attribute field must be present.',
+    'present_if' => 'The :attribute field must be present when :other is :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'The :attribute field must be present when :values is present.',
+    'present_with_all' => 'The :attribute field must be present when :values are present.',
+    'prohibited' => 'The :attribute field is prohibited.',
+    'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
+    'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
+    'prohibits' => 'The :attribute field prohibits :other from being present.',
+    'regex' => 'The :attribute field format is invalid.',
+    'required' => 'The :attribute field is required.',
+    'required_array_keys' => 'The :attribute field must contain entries for: :values.',
+    'required_if' => 'The :attribute field is required when :other is :value.',
+    'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
+    'required_unless' => 'The :attribute field is required unless :other is in :values.',
+    'required_with' => 'The :attribute field is required when :values is present.',
+    'required_with_all' => 'The :attribute field is required when :values are present.',
+    'required_without' => 'The :attribute field is required when :values is not present.',
+    'required_without_all' => 'The :attribute field is required when none of :values are present.',
+    'same' => 'The :attribute field must match :other.',
+    'size' => [
+        'array' => 'The :attribute field must contain :size items.',
+        'file' => 'The :attribute field must be :size kilobytes.',
+        'numeric' => 'The :attribute field must be :size.',
+        'string' => 'The :attribute field must be :size characters.',
+    ],
+    'starts_with' => 'The :attribute field must start with one of the following: :values.',
+    'string' => 'The :attribute field must be a string.',
+    'timezone' => 'The :attribute field must be a valid timezone.',
+    'unique' => 'The :attribute has already been taken.',
+    'uploaded' => 'The :attribute failed to upload.',
+    'uppercase' => 'The :attribute field must be uppercase.',
+    'url' => 'The :attribute field must be a valid URL.',
+    'ulid' => 'The :attribute field must be a valid ULID.',
+    'uuid' => 'The :attribute field must be a valid UUID.',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => [
+        'attribute-name' => [
+            'rule-name' => 'custom-message',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap our attribute placeholder
+    | with something more reader friendly such as "E-Mail Address" instead
+    | of "email". This simply helps us make our message more expressive.
+    |
+    */
+
+    'attributes' => [
+        'password' => 'password',
+        'Password' => 'password',
+    ],
+];
--- a/lang/ru/requests.php
+++ b/lang/ru/requests.php
@ -0,0 +1,5 @@
+<?php
+
+return [
+    'required' => 'Поле :attribute обязательно.',
+];
--- a/lang/ru/tooltips.php
+++ b/lang/ru/tooltips.php
@ -0,0 +1,5 @@
+<?php
+
+return [
+    'position' => '1',
+];
--- a/lang/ru/validation.php
+++ b/lang/ru/validation.php
@ -0,0 +1,193 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | as the size rules. Feel free to tweak each of these messages here.
+    |
+    */
+
+    'accepted' => ':attribute должен быть принят.',
+    'accepted_if' => ':attribute должен быть принят, если :other равно :value.',
+    'active_url' => ':attribute не является допустимым URL.',
+    'after' => ':attribute должен быть датой после :date.',
+    'after_or_equal' => ':attribute должен быть датой после :date или равным ей.',
+    'alpha' => ':attribute должен содержать только буквы.',
+    'alpha_dash' => ':attribute должен содержать только буквы, цифры, дефисы и символы подчеркивания.',
+    'alpha_num' => ':attribute должен содержать только буквы и цифры.',
+    'array' => ':attribute должен быть массивом.',
+    'ascii' => 'Поле :attribute должно содержать только однобайтные буквенно-цифровые символы и символы.',
+    'before' => ':attribute должен быть датой до :date.',
+    'before_or_equal' => ':attribute должен быть датой, предшествующей :date или равной ей.',
+    'between' => [
+        'array' => ':attribute должен содержать от :min до :max элементов.',
+        'file' => ':attribute должен быть между :min и :max килобайтами.',
+        'numeric' => ':attribute должен быть между :min и :max.',
+        'string' => ':attribute должен быть между символами :min и :max.',
+    ],
+    'boolean' => 'Поле :attribute должно быть истинным или ложным.',
+    'can' => 'Поле :attribute содержит неавторизованное значение.',
+    'confirmed' => ':attribute и подтверждение не совпадают',
+    'current_password' => 'Неверный пароль.',
+    'date' => ':attribute не является действительной датой.',
+    'date_equals' => ':attribute должен быть датой, равной :date.',
+    'date_format' => ':attribute не соответствует формату :format.',
+    'decimal' => 'Поле :attribute должно иметь :decimal десятичные места.',
+    'declined' => ':attribute должен быть отклонен.',
+    'declined_if' => ':attribute должен быть отклонен, если :other равно :value.',
+    'different' => ':attribute и :other должны быть разными.',
+    'digits' => 'The :attribute должен быть :digits digits.',
+    'digits_between' => 'должен быть между цифрами :min и :max.',
+    'dimensions' => 'The :attribute имеет недопустимые размеры изображения.',
+    'distinct' => 'The :attribute имеет повторяющееся значение.',
+    'doesnt_end_with' => 'The :attribute не может заканчиваться одним из следующих: :values.',
+    'doesnt_start_with' => 'The :attribute не может начинаться с одного из следующих: :values.',
+    'email' => ':attribute должен быть действительным адресом электронной почты.',
+    'ends_with' => 'The :attribute должен заканчиваться одним из следующих: :values.',
+    'enum' => 'Выбранный :attribute недействителен.',
+    'exists' => 'Выбранный :attribute недействителен.',
+    'extensions' => 'Поле :attribute должно иметь одно из следующих расширений :values.',
+    'file' => ':attribute должен быть файлом.',
+    'filled' => 'Поле :attribute должно иметь значение.',
+    'gt' => [
+        'array' => ':attribute должен содержать больше элементов, чем :value.',
+        'file' => ':attribute должен быть больше :value килобайт.',
+        'numeric' => ':attribute должен быть больше :value.',
+        'string' => ':attribute должен быть больше символов :value.',
+    ],
+    'gte' => [
+        'array' => ':attribute должен содержать элементы :value или более.',
+        'file' => ':attribute должен быть больше или равен :value килобайтам.',
+        'numeric' => ':attribute должен быть больше или равен :value.',
+        'string' => ':attribute должен быть больше или равен символам :value.',
+    ],
+    'hex_color' => 'Поле :attribute должно иметь допустимый шестнадцатеричный цвет.',
+    'image' => ':attribute должен быть изображением.',
+    'in' => 'Выбранный :attribute недействителен.',
+    'in_array' => 'Поле :attribute не существует в :other.',
+    'integer' => ':attribute должен быть целым числом.',
+    'ip' => ':attribute должен быть действительным IP-адресом.',
+    'ipv4' => ':attribute должен быть действительным адресом IPv4.',
+    'ipv6' => ':attribute должен быть действительным адресом IPv6.',
+    'json' => ':attribute должен быть допустимой строкой JSON.',
+    'lowercase' => 'Поле :attribute должно быть в нижнем регистре.',
+    'lt' => [
+        'array' => ':attribute должен содержать элементов меньше :value.',
+        'file' => ':attribute должен быть меньше :value килобайт.',
+        'numeric' => ':attribute должен быть меньше :value.',
+        'string' => ':attribute должен быть меньше символов :value.',
+    ],
+    'lte' => [
+        'array' => ':attribute не должен содержать больше элементов, чем :value.',
+        'file' => 'The :attribute должен быть меньше или равен :value килобайтам.',
+        'numeric' => 'The :attribute должен быть меньше или равен :value.',
+        'string' => 'The :attribute должен быть меньше или равен символам :value.',
+    ],
+    'mac_address' => ':attribute должен быть действительным MAC-адресом.',
+    'max' => [
+        'array' => ':attribute должен содержать не более :max элементов.',
+        'file' => ':attribute не должен превышать :max килобайт.',
+        'numeric' => ':attribute не должен быть больше :max.',
+        'string' => ':attribute не должен превышать :max символов.',
+    ],
+    'max_digits' => ':attribute не должен содержать более :max цифр.',
+    'mimes' => ':attribute должен быть файлом типа: :values.',
+    'mimetypes' => ':attribute должен быть файлом типа: :values.',
+    'min' => [
+        'array' => ':attribute должен содержать не менее :min элементов.',
+        'file' => ':attribute должен быть не менее :min килобайт.',
+        'numeric' => ':attribute должен быть не меньше :min.',
+        'string' => ':attribute должен иметь длину не менее :min символов.',
+    ],
+    'min_digits' => ':attribute должен содержать не менее :min цифр.',
+    'missing' => 'Поле :attribute должно отсутствовать.',
+    'missing_if' => 'Поле :attribute должно отсутствовать, если :other является :value.',
+    'missing_unless' => 'Поле :attribute должно отсутствовать, если :other не является :value.',
+    'missing_with' => 'При наличии :values :attribute должно отсутствовать.',
+    'missing_with_all' => 'Поле :attribute должно отсутствовать при наличии :values.',
+    'multiple_of' => ':attribute должен быть кратен :value.',
+    'not_in' => 'Выбранный :attribute недействителен.',
+    'not_regex' => 'Неверный формат :attribute.',
+    'numeric' => ':attribute должен быть числом.',
+    'password' => [
+        'letters' => ':attribute должен содержать хотя бы одну букву.',
+        'mixed' => ':attribute должен содержать как минимум одну прописную и одну строчную букву.',
+        'numbers' => ':attribute должен содержать хотя бы одно число.',
+        'symbols' => ':attribute должен содержать хотя бы один символ.',
+        'uncompromised' => 'Данный :attribute появился в утечке данных. Пожалуйста, выберите другой :attribute.',
+    ],
+    'present' => 'Поле :attribute должно присутствовать.',
+    'present_if' => 'Поле :attribute должно присутствовать, когда :other является :value.',
+    'present_unless' => 'The :attribute field must be present unless :other is :value.',
+    'present_with' => 'Поле :attribute должно присутствовать, если :other не является :value.',
+    'present_with_all' => 'Поле :attribute должно присутствовать, когда присутствуют :values.',
+    'prohibited' => 'Поле :attribute запрещено.',
+    'prohibited_if' => 'Поле :attribute запрещено, если :other равно :value.',
+    'prohibited_unless' => 'Поле :attribute запрещено, если :other не находится в :values.',
+    'prohibits' => 'Поле :attribute запрещает присутствие :other.',
+    'regex' => 'Неверный формат :attribute.',
+    'required' => 'Поле :attribute обязательно.',
+    'required_array_keys' => 'Поле :attribute должно содержать записи для: :values.',
+    'required_if' => 'Поле :attribute обязательно, если :other равно :value.',
+    'required_if_accepted' => 'Поле :attribute обязательно, когда принимается :other.',
+    'required_unless' => 'Поле :attribute является обязательным, если только :other не находится в :values.',
+    'required_with' => 'Поле :attribute обязательно, если присутствует :values.',
+    'required_with_all' => 'Поле :attribute обязательно, если присутствуют :values.',
+    'required_without' => 'Поле :attribute является обязательным, если :values отсутствует.',
+    'required_without_all' => 'Поле :attribute является обязательным, если ни одно из :value не присутствует.',
+    'same' => ':attribute и :other должны совпадать.',
+    'size' => [
+        'array' => ':attribute должен содержать элементы :size.',
+        'file' => ':attribute должен быть :size килобайт.',
+        'numeric' => ':attribute должен быть :size.',
+        'string' => ':attribute должен быть размером :size символов.',
+    ],
+    'starts_with' => ':attribute должен начинаться с одного из следующих: :values.',
+    'string' => ':attribute должен быть строкой.',
+    'timezone' => ':attribute должен быть действительным часовым поясом.',
+    'unique' => ':attribute уже занят.',
+    'uploaded' => 'Не удалось загрузить :attribute.',
+    'uppercase' => 'Поле :attribute должно быть в верхнем реистре',
+    'url' => ':attribute должен быть допустимым URL.',
+    'ulid' => 'Поле :attribute должно быть допустимым ULID.',
+    'uuid' => ':attribute должен быть действительным UUID.',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => [
+        'attribute-name' => [
+            'rule-name' => 'custom-message',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap our attribute placeholder
+    | with something more reader friendly such as "E-Mail Address" instead
+    | of "email". This simply helps us make our message more expressive.
+    |
+    */
+
+    'attributes' => [
+        'password' => 'Пароль',
+        'Password' => 'Пароль',
+    ],
+];
--- a/resources/js/app.js
+++ b/resources/js/app.js
@ -1,4 +1,4 @@
-// import './bootstrap';
+import './bootstrap';

 import Alpine from 'alpinejs';
 import ujs from '@rails/ujs';
--- a/resources/views/admin/catalog/faculty/create.blade.php
+++ b/resources/views/admin/catalog/faculty/create.blade.php
@ -1,3 +1,4 @@
+@php use App\Helpers\PositionHelper; @endphp
@extends('layouts.admin_layout')
@section('content')
    @auth()
@ -7,12 +8,13 @@
                {{ Form::open(['url' => route('faculties.store'), 'method' => 'POST', 'class' => '']) }}
                <div class="col">
                    <div class="mt-3">
-                        {{ Form::label('position', 'Позиция') }}
+                        {{ Form::label('position', 'Позиция', ['data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.position')]) }}
+                        <span class="text-danger">*</span>
                    </div>
                    <div class="mt-1">
-                        {{ Form::text('position', '', ['class' => 'form-control']) }}
+                        {{ Form::number('position', PositionHelper::faculty(), ['class' => 'form-control', 'data-bs-toggle' => "tooltip", 'data-bs-title' => __('tooltips.position')]) }}
                    </div>
-                    <div>
+                    <div class="text-danger">
                        @if ($errors->any())
                            {{ $errors->first('position') }}
                        @endif
@ -20,11 +22,12 @@

                    <div class="mt-3">
                        {{ Form::label('name', 'Название') }}
+                        <span class="text-danger">*</span>
                    </div>
                    <div class="mt-1">
                        {{ Form::text('name', '', ['class' => 'form-control']) }}
                    </div>
-                    <div>
+                    <div class="text-danger">
                        @if ($errors->any())
                            {{ $errors->first('name') }}
                        @endif
@ -36,18 +39,19 @@
                    <div class="mt-1">
                        {{ Form::text('description', '', ['class' => 'form-control']) }}
                    </div>
-                    <div>
+                    <div class="text-danger">
                        @if ($errors->any())
                            {{ $errors->first('description') }}
                        @endif
                    </div>
                    <div class="mt-3">
                        {{ Form::label('educational_institution_id', 'Учебное заведение') }}
+                        <span class="text-danger">*</span>
                    </div>
                    <div class="mt-1">
                        {{ Form::select('educational_institution_id', $educationalInstitutions, null, ['class' => 'form-select']) }}
                    </div>
-                    <div>
+                    <div class="text-danger">
                        @if ($errors->any())
                            {{ $errors->first('educational_institution_id') }}
                        @endif
@ -58,7 +62,7 @@
                    <div class="mt-1">
                        {{ Form::text('slug', '', ['class' => 'form-control']) }}
                    </div>
-                    <div>
+                    <div class="text-danger">
                        @if ($errors->any())
                            {{ $errors->first('slug') }}
                        @endif
--- a/resources/views/layouts/admin_layout.blade.php
+++ b/resources/views/layouts/admin_layout.blade.php
@ -11,6 +11,7 @@
    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"></script>
 </head>
 <body class="antialiased">
+@include('layouts.tooltips')
 <div class="container-fluid">
    <header
        class="d-flex flex-wrap align-items-center justify-content-center justify-content-md-between py-3 mb-4 border-bottom">
@ -41,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>
--- a/resources/views/layouts/tooltips.blade.php
+++ b/resources/views/layouts/tooltips.blade.php
@ -0,0 +1,4 @@
+<script type="module">
+    const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]')
+    const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl))
+</script>
--- a/resources/views/new-design/bakalavr-special.blade.php
+++ b/resources/views/new-design/bakalavr-special.blade.php
@ -1,3 +1,4 @@
+
@extends('layouts.new-design-layout')
@section('content')
    <style>
@ -311,20 +312,24 @@ overflow-x: hidden;

        <div class="container-fluid ms-sm-5  py-5" >
            <div class="row">
-                <div class="display-5 col-12  mb-3 text-center text-md-start " style="background-image: url({{ URL::to('img/front-page/fon1_blok.png') }}); -webkit-background-clip: text; -webkit-text-fill-color: transparent; font-weight: 700; letter-spacing: 0em;  ">
+                <div class="display-5 col-12  mb-3 text-center text-md-start " style="background-image: url({{ URL::to('img/front-page/bakalavr-special/fon1_blok.png') }}); -webkit-background-clip: text; -webkit-text-fill-color: transparent; font-weight: 700; letter-spacing: 0em;  ">
                    ПЕРЕЧЕНЬ ФАКУЛЬТЕТОВ
                </div>
            </div>
-            <div class="row d-flex  justify-content-center">
-                <div class="col-xxl-4 col-md-6 col-10">
-                    <!-- Button trigger modal -->

-                    <button type="button" data-bs-toggle="modal" data-bs-target="#exampleModal" class="btn col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1 " style="background-color: #ffffff; border-radius: 15px;">
+            <div class="row d-flex  justify-content-md-start justify-content-center">
+                @foreach($faculties as $faculty)
+
+                    <div class="mt-xl-5 col-xxl-4 col-md-6 col-10 ">
+
+                        <!-- Button trigger modal -->
+                        <button type="button" data-bs-toggle="modal" data-bs-target="#exampleModal-{{ $faculty->id }}" class="btn col-md-11 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex align-items-center hover1 " style="background-color: #ffffff; border-radius: 15px;">
                            <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/5.png') }}" alt="">
-                        <span class="ms-xl-5  z-3 gradient-text" > Факультет послевузовского профессионального образования</span>
+                            <span class="ms-xl-5 ms-2 z-3 gradient-text" > {{ $faculty->name }}</span>
                        </button>
+
                        <!-- Modal -->
-                    <div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+                        <div class="modal fade" id="exampleModal-{{ $faculty->id }}" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
                            <div class="modal-dialog modal-xl" >
                                <div class="modal-content" style="border-radius: 30px;">
                                    <div class="modal-header d-flex justify-content-center">
@ -332,10 +337,41 @@ overflow-x: hidden;


                                    </div>
-                                <p class="text-center fs-3"> Факультет послевузовского профессионального образования </p>
+                                    <p class="text-center fs-3"> {{ $faculty->name }} </p>
+
+                                    <div class="modal-body d-flex justify-content-center">
+                                        <div class="col-11">
+                                            <p class="fs-5">Основная информация</p>
+                                            <p class="fs-6" style=" font-family: Geologica-ExtraLight;   text-align: justify;"> {{ $faculty->description }}</p>
+                                            <p class="fs-5">Специальности</p>
+                                            <div class="table-responsive">
+                                                <table class="table w-100 fs-6" style=" font-family: Geologica-ExtraLight">
+                                                    <tr>
+                                                        <th> Название </th>
+                                                        <th> Код специальности </th>
+                                                        <th> Уровень образования </th>
+                                                        <th> Форма обучения </th>
+                                                    </tr>
+                                                    @foreach($faculty->departments as $department)
+                                                        @foreach($department->directions as $direction)
+
+                                                            <tr>
+                                                                <td> {{ $direction->name }} </td>
+                                                                <td> {{ $direction->code }} </td>
+                                                                <td> {{ $direction->educationLevel->name }} </td>
+                                                                <td> {{ $direction->educationForm->name }} </td>
+                                                            </tr>
+                                                        @endforeach
+                                                    @endforeach
+                                                </table>
+                                            </div>
+
+                                        </div>
+
+
+
+

-                                <div class="modal-body">
-                                    Основная информация
                                    </div>
                                    <div class="modal-footer">
                                        <button type="button" class="btn btn-danger" data-bs-dismiss="modal">Закрыть</button>
@ -344,121 +380,123 @@ overflow-x: hidden;
                                </div>
                            </div>
                        </div>
-
-
-
-                </div>
-                <div class="col-xxl-4 col-md-6 col-10">
-                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">
-
-                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/10.png') }}" alt="">
-                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Лечебный факультет</p>
-
-                    </a>
-                </div>
-                <div class="col-xxl-4 col-md-6 col-10">
-                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">
-
-                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/8.png') }}" alt="">
-                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Инженерный факультет</p>
-
-                    </a>
                    </div>

-            </div>
-            <div class="row d-flex mt-md-4 justify-content-center">
-                <div class="col-xxl-4 col-md-6 col-10">
-                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">
+                @endforeach

-                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/9.png') }}" alt="">
-                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Технологический факультет</p>

-                    </a>
-                </div>
-                <div class="col-xxl-4 col-md-6 col-10">
-                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">

-                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/1.png') }}" alt="">
-                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Факультет аграрных технологий</p>
+{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
+{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}

-                    </a>
-                </div>
-                <div class="col-xxl-4 col-md-6 col-10">
-                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">
+{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/10.png') }}" alt="">--}}
+{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Лечебный факультет</p>--}}

-                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/12.png') }}" alt="">
-                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Педиатрический факультет</p>
+{{--                    </a>--}}
+{{--                </div>--}}
+{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
+{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}

-                    </a>
-                </div>
+{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/8.png') }}" alt="">--}}
+{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Инженерный факультет</p>--}}
+
+{{--                    </a>--}}
+{{--                </div>--}}

            </div>
-            <div class="row d-flex mt-md-4 justify-content-center">
-                <div class="col-xxl-4 col-md-6 col-10">
-                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">
+{{--            <div class="row d-flex mt-md-4 justify-content-center">--}}
+{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
+{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}

-                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/13.png') }}" alt="">
-                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Фармацевтический факультет</p>
+{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/9.png') }}" alt="">--}}
+{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Технологический факультет</p>--}}

-                    </a>
-                </div>
-                <div class="col-xxl-4 col-md-6 col-10">
-                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">
+{{--                    </a>--}}
+{{--                </div>--}}
+{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
+{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}

-                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/4.png') }}" alt="">
-                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Факультет международного образования</p>
+{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/1.png') }}" alt="">--}}
+{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Факультет аграрных технологий</p>--}}

-                    </a>
-                </div>
-                <div class="col-xxl-4 col-md-6 col-10">
-                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">
+{{--                    </a>--}}
+{{--                </div>--}}
+{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
+{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}

-                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/11.png') }}" alt="">
-                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Стоматологический факультет </p>
+{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/12.png') }}" alt="">--}}
+{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Педиатрический факультет</p>--}}

-                    </a>
-                </div>
+{{--                    </a>--}}
+{{--                </div>--}}

-            </div>
-            <div class="row d-flex mt-md-4 justify-content-center">
-                <div class="col-xxl-4 col-md-6 col-10">
-                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">
+{{--            </div>--}}
+{{--            <div class="row d-flex mt-md-4 justify-content-center">--}}
+{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
+{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}

-                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/6.png') }}" alt="">
-                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Экологический факультет</p>
+{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/13.png') }}" alt="">--}}
+{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Фармацевтический факультет</p>--}}

-                    </a>
-                </div>
-                <div class="col-xxl-4 col-md-6 col-10">
-                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">
+{{--                    </a>--}}
+{{--                </div>--}}
+{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
+{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}

-                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/7.png') }}" alt="">
-                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Медицинский факультет </p>
+{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/4.png') }}" alt="">--}}
+{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Факультет международного образования</p>--}}

-                    </a>
-                </div>
-                <div class="col-xxl-4 col-md-6 col-10">
-                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">
+{{--                    </a>--}}
+{{--                </div>--}}
+{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
+{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}

-                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/2.png') }}" alt="">
-                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Факультет экономики и управления </p>
+{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/11.png') }}" alt="">--}}
+{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Стоматологический факультет </p>--}}

-                    </a>
-                </div>
+{{--                    </a>--}}
+{{--                </div>--}}

-            </div>
-            <div class="row d-flex mt-md-4 justify-content-xxl-start justify-content-center">
-                <div class="col-xxl-4 col-md-6 col-10">
-                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">
+{{--            </div>--}}
+{{--            <div class="row d-flex mt-md-4 justify-content-center">--}}
+{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
+{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}

-                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/3.png') }}" alt="">
-                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Факультет информационных систем в экономике и юрисприденции</p>
+{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/6.png') }}" alt="">--}}
+{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Экологический факультет</p>--}}

-                    </a>
-                </div>
+{{--                    </a>--}}
+{{--                </div>--}}
+{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
+{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}
+
+{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/7.png') }}" alt="">--}}
+{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Медицинский факультет </p>--}}
+
+{{--                    </a>--}}
+{{--                </div>--}}
+{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
+{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}
+
+{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/2.png') }}" alt="">--}}
+{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Факультет экономики и управления </p>--}}
+
+{{--                    </a>--}}
+{{--                </div>--}}
+
+{{--            </div>--}}
+{{--            <div class="row d-flex mt-md-4 justify-content-xxl-start justify-content-center">--}}
+{{--                <div class="col-xxl-4 col-md-6 col-10">--}}
+{{--                    <a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">--}}
+
+{{--                        <img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/3.png') }}" alt="">--}}
+{{--                        <p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Факультет информационных систем в экономике и юрисприденции</p>--}}
+
+{{--                    </a>--}}
+{{--                </div>--}}


-            </div>
+{{--            </div>--}}



--- a/routes/pages.php
+++ b/routes/pages.php
@ -11,9 +11,11 @@ Route::get('/magistr', function () {
    return view('new-design.magistr');
 })->name('magistr');

-Route::get('/', function () {
-    return view('new-design.bakalavr-special');
-})->name('bakalavr-special');
+Route::get('/', [PageController::class, 'directions'])->name('/bakalavr-special');
+
+//Route::get('/', function () {
+//    return view('new-design.bakalavr-special');
+//})->name('bakalavr-special');

 Route::get('/course', function () {
    return view('menu.course');
Author	SHA1	Message	Date
ROMANGOLIENKO	33b803472d	adding logic in views	2024-03-05 16:31:27 +03:00
aslan	b3d4231ec8	for view faculty	2024-03-05 14:29:18 +03:00
aslan	c4caf84226	add rules message and active class to main menu	2024-03-05 11:23:18 +03:00
aslan	3dc4b84357	Merge branch 'main' of gitea.mkgtu.ru:aslan/applicant-site	2024-03-04 17:25:06 +03:00
aslan	0a9f7ab004	add locale for requests and position helper	2024-03-04 17:24:12 +03:00
aslan	a8c6394684	Merge pull request 'variations added' (#18 ) from RomanGolienko/Roman_applicant-site:new-design into main Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/18	2024-03-04 15:28:23 +03:00