From 6512b8a6a30c2c4db2aad98b0176164d37f0f03d Mon Sep 17 00:00:00 2001 From: ReWiG Date: Thu, 17 Jul 2025 01:23:28 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B8=20=D0=B2=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B2=D0=BE=D0=BC=20=D1=83=D1=80=D0=BE=D0=B2=D0=BD?= =?UTF-8?q?=D0=B5=20=D0=BC=D0=B5=D0=BD=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Docs.php | 19 +++++---- resources/views/docs/docs.blade.php | 51 +++++++++++++---------- resources/views/docs/navigation.blade.php | 49 ++++++++++++---------- 3 files changed, 67 insertions(+), 52 deletions(-) diff --git a/app/Docs.php b/app/Docs.php index 0c50ec4e..85e41812 100644 --- a/app/Docs.php +++ b/app/Docs.php @@ -232,24 +232,25 @@ public function docsToArray(string $html): array $crawler = new Crawler; $crawler->addContent($html); - $crawler = new Crawler($html); - $menu = []; - $crawler->filter('ul > li')->each(function (Crawler $node) use (&$menu) { + $crawler->filter('body > ul > li')->each(function (Crawler $node) use (&$menu) { $subList = $node->filter('ul > li')->each(fn (Crawler $subNode) => [ 'title' => $subNode->filter('a')->text(), 'href' => url($subNode->filter('a')->attr('href')), ]); if (empty($subList)) { - return null; + $menu[] = [ + 'title' => $node->filter('a')->text(), + 'href' => url($node->filter('a')->attr('href')) + ]; + } else { + $menu[] = [ + 'title' => $node->filter('h2')->text(), + 'list' => $subList, + ]; } - - $menu[] = [ - 'title' => $node->filter('h2')->text(), - 'list' => $subList, - ]; }); return $menu; diff --git a/resources/views/docs/docs.blade.php b/resources/views/docs/docs.blade.php index cc5ef5b8..ac74841d 100644 --- a/resources/views/docs/docs.blade.php +++ b/resources/views/docs/docs.blade.php @@ -21,28 +21,35 @@ diff --git a/resources/views/docs/navigation.blade.php b/resources/views/docs/navigation.blade.php index c8ebaa58..843e3a08 100644 --- a/resources/views/docs/navigation.blade.php +++ b/resources/views/docs/navigation.blade.php @@ -20,28 +20,35 @@ @foreach ($docs->getMenu() as $item)
  • - + @if (!empty($item['list'])) + -
    - -
    +
    + +
    + @else + + @endif
  • @endforeach From f1080b38dd03c54524177ff82fcfbe84d31d49b9 Mon Sep 17 00:00:00 2001 From: ReWiG <5054805+ReWiG@users.noreply.github.com> Date: Wed, 16 Jul 2025 22:24:17 +0000 Subject: [PATCH 2/2] Fixed code style --- app/Docs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Docs.php b/app/Docs.php index 85e41812..094f018e 100644 --- a/app/Docs.php +++ b/app/Docs.php @@ -243,7 +243,7 @@ public function docsToArray(string $html): array if (empty($subList)) { $menu[] = [ 'title' => $node->filter('a')->text(), - 'href' => url($node->filter('a')->attr('href')) + 'href' => url($node->filter('a')->attr('href')), ]; } else { $menu[] = [