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

Merge pull request 'fixing main page' (#44) from RomanGolienko/Roman_applicant-site:prodV1 into main 

Reviewed-on: http://gitea.mkgtu.ru/aslan/applicant-site/pulls/44
This commit is contained in:
aslan 2024-04-04 15:01:46 +03:00
parent dce51c638d 48faac8771
commit 0c16dc960e
20 changed files with 105 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/admin/PageController.php
View File

@ -23,6 +23,7 @@ class PageController extends Controller
public function directions()
{
$admissions = Admission::all();
$faculties = Faculty::all();
$subjects = EntranceExamination::all()
->select('subject_id', 'subject_type_id', 'examination_type_id')
@ -172,7 +173,8 @@ class PageController extends Controller
'faculties',
'subjects',
'directionsWithInstitution',
'groupedDirections'
'groupedDirections',
'admissions',
));
}

6
app/Services/DirectonHtmlBuilder.php
View File

@ -100,7 +100,7 @@ class DirectonHtmlBuilder
}
$tmp = str_replace(' ', '', $profile_name);
$tmp = str_replace(',', '', $tmp);
$mgtu .= "<div class=\"accordion\" id=\"accordionExample\" >
$mgtu .= "<div class=\"accordion mb-3\" id=\"accordionExample\" >
<div class=\"accordion-item\" style='border-radius: 20px;'>
<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}\">
@ -134,7 +134,7 @@ class DirectonHtmlBuilder
}
$tmp = str_replace(' ', '', $profile_name);
$tmp = str_replace(',', '', $tmp);
$filial .= "<div class=\"accordion \" id=\"accordionExample\">
$filial .= "<div class=\"accordion mb-3 \" id=\"accordionExample\">
<div class=\"accordion-item\" style='border-radius: 20px;'>
<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}\">
@ -161,7 +161,7 @@ class DirectonHtmlBuilder
}
$tmp = str_replace(' ', '', $profile_name);
$tmp = str_replace(',', '', $tmp);
$paid_places_content .= "<div class=\"accordion \" id=\"accordionExample\">
$paid_places_content .= "<div class=\"accordion mb-3 \" id=\"accordionExample\">
<div class=\"accordion-item\" style='border-radius: 20px;'>
<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}\">

24
app/Services/DirectonHtmlBuilderForCalculator.php
View File

@ -100,8 +100,8 @@ class DirectonHtmlBuilderForCalculator
}
$tmp = str_replace(' ', '', $profile_name);
$tmp = str_replace(',', '', $tmp);
$mgtu .= "<div class=\"accordion\" id=\"accordionExample\">
<div class=\"accordion-item\">
$mgtu .= "<div class=\"accordion mb-3\" id=\"accordionExample\">
<div class=\"accordion-item\" style='border-radius: 20px;'>
<h2 class=\"accordion-header\">
<button class=\"accordion-button\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"#collapse-{$tmp}\" aria-expanded=\"true\" aria-controls=\"collapse-{$tmp}\">
$profile_name
@ -134,8 +134,8 @@ class DirectonHtmlBuilderForCalculator
}
$tmp = str_replace(' ', '', $profile_name);
$tmp = str_replace(',', '', $tmp);
$filial .= "<div class=\"accordion \" id=\"accordionExample\">
<div class=\"accordion-item\">
$filial .= "<div class=\"accordion mb-3 \" id=\"accordionExample\">
<div class=\"accordion-item\" style='border-radius: 20px;'>
<h2 class=\"accordion-header\">
<button class=\"accordion-button\" type=\"button\" data-bs-toggle=\"collapse\" data-bs-target=\"#collapse-{$tmp}\" aria-expanded=\"true\" aria-controls=\"collapse-{$tmp}\">
$profile_name
@ -161,8 +161,8 @@ class DirectonHtmlBuilderForCalculator
}
$tmp = str_replace(' ', '', $profile_name);
$tmp = str_replace(',', '', $tmp);
$paid_places_content .= "<div class=\"accordion \" id=\"accordionExample\">
<div class=\"accordion-item\">
$paid_places_content .= "<div class=\"accordion mb-3\" id=\"accordionExample\">
<div class=\"accordion-item\" style='border-radius: 20px;'>
<h2 class=\"accordion-header\">
<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
@ -195,13 +195,13 @@ class DirectonHtmlBuilderForCalculator
<div class='col d-flex justify-content-end'>
<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']}'>
<img style='width: 8px; height: auto;' id = 'id_mgtu_{$direction['id']}' src='img/front-page/green-circle.png'>
<button type='button' class='calc_green_circle_button hover2 btn btn-outline-success' data-institut='mgtu' data-id='{$direction['id']}calc'>
<img style='width: 8px; height: auto;' id = 'id_mgtu_{$direction['id']}calc' src='img/front-page/green-circle.png'>
МГТУ
</button> |
<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'> Филиал МГТУ (пос. Яблоновский)
<button type='button' class='calc_green_circle_button hover2 btn btn-outline-success' data-institut='filial' data-id='{$direction['id']}calc'>
<img style='display: none; width: 8px; height: auto;' id = 'id_filial_{$direction['id']}calc' src='img/front-page/green-circle.png'> Филиал МГТУ (пос. Яблоновский)
</button>
</div>
</div>
@ -234,8 +234,8 @@ class DirectonHtmlBuilderForCalculator
<div class='row'>
<div class='col'>
<p class='text-center'> Бюджет</p>
<div id='content_budget_filial_{$direction['id']}' style='display: none;' >{$filial}</div>
<div id='content_budget_mgtu_{$direction['id']}' >{$mgtu}</div>
<div id='content_budget_filial_{$direction['id']}calc' style='display: none;' >{$filial}</div>
<div id='content_budget_mgtu_{$direction['id']}calc' >{$mgtu}</div>
</div>

