From 3bf100ed741aff0ddc16fb28b31f6c906d8e92ac Mon Sep 17 00:00:00 2001 From: ROMANGOLIENKO Date: Thu, 21 Mar 2024 14:48:08 +0300 Subject: [PATCH] design changes --- app/Services/DirectonHtmlBuilder.php | 127 ++++++++---------- .../new-design/bakalavr-special.blade.php | 2 +- 2 files changed, 58 insertions(+), 71 deletions(-) diff --git a/app/Services/DirectonHtmlBuilder.php b/app/Services/DirectonHtmlBuilder.php index af5ce2a..3575c6f 100644 --- a/app/Services/DirectonHtmlBuilder.php +++ b/app/Services/DirectonHtmlBuilder.php @@ -2,9 +2,7 @@ namespace App\Services; -use App\Models\Direction; use Illuminate\Support\Facades\URL; -use PhpParser\Node\Expr\Array_; class DirectonHtmlBuilder { @@ -15,6 +13,7 @@ class DirectonHtmlBuilder { $this->direction = $direction; } + public function getHTML() { @@ -22,12 +21,9 @@ class DirectonHtmlBuilder $direction = $this->direction; - $fon_3 = URL::to('img/front-page/bakalavr-special/fon3_blok.png'); - - $educationForms = ''; foreach ($direction['educationForms'] as $key => $educationForm) { $educationForms .= $key . ', '; @@ -35,7 +31,6 @@ class DirectonHtmlBuilder $educationForms = substr($educationForms, 0, -2); - // phpcs:disable $budget_places_array = array(); @@ -96,76 +91,68 @@ class DirectonHtmlBuilder return "
-
-
- -
+
+
+ +
-
+
-
+
+
+
{$direction['code']}
+
{$direction['name']}
+
+
+
+ МГТУ | + Филиал МГТУ (пос. Яблоновский) +
+
+
-
-
{$direction['code']}
-
{$direction['name']}
-
-
-

{$direction['description']}

+
+
+

{$direction['description']}

+
+
+
+
Бюджет | Коммерция
+
+
+
Уровень образования: + {$direction['educationLevel']} +
+
Форма обучения: + $educationForms +
+
Период обучения (в годах): + {$period} +
+
+
+
+
+ Места для обучения: +
+
+
+
+
+
-
+
+
+
+
- - - -
-
- -
-
Бюджет | Коммерция
-
- -
-
Уровень образования: - {$direction['educationLevel']} -
- -
Форма обучения: - $educationForms - -
- - - - - - -
Период обучения (в годах): - {$period} -
-
-
-
- -
- - Места для обучения: - -
-
-
- -
- - - -
-
-
- -
-
"; +
+
+ + + + "; } // phpcs:enable } diff --git a/resources/views/new-design/bakalavr-special.blade.php b/resources/views/new-design/bakalavr-special.blade.php index a026380..e198121 100644 --- a/resources/views/new-design/bakalavr-special.blade.php +++ b/resources/views/new-design/bakalavr-special.blade.php @@ -581,7 +581,7 @@ style="font-family: Geologica-ExtraLight">Выберите предметы
-