From 84f26441c0f546950b27fe0934e7d6993e5bfdb0 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Wed, 9 Feb 2022 15:53:55 +0300
Subject: [PATCH 1/2] update navigation

---
 .../visiosoft/advs-module/composer.json       |  3 +-
 .../visiosoft/cats-module/src/CatsModule.php  |  3 +-
 .../resources/views/partials/menu.twig        | 33 ++++++++++++++++---
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/composer.json b/addons/default/visiosoft/advs-module/composer.json
index df501fdd2..80513095b 100644
--- a/addons/default/visiosoft/advs-module/composer.json
+++ b/addons/default/visiosoft/advs-module/composer.json
@@ -11,6 +11,7 @@
   },
   "require": {
     "fruitcake/laravel-cors": "^2.0",
-    "visiosoft/style_selector-module": "*"
+    "visiosoft/style_selector-module": "*",
+    "visiosoft/submenu-plugin": "*"
   }
 }
diff --git a/addons/default/visiosoft/cats-module/src/CatsModule.php b/addons/default/visiosoft/cats-module/src/CatsModule.php
index c6e5d958b..d355bd1ba 100644
--- a/addons/default/visiosoft/cats-module/src/CatsModule.php
+++ b/addons/default/visiosoft/cats-module/src/CatsModule.php
@@ -10,7 +10,7 @@ class CatsModule extends Module
      *
      * @var bool
      */
-    protected $navigation = true;
+    protected $navigation = false;
 
     /**
      * The addon icon.
@@ -32,4 +32,5 @@ class CatsModule extends Module
         ]
     ];
 
+    protected $parent = 'visiosoft.module.advs';
 }
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/menu.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/menu.twig
index 550b2b997..44bc61188 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/menu.twig
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/menu.twig
@@ -1,11 +1,34 @@
 {% import "visiosoft.theme.defaultadmin::macros/sections.twig" as menu %}
 
 <aside id="menu" class="scrollbar">
-
     <ul>
-        {% for section in template.cp.sections.root().visible() %}
-            {{ menu.sections(template.cp.sections, section) }}
-        {% endfor %}
-    </ul>
+        {% if not template.module.parent %}
+            {% for section in template.cp.sections.root().visible() %}
+                {{ menu.sections(template.cp.sections, section) }}
+            {% endfor %}
 
+            {% for navigation in getSubmenus(template.module.namespace) %}
+                <li>
+                    <a href="{{ url(navigation.href) }}">
+                        {{ trans(navigation.title) }}
+                    </a>
+                </li>
+            {% endfor %}
+        {% else %}
+            {% for navigation in getSections(template.module.parent) %}
+                <li>
+                    <a href="{{ url(navigation.href) }}">
+                        {{ trans(navigation.title) }}
+                    </a>
+                </li>
+            {% endfor %}
+            {% for navigation in getSections(template.module.namespace) %}
+                <li>
+                    <a href="{{ url(navigation.href) }}">
+                        {{ trans(navigation.title) }}
+                    </a>
+                </li>
+            {% endfor %}
+        {% endif %}
+    </ul>
 </aside>

From b6c7f0b127dd5616035e0f130dc760b51ae52bef Mon Sep 17 00:00:00 2001
From: spektra2147 <spektra2147@gmail.com>
Date: Wed, 16 Feb 2022 15:12:28 +0300
Subject: [PATCH 2/2] update

---
 addons/default/visiosoft/cats-module/src/CatsModule.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/default/visiosoft/cats-module/src/CatsModule.php b/addons/default/visiosoft/cats-module/src/CatsModule.php
index d355bd1ba..ca21a3033 100644
--- a/addons/default/visiosoft/cats-module/src/CatsModule.php
+++ b/addons/default/visiosoft/cats-module/src/CatsModule.php
@@ -10,7 +10,7 @@ class CatsModule extends Module
      *
      * @var bool
      */
-    protected $navigation = false;
+    protected $navigation = true;
 
     /**
      * The addon icon.
@@ -31,6 +31,4 @@ class CatsModule extends Module
             ]
         ]
     ];
-
-    protected $parent = 'visiosoft.module.advs';
 }