BIN
public/img/faculties/11.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 22 KiB

BIN
public/img/faculties/4.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
public/img/faculties/5.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

BIN
public/img/faculties/7.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

0
public/img/faculties/8.png → public/img/faculties/Инженерный факультет.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
public/img/faculties/10.png → public/img/faculties/Лечебный факультет.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
public/img/faculties/12.png → public/img/faculties/Педиатрический факультет.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
public/img/faculties/9.png → public/img/faculties/Технологический факультет.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

0
public/img/faculties/1.png → public/img/faculties/Факультет аграрных технологий.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
public/img/faculties/3.png → public/img/faculties/Факультет информационных систем в экономике и юриспруденции.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

0
public/img/faculties/2.png → public/img/faculties/Факультет экономики и управления.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
public/img/faculties/13.png → public/img/faculties/Фармацевтический факультет.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
public/img/faculties/6.png → public/img/faculties/Экологический факультет.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

BIN
public/img/front-page/pointer-svgrepo-com.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.1 KiB

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

@ -356,11 +356,22 @@
style=" background: linear-gradient(#56CCF2, #56CCF200); border-radius: 20px; letter-spacing: 0; ">
День открытых дверей
</a>
<a href="#"
class=" hover1 col-auto text-white position-relative z-2 mb-3 mx-3 text-center text-md-start shadow py-3 px-4 justify-content-center d-inline-flex"
style=" background: linear-gradient(#56CCF2, #56CCF200); border-radius: 20px; letter-spacing: 0; ">
Твои возможности
<!-- Button trigger modal -->
<a type="button" class="hover1 col-auto text-white position-relative z-2 mb-3 mx-3 text-center text-md-start shadow py-3 px-4 justify-content-center d-inline-flex" data-bs-toggle="modal" data-bs-target="#exampleModal" style=" background: linear-gradient(#56CCF2, #56CCF200); border-radius: 20px; letter-spacing: 0; ">
Видео про МГТУ
</a>
<!-- Modal -->
<div class="modal fade" id="exampleModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg modal-dialog-centered">
<div class="modal-content">
<iframe width="100%" height="405" src="https://rutube.ru/play/embed/c2f57bbb4c09b2c8dc78b5e5ccd9cefb" frameBorder="0" allow="clipboard-write; autoplay" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
</div>
</div>
</div>
</div>
@ -380,8 +391,28 @@
</div>
<div class="row d-flex justify-content-md-start justify-content-center">
@php use App\Services\DirectonHtmlBuilder; @endphp
@php
use App\Services\DirectonHtmlBuilder;
use Illuminate\Support\Facades\Storage;
$facultiesLogosPaths = array();
@endphp
@foreach($groupedDirections as $faculty)
@php
$path = "img/faculties/" . $faculty['name'] . '.png';
if(file_exists($path) == false){
$path = URL::to('img/faculties/Экологический факультет.png');
}
$path = URL::to($path);
$groupedDirections[$faculty['name']]['path'] = $path;
@endphp
@endforeach
@foreach($groupedDirections as $faculty)
<div class="mt-xl-5 col-xxl-4 col-md-6 col-10 ">
@ -390,7 +421,7 @@
class=" col-md-11 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex justify-content-start align-items-center hover1 "
style="background-color: #ffffff; border-radius: 15px; border: unset;">
<img class=" " style="width: 108px; height: auto "
src="{{ URL::to('img/faculties/5.png') }}" alt="">
src="{{$groupedDirections[$faculty['name']]['path']}}" alt="">
<span class="ms-xl-5 ms-2 z-3 gradient-text text-start"> {{ $faculty['name'] }}</span>
</button>
@ -401,7 +432,7 @@
<div class="modal-content"> <!--style="border-radius: 30px;"-->
<div class="modal-header d-flex justify-content-center">
<img class="" style="width: 108px; height: auto "
src="{{ URL::to('img/faculties/5.png') }}" alt="">
src="{{$groupedDirections[$faculty['name']]['path']}}" alt="">
</div>
@ -571,6 +602,25 @@
});
});
};
</script>
<script>
$(".calc_green_circle_button").click(function () {
console.log('111')
let name=$(this).data('id');
let institut=$(this).data('institut');
if(institut=='mgtu') {
$("#content_budget_filial_" + id).hide();
$("#content_budget_mgtu_" + id).show();
$("#id_mgtu_" + id).show();
$("#id_filial_" + id).hide();
}else{
$("#content_budget_filial_"+id).show();
$("#content_budget_mgtu_"+id).hide();
$("#id_mgtu_"+id).hide();
$("#id_filial_"+id).show();
}
});
</script>
</div>
</div>
@ -635,176 +685,38 @@
</div>
</div> -->
<div class="mt-3 d-flex justify-content-start scroll-1 ps-lg-0 ms-lg-0 ps-3 ms-3">
<div class="row ps-2 scroll-1 mb-4 " style=" overflow:auto; width: 95%; height: 60em;">
<div class="row ps-2 scroll-1 mb-4 " style=" overflow:auto; width: 95%; height: 30em;">
<div class="col-11 ">
@foreach($admissions as $admission)
<div class="row shadow-lg mt-3 bg-white" style=" border-radius: 20px;">
<div class="col-9 m-3">
<div class="fs-4 gradient-text">
Начало приема документов
</div>
<p class="mt-2 gradient-text"
style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
А ещё базовые сценарии поведения пользователей представляют собой не что иное,
как квинтэссенцию победы
маркетинга над разумом и должны быть описаны максимально подробно
</p>
</div>
<div class="col-12 col-xxl-2 d-flex align-items-center ">
<div>
<div class="row mb-3 ms-3">
<div class="col-6"> 20.06.24</div>
<div class="col-6"> Бюджет</div>
<div class="col-6"> 20.06.24</div>
<div class="col-6"> Бюджет</div>
</div>
</div>
{{$admission->name}}
</div>
</div>
<div class="row shadow-lg mt-3 bg-white" style=" border-radius: 20px;">
<div class="col-9 m-3">
<div class="fs-4 gradient-text">
Начало приема документов
</div>
<p class="mt-2 gradient-text"
@foreach($admission->documents as $document)
<div class="row mt-2 gradient-text shadow p-2 my-3 rounded-3"
style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
А ещё базовые сценарии поведения пользователей представляют собой не что иное,
как квинтэссенцию победы
маркетинга над разумом и должны быть описаны максимально подробно
</p>
</div>
<div class="col-12 col-xxl-2 d-flex align-items-center ">
<div>
<div class="row mb-3 ms-3">
<div class="col-6"> 20.06.24</div>
<div class="col-6"> Бюджет</div>
<div class="col-6"> 20.06.24</div>
<div class="col-6"> Бюджет</div>
</div>
</div>
<a href="{{ URL::to($document->url) }}" > <strong>{{ $document->name }} </strong> <img class="" style="width: 22px; height: auto" src="{{ URL::to('img/front-page/pointer-svgrepo-com.png') }}"></a>
<br>
{{$document->description}}
</div>
</div>
<div class="row shadow-lg mt-3 bg-white" style=" border-radius: 20px;">
<div class="col-9 m-3">
<div class="fs-4 gradient-text">
Начало приема документов
</div>
<p class="mt-2 gradient-text"
style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
А ещё базовые сценарии поведения пользователей представляют собой не что иное,
как квинтэссенцию победы
маркетинга над разумом и должны быть описаны максимально подробно
</p>
</div>
<div class="col-12 col-xxl-2 d-flex align-items-center ">
<div>
<div class="row mb-3 ms-3">
<div class="col-6"> 20.06.24</div>
<div class="col-6"> Бюджет</div>
<div class="col-6"> 20.06.24</div>
<div class="col-6"> Бюджет</div>
</div>
</div>
</div>
@endforeach
</div>
<div class="row shadow-lg mt-3 bg-white" style=" border-radius: 20px;">
<div class="col-9 m-3">
<div class="fs-4 gradient-text">
Начало приема документов
</div>
<p class="mt-2 gradient-text"
style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
А ещё базовые сценарии поведения пользователей представляют собой не что иное,
как квинтэссенцию победы
маркетинга над разумом и должны быть описаны максимально подробно
</p>
</div>
<div class="col-12 col-xxl-2 d-flex align-items-center ">
<div>
<div class="row mb-3 ms-3">
<div class="col-6"> 20.06.24</div>
<div class="col-6"> Бюджет</div>
<div class="col-6"> 20.06.24</div>
<div class="col-6"> Бюджет</div>
</div>
</div>
</div>
</div>
<div class="row shadow-lg mt-3 bg-white" style=" border-radius: 20px;">
<div class="col-9 m-3">
<div class="fs-4 gradient-text">
Начало приема документов
</div>
<p class="mt-2 gradient-text"
style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
А ещё базовые сценарии поведения пользователей представляют собой не что иное,
как квинтэссенцию победы
маркетинга над разумом и должны быть описаны максимально подробно
</p>
</div>
<div class="col-12 col-xxl-2 d-flex align-items-center ">
<div>
<div class="row mb-3 ms-3">
<div class="col-6"> 20.06.24</div>
<div class="col-6"> Бюджет</div>
<div class="col-6"> 20.06.24</div>
<div class="col-6"> Бюджет</div>
</div>
</div>
</div>
</div>
<div class="row shadow-lg mt-3 bg-white" style=" border-radius: 20px;">
<div class="col-9 m-3">
<div class="fs-4 gradient-text">
Начало приема документов
</div>
<p class="mt-2 gradient-text"
style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
А ещё базовые сценарии поведения пользователей представляют собой не что иное,
как квинтэссенцию победы
маркетинга над разумом и должны быть описаны максимально подробно
</p>
</div>
<div class="col-12 col-xxl-2 d-flex align-items-center ">
<div>
<div class="row mb-3 ms-3">
<div class="col-6"> 20.06.24</div>
<div class="col-6"> Бюджет</div>
<div class="col-6"> 20.06.24</div>
<div class="col-6"> Бюджет</div>
</div>
</div>
</div>
@endforeach
</div>
<div class="row shadow-lg mt-3 bg-white" style=" border-radius: 20px;">
<div class="col-9 m-3">
<div class="fs-4 gradient-text">
Начало приема документов
</div>
<p class="mt-2 gradient-text"
style=" font-family: Geologica-ExtraLight; font-size: 16px; ">
А ещё базовые сценарии поведения пользователей представляют собой не что иное,
как квинтэссенцию победы
маркетинга над разумом и должны быть описаны максимально подробно
</p>
</div>
<div class="col-12 col-xxl-2 d-flex align-items-center ">
<div>
<div class="row mb-3 ms-3">
<div class="col-6"> 20.06.24</div>
<div class="col-6"> Бюджет</div>
<div class="col-6"> 20.06.24</div>
<div class="col-6"> Бюджет</div>
</div>
</div>
</div>
</div>
<br><br><br><br><br><br><br><br>
</div>
@ -1070,8 +982,8 @@
<a href="#"><img width="30px" height="30px" src="{{ URL::to('img/front-page/odnok.png') }}" alt="vid"></a>
</div>
</div>
<div class="col">
<div class="col-md-6 col-12 d-flex justify-content-md-end justify-content-center">
<div class="col" >
<div class="col-md-6 col-12 d-flex justify-content-md-end justify-content-center" style='border-radius: 20px;'>
<script type="text/javascript" charset="utf-8" async src="https://api-maps.yandex.ru/services/constructor/1.0/js/?um=constructor%3Abce7036e67cc958b252a800040dcada03df467881dac609a6f6b7ef8618fe7a1&amp;width=500&amp;height=400&amp;lang=ru_RU&amp;scroll=true"></script>
</div>
</div>
@ -1084,7 +996,7 @@
<br><br><br>
</div>
</div>
</body>
@endsection

2
resources/views/new-design/inostran.blade.php
View File

@ -378,7 +378,7 @@ overflow-x: hidden;
<div class="col-xxl-4 col-md-6 col-10">
<a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">
<img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/1.png') }}" alt="">
<img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/7.png') }}" alt="">
<p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Факультет аграрных технологий</p>
</a>

2
resources/views/new-design/magistr.blade.php
View File

@ -379,7 +379,7 @@ overflow-x: hidden;
<div class="col-xxl-4 col-md-6 col-10">
<a class="col-md-10 col-12 shadow-lg p-2 ps-md-3 mt-3 d-flex hover1" style="background-color: #ffffff; border-radius: 15px;">
<img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/1.png') }}" alt="">
<img class=" " style="width: 108px; height: auto " src="{{ URL::to('img/faculties/7.png') }}" alt="">
<p class="ms-xl-5 ms-2 d-flex align-items-center gradient-text" > Факультет аграрных технологий</p>
</a>