Merge pull request 'completing all pages in categories' (#9) from RomanGolienko/Roman_applicant-site:main into main
Tests & Lint & Deploy to Railway / build (20.x, 8.2) (push) Failing after 2m0s Details
Tests & Lint & Deploy to Railway / deploy (8.1) (push) Has been skipped Details

Reviewed-on: http://172.17.254.104/aslan/applicant-site/pulls/9
This commit is contained in:
aslan 2024-01-26 11:13:59 +03:00
commit e874cf99f4
15 changed files with 338 additions and 11 deletions

View File

@ -35,6 +35,13 @@ class PageScrapper
$content = str_replace($el, 'https://mkgtu.ru' . $el, $content); $content = str_replace($el, 'https://mkgtu.ru' . $el, $content);
} }
} }
$rez = preg_match_all('/src="(.*)">/isU', $content, $arr);
$arr[1] = array_unique($arr[1]);
foreach ($arr[1] as $el) {
if (!str_starts_with($el, 'https') && str_contains($el, 'upload')) {
$content = str_replace($el, 'https://mkgtu.ru' . $el, $content);
}
}
return $content; return $content;
} }
@ -43,8 +50,12 @@ class PageScrapper
$arr = []; $arr = [];
//<footer(.*)<\/footer>
//safdsaf sdfdasf<footer>--------------------------------fsdfdasf <\/footer> asdfdasf asdf
$rez = preg_match_all($strForScissors, $content, $arr); $rez = preg_match_all($strForScissors, $content, $arr);
$content = str_replace($arr[1], '', $content); //$arr[1][0] = '>--------------------------------fsdfdasf ';
$content = str_replace($arr[0], '', $content);
//safdsaf sdfdasf<footer<\/footer> asdfdasf asdf
return $content; return $content;
} }

View File

@ -46,7 +46,7 @@
</a> </a>
</div> </div>
<div class="col-lg-3 col-md-4"> <div class="col-lg-3 col-md-4">
<a href="#"> <a href="{{ route('inostrannym-abiturientam') }}">
<div class="tp-feature__item before-color-4 mb-40"> <div class="tp-feature__item before-color-4 mb-40">
<div class="tp-feature__icon"> <div class="tp-feature__icon">
<img style="max-width: 26%;" src="{{ URL::to('img/courses/abroad.png') }}" alt=""> <img style="max-width: 26%;" src="{{ URL::to('img/courses/abroad.png') }}" alt="">
@ -67,7 +67,7 @@
</a> </a>
</div> </div>
<div class="col-lg-3 col-md-4"> <div class="col-lg-3 col-md-4">
<a href="#"> <a href="{{ route('paid_edu') }}">
<div class="tp-feature__item before-color-6 mb-40"> <div class="tp-feature__item before-color-6 mb-40">
<div class="tp-feature__icon"> <div class="tp-feature__icon">
<img style="max-width: 26%;" src="{{ URL::to('img/courses/oplata.png') }}" alt=""> <img style="max-width: 26%;" src="{{ URL::to('img/courses/oplata.png') }}" alt="">
@ -77,7 +77,7 @@
</a> </a>
</div> </div>
<div class="col-lg-3 col-md-4"> <div class="col-lg-3 col-md-4">
<a href="#"> <a href="{{ route('olimpiady-dlya-shkolnikov') }}">
<div class="tp-feature__item before-color-7 mb-40"> <div class="tp-feature__item before-color-7 mb-40">
<div class="tp-feature__icon"> <div class="tp-feature__icon">
<img style="max-width: 26%;" src="{{ URL::to('img/courses/school.png') }}" alt=""> <img style="max-width: 26%;" src="{{ URL::to('img/courses/school.png') }}" alt="">
@ -87,7 +87,7 @@
</a> </a>
</div> </div>
<div class="col-lg-3 col-md-4"> <div class="col-lg-3 col-md-4">
<a href="#"> <a href="{{ route('podgotovitelnye-kursy') }}">
<div class="tp-feature__item before-color-8 mb-40"> <div class="tp-feature__item before-color-8 mb-40">
<div class="tp-feature__icon"> <div class="tp-feature__icon">
<img style="max-width: 26%;" src="{{ URL::to('img/courses/courses.png') }}" alt=""> <img style="max-width: 26%;" src="{{ URL::to('img/courses/courses.png') }}" alt="">

