button fix, kernel update

kernel/modules/module_shop_client/controllers/ModuleShopClientController.php

@@ -12,8 +12,9 @@ use kernel\helpers\Files;
 use kernel\helpers\RESTClient;
 use kernel\helpers\SMTP;
 use kernel\Mailing;
-use kernel\modules\module_shop_client\services\ModuleShopClientService;
 use kernel\Request;
+use kernel\services\AdminThemeService;
+use kernel\services\KernelService;
 use kernel\services\ModuleService;
 use kernel\services\ModuleShopService;
 use kernel\services\TokenService;
@@ -24,6 +25,7 @@ class ModuleShopClientController extends AdminController
 
     protected Client $client;
     protected ModuleService $moduleService;
+    protected KernelService $kernelService;
 
     protected function init(): void
     {
@@ -32,6 +34,7 @@ class ModuleShopClientController extends AdminController
 
         $this->client = new Client();
         $this->moduleService = new ModuleService();
+        $this->kernelService = new KernelService();
     }
 
     /**
@@ -55,6 +58,8 @@ class ModuleShopClientController extends AdminController
                     'page_number' => $page_number,
                     'module_count' => $module_count,
                     'per_page' => $per_page,
+                    'kernelService' => new KernelService(),
+                    'adminThemeService' => new AdminThemeService(),
                 ]);
             } else {
                 $this->cgView->render("module_shop_error_connection.php");
@@ -112,6 +117,35 @@ class ModuleShopClientController extends AdminController
         $this->redirect('/admin/module_shop_client', 302);
     }
 
+    public function actionRenderKernelUpdateForm(): void
+    {
+        $this->cgView->render("kernel_update.php");
+    }
+
+    #[NoReturn] public function actionKernelUpdate(): void
+    {
+        $modules_info = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug');
+
+        $modules_info = json_decode($modules_info->getBody()->getContents(), true);
+        foreach ($modules_info as $module) {
+            if ($module['slug'] === 'kernel') {
+                $path = $module['path_to_archive'];
+            }
+        }
+        if (isset($path)) {
+            Files::uploadByUrl($_ENV['MODULE_SHOP_URL'] . $path, RESOURCES_DIR . "/tmp/kernel");
+            if ($this->kernelService->updateKernel('/resources/tmp/kernel/' . basename($path))) {
+                Flash::setMessage("success", "Ядро успешно обновлено.");
+            } else {
+                Flash::setMessage("error", "Ошибка обновления ядра.");
+            }
+        } else {
+            Flash::setMessage("error", "Ошибка обновления ядра.");
+        }
+
+        $this->redirect('/admin/module_shop_client', 302);
+    }
+
     #[NoReturn] public function actionDelete(): void
     {
         $request = new Request();
@@ -123,6 +157,47 @@ class ModuleShopClientController extends AdminController
         $this->redirect('/admin/module_shop_client', 302);
     }
 
+    public function actionSearch(int $page_number = 1): void
+    {
+        $request = new Request();
+        $filters = $request->get();
+        if ($this->moduleService->issetModuleShopToken()) {
+            if ($this->moduleService->isServerAvailable()) {
+                $modules_info = [];
+                $per_page = 8;
+                $modules = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug');
+                $modules = json_decode($modules->getBody()->getContents(), true);
+                foreach ($modules as $module) {
+                    foreach ($filters as $key => $value) {
+                        if ($value === '') continue;
+                        if ($module[$key] !== $value) {
+                            break;
+                        }
+
+                        $modules_info[] = $module;
+                    }
+                }
+                $module_count = count($modules_info);
+                $modules_info = array_slice($modules_info, $per_page * ($page_number - 1), $per_page);
+
+                $this->cgView->render("index.php", [
+                    'modules_info' => $modules_info,
+                    'moduleService' => $this->moduleService,
+                    'page_number' => $page_number,
+                    'module_count' => $module_count,
+                    'per_page' => $per_page,
+                    'kernelService' => new KernelService(),
+                    'adminThemeService' => new AdminThemeService(),
+                ]);
+            } else {
+                $this->cgView->render("module_shop_error_connection.php");
+            }
+
+        } else {
+            $this->cgView->render("login_at_module_shop.php");
+        }
+    }
+
     /**
      * @throws Exception
      */
