diff --git a/app/Http/Controllers/Api/CalculatorController.php b/app/Http/Controllers/Api/CalculatorController.php index 6ff35ce..96dfa79 100644 --- a/app/Http/Controllers/Api/CalculatorController.php +++ b/app/Http/Controllers/Api/CalculatorController.php @@ -9,6 +9,7 @@ use App\Models\EntranceExamination; use App\Models\Faculty; use Illuminate\Http\Request; + class CalculatorController extends Controller { public function findDirectionFromSubjects(Request $request) @@ -34,10 +35,63 @@ class CalculatorController extends Controller $faculty = Faculty::find($department->faculty_id); return "{$acc} - {$faculty->name} - {$direction->name} - {$direction->period} -"; + {$faculty->name} + + id}{$direction->id }\" aria-controls=\"offcanvasScrolling\" role=\"button\">{$direction->name} +
id }{$direction->id }\" aria-labelledby=\"offcanvasScrollingLabel-{$direction->id}{$direction->id }\" style=\"height: 100%; font-family: Geologica-Medium;overflow-y: auto ;\"> +
+
+ +
+
+
+
{$direction->code}
+
{$direction->name}
+
+ + +
+
+ +
+
+
+
Уровень образования: {$direction->educationLevel->name}
+
Форма обучения: {$direction->educationForm->name}
+
+
+
+
+
Бюджетные места: {$direction->budget_places}
+
Квота: {$direction->quota}
+
+
+
+
+
Места на контракт: {$direction->paid_places}
+
Стоимость платного обучения: {$direction->cost_paid_place}
+
+
+
+
+
Период обучения (в годах): {$direction->period}
+ +
+
+ + +
+

{$direction->description}

+ + +
+
+ +
+ + + {$direction->period} + "; }; $html = $directions->reduce($generateHtml, ''); diff --git a/app/Services/DirectonHtmlBuilder.php b/app/Services/DirectonHtmlBuilder.php new file mode 100644 index 0000000..1456895 --- /dev/null +++ b/app/Services/DirectonHtmlBuilder.php @@ -0,0 +1,68 @@ +direction = $direction; + } + public function getHTML() + { + $direction = $this->direction; + return "
id }\" aria-labelledby=\"offcanvasScrollingLabel-{$direction->id}\" style=\"height: 100%; font-family: Geologica-Medium;overflow-y: auto ;\"> +
+
+ +
+
+
+
{$direction->code}
+
{$direction->name}
+
+ + +
+
+ +
+
+
+
Уровень образования: {$direction->educationLevel->name}
+
Форма обучения: {$direction->educationForm->name}
+
+
+
+
+
Бюджетные места: {$direction->budget_places}
+
Квота: {$direction->quota}
+
+
+
+
+
Места на контракт: {$direction->paid_places}
+
Стоимость платного обучения: {$direction->cost_paid_place}
+
+
+
+
+
Период обучения (в годах): {$direction->period}
+ +
+
+ + +
+

{$direction->description}

+ + +
+
+ +
"; + } +} diff --git a/public/img/front-page/icons8-checkmark (1).svg b/public/img/front-page/icons8-checkmark (1).svg new file mode 100644 index 0000000..3957423 --- /dev/null +++ b/public/img/front-page/icons8-checkmark (1).svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/views/new-design/bakalavr-special.blade.php b/resources/views/new-design/bakalavr-special.blade.php index 759184a..6fe600b 100644 --- a/resources/views/new-design/bakalavr-special.blade.php +++ b/resources/views/new-design/bakalavr-special.blade.php @@ -48,7 +48,7 @@ color: unset; } a:hover{ - + color: unset; } @@ -126,19 +126,20 @@ left: 0; height: 25px; width: 25px; - background-color: rgba(255, 255, 255, 0.18); - border: 1px solid rgba(255, 255, 255, 0.2); - border-radius: 5px; + background-color: transparent; + border: 1px solid rgb(241, 241, 241); + border-radius: 8px; } /* On mouse-over, add a grey background color */ .checkbox1:hover input ~ .checkmark { - background-color: rgba(44, 131, 204, 0.85); + background-color: rgba(64, 160, 241, 0.85); } /* When the checkbox is checked, add a blue background */ .checkbox1 input:checked ~ .checkmark { background-color: rgb(255, 255, 255); + } /* Create the checkmark/indicator (hidden when not checked) */ @@ -171,12 +172,14 @@ /* width */ ::-webkit-scrollbar { width: 15px; + transition: 0.3s; + background-image: linear-gradient(to right, rgb(38, 159, 239), 20%, rgb(2, 142, 229)); } /* Track */ ::-webkit-scrollbar-track { - background: #FFFFFF; - box-shadow: rgba(0, 0, 0, 0.35) 0px 5px 15px; + background: #bdbdbd; + border-radius: 20px; @@ -187,15 +190,18 @@ height: 30px; width: 8px; - background: #eaeaea; - box-shadow: rgba(0, 0, 0, 0.35) 0px 5px 15px; + background-image: linear-gradient(to right, rgba(38, 159, 239, 0.6), 20%, rgba(2, 142, 229, 0.6)); + opacity: 0.1; border-radius: 10px; + transition: 0.3s; + } /* Handle on hover */ ::-webkit-scrollbar-thumb:hover { - background: #bebebe; + background-image: linear-gradient(to right, rgb(38, 159, 239), 20%, rgb(2, 142, 229)); + transition: 0.3s; } @@ -237,9 +243,9 @@
Все контакты
 - -
RU
- +{{-- --}} +{{--
RU
--}} +{{-- --}} {{-- ВЕРСИЯ ДЛЯ СЛАБОВИДЯЩИХ--}} @@ -318,7 +324,7 @@
- + @php use App\Services\DirectonHtmlBuilder; @endphp @foreach($faculties as $faculty)
@@ -358,57 +364,11 @@ - {{ $direction->name }} -
-
-
- -
-
-
-
{{ $direction->code }}
-
{{ $direction->name }}
-
- - -
-
- -
-
-
-
Уровень образования: {{ $direction->educationLevel->name }}
-
Форма обучения: {{ $direction->educationForm->name }}
-
-
-
-
-
Бюджетные места: {{ $direction->budget_places }}
-
Квота: {{ $direction->quota }}
-
-
-
-
-
Места на контракт: {{ $direction->paid_places }}
-
Стоимость платного обучения: {{ $direction->cost_paid_place }}
-
-
-
-
-
Период обучения (в годах): {{ $direction->period }}
- -
-
-{{--

{{ $direction->code }}

--}} -{{--

{{ $direction->name }}

--}} -
-

{{ $direction->description }}

- -

{{ $direction->description }}

-
-
- -
+ {{ $direction->name }} + @php + $DirectonHtmlBuilder = new DirectonHtmlBuilder($direction); + echo $DirectonHtmlBuilder->getHTML(); + @endphp {{ $direction->code }} @@ -456,6 +416,7 @@
Выберите предметы ЕГЭ
+ @foreach($subjects as $id => $name) @if($name == "Русский язык" || $name == "математика" ) @@ -477,22 +438,26 @@
- -