View File

@ -32,6 +32,7 @@
<link rel="stylesheet" type="text/css" href="{{ URL::to('css/awesome/css/regular.css') }}"> <link rel="stylesheet" type="text/css" href="{{ URL::to('css/awesome/css/regular.css') }}">
<link rel="stylesheet" type="text/css" href="{{ URL::to('css/awesome/css/svg-with-js.css') }}"> <link rel="stylesheet" type="text/css" href="{{ URL::to('css/awesome/css/svg-with-js.css') }}">
<link rel="stylesheet" type="text/css" href="{{ URL::to('css/awesome/css/v4-shims.css') }}"> <link rel="stylesheet" type="text/css" href="{{ URL::to('css/awesome/css/v4-shims.css') }}">
@yield('extra_styles')
<!-- css end here--> <!-- css end here-->
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate"> <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
<meta http-equiv="Pragma" content="no-cache"> <meta http-equiv="Pragma" content="no-cache">
@ -135,7 +136,7 @@
<a href="contact.html">Контакты</a> <a href="contact.html">Контакты</a>
</li> </li>
</ul> </ul>
</nav> </nav>
</div> </div>

View File

@ -13,7 +13,7 @@
} }
</style> </style>
<div class="container mt-4"> <div class="container my-4">
<div class="row d-flex justify-content-center align-items-center"> <div class="row d-flex justify-content-center align-items-center">
<div class="col-8"> <div class="col-8">
<a href="{{ route('web-consultations') }}"> <a href="{{ route('web-consultations') }}">

View File

@ -11,10 +11,10 @@
$content = $pageScrapper->normalizeURLFile($row); $content = $pageScrapper->normalizeURLFile($row);
$content = $pageScrapper->cutHTML($content,'/<footer(.*)<\/footer>/isU'); $content = $pageScrapper->cutHTML($content,'/<footer(.*)<\/footer>/isU');
$content = str_replace( // $content = str_replace(
'<img width="614" alt="Обложка Госуслуги_page-0001.jpg" src="/upload/medialibrary/c76/c761087fd6938bd8eb8708e9e036679e.jpg" height="346" title="Обложка Госуслуги_page-0001.jpg">', // '<img width="614" alt="Обложка Госуслуги_page-0001.jpg" src="/upload/medialibrary/c76/c761087fd6938bd8eb8708e9e036679e.jpg" height="346" title="Обложка Госуслуги_page-0001.jpg">',
'<img width="614" alt="Обложка Госуслуги_page-0001.jpg" src="https://mkgtu.ru/upload/medialibrary/c76/c761087fd6938bd8eb8708e9e036679e.jpg" height="346" title="Обложка Госуслуги_page-0001.jpg" class="border border-3 rounded-3 border-secondary">', // '<img width="614" alt="Обложка Госуслуги_page-0001.jpg" src="https://mkgtu.ru/upload/medialibrary/c76/c761087fd6938bd8eb8708e9e036679e.jpg" height="346" title="Обложка Госуслуги_page-0001.jpg" class="border border-3 rounded-3 border-secondary">',
$content); // $content);
echo $content; echo $content;
@endphp @endphp

View File