@@ -131,13 +206,6 @@ class ModuleShopClientController extends AdminController
         $request = new Request();
         $address = $request->post("email");
 
-//        $mailing = new Mailing();
-//        $mailing->send_html("login_by_code.php", ['code' => mt_rand(100000, 999999)], [
-//            'address' => $address,
-//            'subject' => "Код авторизации",
-//            "from_name" => $_ENV['APP_NAME']
-//        ]);
-
         $moduleShopService = new ModuleShopService();
         $result = $moduleShopService->email_auth($address);
 
@@ -153,13 +221,6 @@ class ModuleShopClientController extends AdminController
         $request = new Request();
         $code = $request->post("code");
 
-//        $mailing = new Mailing();
-//        $mailing->send_html("login_by_code.php", ['code' => mt_rand(100000, 999999)], [
-//            'address' => $address,
-//            'subject' => "Код авторизации",
-//            "from_name" => $_ENV['APP_NAME']
-//        ]);
-
         $moduleShopService = new ModuleShopService();
         $result = $moduleShopService->code_check($code);
 

kernel/modules/module_shop_client/routs/module_shop_client.php

@@ -15,8 +15,17 @@ App::$collector->group(["prefix" => "admin"], function (RouteCollector $router){
             App::$collector->get('/view/{id}', [\kernel\modules\module_shop_client\controllers\ModuleShopClientController::class, 'actionView']);
             App::$collector->get('/delete', [\kernel\modules\module_shop_client\controllers\ModuleShopClientController::class, 'actionDelete']);
             App::$collector->get('/update', [\kernel\modules\module_shop_client\controllers\ModuleShopClientController::class, 'actionUpdate']);
+            App::$collector->get('/search', [\kernel\modules\module_shop_client\controllers\ModuleShopClientController::class, 'actionSearch']);
             App::$collector->post('/auth', [\kernel\modules\module_shop_client\controllers\ModuleShopClientController::class, 'actionAuth']);
             App::$collector->post('/code_check', [\kernel\modules\module_shop_client\controllers\ModuleShopClientController::class, 'actionCodeCheck']);
+            App::$collector->group(["prefix" => "kernel"], function (RouteCollector $router) {
+                App::$collector->get('/update_form', [\kernel\modules\module_shop_client\controllers\ModuleShopClientController::class, 'actionRenderKernelUpdateForm']);
+                App::$collector->post('/update', [\kernel\modules\module_shop_client\controllers\ModuleShopClientController::class, 'actionKernelUpdate']);
+            });
+            App::$collector->group(["prefix" => "admin_theme"], function (RouteCollector $router) {
+                App::$collector->get('/install', [\kernel\modules\module_shop_client\controllers\ModuleShopClientController::class, 'actionAdminThemeInstall']);
+                App::$collector->post('/update', [\kernel\modules\module_shop_client\controllers\ModuleShopClientController::class, 'actionAdminThemeUpdate']);
+            });
         });
     });
 });

kernel/modules/module_shop_client/views/index.php

@@ -5,6 +5,8 @@
  * @var int $page_number
  * @var int $per_page
  * @var \kernel\services\ModuleService $moduleService
+ * @var \kernel\services\KernelService $kernelService
+ * @var \kernel\services\AdminThemeService $adminThemeService
  */
 
 use Itguild\Tables\ListJsonTable;
