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

Compare commits

base: RomanGolienko:794b0db6a1a463c37b007922d7499d17b9bc46a4
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:bc0cd7989c8721efb25ecebb0462f69098093daf
Branches Tags
RomanGolienko:feature/visually-impaired-mode
RomanGolienko:prodV1
RomanGolienko:new-design
RomanGolienko:main
RomanGolienko:new-scrapper
RomanGolienko:pages
aslan:main
aslan:new-calculator

4 Commits
794b0db6a1 ... bc0cd7989c

Author SHA1 Message Date
ROMANGOLIENKO bc0cd7989c direction offcanvas minor changes 2024-04-01 15:57:19 +03:00
aslan 61defaaf37 Merge pull request 'adaptive design fixes' (#39) from RomanGolienko/Roman_applicant-site:prodV1 into main 
Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/39
 2024-03-27 15:50:32 +03:00
aslan d7430e13ee fix ci 2024-03-27 15:35:58 +03:00
aslan edb4a2b383 fix ci 2024-03-27 15:20:38 +03:00
4 changed files with 29 additions and 16 deletions
Show Stats Expand all files Collapse all files

4
.gitea/workflows/php.yml
View File

@ -14,7 +14,7 @@ jobs:
strategy: strategy:
matrix: matrix:
php-version: [ '8.2' ] php-version: [ '8.3' ]
node-version: ['20.x'] node-version: ['20.x']
composer-version: ['2.6.6'] composer-version: ['2.6.6']
@ -25,9 +25,9 @@ jobs:
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2
with: with:
php-version: ${{ matrix.php-version }} php-version: ${{ matrix.php-version }}
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, extension=gd
env: env:
debug: true debug: true

26
app/Services/DirectonHtmlBuilder.php
View File

@ -40,7 +40,7 @@ class DirectonHtmlBuilder
$paid_cost = '<div class="col-auto "> $paid_cost = '<div class="col-auto ">
<strong class="fs-3"> Стоимость обучения </strong> <strong class="fs-3"> Стоимость обучения </strong>
<br> <br>
<br>
<div class="fs-4 text-start">'; <div class="fs-4 text-start">';
foreach ($direction['cost_paid_place'] as $key => $el) { foreach ($direction['cost_paid_place'] as $key => $el) {
$paid_cost .= '<span style="font-family: Geologica-ExtraLight">' . $key . '</span> - ' . '<strong>' . $el . '</strong><br>' ; $paid_cost .= '<span style="font-family: Geologica-ExtraLight">' . $key . '</span> - ' . '<strong>' . $el . '</strong><br>' ;
@ -53,7 +53,7 @@ class DirectonHtmlBuilder
$EGE = '<div class="col-auto "> $EGE = '<div class="col-auto ">
<strong> ЕГЭ </strong> <strong> ЕГЭ </strong>
<br> <br>
<br>
<div class=" d-inline-block p-2 text-start">'; <div class=" d-inline-block p-2 text-start">';
foreach ($direction['entrance_examinations']['ЕГЭ']['Обязательные'] as $key => $el) { foreach ($direction['entrance_examinations']['ЕГЭ']['Обязательные'] as $key => $el) {
$EGE .= '<span style="font-family: Geologica-ExtraLight">' . $key . '</span> - ' . '<strong>' . $el . '</strong><br>' ; $EGE .= '<span style="font-family: Geologica-ExtraLight">' . $key . '</span> - ' . '<strong>' . $el . '</strong><br>' ;
@ -63,7 +63,7 @@ class DirectonHtmlBuilder
$po_viboru = '<div class="col-auto "> $po_viboru = '<div class="col-auto ">
<strong> Предметы по выбору </strong> <strong> Предметы по выбору </strong>
<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) {
@ -78,7 +78,7 @@ class DirectonHtmlBuilder
$SPO = '<div class="col-auto "> $SPO = '<div class="col-auto ">
<strong> СПО </strong> <strong> СПО </strong>
<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) {
@ -100,9 +100,9 @@ class DirectonHtmlBuilder
} }
$tmp = str_replace(' ', '', $profile_name); $tmp = str_replace(' ', '', $profile_name);
$tmp = str_replace(',', '', $tmp); $tmp = str_replace(',', '', $tmp);
$mgtu .= "<div class=\"accordion\" id=\"accordionExample\"> $mgtu .= "<div class=\"accordion\" id=\"accordionExample\" >
<div class=\"accordion-item\"> <div class=\"accordion-item\" style='border-radius: 20px;'>
<h2 class=\"accordion-header\"> <h2 class=\"accordion-header\" style='border-radius: 20px;'>
<button class=\"accordion-button\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"#collapse-{$tmp}\" aria-expanded=\"true\" aria-controls=\"collapse-{$tmp}\"> <button class=\"accordion-button\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"#collapse-{$tmp}\" aria-expanded=\"true\" aria-controls=\"collapse-{$tmp}\">
$profile_name $profile_name
</button> </button>
@ -135,8 +135,8 @@ class DirectonHtmlBuilder
$tmp = str_replace(' ', '', $profile_name); $tmp = str_replace(' ', '', $profile_name);
$tmp = str_replace(',', '', $tmp); $tmp = str_replace(',', '', $tmp);
$filial .= "<div class=\"accordion \" id=\"accordionExample\"> $filial .= "<div class=\"accordion \" id=\"accordionExample\">
<div class=\"accordion-item\"> <div class=\"accordion-item\" style='border-radius: 20px;'>
<h2 class=\"accordion-header\"> <h2 class=\"accordion-header\" style='border-radius: 20px;'>
<button class=\"accordion-button\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"#collapse-{$tmp}\" aria-expanded=\"true\" aria-controls=\"collapse-{$tmp}\"> <button class=\"accordion-button\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"#collapse-{$tmp}\" aria-expanded=\"true\" aria-controls=\"collapse-{$tmp}\">
$profile_name $profile_name
</button> </button>
@ -162,8 +162,8 @@ class DirectonHtmlBuilder
$tmp = str_replace(' ', '', $profile_name); $tmp = str_replace(' ', '', $profile_name);
$tmp = str_replace(',', '', $tmp); $tmp = str_replace(',', '', $tmp);
$paid_places_content .= "<div class=\"accordion \" id=\"accordionExample\"> $paid_places_content .= "<div class=\"accordion \" id=\"accordionExample\">
<div class=\"accordion-item\"> <div class=\"accordion-item\" style='border-radius: 20px;'>
<h2 class=\"accordion-header\"> <h2 class=\"accordion-header\" style='border-radius: 20px;'>
<button class=\"accordion-button\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"#collapse-{$tmp}{$tmp}\" aria-expanded=\"true\" aria-controls=\"collapse-{$tmp}{$tmp}\"> <button class=\"accordion-button\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"#collapse-{$tmp}{$tmp}\" aria-expanded=\"true\" aria-controls=\"collapse-{$tmp}{$tmp}\">
$profile_name $profile_name
</button> </button>
@ -196,12 +196,12 @@ class DirectonHtmlBuilder
<div class=\"fs-5 mb-3 \" style=\"font-family: Geologica-Light\"> <div class=\"fs-5 mb-3 \" style=\"font-family: Geologica-Light\">
<button type='button' class='button_chng_instit hover2 btn btn-outline-success' data-institut='mgtu' data-id='{$direction['id']}'> <button type='button' class='button_chng_instit hover2 btn btn-outline-success' data-institut='mgtu' data-id='{$direction['id']}'>
<img style='width: 8px; height: auto;' id = 'id_mgtu_{$direction['id']}' src='img/front-page/green-circle.png'> <img style='width: 12px; height: auto;' id = 'id_mgtu_{$direction['id']}' src='img/front-page/green-circle.png'>
МГТУ МГТУ
</button> | </button> |
<button type='button' class='button_chng_instit hover2 btn btn-outline-success' data-institut='filial' data-id='{$direction['id']}'> <button type='button' class='button_chng_instit hover2 btn btn-outline-success' data-institut='filial' data-id='{$direction['id']}'>
<img style='display: none; width: 8px; height: auto;' id = 'id_filial_{$direction['id']}' src='img/front-page/green-circle.png'> Филиал МГТУ (пос. Яблоновский) <img style='display: none; width: 12px; height: auto;' id = 'id_filial_{$direction['id']}' src='img/front-page/green-circle.png'> Филиал МГТУ (пос. Яблоновский)
</button> </button>
</div> </div>
</div> </div>

2
public/css/bootstrap.css vendored
View File

File diff suppressed because one or more lines are too long

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

@ -224,6 +224,19 @@
background-image: linear-gradient(to right, rgb(38, 159, 239), 20%, rgb(2, 142, 229)); background-image: linear-gradient(to right, rgb(38, 159, 239), 20%, rgb(2, 142, 229));
transition: 0.3s; transition: 0.3s;
} }
.accordion-button:not(.collapsed) {
color: #007337;
background-color: transparent;
box-shadow: inset 0 -1px 0 rgba(0,0,0,.125);
}
.accordion-button:focus {
box-shadow: inset 0 -1px 0 rgba(0,0,0,.125);
}
.accordion-button:not(.collapsed)::after {
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);
}
</style> </style>