Merge branch 'RomanGolienko-main'

add http://172.17.254.104/RomanGolienko/Roman_applicant-site main
new pages, renaming routes
2024-01-24 15:50:42 +03:00 · 2024-01-24 15:50:33 +03:00 · 2024-01-24 15:23:23 +03:00 · 2024-01-24 13:30:27 +03:00 · 2024-01-23 15:50:36 +03:00 · 2024-01-23 15:45:52 +03:00
12 changed files with 186 additions and 19 deletions
--- a/app/Services/PageScrapper.php
+++ b/app/Services/PageScrapper.php
@ -15,21 +15,42 @@ class PageScrapper

    public function getHTML()
    {
+
        $page = file_get_contents($this->url);
-        $strForPregMatch = "/" . "{$this->contentMarker}" . "(.*)<\/div>/isU";
+        $strForPregMatch = "/" . "{$this->contentMarker}" . "(.*)<\/div>/is";
+
        $arr = [];
        $rez = preg_match_all($strForPregMatch, $page, $arr);
-        return $content = $arr[1][0] . '</div>';
+
+        return $content = $arr[1][0];
+
+
    }

    public function normalizeURLFile($content)
    {
-        $rez = preg_match_all('/href="(.*)"/isU', $content, $arr);
+
+        $rez = preg_match_all('/<a href="(.*)">/isU',$content,$arr);
+        $arr[1] = array_unique($arr[1]);
        foreach ($arr[1] as $el) {
-            if (strpos($el, 'http') !== 0) {
+            if (!str_starts_with($el, 'https')){
                $content = str_replace($el,'https://mkgtu.ru' . $el,$content);
            }
        }
+
        return $content;
+
+    }
+    public function cutHTML($content,$strForScissors)
+    {
+
+
+        $arr = [];
+        $rez = preg_match_all($strForScissors, $content, $arr);
+        $content = str_replace($arr[1],'',$content);
+
+        return $content;
+
+
    }
 }
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@ -26,7 +26,7 @@
                        </a>
                    </div>
                    <div class="col-lg-3 col-md-4">
-                        <a href="{{ route('applicant') }}">
+                        <a href="{{ route('abitur') }}">
                            <div class="tp-feature__item before-color-2 mb-40">
                                <div class="tp-feature__icon">
                                    <img style="max-width: 26%;" src="{{ URL::to('img/courses/abit.png') }}" alt="">
--- a/resources/views/menu/abitur.blade.php
+++ b/resources/views/menu/abitur.blade.php
@ -38,7 +38,7 @@
            </div>

            <div class="col-8">
-                <a href="postup.php">
+                <a href="{{ route('spetsialitet-magistratura')  }}">
                    <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">
@ -49,7 +49,7 @@
            </div>

            <div class="col-8">
-                <a href="postup-col.php">
+                <a href="{{ route('kolledzh')  }}">
                    <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">
@ -60,7 +60,7 @@
            </div>

            <div class="col-8">
-                <a href="ui-4.html#">
+                <a href="{{ route('platnye-obrazovatelnye-uslugi')  }}">
                    <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">
@ -71,7 +71,7 @@
            </div>

            <div class="col-8">
-                <a href="ui-4.html#">
+                <a href="{{ route('ordinatura')  }}">
                    <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">
@ -82,7 +82,7 @@
            </div>

            <div class="col-8">
-                <a href="ui-4.html#">
+                <a href="{{ route('aspirantura')  }}">
                    <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">
@ -93,7 +93,7 @@
            </div>

            <div class="col-8">
-                <a href="ui-4.html#">
+                <a href="https://mkgtu.ru/upload/postuplenie_docs/abiturientu/voprosi.pdf" target="_blank">
                    <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">
@ -104,7 +104,7 @@
            </div>

            <div class="col-8">
-                <a href="ui-4.html#">
+                <a href="{{ route('videomaterialy-dlya-postupayushchikh')  }}">
                    <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">
@ -115,7 +115,7 @@
            </div>

            <div class="col-8">
-                <a href="ui-4.html#">
+                <a href="#">
                    <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">
