From 46a6c44ebe4ea4231dfd9451e283716f0f3a3abb Mon Sep 17 00:00:00 2001
From: Donatas Glodenis <dgvirtual@akl.lt>
Date: Sun, 14 May 2023 19:21:01 +0300
Subject: [PATCH 1/3] Fix to make open menu items active Broken accidentally by
 previous PR #336

---
 src/Menus/MenuItem.php              | 2 +-
 tests/Menus/MenuItemTest.php        | 2 +-
 themes/Admin/Components/sidebar.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Menus/MenuItem.php b/src/Menus/MenuItem.php
index 049943d0..4b6d7eb1 100644
--- a/src/Menus/MenuItem.php
+++ b/src/Menus/MenuItem.php
@@ -120,7 +120,7 @@ public function setUrl(string $url)
      */
     public function setNamedRoute(string $name)
     {
-        $this->url = url_to($name);
+        $this->url = route_to($name);
 
         return $this;
     }
diff --git a/tests/Menus/MenuItemTest.php b/tests/Menus/MenuItemTest.php
index 507606a6..13a8f68e 100644
--- a/tests/Menus/MenuItemTest.php
+++ b/tests/Menus/MenuItemTest.php
@@ -91,7 +91,7 @@ public function testWithNamedRoutes()
         $item = new MenuItem();
         $item->setNamedRoute('home');
 
-        $this->assertSame(site_url('/home-sweet-home'), $item->url());
+        $this->assertSame('/home-sweet-home', $item->url());
     }
 
     public function testPropertyGetter()
diff --git a/themes/Admin/Components/sidebar.php b/themes/Admin/Components/sidebar.php
index d844afc5..13476196 100644
--- a/themes/Admin/Components/sidebar.php
+++ b/themes/Admin/Components/sidebar.php
@@ -40,7 +40,7 @@
                 <?php foreach ($collection->items() as $item) : ?>
                     <?php if ($item->userCanSee()): ?>
                         <li class="nav-item">
-                            <a class="nav-link <?= url_is($item->url . '*') ? 'active' : '' ?>" href="<?= $item->url ?>">
+                            <a class="nav-link <?= url_is($item->url . '*') ? 'active' : '' ?>" href="<?= site_url($item->url) ?>">
                                 <?php if (! $collection->isCollapsible()) : ?>
                                     <?= $item->icon ?>
                                 <?php endif ?>

From 77e502b9a9f73a4522c64aeea93eaed92de95f29 Mon Sep 17 00:00:00 2001
From: Donatas Glodenis <dgvirtual@akl.lt>
Date: Sun, 14 May 2023 22:35:42 +0300
Subject: [PATCH 2/3] Use absolute urls in quick_links.php and view_log.php

---
 src/Dashboard/Views/quick_links.php | 2 +-
 src/Tools/Views/view_log.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Dashboard/Views/quick_links.php b/src/Dashboard/Views/quick_links.php
index f7e3f5c2..1f1ad52d 100644
--- a/src/Dashboard/Views/quick_links.php
+++ b/src/Dashboard/Views/quick_links.php
@@ -5,7 +5,7 @@
     <?php foreach ($menu->items() as $item) : ?>
         <?php if ($item->userCanSee()): ?>
             <div class="quick-link">
-                <a href="<?= $item->url ?>">
+                <a href="<?= site_url($item->url) ?>">
                     <?= $item->icon ?>
                     <span><?= $item->title ?></span>
                 </a>
diff --git a/src/Tools/Views/view_log.php b/src/Tools/Views/view_log.php
index 056e595e..4cfb4777 100644
--- a/src/Tools/Views/view_log.php
+++ b/src/Tools/Views/view_log.php
@@ -4,7 +4,7 @@
 <?php
 $this->section('main') ?>
 <x-page-head>
-    <a href="/<?= ADMIN_AREA ?>/tools/logs" class="back">&larr; Logs</a>
+    <a href="<?= site_url(ADMIN_AREA . '/tools/logs') ?>" class="back">&larr; Logs</a>
     <h2>Logs : <?= $logFilePretty; ?></h2>
     <h2>
         <Logs

From 826588443aaa22f06d682a9a1e99ed9b8c736069 Mon Sep 17 00:00:00 2001
From: Donatas Glodenis <dgvirtual@akl.lt>
Date: Sun, 14 May 2023 22:43:24 +0300
Subject: [PATCH 3/3] Removing unused code fragment

---
 src/Tools/Views/view_log.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Tools/Views/view_log.php b/src/Tools/Views/view_log.php
index 4cfb4777..f0944bdf 100644
--- a/src/Tools/Views/view_log.php
+++ b/src/Tools/Views/view_log.php
@@ -6,9 +6,6 @@
 <x-page-head>
     <a href="<?= site_url(ADMIN_AREA . '/tools/logs') ?>" class="back">&larr; Logs</a>
     <h2>Logs : <?= $logFilePretty; ?></h2>
-    <h2>
-        <Logs
-    </h2>
 </x-page-head>
 
 <x-admin-box>