RomanGolienko
/
Roman_applicant-site
forked from aslan/applicant-site
1
1
Fork 0
Code Pull Requests 2 Activity

Compare commits

base: RomanGolienko:22e6a16c328f51378e54685fc3aa1c88fa46e8c8
Branches Tags
RomanGolienko:main
RomanGolienko:feature/visually-impaired-mode
RomanGolienko:prodV1
RomanGolienko:new-design
RomanGolienko:new-scrapper
RomanGolienko:pages
aslan:main
aslan:new-calculator
...
compare: RomanGolienko:794b0db6a1a463c37b007922d7499d17b9bc46a4
Branches Tags
RomanGolienko:feature/visually-impaired-mode
RomanGolienko:prodV1
RomanGolienko:new-design
RomanGolienko:main
RomanGolienko:new-scrapper
RomanGolienko:pages
aslan:main
aslan:new-calculator

6 Commits
22e6a16c32 ... 794b0db6a1

Author SHA1 Message Date
ROMANGOLIENKO 794b0db6a1 adaptive design fixes 2024-03-27 15:50:03 +03:00
aslan ceef0fe966 fix lint && prodV1 #38 2024-03-27 14:47:06 +03:00
aslan 1a9cdae6e2 fix ci 2024-03-27 14:28:30 +03:00
aslan 97522fd6de fix ci 2024-03-27 14:18:58 +03:00
aslan 6f50c7ff07 fix lint 2024-03-27 14:03:46 +03:00
aslan bd897c90f5 merge pull request - direction view completed, favicon changed #37 2024-03-27 13:57:45 +03:00
3 changed files with 25 additions and 34 deletions
Show Stats Expand all files Collapse all files

3
.gitea/workflows/php.yml
View File

@ -14,7 +14,7 @@ jobs:
strategy: strategy:
matrix: matrix:
php-version: [ '8.3' ] php-version: [ '8.2' ]
node-version: ['20.x'] node-version: ['20.x']
composer-version: ['2.6.6'] composer-version: ['2.6.6']
@ -28,7 +28,6 @@ jobs:
coverage: xdebug coverage: xdebug
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, gd extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, gd
tools: composer:${{ matrix.composer-version }} tools: composer:${{ matrix.composer-version }}
ini-values: opcache.enable_cli=1
env: env:
debug: true debug: true

29
app/Services/DirectonHtmlBuilder.php
View File