@@ -15,6 +17,7 @@ $meta['columns'] = [
     "name" => "Название",
     "author" => "Автор",
     "version" => "Версия",
+    "type" => "Тип",
     "description" => "Описание",
     "installations" => "Установки",
     "views" => "Просмотры"
@@ -27,6 +30,7 @@ $meta['total'] = $module_count;
 
 $info_to_table['meta'] = $meta;
 $info_to_table['data'] = $modules_info;
+$info_to_table['filters'] = ['type'];
 
 $table = new ListJsonTable(json_encode($info_to_table, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
 
@@ -37,21 +41,23 @@ $table->addAction(function ($row, $url) use ($moduleService) {
 });
 
 $table->addAction(function ($row, $url) use ($moduleService){
-    if ($moduleService->isInstall($row['slug'])){
-        $url = "$url/delete/?slug=" . $row['slug'];
+    if ($row['slug'] !== 'kernel') {
+        if ($moduleService->isInstall($row['slug'])) {
+            $url = "$url/delete/?slug=" . $row['slug'];
 
-        return \kernel\widgets\IconBtn\IconBtnDeleteWidget::create(['url' => $url])->run();
-    }
-    else {
-        $url = "$url/install/?id=" . $row['id'];
+            return \kernel\widgets\IconBtn\IconBtnDeleteWidget::create(['url' => $url])->run();
+        } else {
+            $url = "$url/install/?id=" . $row['id'];
 
-        return \kernel\widgets\IconBtn\IconBtnInstallWidget::create(['url' => $url])->run();
+            return \kernel\widgets\IconBtn\IconBtnInstallWidget::create(['url' => $url])->run();
+        }
     }
+    return null;
 });
 
-$table->addAction(function ($row, $url) use ($moduleService){
+$table->addAction(function ($row, $url) use ($moduleService) {
     $slug = $row['slug'];
-    if ($moduleService->isInstall($slug)){
+    if ($moduleService->isInstall($slug)) {
         if (!$moduleService->isLastVersion($slug)) {
             $url = "$url/update/?slug=" . $slug;
 
@@ -62,6 +68,39 @@ $table->addAction(function ($row, $url) use ($moduleService){
     return false;
 });
 
+$table->addAction(function ($row, $url) use ($kernelService) {
+    $slug = $row['slug'];
+    if ($slug === 'kernel') {
+        if (!$kernelService->isLastVersion()) {
+            $url = "$url/kernel/update_form/";
+
+            return \kernel\widgets\IconBtn\IconBtnUpdateWidget::create(['url' => $url])->run();
+        }
+    }
+
+    return false;
+});
+
+$table->addAction(function ($row, $url) use ($adminThemeService) {
+    $type = $row['type'];
+    $slug = $row['slug'];
+    if ($type === 'admin_theme') {
+        if ($adminThemeService->isInstall($slug)) {
+            if (!$adminThemeService->isLastVersion($slug)) {
+                $url = "$url/admin_theme/update/";
+
+                return \kernel\widgets\IconBtn\IconBtnUpdateWidget::create(['url' => $url])->run();
+            }
+        }
+    }
+
+    return false;
+});
+
+$table->afterPrint(function () {
+    return \kernel\IGTabel\btn\PrimaryBtn::create('Сбросить все фильтры', '/admin/module_shop_client')->fetch();
+});
+
 \kernel\widgets\ModuleTabsWidget::create()->run();
 
 $table->create();

kernel/modules/module_shop_client/views/kernel_update.php

@@ -0,0 +1,39 @@
+<?php
+
+use itguild\forms\ActiveForm;
+
+\kernel\widgets\ModuleTabsWidget::create()->run();
+
+echo \kernel\helpers\Html::h(2, "Выберите нужные файлы для обновления");
+
+$form = new ActiveForm();
+$form->beginForm("/admin/module_shop_client/kernel/update/", enctype: 'multipart/form-data');
+
+$form->field(\itguild\forms\inputs\Select::class, "files[]", [
+    'class' => "form-control",
+    'multiple' => "multiple",
+])
+    ->setLabel("Дополнительные файлы")
+    ->setOptions([
+        'env.example' => 'env.example',
+        'bootstrap.php' => 'bootstrap',
+        'composer.json' => 'composer.json',
+    ])
+    ->render();
+?>
+
+    <div class="row">
+        <div class="col-sm-2">
+            <?php
+            $form->field(\itguild\forms\inputs\Button::class, name: "btn-submit", params: [
+                'class' => "btn btn-primary ",
+                'value' => 'Отправить',
+                'typeInput' => 'submit'
+            ])
+                ->render();
+            ?>
+        </div>
+
+    </div>
+<?php
+$form->endForm();