From 3d33a03f97c8fe6e24f9d79ed9223c699e1716ea Mon Sep 17 00:00:00 2001
From: ROMANGOLIENKO <romangolienko@yandex.ru>
Date: Fri, 26 Jan 2024 16:05:28 +0300
Subject: [PATCH] actual version, device change

---
 .gitignore                                    |  1 +
 app/Services/PageScrapper.php                 |  2 +-
 composer.json                                 |  4 ++-
 resources/views/menu/course.blade.php         | 26 ++++++++++++++-----
 ...i-mezhdunarodnoe-sotrudnichestvo.blade.php |  3 ++-
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3649080..b01c8c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ yarn-error.log
 /.phpstorm.meta.php
 /_ide_helper.php
 /_ide_helper_models.php
+/public/img/icons/play-button.png
diff --git a/app/Services/PageScrapper.php b/app/Services/PageScrapper.php
index 956cfb1..0edaa7c 100644
--- a/app/Services/PageScrapper.php
+++ b/app/Services/PageScrapper.php
@@ -22,7 +22,7 @@ class PageScrapper
         $arr = [];
         $rez = preg_match_all($strForPregMatch, $page, $arr);
 
-        return $content = $arr[1][0];
+        return $content = $arr[0][0];
     }
 
     public function normalizeURLFile($content)
diff --git a/composer.json b/composer.json
index 711b14f..4fa8bb7 100644
--- a/composer.json
+++ b/composer.json
@@ -8,8 +8,9 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^8.2",
+        "php": "^8.1|8.2",
         "guzzlehttp/guzzle": "^7.8.1",
+        "imangazaliev/didom": "^2.0",
         "laravel/framework": "^10.41.0",
         "laravel/sanctum": "^3.3.3",
         "laravel/tinker": "^2.9.0",
@@ -64,6 +65,7 @@
         }
     },
     "config": {
+        "platform-check": false,
         "optimize-autoloader": true,
         "preferred-install": "dist",
         "sort-packages": true,
diff --git a/resources/views/menu/course.blade.php b/resources/views/menu/course.blade.php
index df990a3..8779bd1 100644
--- a/resources/views/menu/course.blade.php
+++ b/resources/views/menu/course.blade.php
@@ -1,4 +1,5 @@
 @extends('layouts.applicant-layout')
+
 @section('content')
 
     <style>
@@ -35,12 +36,25 @@
 
         <div class="col-10">
             @php
-                use App\Services\PageScrapper;
-                $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;
+
+
+
+
+                use DiDom\Document;
+
+                    $document = new Document('https://mkgtu.ru/postuplenie/podat-dokumenty-onlayn/', true);
+
+                    $posts = $document->find('.content_info');
+
+                    echo $document->first('.content_info')->html();
+    /*
+                    use App\Services\PageScrapper;
+                    $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
 
diff --git a/resources/views/menu/inostrannym-abiturientam/akademicheskaya-mobilnost-i-mezhdunarodnoe-sotrudnichestvo.blade.php b/resources/views/menu/inostrannym-abiturientam/akademicheskaya-mobilnost-i-mezhdunarodnoe-sotrudnichestvo.blade.php
index 2fd3435..423ec8e 100644
--- a/resources/views/menu/inostrannym-abiturientam/akademicheskaya-mobilnost-i-mezhdunarodnoe-sotrudnichestvo.blade.php
+++ b/resources/views/menu/inostrannym-abiturientam/akademicheskaya-mobilnost-i-mezhdunarodnoe-sotrudnichestvo.blade.php
@@ -28,13 +28,14 @@
                 $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);
+                echo $content;
 
             @endphp