From faf0217b522a22e19de5e57eba94eb5b531aae0a Mon Sep 17 00:00:00 2001
From: stasbilay02 <stasbilay02@yandex.ru>
Date: Mon, 18 Nov 2024 13:56:00 +0300
Subject: [PATCH] some fix

---
 app/modules/tag/TagModule.php                 | 38 +++++++++++++++++++
 app/modules/tag/controllers/TagController.php | 13 +++++++
 app/modules/tag/manifest.json                 | 12 ++++++
 app/modules/tag/routs/tag.php                 |  2 +
 kernel/modules/menu/service/MenuService.php   |  3 --
 kernel/views/module/index.php                 |  8 ++--
 views/widgets/admin/menu.php                  |  2 +-
 7 files changed, 70 insertions(+), 8 deletions(-)
 create mode 100644 app/modules/tag/TagModule.php
 create mode 100644 app/modules/tag/controllers/TagController.php
 create mode 100644 app/modules/tag/manifest.json
 create mode 100644 app/modules/tag/routs/tag.php

diff --git a/app/modules/tag/TagModule.php b/app/modules/tag/TagModule.php
new file mode 100644
index 0000000..b2f0ffd
--- /dev/null
+++ b/app/modules/tag/TagModule.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace app\modules\tag;
+
+use kernel\Module;
+use kernel\modules\menu\service\MenuService;
+use kernel\services\MigrationService;
+
+class TagModule extends Module
+{
+
+    public MenuService $menuService;
+    public MigrationService $migrationService;
+    public function __construct()
+    {
+        $this->menuService = new MenuService();
+        $this->migrationService = new MigrationService();
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function init(): void
+    {
+        $this->migrationService->runAtPath("{KERNEL_APP_MODULES}/tag/migrations");
+
+        $this->menuService->createItem([
+            "label" => "Тэги",
+            "url" => "/admin/tag",
+            "slug" => "tag",
+        ]);
+    }
+
+    public function deactivate(): void
+    {
+        $this->menuService->removeItemBySlug("tag");
+    }
+}
\ No newline at end of file
diff --git a/app/modules/tag/controllers/TagController.php b/app/modules/tag/controllers/TagController.php
new file mode 100644
index 0000000..e0212a2
--- /dev/null
+++ b/app/modules/tag/controllers/TagController.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace app\modules\tag\controllers;
+
+class TagController extends \kernel\app_modules\tag\controllers\TagController
+{
+
+    public function actionByEntity()
+    {
+        // TODO
+    }
+
+}
\ No newline at end of file
diff --git a/app/modules/tag/manifest.json b/app/modules/tag/manifest.json
new file mode 100644
index 0000000..87665ad
--- /dev/null
+++ b/app/modules/tag/manifest.json
@@ -0,0 +1,12 @@
+{
+  "name": "Tags",
+  "version": "0.1",
+  "author": "ITGuild",
+  "slug": "tag",
+  "description": "Tags module",
+  "app_module_path": "{APP}/modules/{slug}",
+  "module_class": "app\\modules\\tag\\TagModule",
+  "module_class_file": "{APP}/modules/tag/TagModule.php",
+  "routs": "routs/tag.php",
+  "dependence": "menu"
+}
diff --git a/app/modules/tag/routs/tag.php b/app/modules/tag/routs/tag.php
new file mode 100644
index 0000000..112d2a1
--- /dev/null
+++ b/app/modules/tag/routs/tag.php
@@ -0,0 +1,2 @@
+<?php
+include KERNEL_APP_MODULES_DIR . "/tag/routs/tag.php";
\ No newline at end of file
diff --git a/kernel/modules/menu/service/MenuService.php b/kernel/modules/menu/service/MenuService.php
index 0b32ff6..65476c4 100644
--- a/kernel/modules/menu/service/MenuService.php
+++ b/kernel/modules/menu/service/MenuService.php
@@ -105,9 +105,6 @@ class MenuService
         $child = self::getChild($id);
         if (!$child->isEmpty()){
             foreach ($child as $item){
-//                if ($item->url === \kernel\Request::getUrlPath()){
-//                    return true;
-//                }
                 if (strripos(Request::getUrlPath(), $item->url) !== false) {
                     return true;
                 }
diff --git a/kernel/views/module/index.php b/kernel/views/module/index.php
index 3fcff21..8bf0051 100644
--- a/kernel/views/module/index.php
+++ b/kernel/views/module/index.php
@@ -47,10 +47,10 @@ $table->addAction(function ($row, $url) use ($moduleService) {
     return "<a class='btn btn-primary' href='$url/view/?slug=$slug' style='margin: 3px; width: 150px;' >Просмотр</a>";
 });
 
-$table->addAction(function ($row, $url) use ($moduleService) {
-    $slug = $row['slug'];
-    return "<a class='btn btn-primary' href='$url/update/?slug=$slug' style='margin: 3px; width: 150px;' >Обновить</a>";
-});
+//$table->addAction(function ($row, $url) use ($moduleService) {
+//    $slug = $row['slug'];
+//    return "<a class='btn btn-primary' href='$url/update/?slug=$slug' style='margin: 3px; width: 150px;' >Обновить</a>";
+//});
 
 $table->create();
 
diff --git a/views/widgets/admin/menu.php b/views/widgets/admin/menu.php
index fe5773b..124c239 100644
--- a/views/widgets/admin/menu.php
+++ b/views/widgets/admin/menu.php
@@ -18,7 +18,7 @@
                 </ul>
             </li>
         <?php else: ?>
-            <li class="<?= $item->url === \kernel\Request::getUrlPath() ? "active" : "" ?>">
+            <li class="<?= $item->url === \kernel\Request::getUrlPath() || $item->url . "/module_shop_client" === \kernel\Request::getUrlPath() ? "active" : "" ?>">
                 <a href="<?= $item->url ?>"><?= $item->label ?></a>
             </li>
         <?php endif; ?>