@ -0,0 +1,76 @@
@extends('layouts.applicant-layout')
@section('content')
<style>
.buttonHover {
transition: .3s all;
}
.buttonHover:hover {
background-color: #006147;
transform: scale(1.03);
color: #e0e0e0;
}
</style>
<div class="container my-4">
<div class="row d-flex justify-content-center align-items-center">
<div class="col-8">
<a href="{{ route('mezhdunarodnaya-deyatelnost') }}">
<h4>
<div
class="d-flex justify-content-start align-items-center w-100 h-100 border border-secondary m-1 p-4 buttonHover rounded-2">
Международная деятельность
</div>
</h4>
</a>
</div>
<div class="col-8">
<a href="{{ route('obshchie-svedeniya') }}">
<h4>
<div
class="d-flex justify-content-start align-items-center w-100 h-100 border border-secondary m-1 p-4 buttonHover rounded-2">
Общие сведения
</div>
</h4>
</a>
</div>
<div class="col-8">
<a href="{{ route('kafedry') }}">
<h4>
<div
class="d-flex justify-content-start align-items-center w-100 h-100 border border-secondary m-1 p-4 buttonHover rounded-2">
Кафедры
</div>
</h4>
</a>
</div>
<div class="col-8">
<a href="{{ route('tsentr-mezhdunarodnogo-obrazovaniya') }}">
<h4>
<div
class="d-flex justify-content-start align-items-center w-100 h-100 border border-secondary m-1 p-4 buttonHover rounded-2">
Центр международного образования
</div>
</h4>
</a>
</div>
<div class="col-8">
<a href="{{ route('akademicheskaya-mobilnost-i-mezhdunarodnoe-sotrudnichestvo') }}">
<h4>
<div
class="d-flex justify-content-start align-items-center w-100 h-100 border border-secondary m-1 p-4 buttonHover rounded-2">
Академическая мобильность и международное сотрудничество
</div>
</h4>
</a>
</div>
</div>
</div>
@endsection

View File

@ -0,0 +1,43 @@
@extends('layouts.applicant-layout')
@section('content')
<div class=" fw-bolder fs-1 text-center py-5 lh-lg"> Академическая мобильность и международное сотрудничество </div>
<div class="container pt-4 d-flex justify-content-center">
<div class="col-10">
@php
use App\Services\PageScrapper;
$pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/akademicheskaya-mobilnost-i-mezhdunarodnoe-sotrudnichestvo/akademicheskaya-mobilnost-i-fondy/", '<div class=["\']content_info["\']>');
$row = $pageScrapper->getHTML();
//$tmp = explode('<footer',$row); $row = $tmp[0];
$row = $pageScrapper->cutHTML($row,'/<footer(.*)<\/footer>/isU');
$pageScrapper2 = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/akademicheskaya-mobilnost-i-mezhdunarodnoe-sotrudnichestvo/individualnaya-mobilnost-studentov-i-aspirantov/", '<div class=["\']content_info["\']>');
$row2 = $pageScrapper2->getHTML();
//$tmp = explode('<footer',$row2); $row2 = $tmp[0];
$row2 = $pageScrapper2->cutHTML($row2,'/<footer(.*)<\/footer>/isU');
$pageScrapper3 = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/akademicheskaya-mobilnost-i-mezhdunarodnoe-sotrudnichestvo/kak-stat-uchastnikom-programm-akademicheskoy-mobilnosti/", '<div class=["\']content_info["\']>');
$row3 = $pageScrapper3->getHTML();
//$tmp = explode('<footer',$row3); $row3 = $tmp[0];
$row3 = $pageScrapper3->cutHTML($row3,'/<footer(.*)<\/footer>/isU');
$content = $row . $row2 . $row3;
//dd($content);
//$content = $pageScrapper->cutHTML($row,'/<footer(.*)<\/footer>/isU');
// $content = $pageScrapper->normalizeURLFile($content);
echo htmlspecialchars($content);
@endphp
</div>
</div>
@endsection

View File

@ -0,0 +1,19 @@
@extends('layouts.applicant-layout')
@section('content')
<div class=" fw-bolder fs-1 text-center py-5 lh-lg"> Кафедры </div>
<div class="container py-4 d-flex justify-content-center">
<div class="col-10">
@php
use App\Services\PageScrapper;
$pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/kafedry/", '<div class=["\']content_info["\']>');
$row = $pageScrapper->getHTML();
$content = $pageScrapper->normalizeURLFile($row);
$content = $pageScrapper->cutHTML($content,'/<footer(.*)<\/footer>/isU');
echo $content;
@endphp
</div>
</div>
@endsection

View File

