diff --git a/app/Http/Controllers/admin/FeedbackController.php b/app/Http/Controllers/admin/FeedbackController.php index f86a3cd..2a4b699 100644 --- a/app/Http/Controllers/admin/FeedbackController.php +++ b/app/Http/Controllers/admin/FeedbackController.php @@ -18,15 +18,18 @@ class FeedbackController extends Controller public function store(StoreFeedbackRequest $request) { + $validated = $request->validated(); $feedback = new Feedback(); $feedback->contact = $validated['contact']; $feedback->text = $validated['text']; - $feedback->status_id = $validated['status_id']; + $feedback->status_id = 1; $feedback->save(); - return response()->json(["result" => "success"]); + flash('Ваше сообщение отправлено!')->success(); + + return back(); } public function edit(Feedback $feedback) diff --git a/app/Http/Requests/admin/StoreFeedbackRequest.php b/app/Http/Requests/admin/StoreFeedbackRequest.php index 4a87b35..0d0331b 100644 --- a/app/Http/Requests/admin/StoreFeedbackRequest.php +++ b/app/Http/Requests/admin/StoreFeedbackRequest.php @@ -16,7 +16,6 @@ class StoreFeedbackRequest extends FormRequest return [ 'contact' => 'required|string|max:255', 'text' => 'string|nullable', - 'status_id' => 'required|numeric|exists:feedback_statuses,id', ]; } } diff --git a/app/Services/DirectonHtmlBuilder.php b/app/Services/DirectonHtmlBuilder.php index 7c5b581..5f720f3 100644 --- a/app/Services/DirectonHtmlBuilder.php +++ b/app/Services/DirectonHtmlBuilder.php @@ -18,7 +18,7 @@ class DirectonHtmlBuilder public function getHTML() { $direction = $this->direction; - $fon_3 = URL::to('img/front-page/bakalavr-special/fon3_blok.png'); + $fon_3 = URL::to('img/front-page/bakalavr-special/fon2_blok.png'); $green_circle = URL::to('img/front-page/green-circle.png'); @@ -179,7 +179,7 @@ class DirectonHtmlBuilder } - return "
+ return "
diff --git a/app/Services/DirectonHtmlBuilderForCalculator.php b/app/Services/DirectonHtmlBuilderForCalculator.php index bfcd94c..fa3388d 100644 --- a/app/Services/DirectonHtmlBuilderForCalculator.php +++ b/app/Services/DirectonHtmlBuilderForCalculator.php @@ -18,7 +18,7 @@ class DirectonHtmlBuilderForCalculator public function getHTML() { $direction = $this->direction; - $fon_3 = URL::to('img/front-page/bakalavr-special/fon3_blok.png'); + $fon_3 = URL::to('img/front-page/bakalavr-special/fon2_blok.png'); $green_circle = URL::to('img/front-page/green-circle.png'); @@ -179,7 +179,7 @@ class DirectonHtmlBuilderForCalculator } - return "
+ return "
diff --git a/composer.json b/composer.json index 444180c..22a4b04 100644 --- a/composer.json +++ b/composer.json @@ -13,6 +13,7 @@ "fakerphp/faker": "^1.23.1", "guzzlehttp/guzzle": "^7.8.1", "imangazaliev/didom": "^2.0.1", + "laracasts/flash": "^3.2", "laravel/framework": "^10.48.2", "laravel/sanctum": "^3.3.3", "laravel/tinker": "^2.9.0", diff --git a/composer.lock b/composer.lock index 3253cc0..9a26d10 100644 --- 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": "7430aa832d42dad89f7314c9c96e0023", + "content-hash": "cdd9e5c44654ea2c37c37d36bc80e259", "packages": [ { "name": "brick/math", @@ -1302,6 +1302,60 @@ }, "time": "2023-03-05T03:23:48+00:00" }, + { + "name": "laracasts/flash", + "version": "3.2.3", + "source": { + "type": "git", + "url": "https://github.com/laracasts/flash.git", + "reference": "c2c4be1132f1bec3a689e84417a1c5787e6c71fd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laracasts/flash/zipball/c2c4be1132f1bec3a689e84417a1c5787e6c71fd", + "reference": "c2c4be1132f1bec3a689e84417a1c5787e6c71fd", + "shasum": "" + }, + "require": { + "illuminate/support": "~5.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", + "php": ">=5.4.0" + }, + "require-dev": { + "mockery/mockery": "dev-master", + "phpunit/phpunit": "^6.1|^9.5.10|^10.5" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Laracasts\\Flash\\FlashServiceProvider" + ], + "aliases": { + "Flash": "Laracasts\\Flash\\Flash" + } + } + }, + "autoload": { + "files": [ + "src/Laracasts/Flash/functions.php" + ], + "psr-0": { + "Laracasts\\Flash": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jeffrey Way", + "email": "jeffrey@laracasts.com" + } + ], + "description": "Easy flash notifications", + "time": "2024-03-03T16:51:25+00:00" + }, { "name": "laravel/framework", "version": "v10.48.2", diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 53f700c..d798ee8 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -10,32 +10,32 @@ class DatabaseSeeder extends Seeder { public function run(): void { - User::factory()->create([ - 'name' => config('app.admin_name'), - 'email' => config('app.admin_email'), - 'password' => 123456 - ]); +// User::factory()->create([ +// 'name' => config('app.admin_name'), +// 'email' => config('app.admin_email'), +// 'password' => 123456 +// ]); // User::factory(10)->create(); - $this->call([ - EducationalInstitutionSeeder::class, - FacultySeeder::class, - DepartmentSeeder::class, - EducationLevelSeeder::class, - EducationFormSeeder::class, - ExaminationTypeSeeder::class, - SubjectSeeder::class, - SubjectTypeSeeder::class, - DirectionSeeder::class, - EntranceExaminationSeeder::class, - DirectionProfileSeeder::class, - ]); +// $this->call([ +// EducationalInstitutionSeeder::class, +// FacultySeeder::class, +// DepartmentSeeder::class, +// EducationLevelSeeder::class, +// EducationFormSeeder::class, +// ExaminationTypeSeeder::class, +// SubjectSeeder::class, +// SubjectTypeSeeder::class, +// DirectionSeeder::class, +// EntranceExaminationSeeder::class, +// DirectionProfileSeeder::class, +// ]); - $this->call([ - AdmissionSeeder::class, - DocumentSeeder::class, - ]); +// $this->call([ +// AdmissionSeeder::class, +// DocumentSeeder::class, +// ]); $this->call([ FeedbackStatusSeeder::class, diff --git a/public/img/front-page/bakalavr-special/fon2_blok.png b/public/img/front-page/bakalavr-special/fon2_blok.png index d96529b..c5d67aa 100644 Binary files a/public/img/front-page/bakalavr-special/fon2_blok.png and b/public/img/front-page/bakalavr-special/fon2_blok.png differ diff --git a/public/img/front-page/bakalavr-special/fon3_blok.png b/public/img/front-page/bakalavr-special/fon3_blok.png index c5d67aa..d96529b 100644 Binary files a/public/img/front-page/bakalavr-special/fon3_blok.png and b/public/img/front-page/bakalavr-special/fon3_blok.png differ diff --git a/public/img/front-page/white-bg.jpg b/public/img/front-page/white-bg.jpg new file mode 100644 index 0000000..4fe6c0a Binary files /dev/null and b/public/img/front-page/white-bg.jpg differ diff --git a/resources/views/layouts/new-design-layout.blade.php b/resources/views/layouts/new-design-layout.blade.php index 3b8ec55..46fc744 100644 --- a/resources/views/layouts/new-design-layout.blade.php +++ b/resources/views/layouts/new-design-layout.blade.php @@ -23,6 +23,8 @@ @yield('extra_styles') + + @@ -56,22 +58,11 @@ font-weight: normal; } - html { - width: 100%; - height: 100%; - margin: 0; - padding: 0; - } body { - {{--background-image: url({{ URL::to('img/front-page/fon1_blok.png') }});--}} - overflow-x: hidden; - background-repeat: no-repeat; - width: 100%; - height: 100%; - object-fit: cover; + overflow-x: hidden; font-family: "Geologica-Medium";!important; } @@ -147,10 +138,15 @@ background-color: transparent; border: 1px solid rgb(241, 241, 241); border-radius: 8px; + } .checkbox1 input:checked ~ .checkmark { background-color: rgb(255, 255, 255); + } + .checkbox2 input:checked ~ .checkmark { + background-color: rgb(0, 0, 0); + } /* Create the checkmark/indicator (hidden when not checked) */ @@ -158,6 +154,7 @@ content: ""; position: absolute; display: none; + } /* Show the checkmark when checked */ @@ -212,5 +209,125 @@ background-image: url({{ URL::to("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#35af00' %3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e")}}); transform: rotate(-180deg); } + .visually_impaired_mode_bg { + + background-image: url({{ URL::to("public/img/front-page/white-bg.jpg")}})!important; + + } + .direction-card-text { + color: #004329; + } + .disabled { + display: none; + } + + + + + @yield('content') diff --git a/resources/views/new-design/bakalavr-special.blade.php b/resources/views/new-design/bakalavr-special.blade.php index 258d7e1..d81f63c 100644 --- a/resources/views/new-design/bakalavr-special.blade.php +++ b/resources/views/new-design/bakalavr-special.blade.php @@ -53,20 +53,36 @@ background-image: linear-gradient(to right, rgb(38, 159, 239), 20%, rgb(2, 142, 229)); transition: 0.3s; } - - + .fon1_blok { + background-image: url({{ URL::to('img/front-page/bakalavr-special/fon1_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed;" + } + .fon2_blok { + background-image: url({{ URL::to('img/front-page/bakalavr-special/fon2_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed; + } + .fon3_blok { + background-image: url({{ URL::to('img/front-page/bakalavr-special/fon3_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed; + } + .fon4_blok { + background-image: url({{ URL::to('img/front-page/bakalavr-special/fon4_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed; + } + .buttonBG { + background: linear-gradient(#56CCF2, #56CCF200); border-radius: 20px; letter-spacing: 0; + } +
-
+ + +
+
@include('flash::message')
@@ -105,6 +121,10 @@ {{--
RU
--}} {{-- --}} {{-- ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ--}} + +
Режим для слабовидящих
+
@@ -164,24 +184,24 @@
+ class="buttonBG hover1 col-auto text-white position-relative z-2 mb-3 mx-3 text-center text-md-start shadow py-3 px-4 justify-content-center d-inline-flex"> + Личный кабинет + class="buttonBG hover1 col-auto text-white position-relative z-2 mb-3 mx-3 text-center text-md-start shadow py-3 px-4 justify-content-center d-inline-flex"> + День открытых дверей - + Видео про МГТУ
-
+
-
+
ПЕРЕЧЕНЬ ФАКУЛЬТЕТОВ
@@ -332,7 +351,7 @@ @endsection diff --git a/resources/views/new-design/inostran-old.blade.php b/resources/views/new-design/inostran-old.blade.php index 26c0b3c..1d3f189 100644 --- a/resources/views/new-design/inostran-old.blade.php +++ b/resources/views/new-design/inostran-old.blade.php @@ -307,7 +307,7 @@ overflow-x: hidden;
-
+
@@ -466,7 +466,7 @@ overflow-x: hidden;
-
+
diff --git a/resources/views/new-design/inostran.blade.php b/resources/views/new-design/inostran.blade.php index 80628bc..934953a 100644 --- a/resources/views/new-design/inostran.blade.php +++ b/resources/views/new-design/inostran.blade.php @@ -174,7 +174,7 @@