Merge pull request 'design changes' (#34) from RomanGolienko/Roman_applicant-site:prodV1 into main

Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/34

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();
@@ -98,73 +93,65 @@ class DirectonHtmlBuilder
 
             <div class=\"mx-5 \">
                 <div class=\"col-12 d-flex justify-content-end mt-4\">
-                                                                    <button type=\"button\" class=\"btn-close text-reset\" data-bs-dismiss=\"offcanvas\" aria-label=\"Close\">
+                    <button type=\"button\" class=\"btn-close text-reset\" data-bs-dismiss=\"offcanvas\" aria-label=\"Close\"></button>
-                                                                    </button>
                 </div>
 
                 <div class='row'>
 
-                                                                            <div class='col-12 d-block'>
+                    <div class='col-11 d-block'>
-
+                        <div class='col'>
-                                                                                    <div class=\"\">
                             <div class=\"display-6 \" style=\"font-family: Geologica-Light\"> {$direction['code']} </div>
                             <div class=\"display-6 \" > {$direction['name']}</div>
                         </div>
+                        <div class='col d-flex justify-content-end'>
+                            <div class=\"fs-5 \" style=\"font-family: Geologica-Light\">
+                                <a href='#' role='button'> МГТУ </a> |
+                                <a href='#' role='button' > Филиал МГТУ (пос. Яблоновский)</a>
+                             </div>
+                        </div>
+                    </div>
+
+                    <hr class='col-11 '>
                     <div class=\"mt-4\">
                                 <p style=\"text-align: justify;\">{$direction['description']}</p>
-
-
                            </div>
 
-
-
-
                 </div>
-                                                            </div>
-
                 <div class='row'>
                     <div class='col-11 d-flex justify-content-end'> <a href='#' role='button'> Бюджет </a> | <a href='#' role='button' > Коммерция</a> </div>
                     <div class=' col-4 '>
-
                            <div class=\"p-3 px-5 border-success fs-5\" style='border-radius: 20px; border: 2px solid;'>
                                <div > Уровень образования:
                                     <strong>{$direction['educationLevel']} </strong>
                                </div>
-
                                <div > Форма обучения:
-                                                                                        <strong> $educationForms
+                                    <strong> $educationForms</strong>
-                                                                                          </strong>
                                </div>
-
-
-
-
-
-
                                <div > Период обучения (в годах):
                                     {$period}
                                </div>
                            </div>
                     </div>
                     <div class=' col-7 '>
-
+                        <div class=\"p-3 px-5 border-success fs-5 h-100\" style='border-radius: 20px; border: 2px solid;'>
+                            Места для обучения:
+                        </div>
+                    </div>
+                </div>
+                <div class='row mt-3'>
+                    <div class=' col-9 '>
                         <div class=\"p-3 px-5 border-success fs-5 h-100\" style='border-radius: 20px; border: 2px solid;'>
 
-                                                                                        Места для обучения:
+                        </div>
+                    </div>
+                    <div class=' col-2 '>
+                        <div class=\"p-3 px-5 border-success fs-5 h-100\" style='border-radius: 20px; border: 2px solid;'>
 
                         </div>
                     </div>
                 </div>
-
-                                                                            <div class=\"offcanvas-body mt-2\" style=\"font-family: Geologica-ExtraLight\">
-
-
-
             </div>
         </div>
-                                                                        </div>
-
-                                                                        </div>
         </div>";
     }
     // phpcs:enable

resources/views/new-design/bakalavr-special.blade.php

@@ -581,7 +581,7 @@
                              style="font-family: Geologica-ExtraLight">Выберите предметы
                         </div>
                         <div class="table-responsive p-5 w-100   " style=" max-height: 700px; ">
-                            <table class=" text-white  px-5 calcul_rez"
+                            <table class=" text-white   calcul_rez"
                                    style="width: 90%; font-family: Geologica-ExtraLight;">