@ -0,0 +1,19 @@
@extends('layouts.applicant-layout')
@section('content')
<div class=" fw-bolder fs-1 text-center py-5 lh-lg"> Международная деятельность </div>
<div class="container py-4 d-flex justify-content-center">
<div class="col-10">
@php
use App\Services\PageScrapper;
$pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/mezhdunarodnaya-deyatelnost/", '<div class=["\']content_info["\']>');
$row = $pageScrapper->getHTML();
$content = $pageScrapper->normalizeURLFile($row);
$content = $pageScrapper->cutHTML($content,'/<footer(.*)<\/footer>/isU');
echo $content;
@endphp
</div>
</div>
@endsection

View File

@ -0,0 +1,19 @@
@extends('layouts.applicant-layout')
@section('content')
<div class=" fw-bolder fs-1 text-center py-5 lh-lg"> Общие сведения </div>
<div class="container py-4 d-flex justify-content-center">
<div class="col-10">
@php
use App\Services\PageScrapper;
$pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/obshchie-svedeniya/", '<div class=["\']content_info["\']>');
$row = $pageScrapper->getHTML();
$content = $pageScrapper->normalizeURLFile($row);
$content = $pageScrapper->cutHTML($content,'/<footer(.*)<\/footer>/isU');
echo $content;
@endphp
</div>
</div>
@endsection

View File

@ -0,0 +1,19 @@
@extends('layouts.applicant-layout')
@section('content')
<div class=" fw-bolder fs-1 text-center py-5 lh-lg"> Центр Международного образования </div>
<div class="container py-4 d-flex justify-content-center">
<div class="col-10">
@php
use App\Services\PageScrapper;
$pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/inostrannym-abiturientam/tsentr-mezhdunarodnogo-obrazovaniya/", '<div class=["\']content_info["\']>');
$row = $pageScrapper->getHTML();
$content = $pageScrapper->normalizeURLFile($row);
$content = $pageScrapper->cutHTML($content,'/<footer(.*)<\/footer>/isU');
echo $content;
@endphp
</div>
</div>
@endsection

View File

@ -0,0 +1,30 @@
@extends('layouts.applicant-layout')
@section('content')
<div class=" fw-bolder fs-1 text-center py-5 lh-lg"> Олимпиады для школьников </div>
{{-- пофиксить!!!!--}}
<div class="container py-4 d-flex justify-content-center" style="padding-left: 150px;" >
<div class="col-10">
@php
use App\Services\PageScrapper;
$pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/olimpiady-dlya-shkolnikov/", '<div class=["\']content_info["\']>');
$row = $pageScrapper->getHTML();
$content = $pageScrapper->normalizeURLFile($row);
$content = $pageScrapper->cutHTML($content,'/<footer(.*)<\/footer>/isU');
// $tmp = preg_match_all('/<p (.*)>/isU', "https://mkgtu.ru/postuplenie/olimpiady-dlya-shkolnikov/", $arr);
//
// $arr[0] = array_unique($arr[0]);
// $str = $arr[0][0];
$content = str_replace('<p style="text-align: left;">', '<p>', $content);
echo $content;
@endphp
</div>
</div>
@endsection

View File

@ -0,0 +1,28 @@
@extends('layouts.applicant-layout')
@section('extra_styles')
<link rel="stylesheet" type="text/css" href="{{ URL::to('https://mkgtu.ru/bitrix/js/ui/design-tokens/dist/ui.design-tokens.css?169469846524720') }}">
<link rel="stylesheet" type="text/css" href="{{ URL::to('https://mkgtu.ru/sveden/assets/review/v1/common/css/sveden.css?169469165352526') }}">
<link rel="stylesheet" type="text/css" href="{{ URL::to('https://mkgtu.ru/sveden/assets/review/v1/common/css/vendor.css?1694691653153304') }}">
<link rel="stylesheet" type="text/css" href="{{ URL::to('https://mkgtu.ru/vikon/sveden/assets/review/v1/common/css/vendor.css?1706157854153304') }}">
<link rel="stylesheet" type="text/css" href="{{ URL::to('https://mkgtu.ru/vikon/sveden/assets/review/v1/common/css/sveden.css?170615785463681') }}">
@endsection
@section('content')
<div class=" fw-bolder fs-1 text-center py-5 lh-lg"> Платные образовательные услуги </div>
<div class="container fs-6 py-4 d-flex justify-content-center">
<div class="col-10">
@php
use App\Services\PageScrapper;
$pageScrapper = new PageScrapper("https://mkgtu.ru/sveden/paid_edu/", '<div class=["\']content_info["\']>');
$row = $pageScrapper->getHTML();
$content = $pageScrapper->normalizeURLFile($row);
$content = $pageScrapper->cutHTML($content,'/<footer(.*)<\/footer>/isU');
echo $content;
@endphp
</div>
</div>
@endsection