@ -4,6 +4,7 @@ namespace App\Services;
use Illuminate\Support\Facades\URL; use Illuminate\Support\Facades\URL;
// phpcs:disable
class DirectonHtmlBuilder class DirectonHtmlBuilder
{ {
private array $direction; private array $direction;
@ -64,12 +65,12 @@ class DirectonHtmlBuilder
<br> <br>
<br> <br>
<div class=" d-inline-block p-2 text-start">'; <div class=" d-inline-block p-2 text-start">';
if(array_key_exists('Предметы по выбору', $direction['entrance_examinations']['ЕГЭ'])){ if (array_key_exists('Предметы по выбору', $direction['entrance_examinations']['ЕГЭ'])) {
foreach ($direction['entrance_examinations']['ЕГЭ']['Предметы по выбору'] as $key => $el) { foreach ($direction['entrance_examinations']['ЕГЭ']['Предметы по выбору'] as $key => $el) {
$po_viboru .= '<span style="font-family: Geologica-ExtraLight">' . $key . '</span> - ' . '<strong>' . $el . '</strong><br>' ; $po_viboru .= '<span style="font-family: Geologica-ExtraLight">' . $key . '</span> - ' . '<strong>' . $el . '</strong><br>' ;
} }
$po_viboru .= '</div></div>'; $po_viboru .= '</div></div>';
}else { } else {
$po_viboru = ''; $po_viboru = '';
} }
@ -79,24 +80,22 @@ class DirectonHtmlBuilder
<br> <br>
<br> <br>
<div class=" d-inline-block p-2 text-start">'; <div class=" d-inline-block p-2 text-start">';
if(array_key_exists('СПО', $direction['entrance_examinations'])){ if (array_key_exists('СПО', $direction['entrance_examinations'])) {
foreach ($direction['entrance_examinations']['СПО']['Обязательные'] as $key => $el) { foreach ($direction['entrance_examinations']['СПО']['Обязательные'] as $key => $el) {
$SPO .= '<span style="font-family: Geologica-ExtraLight">' . $key . '</span> - ' . '<strong>' . $el . '</strong><br>' ; $SPO .= '<span style="font-family: Geologica-ExtraLight">' . $key . '</span> - ' . '<strong>' . $el . '</strong><br>' ;
} }
$SPO .= '</div></div>'; $SPO .= '</div></div>';
}else { } else {
$SPO = ''; $SPO = '';
} }
$mgtu = ''; $mgtu = '';
if(array_key_exists('МГТУ', $direction['budget_places'])){ if (array_key_exists('МГТУ', $direction['budget_places'])) {
foreach ($direction['budget_places']['МГТУ'] as $profile_name => $profile) { foreach ($direction['budget_places']['МГТУ'] as $profile_name => $profile) {
$profile_content =''; $profile_content = '';
foreach($profile as $forms => $budget_places){ foreach ($profile as $forms => $budget_places) {
$profile_content .= "<strong> {$forms} </strong> - " . "<span style=\'font-family: Geologica-ExtraLight\'> {$budget_places} </span><br>"; $profile_content .= "<strong> {$forms} </strong> - " . "<span style=\'font-family: Geologica-ExtraLight\'> {$budget_places} </span><br>";
} }
$tmp = str_replace(' ', '', $profile_name); $tmp = str_replace(' ', '', $profile_name);
@ -127,11 +126,10 @@ class DirectonHtmlBuilder
$filial = ''; $filial = '';
if(array_key_exists('Филиал МГТУ (пос. Яблоновский)', $direction['budget_places'])){ if (array_key_exists('Филиал МГТУ (пос. Яблоновский)', $direction['budget_places'])) {
foreach ($direction['budget_places']['Филиал МГТУ (пос. Яблоновский)'] as $profile_name => $profile) { foreach ($direction['budget_places']['Филиал МГТУ (пос. Яблоновский)'] as $profile_name => $profile) {
$profile_content =''; $profile_content = '';
foreach($profile as $forms => $budget_places){ foreach ($profile as $forms => $budget_places) {
$profile_content .= "<strong> {$forms} </strong> - " . "<span style=\'font-family: Geologica-ExtraLight\'> {$budget_places} </span><br>"; $profile_content .= "<strong> {$forms} </strong> - " . "<span style=\'font-family: Geologica-ExtraLight\'> {$budget_places} </span><br>";
} }
$tmp = str_replace(' ', '', $profile_name); $tmp = str_replace(' ', '', $profile_name);
@ -151,14 +149,12 @@ class DirectonHtmlBuilder
</div> </div>
</div>" ; </div>" ;
} }
} } else {
else {
$filial = '<div class="w-100 h-100 d-flex justify-content-center align-items-center" >Этой специальности нет в филиалле</div>'; $filial = '<div class="w-100 h-100 d-flex justify-content-center align-items-center" >Этой специальности нет в филиалле</div>';
} }
$paid_places_content = ''; $paid_places_content = '';
foreach ($direction['paid_places'] as $institution) { foreach ($direction['paid_places'] as $institution) {
foreach ($institution as $profile_name => $profile) { foreach ($institution as $profile_name => $profile) {
$profile_content = ''; $profile_content = '';
foreach ($profile as $forms => $paid_places) { foreach ($profile as $forms => $paid_places) {
$profile_content .= "<strong> {$forms} </strong> - " . "<span style=\'font-family: Geologica-ExtraLight\'> {$paid_places} </span><br>"; $profile_content .= "<strong> {$forms} </strong> - " . "<span style=\'font-family: Geologica-ExtraLight\'> {$paid_places} </span><br>";
@ -179,7 +175,6 @@ class DirectonHtmlBuilder
</div> </div>
</div> </div>
</div>" ; </div>" ;
} }
} }

17
resources/views/new-design/bakalavr-special.blade.php
View File

@ -420,7 +420,7 @@
type="button" data-bs-toggle="offcanvas" type="button" data-bs-toggle="offcanvas"
data-bs-target="#offcanvasScrolling-{{ $direction['id'] }}" data-bs-target="#offcanvasScrolling-{{ $direction['id'] }}"
aria-controls="offcanvasScrolling" aria-controls="offcanvasScrolling"
role="button">{{ $direction['name'] }}</a> role="button" style="background: white">{{ $direction['name'] }}</a>
@php @php
$DirectonHtmlBuilder = new DirectonHtmlBuilder($direction); $DirectonHtmlBuilder = new DirectonHtmlBuilder($direction);
@ -486,7 +486,7 @@
<div <div
style="background-image: url({{ URL::to('img/front-page/bakalavr-special/fon2_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed;"> style="background-image: url({{ URL::to('img/front-page/bakalavr-special/fon2_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed;">
<div class="container-fluid ms-sm-5 pt-5"> <div class="container-fluid ms-sm-5 py-5">
<div class="row"> <div class="row">
<div class="display-5 col-12 text-white mb-3 text-center text-md-start " <div class="display-5 col-12 text-white mb-3 text-center text-md-start "
style=" font-weight: 700; letter-spacing: 0em; "> style=" font-weight: 700; letter-spacing: 0em; ">
@ -588,14 +588,14 @@
</div> </div>
<br><br><br><br><br><br><br><br><br><br><br><br><br> <div class="d-md-block d-none"><br><br><br><br><br><br><br><br><br><br><br><br><br></div>
</div> </div>
<div <div
style="background-image: url({{ URL::to('img/front-page/bakalavr-special/fon4_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed;"> style="background-image: url({{ URL::to('img/front-page/bakalavr-special/fon4_blok.png') }}); background-repeat: no-repeat; background-attachment: fixed;">
<div class="container-fluid ms-sm-5 pt-5"> <div class="container-fluid ms-sm-5 pt-5">
<div class="row"> <div class="row">
<div class="col-6"> <div class="col d-lg-block d-flex justify-content-center">
<div class="display-5 col-12 mb-3 text-center text-md-start gradient-text " <div class="display-5 col-12 mb-3 text-center text-md-start gradient-text "
style=" font-weight: 700; letter-spacing: 0em; "> style=" font-weight: 700; letter-spacing: 0em; ">
ЭКРАН ПРИЕМА ЭКРАН ПРИЕМА
@ -624,8 +624,8 @@
</a> </a>
</div> </div>
</div> --> </div> -->
<div class="mt-3 d-flex justify-content-center scroll-1"> <div class="mt-3 d-flex justify-content-start scroll-1 ps-lg-0 ms-lg-0 ps-3 ms-3">
<div class="row w-75 h-75 ps-2 scroll-1" style=" overflow:auto;"> <div class="row ps-2 scroll-1 mb-4 " style=" overflow:auto; width: 95%; height: 60em;">
<div class="col-11 "> <div class="col-11 ">
<div class="row shadow-lg mt-3 bg-white" style=" border-radius: 20px;"> <div class="row shadow-lg mt-3 bg-white" style=" border-radius: 20px;">
<div class="col-9 m-3"> <div class="col-9 m-3">
@ -796,13 +796,10 @@
</div> </div>
<br><br><br><br><br><br><br><br>
</div> </div>
</div> </div>
</div> </div>
<br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br>
<br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br> <br>
</div> </div>
</div> </div>
</div> </div>