--- a/resources/views/menu/abitur/aspirantura.blade.php
+++ b/resources/views/menu/abitur/aspirantura.blade.php
@ -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 pt-4 d-flex justify-content-center">
+
+        <div class="col-10">
+            @php
+                use App\Services\PageScrapper;
+                $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/priemnaya-kampaniya/aspirantura/", '<div class=["\']content_info["\']>');
+                $row = $pageScrapper->getHTML();
+                $content = $pageScrapper->normalizeURLFile($row);
+                $content = $pageScrapper->cutHTML($content,'/<footer(.*)<\/footer>/isU');
+                echo $content;
+
+            @endphp
+
+        </div>
+    </div>
+@endsection
--- a/resources/views/menu/abitur/kolledzh.blade.php
+++ b/resources/views/menu/abitur/kolledzh.blade.php
@ -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 pt-4 d-flex justify-content-center">
+
+        <div class="col-10">
+            @php
+                use App\Services\PageScrapper;
+                $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/priemnaya-kampaniya/kolledzh/", '<div class=["\']content_info["\']>');
+                $row = $pageScrapper->getHTML();
+                $content = $pageScrapper->normalizeURLFile($row);
+                $content = $pageScrapper->cutHTML($content,'/<footer(.*)<\/footer>/isU');
+                echo $content;
+
+            @endphp
+
+        </div>
+    </div>
+@endsection
--- a/resources/views/menu/abitur/ordinatura.blade.php
+++ b/resources/views/menu/abitur/ordinatura.blade.php
@ -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 pt-4 d-flex justify-content-center">
+
+        <div class="col-10">
+            @php
+                use App\Services\PageScrapper;
+                $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/priemnaya-kampaniya/ordinatura/", '<div class=["\']content_info["\']>');
+                $row = $pageScrapper->getHTML();
+                $content = $pageScrapper->normalizeURLFile($row);
+                $content = $pageScrapper->cutHTML($content,'/<footer(.*)<\/footer>/isU');
+                echo $content;
+
+            @endphp
+
+        </div>
+    </div>
+@endsection
--- a/resources/views/menu/abitur/platnye-obrazovatelnye-uslugi.blade.php
+++ b/resources/views/menu/abitur/platnye-obrazovatelnye-uslugi.blade.php
@ -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 fs-4 pt-4 d-flex justify-content-center">
+
+        <div class="col-10">
+            @php
+                use App\Services\PageScrapper;
+                $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/priemnaya-kampaniya/platnye-obrazovatelnye-uslugi/", '<div class=["\']content_info["\']>');
+                $row = $pageScrapper->getHTML();
+                $content = $pageScrapper->normalizeURLFile($row);
+                $content = $pageScrapper->cutHTML($content,'/<footer(.*)<\/footer>/isU');
+                echo $content;
+
+            @endphp
+
+        </div>
+    </div>
+@endsection
--- a/resources/views/menu/abitur/spetsialitet-magistratura.blade.php
+++ b/resources/views/menu/abitur/spetsialitet-magistratura.blade.php
@ -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 pt-4 d-flex justify-content-center">
+
+        <div class="col-10">
+            @php
+                use App\Services\PageScrapper;
+                $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/priemnaya-kampaniya/spetsialitet-magistratura-2022/", '<div class=["\']content_info["\']>');
+                $row = $pageScrapper->getHTML();
+                $content = $pageScrapper->normalizeURLFile($row);
+                $content = $pageScrapper->cutHTML($content,'/<footer(.*)<\/footer>/isU');
+                echo $content ;
+
+            @endphp
+
+        </div>
+    </div>
+@endsection
--- a/resources/views/menu/abitur/videomaterialy-dlya-postupayushchikh.blade.php
+++ b/resources/views/menu/abitur/videomaterialy-dlya-postupayushchikh.blade.php
@ -0,0 +1,25 @@
+@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 text-center pb-4 ">
+            @php
+                use App\Services\PageScrapper;
+                $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/priemnaya-kampaniya/videomaterialy-dlya-postupayushchikh/", '<div class=["\']content_info["\']>');
+                $row = $pageScrapper->getHTML();
+                $content = $pageScrapper->normalizeURLFile($row);
+                $content = $pageScrapper->cutHTML($content,'/<footer(.*)<\/footer>/isU');
+
+                $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="https://mkgtu.ru/upload/medialibrary/c76/c761087fd6938bd8eb8708e9e036679e.jpg" height="346" title="Обложка Госуслуги_page-0001.jpg" class="border border-3 rounded-3 border-secondary">',
+                    $content);
+                echo $content;
+
+            @endphp
+
+        </div>
+    </div>
+@endsection
+
--- a/resources/views/menu/abitur/web-consultations.blade.php
+++ b/resources/views/menu/abitur/web-consultations.blade.php
@ -1,6 +1,6 @@
@extends('layouts.applicant-layout')
@section('content')
-    <div class=" fw-bolder fs-1 text-center py-5"> Веб-консультации для абитуриентов и их родителей </div>
+    <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">
@ -9,6 +9,7 @@
    $pageScrapper = new PageScrapper("https://www.mkgtu.ru/postuplenie/web-consultations/", '<div class=["\']content_info["\']>');
    $row = $pageScrapper->getHTML();
    $content = $pageScrapper->normalizeURLFile($row);