View File

@ -0,0 +1,20 @@
@extends('layouts.applicant-layout')
@section('content')
<div class=" fw-bolder fs-1 text-center py-5 lh-lg"> Подготовительные курсы </div>
<div class="container pt-4 d-flex justify-content-center">
<div class="col-10">
@php
use App\Services\PageScrapper;
$pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/podgotovitelnye-kursy/", '<div class=["\']content_info["\']>');
$row = $pageScrapper->getHTML();
$content = $pageScrapper->normalizeURLFile($row);
$content = $pageScrapper->cutHTML($content,'/<footer(.*)<\/footer>/isU');
echo $content;
@endphp
</div>
</div>
@endsection

View File

@ -34,6 +34,26 @@ Route::get('/applicant', function () {
return view('menu.abitur'); return view('menu.abitur');
})->name('abitur'); })->name('abitur');
Route::get('/for-foreign-applicants', function () {
return view('menu.inostrannym-abiturientam');
})->name('inostrannym-abiturientam');
Route::get('/paid_edu', function () {
return view('menu.paid_edu');
})->name('paid_edu');
Route::get('/olympiads-for-schoolchildren', function () {
return view('menu.olimpiady-dlya-shkolnikov');
})->name('olimpiady-dlya-shkolnikov');
Route::get('/training courses', function () {
return view('menu.podgotovitelnye-kursy');
})->name('podgotovitelnye-kursy');
Route::get('/web-consultations', function () { Route::get('/web-consultations', function () {
return view('menu.abitur.web-consultations'); return view('menu.abitur.web-consultations');
})->name('web-consultations'); })->name('web-consultations');
@ -62,6 +82,28 @@ Route::get('/video-materials-for-applicants', function () {
return view('menu.abitur.videomaterialy-dlya-postupayushchikh'); return view('menu.abitur.videomaterialy-dlya-postupayushchikh');
})->name('videomaterialy-dlya-postupayushchikh'); })->name('videomaterialy-dlya-postupayushchikh');
Route::get('/international-activity', function () {
return view('menu.inostrannym-abiturientam.mezhdunarodnaya-deyatelnost');
})->name('mezhdunarodnaya-deyatelnost');
Route::get('/general-information', function () {
return view('menu.inostrannym-abiturientam.obshchie-svedeniya');
})->name('obshchie-svedeniya');
Route::get('/departments', function () {
return view('menu.inostrannym-abiturientam.kafedry');
})->name('kafedry');
Route::get('/international-education-center', function () {
return view('menu.inostrannym-abiturientam.tsentr-mezhdunarodnogo-obrazovaniya');
})->name('tsentr-mezhdunarodnogo-obrazovaniya');
Route::get('/academic-mobility-and-international-cooperation', function () {
return view('menu.inostrannym-abiturientam.akademicheskaya-mobilnost-i-mezhdunarodnoe-sotrudnichestvo');
})->name('akademicheskaya-mobilnost-i-mezhdunarodnoe-sotrudnichestvo');
Route::post('/uploadfile', [UploadFileController::class, 'showUploadFile'])->name('uploadfile'); Route::post('/uploadfile', [UploadFileController::class, 'showUploadFile'])->name('uploadfile');
Route::get('/dashboard', function () { Route::get('/dashboard', function () {