+    $content = $pageScrapper->cutHTML($content,'/<footer(.*)<\/footer>/isU');
    echo $content;

    @endphp
--- a/resources/views/menu/course.blade.php
+++ b/resources/views/menu/course.blade.php
@ -30,15 +30,16 @@
        }
    </style>

-    <div class=" fw-bolder fs-1 text-center py-5"> Подача документов онлайн </div>
+    <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://www.mkgtu.ru/postuplenie/web-consultations/", '<div class=["\']content_info["\']>');
+                $pageScrapper = new PageScrapper("https://mkgtu.ru/postuplenie/podat-dokumenty-onlayn/", '<div class=["\']content_info["\']>');
                $row = $pageScrapper->getHTML();
                $content = $pageScrapper->normalizeURLFile($row);
+                $content = $pageScrapper->cutHTML($content,'/<footer(.*)<\/footer>/isU');
                echo $content;

            @endphp
--- a/routes/web.php
+++ b/routes/web.php
@ -30,14 +30,38 @@ Route::get('/course', function () {
    return view('menu.course');
 })->name('course');

-Route::get('/abitur', function () {
+Route::get('/applicant', function () {
    return view('menu.abitur');
-})->name('applicant');
+})->name('abitur');

 Route::get('/web-consultations', function () {
    return view('menu.abitur.web-consultations');
 })->name('web-consultations');

+Route::get('/specialty-magistracy', function () {
+    return view('menu.abitur.spetsialitet-magistratura');
+})->name('spetsialitet-magistratura');
+
+Route::get('/college', function () {
+    return view('menu.abitur.kolledzh');
+})->name('kolledzh');
+
+Route::get('/paid-educational-services', function () {
+    return view('menu.abitur.platnye-obrazovatelnye-uslugi');
+})->name('platnye-obrazovatelnye-uslugi');
+
+Route::get('/residency', function () {
+    return view('menu.abitur.ordinatura');
+})->name('ordinatura');
+
+Route::get('/traineeship', function () {
+    return view('menu.abitur.aspirantura');
+})->name('aspirantura');
+
+Route::get('/video-materials-for-applicants', function () {
+    return view('menu.abitur.videomaterialy-dlya-postupayushchikh');
+})->name('videomaterialy-dlya-postupayushchikh');
+
 Route::post('/uploadfile', [UploadFileController::class, 'showUploadFile'])->name('uploadfile');

 Route::get('/dashboard', function () {
Author	SHA1	Message	Date
aslan	49cf4f619a	Merge branch 'RomanGolienko-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	2024-01-24 15:50:42 +03:00
aslan	d50dd092de	add http://172.17.254.104/RomanGolienko/Roman_applicant-site main Tests & Lint & Deploy to Railway / build (20.x, 8.2) (pull_request) Failing after 2m0s Details Tests & Lint & Deploy to Railway / deploy (8.1) (pull_request) Has been skipped Details	2024-01-24 15:50:33 +03:00
Holiienko Roman	dee85023d4	new pages, renaming routes Tests & Lint & Deploy to Railway / build (20.x, 8.2) (pull_request) Failing after 1m57s Details Tests & Lint & Deploy to Railway / deploy (8.1) (pull_request) Has been skipped Details	2024-01-24 15:23:23 +03:00
Holiienko Roman	05fbca2353	adding new method to PageScrapper, adding new page Tests & Lint & Deploy to Railway / build (20.x, 8.2) (pull_request) Failing after 1m54s Details Tests & Lint & Deploy to Railway / deploy (8.1) (pull_request) Has been skipped Details	2024-01-24 13:30:27 +03:00
Holiienko Roman	f8155f2557	fixing previous commit Tests & Lint & Deploy to Railway / build (20.x, 8.2) (pull_request) Failing after 1m58s Details Tests & Lint & Deploy to Railway / deploy (8.1) (pull_request) Has been skipped Details	2024-01-23 15:50:36 +03:00
Holiienko Roman	bfcb9cdba2	adding new page Tests & Lint & Deploy to Railway / build (20.x, 8.2) (pull_request) Failing after 2m5s Details Tests & Lint & Deploy to Railway / deploy (8.1) (pull_request) Has been skipped Details	2024-01-23 15:45:52 +03:00