fix add theme

.env.example

@@ -5,7 +5,6 @@ DB_USER={db_user}
 DB_DRIVER=mysql
 DB_PASSWORD={db_password}
 DB_NAME={db_name}
-
 DB_CHARSET=utf8mb4
 DB_COLLATION=utf8mb4_unicode_ci
 DB_PREFIX=''

app/modules/module_shop/ModuleShopModule.php

@@ -30,8 +30,13 @@ class ModuleShopModule extends Module
         ]);
     }
 
+    /**
+     * @throws \Exception
+     */
     public function deactivate(): void
     {
         $this->menuService->removeItemBySlug("module_shop");
+        $this->migrationService->rollbackAtPath("{APP}/modules/module_shop/migrations");
+
     }
 }

app/modules/module_shop/controllers/AdminThemeShopController.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace app\modules\module_shop\controllers;
+
+use app\modules\module_shop\models\forms\CreateAdminThemeShopForm;
+use app\modules\module_shop\services\ModuleShopService;
+use JetBrains\PhpStorm\NoReturn;
+use kernel\AdminController;
+use kernel\FileUpload;
+use kernel\Flash;
+use kernel\helpers\Debug;
+use kernel\helpers\Files;
+use ZipArchive;
+
+class AdminThemeShopController extends AdminController
+{
+    protected ModuleShopService $moduleShopService;
+    protected Files $files;
+
+    protected function init(): void
+    {
+        parent::init();
+        $this->cgView->viewPath = APP_DIR . "/modules/module_shop/views/admin_theme/";
+        $this->moduleShopService = new ModuleShopService();
+        $this->files = new Files();
+    }
+
+    public function actionCreate(): void
+    {
+        $this->cgView->render("form.php");
+    }
+
+    /**
+     * @throws \Exception
+     */
+    #[NoReturn] public function actionAdd(): void
+    {
+        $adminThemeShopForm = new CreateAdminThemeShopForm();
+        $adminThemeShopForm->load($_REQUEST);
+
+        if (isset($_FILES['path_to_archive']) && $_FILES['path_to_archive']['error'] === UPLOAD_ERR_OK) {
+            $file = new FileUpload($_FILES['path_to_archive'], ['zip', 'rar', 'igt']);
+            $file->upload();
+            $adminThemeShopForm->setItem('path_to_archive', $file->getUploadFile());
+        }
+
+        $tmpThemeDir = md5(time());
+        $zip = new ZipArchive;
+        $res = $zip->open(ROOT_DIR . $adminThemeShopForm->getItem('path_to_archive'));
+        if ($res === TRUE) {
+            if (!is_dir(RESOURCES_DIR . '/tmp/ms/')) {
+                $oldMask = umask(0);
+                mkdir(RESOURCES_DIR . '/tmp/ms/', 0775, true);
+                umask($oldMask);
+            }
+            $tmpModuleShopDirFull = RESOURCES_DIR . '/tmp/ms/' . $tmpThemeDir . "/";
+            $zip->extractTo($tmpModuleShopDirFull);
+            $zip->close();
+
+            if (file_exists($tmpModuleShopDirFull . "meta/manifest.json")){
+                $themeInfo = $this->moduleShopService->getModuleInfo($tmpModuleShopDirFull . "meta");
+                $adminThemeShopForm->load($themeInfo);
+            }
+            else {
+                throw new \Exception("Manifest.json file not found");
+            }
+            $this->files->recursiveRemoveDir($tmpModuleShopDirFull);
+
+        }
+        else {
+            throw new \Exception("zip not found");
+        }
+
+        if ($adminThemeShopForm->validate()) {
+            $theme = $this->moduleShopService->create($adminThemeShopForm);
+            if ($theme) {
+                Flash::setMessage("success", "Тема админ-панели добавлена.");
+                $this->redirect("/admin/module_shop/view/" . $theme->id);
+            }
+        }
+        Flash::setMessage("error", "Ошибка добавления темы админ-панели: <br>" . $adminThemeShopForm->getErrorsStr());
+        $this->redirect("/admin/module_shop/admin_theme/create");
+    }
+}

app/modules/module_shop/controllers/KernelShopController.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace app\modules\module_shop\controllers;
+
+use app\modules\module_shop\models\forms\CreateKernelShopForm;
+use app\modules\module_shop\services\ModuleShopService;
+use JetBrains\PhpStorm\NoReturn;
+use kernel\AdminController;
+use kernel\FileUpload;
+use kernel\Flash;
+use kernel\helpers\Debug;
+use kernel\helpers\Files;
+use ZipArchive;
+
+class KernelShopController extends AdminController
+{
+    protected ModuleShopService $moduleShopService;
+    protected Files $files;
+
+    protected function init(): void
+    {
+        parent::init();
+        $this->cgView->viewPath = APP_DIR . "/modules/module_shop/views/kernel/";
+        $this->moduleShopService = new ModuleShopService();
+        $this->files = new Files();
+    }
+
+    public function actionCreate(): void
+    {
+        $this->cgView->render("form.php");
+    }
+
+    /**
+     * @throws \Exception
+     */
+    #[NoReturn] public function actionAdd(): void
+    {
+        $kernelShopForm = new CreateKernelShopForm();
+        $kernelShopForm->load($_REQUEST);
+
+        if (isset($_FILES['path_to_archive']) && $_FILES['path_to_archive']['error'] === UPLOAD_ERR_OK) {
+            $file = new FileUpload($_FILES['path_to_archive'], ['zip', 'rar', 'igk']);
+            $file->upload();
+            $kernelShopForm->setItem('path_to_archive', $file->getUploadFile());
+        }
+
+        $tmpKernelDir = md5(time());
+        $zip = new ZipArchive;
+        $res = $zip->open(ROOT_DIR . $kernelShopForm->getItem('path_to_archive'));
+        if ($res === TRUE) {
+            if (!is_dir(RESOURCES_DIR . '/tmp/ms/')) {
+                mkdir(RESOURCES_DIR . '/tmp/ms/');
+            }
+            $tmpModuleShopDirFull = RESOURCES_DIR . '/tmp/ms/' . $tmpKernelDir . "/";
+            $zip->extractTo($tmpModuleShopDirFull);
+            $zip->close();
+
+            if (file_exists($tmpModuleShopDirFull . "kernel/manifest.json")){
+                $kernelInfo = $this->moduleShopService->getModuleInfo($tmpModuleShopDirFull . "kernel");
+                $kernelShopForm->load($kernelInfo);
+            }
+            else {
+                throw new \Exception("Manifest.json file not found");
+            }
+            $this->files->recursiveRemoveDir($tmpModuleShopDirFull);
+
+        }
+        else {
+            throw new \Exception("zip not found");
+        }
+
+        if ($kernelShopForm->validate()) {
+            $kernel = $this->moduleShopService->create($kernelShopForm);
+            if ($kernel) {
+                Flash::setMessage("success", "Ядро добавлено.");
+                $this->redirect("/admin/module_shop/view/" . $kernel->id);
+            }
+        }
+        Flash::setMessage("error", "Ошибка добавления ядра: <br>" . $kernelShopForm->getErrorsStr());
+        $this->redirect("/admin/module_shop/kernel/create");
+    }
+}

app/modules/module_shop/controllers/KernelShopRestController.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\modules\module_shop\controllers;
+
+use app\modules\module_shop\models\ModuleShop;
+use JetBrains\PhpStorm\NoReturn;
+use kernel\helpers\Debug;
+use kernel\Request;
+use kernel\RestController;
+
+class KernelShopRestController extends RestController
+{
+
+    public function __construct()
+    {
+        $this->model = new ModuleShop();
+    }
+
+    #[NoReturn] public function actionUpdate($id): void
+    {
+        $model = $this->model->where("id", $id)->first();
+        $model->installations++;
+        $model->save();
+        $this->renderApi($model->toArray());
+    }
+
+}

app/modules/module_shop/controllers/ModuleShopController.php

@@ -7,22 +7,23 @@ use app\modules\module_shop\models\ModuleShop;
 use app\modules\module_shop\services\ModuleShopService;
 use JetBrains\PhpStorm\NoReturn;
 use kernel\AdminController;
-use kernel\app_modules\tag\services\TagService;
 use kernel\FileUpload;
 use kernel\Flash;
 use kernel\helpers\Debug;
-use kernel\services\ModuleService;
+use kernel\helpers\Files;
 use ZipArchive;
 
 class ModuleShopController extends AdminController
 {
     protected ModuleShopService $moduleShopService;
+    protected Files $files;
 
     protected function init(): void
     {
         parent::init();
         $this->cgView->viewPath = APP_DIR . "/modules/module_shop/views/";
         $this->moduleShopService = new ModuleShopService();
+        $this->files = new Files();
     }
 
     public function actionCreate(): void
@@ -44,14 +45,14 @@ class ModuleShopController extends AdminController
             $moduleShopForm->setItem('path_to_archive', $file->getUploadFile());
         }
 
-        $tmpThemeDir = md5(time());
+        $tmpModuleDir = md5(time());
         $zip = new ZipArchive;
         $res = $zip->open(ROOT_DIR . $moduleShopForm->getItem('path_to_archive'));
         if ($res === TRUE) {
             if (!is_dir(RESOURCES_DIR . '/tmp/ms/')) {
                 mkdir(RESOURCES_DIR . '/tmp/ms/');
             }
-            $tmpModuleShopDirFull = RESOURCES_DIR . '/tmp/ms/' . $tmpThemeDir . "/";
+            $tmpModuleShopDirFull = RESOURCES_DIR . '/tmp/ms/' . $tmpModuleDir . "/";
             $zip->extractTo($tmpModuleShopDirFull);
             $zip->close();
 
@@ -62,6 +63,8 @@ class ModuleShopController extends AdminController
             else {
                 throw new \Exception("Manifest.json file not found");
             }
+            $this->files->recursiveRemoveDir($tmpModuleShopDirFull);
+
         }
         else {
             throw new \Exception("zip not found");
@@ -71,11 +74,11 @@ class ModuleShopController extends AdminController
             $module = $this->moduleShopService->create($moduleShopForm);
             if ($module) {
                 Flash::setMessage("success", "Модуль " . $moduleShopForm->getItem("name") . " добавлен.");
-                $this->redirect("/admin/module_shop/" . $module->id);
+                $this->redirect("/admin/module_shop/view/" . $module->id);
             }
         }
         Flash::setMessage("error", "Ошибка добавления модуля: <br>" . $moduleShopForm->getErrorsStr());
-        $this->redirect("/admin/module_shop/create");
+        $this->redirect("/admin/module_shop/module/create");
     }
 
     public function actionIndex(int $page_number = 1): void
@@ -101,6 +104,9 @@ class ModuleShopController extends AdminController
             throw new \Exception("The module not found");
         }
         $name = $module->name;
+        $dir = $module->path_to_archive;
+        $this->files->recursiveRemoveDir(ROOT_DIR .  dirname($dir, 2));
+
 
         $module->delete();
         Flash::setMessage("success", "Модуль " . $name . " удален.");

app/modules/module_shop/controllers/ModuleShopRestController.php

@@ -3,6 +3,7 @@
 namespace app\modules\module_shop\controllers;
 
 use app\modules\module_shop\models\ModuleShop;
+use app\modules\module_shop\services\ModuleShopService;
 use JetBrains\PhpStorm\NoReturn;
 use kernel\helpers\Debug;
 use kernel\Request;
@@ -97,7 +98,7 @@ class ModuleShopRestController extends RestController
         $this->renderApi($res);
     }
 
-    public function actionInstall($id): void
+    #[NoReturn] public function actionInstall($id): void
     {
         $model = $this->model->where("id", $id)->first();
         $model->installations++;
@@ -105,4 +106,9 @@ class ModuleShopRestController extends RestController
         $this->renderApi($model->toArray());
     }
 
+    public function actionGetDependenciesBySlug(string $slug)
+    {
+        $this->renderApi(ModuleShopService::getAllDependencies($slug));
+    }
+
 }

app/modules/module_shop/controllers/ThemeShopController.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace app\modules\module_shop\controllers;
+
+use app\modules\module_shop\models\forms\CreateAdminThemeShopForm;
+use app\modules\module_shop\models\forms\CreateThemeShopForm;
+use app\modules\module_shop\services\ModuleShopService;
+use JetBrains\PhpStorm\NoReturn;
+use kernel\AdminController;
+use kernel\FileUpload;
+use kernel\Flash;
+use kernel\helpers\Debug;
+use kernel\helpers\Files;
+use ZipArchive;
+
+class ThemeShopController extends AdminController
+{
+    protected ModuleShopService $moduleShopService;
+    protected Files $files;
+
+    protected function init(): void
+    {
+        parent::init();
+        $this->cgView->viewPath = APP_DIR . "/modules/module_shop/views/theme/";
+        $this->moduleShopService = new ModuleShopService();
+        $this->files = new Files();
+    }
+
+    public function actionCreate(): void
+    {
+        $this->cgView->render("form.php");
+    }
+
+    /**
+     * @throws \Exception
+     */
+    #[NoReturn] public function actionAdd(): void
+    {
+        $themeShopForm = new CreateThemeShopForm();
+        $themeShopForm->load($_REQUEST);
+
+        if (isset($_FILES['path_to_archive']) && $_FILES['path_to_archive']['error'] === UPLOAD_ERR_OK) {
+            $file = new FileUpload($_FILES['path_to_archive'], ['zip', 'rar', 'igt']);
+            $file->upload();
+            $themeShopForm->setItem('path_to_archive', $file->getUploadFile());
+        }
+
+        $tmpThemeDir = md5(time());
+        $zip = new ZipArchive;
+        $res = $zip->open(ROOT_DIR . $themeShopForm->getItem('path_to_archive'));
+        if ($res === TRUE) {
+            if (!is_dir(RESOURCES_DIR . '/tmp/ms/')) {
+                $oldMask = umask(0);
+                mkdir(RESOURCES_DIR . '/tmp/ms/', 0775, true);
+                umask($oldMask);
+            }
+            $tmpModuleShopDirFull = RESOURCES_DIR . '/tmp/ms/' . $tmpThemeDir . "/";
+            $zip->extractTo($tmpModuleShopDirFull);
+            $zip->close();
+
+            if (file_exists($tmpModuleShopDirFull . "meta/app/manifest.json")){
+                $themeInfo = $this->moduleShopService->getModuleInfo($tmpModuleShopDirFull . "meta/app");
+                $themeShopForm->load($themeInfo);
+            }
+            else {
+                throw new \Exception("Manifest.json file not found");
+            }
+            $this->files->recursiveRemoveDir($tmpModuleShopDirFull);
+
+        }
+        else {
+            throw new \Exception("zip not found");
+        }
+
+        if ($themeShopForm->validate()) {
+            $theme = $this->moduleShopService->create($themeShopForm);
+            if ($theme) {
+                Flash::setMessage("success", "Тема сайта добавлена.");
+                $this->redirect("/admin/module_shop/view/" . $theme->id);
+            }
+        }
+        Flash::setMessage("error", "Ошибка добавления темы сайта: <br>" . $themeShopForm->getErrorsStr());
+        $this->redirect("/admin/module_shop/theme/create");
+    }
+}

app/modules/module_shop/migrations/2024_10_15_135454_create_module_shop_table.php

@@ -14,6 +14,7 @@ return new class extends Migration {
             $table->increments('id');
             $table->string("name", 255)->nullable(false);
             $table->string("slug", 255)->nullable(false);
+            $table->string("type", 255)->nullable(false);
             $table->text("description")->nullable(false);
             $table->string("version", 255)->nullable(false);
             $table->string("author", 255)->nullable(false);

app/modules/module_shop/models/ModuleShop.php

@@ -8,6 +8,7 @@ use Illuminate\Database\Eloquent\Model;
  * @property int    $id
  * @property string $name
  * @property string $slug
+ * @property string $type
  * @property string $version
  * @property string $description
  * @property string $author
@@ -24,7 +25,7 @@ class ModuleShop extends Model
 
     protected $table = "module_shop";
 
-    protected $fillable = ['name', 'slug', 'version', 'description', 'author', 'status', 'dependence', 'installations', 'views'];
+    protected $fillable = ['name', 'slug', 'type', 'version', 'description', 'author', 'status', 'dependence', 'installations', 'views'];
 
     public static function labels(): array
     {
@@ -35,6 +36,7 @@ class ModuleShop extends Model
             'author' => 'Автор',
             'status' => 'Статус',
             'slug' => 'Slug',
+            'type' => 'Тип',
             'dependence' => 'Зависимости',
             'installations' => 'Установки',
             'views' => 'Просмотры',

app/modules/module_shop/models/forms/CreateAdminThemeShopForm.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace app\modules\module_shop\models\forms;
+
+use kernel\FormModel;
+
+class CreateAdminThemeShopForm extends FormModel
+{
+    public function rules(): array
+    {
+        return [
+            'name' => 'required|min-str-len:3',
+            'version' => 'required',
+            'description' => '',
+            'author' => 'required',
+            'status' => 'required',
+            'slug' => 'required',
+            'type' => 'required',
+            'path_to_archive' => 'required',
+        ];
+    }
+}

app/modules/module_shop/models/forms/CreateKernelShopForm.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace app\modules\module_shop\models\forms;
+
+use kernel\FormModel;
+
+class CreateKernelShopForm extends FormModel
+{
+    public function rules(): array
+    {
+        return [
+            'name' => 'required',
+            'version' => 'required',
+            'author' => 'required',
+            'status' => 'required',
+            'slug' => 'required',
+            'type' => 'required',
+            'description' => '',
+            'path_to_archive' => 'required',
+        ];
+    }
+}

app/modules/module_shop/models/forms/CreateModuleShopForm.php

@@ -15,6 +15,7 @@ class CreateModuleShopForm extends FormModel
             'author' => 'required',
             'status' => 'required',
             'slug' => 'required',
+            'type' => 'required',
             'path_to_archive' => 'required',
             'dependence' => '',
         ];

app/modules/module_shop/models/forms/CreateThemeShopForm.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace app\modules\module_shop\models\forms;
+
+use kernel\FormModel;
+
+class CreateThemeShopForm extends FormModel
+{
+    public function rules(): array
+    {
+        return [
+            'name' => 'required|min-str-len:3',
+            'version' => 'required',
+            'description' => '',
+            'author' => 'required',
+            'status' => 'required',
+            'slug' => 'required',
+            'type' => 'required',
+            'path_to_archive' => 'required',
+            'dependence' => ''
+        ];
+    }
+}

app/modules/module_shop/routs/ms.php

@@ -6,24 +6,43 @@ use kernel\CgRouteCollector;
 App::$collector->filter('bearer', [\kernel\modules\secure\middlewares\BearerAuthMiddleware::class, "handler"]);
 
 App::$collector->group(["prefix" => "admin"], function (CgRouteCollector $router) {
-    App::$collector->group(["prefix" => "module_shop"], function (CgRouteCollector $router){
+    App::$collector->group(["prefix" => "module_shop"], function (CgRouteCollector $router) {
         App::$collector->get('/', [\app\modules\module_shop\controllers\ModuleShopController::class, 'actionIndex']);
         App::$collector->get('/page/{page_number}', [\app\modules\module_shop\controllers\ModuleShopController::class, 'actionIndex']);
-        App::$collector->get('/create', [\app\modules\module_shop\controllers\ModuleShopController::class, 'actionCreate']);
-        App::$collector->post("/", [\app\modules\module_shop\controllers\ModuleShopController::class, 'actionAdd']);
-        App::$collector->get('/{id}', [\app\modules\module_shop\controllers\ModuleShopController::class, 'actionView']);
+        App::$collector->get('/view/{id}', [\app\modules\module_shop\controllers\ModuleShopController::class, 'actionView']);
         App::$collector->any('/update/{id}', [\app\modules\module_shop\controllers\ModuleShopController::class, 'actionUpdate']);
         App::$collector->any("/edit/{id}", [\app\modules\module_shop\controllers\ModuleShopController::class, 'actionEdit']);
         App::$collector->get('/delete/{id}', [\app\modules\module_shop\controllers\ModuleShopController::class, 'actionDelete']);
         App::$collector->get('/pack/{id}', [\app\modules\module_shop\controllers\ModuleShopController::class, 'actionPack']);
+
+        App::$collector->group(["prefix" => "module"], function (CgRouteCollector $router) {
+            App::$collector->get('/create', [\app\modules\module_shop\controllers\ModuleShopController::class, 'actionCreate']);
+            App::$collector->post("/", [\app\modules\module_shop\controllers\ModuleShopController::class, 'actionAdd']);
+        });
+        App::$collector->group(["prefix" => "kernel"], function (CgRouteCollector $router) {
+            App::$collector->get('/create', [\app\modules\module_shop\controllers\KernelShopController::class, 'actionCreate']);
+            App::$collector->post("/", [\app\modules\module_shop\controllers\KernelShopController::class, 'actionAdd']);
+        });
+        App::$collector->group(["prefix" => "admin_theme"], function (CgRouteCollector $router) {
+            App::$collector->get('/create', [\app\modules\module_shop\controllers\AdminThemeShopController::class, 'actionCreate']);
+            App::$collector->post("/", [\app\modules\module_shop\controllers\AdminThemeShopController::class, 'actionAdd']);
+        });
+        App::$collector->group(["prefix" => "theme"], function (CgRouteCollector $router) {
+            App::$collector->get('/create', [\app\modules\module_shop\controllers\ThemeShopController::class, 'actionCreate']);
+            App::$collector->post("/", [\app\modules\module_shop\controllers\ThemeShopController::class, 'actionAdd']);
+        });
     });
 });
 
-App::$collector->group(["prefix" => "api"], function (CgRouteCollector $router){
-    App::$collector->group(['before' => 'bearer'], function (CgRouteCollector $router){
-        App::$collector->group(["prefix" => "module_shop"], function (CgRouteCollector $router){
-            App::$collector->get('/gb_slug', [\app\modules\module_shop\controllers\ModuleShopRestController::class, 'actionIndexGroupBySlug']);
-            App::$collector->get('/install/{id}', [\app\modules\module_shop\controllers\ModuleShopRestController::class, 'actionInstall']);
+App::$collector->group(["prefix" => "api"], function (CgRouteCollector $router) {
+    App::$collector->group(['before' => 'bearer'], function (CgRouteCollector $router) {
+        App::$collector->group(["prefix" => "module_shop"], function (CgRouteCollector $router) {
+                App::$collector->get('/gb_slug', [\app\modules\module_shop\controllers\ModuleShopRestController::class, 'actionIndexGroupBySlug']);
+                App::$collector->get('/install/{id}', [\app\modules\module_shop\controllers\ModuleShopRestController::class, 'actionInstall']);
+                App::$collector->get('/get_all_dependencies/{slug}', [\app\modules\module_shop\controllers\ModuleShopRestController::class, 'actionGetDependenciesBySlug']);
+            App::$collector->group(["prefix" => "kernel"], function (CgRouteCollector $router) {
+                App::$collector->get('/update/{id}', [\app\modules\module_shop\controllers\KernelShopRestController::class, 'actionUpdate']);
+            });
         });
         $router->rest("module_shop", [\app\modules\module_shop\controllers\ModuleShopRestController::class]);
     });

app/modules/module_shop/services/ModuleShopService.php

@@ -23,6 +23,7 @@ class ModuleShopService extends ModuleService
         $model->path_to_archive = $form_model->getItem("path_to_archive");
         $model->dependence = $form_model->getItem("dependence");
         $model->slug = $form_model->getItem("slug");
+        $model->type = $form_model->getItem("type");
 
         if ($model->save()) {
             return $model;
@@ -41,6 +42,7 @@ class ModuleShopService extends ModuleService
         $model->path_to_archive = $form_model->getItem("path_to_archive");
         $model->dependence = $form_model->getItem("dependence");
         $model->slug = $form_model->getItem("slug");
+        $model->type = $form_model->getItem("type");
 
         if ($model->save()) {
             return $model;
@@ -49,4 +51,40 @@ class ModuleShopService extends ModuleService
         return false;
     }
 
+    public static function getAllDependencies(string $slug, array $depArr = []): array
+    {
+        $query = ModuleShop::query();
+
+        $query->select('ms1.*')
+            ->from('module_shop as ms1')
+            ->leftJoin('module_shop as ms2', function ($join) {
+                $join->on('ms1.slug', '=', 'ms2.slug')
+                    ->on('ms1.id', '<', 'ms2.id');
+            })
+            ->where('ms2.slug', '=', null);
+
+        $query->where('ms1.slug', $slug);
+
+        $module = $query->first();
+
+        if ($module){
+            if ($module->dependence !== null){
+                $moduleDependencies = explode(",", $module->dependence);
+                foreach ($moduleDependencies as $dependency){
+                    if (!in_array($dependency, $depArr)){
+                        $depArr[] = $dependency;
+                        $depArrTmp = self::getAllDependencies($dependency, $depArr);
+                        foreach ($depArrTmp as $item){
+                            if (!in_array($item, $depArr)){
+                                $depArr[] = $item;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return array_diff($depArr, [$slug]);
+    }
+
 }

app/modules/module_shop/views/admin_theme/form.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * @var ModuleShop $model
+ */
+
+use app\modules\module_shop\models\ModuleShop;
+
+$form = new \itguild\forms\ActiveForm();
+$form->beginForm("/admin/module_shop/admin_theme", enctype: 'multipart/form-data');
+
+$form->field(class: \itguild\forms\inputs\File::class, name: "path_to_archive", params: [
+    'class' => "form-control",
+    'placeholder' => 'Путь к файлу темы админ-панели',
+    'value' => $model->path_to_archive ?? ''
+])
+    ->setLabel("Путь к файлу темы админ-панели")
+    ->render();
+
+$form->field(class: \itguild\forms\inputs\Select::class, name: "status", params: [
+    'class' => "form-control",
+    'value' => $model->status ?? ''
+])
+    ->setLabel("Статус")
+    ->setOptions(ModuleShop::getStatus())
+    ->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 class="col-sm-2">
+            <?php
+            $form->field(\itguild\forms\inputs\Button::class, name: "btn-reset", params: [
+                'class' => "btn btn-warning",
+                'value' => 'Сбросить',
+                'typeInput' => 'reset'
+            ])
+                ->render();
+            ?>
+        </div>
+    </div>
+<?php
+$form->endForm();

app/modules/module_shop/views/form.php

@@ -6,7 +6,7 @@
 use app\modules\module_shop\models\ModuleShop;
 
 $form = new \itguild\forms\ActiveForm();
-$form->beginForm("/admin/module_shop", enctype: 'multipart/form-data');
+$form->beginForm("/admin/module_shop/module", enctype: 'multipart/form-data');
 
 
 

app/modules/module_shop/views/index.php

@@ -24,8 +24,11 @@ $table->columns([
     }
 ]);
 $table->beforePrint(function () {
-    return PrimaryBtn::create("Создать", "/admin/module_shop/create")->fetch();
-    //return (new PrimaryBtn("Создать", "/admin/user/create"))->fetch();
+    $btn = PrimaryBtn::create("Добавить модуль", "/admin/module_shop/module/create", width: '250px')->fetch();
+    $btn .= PrimaryBtn::create("Добавить ядро", "/admin/module_shop/kernel/create", '250px')->fetch();
+    $btn .= PrimaryBtn::create("Добавить тему админ-панели", "/admin/module_shop/admin_theme/create", '250px')->fetch();
+    $btn .= PrimaryBtn::create("Добавить тему сайта", "/admin/module_shop/theme/create", '250px')->fetch();
+    return $btn;
 });
 $table->addAction(ViewActionColumn::class);
 $table->addAction(DeleteActionColumn::class);

app/modules/module_shop/views/kernel/form.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * @var ModuleShop $model
+ */
+
+use app\modules\module_shop\models\ModuleShop;
+
+$form = new \itguild\forms\ActiveForm();
+$form->beginForm("/admin/module_shop/kernel", enctype: 'multipart/form-data');
+
+
+
+$form->field(class: \itguild\forms\inputs\File::class, name: "path_to_archive", params: [
+    'class' => "form-control",
+    'placeholder' => 'Путь к ядра',
+    'value' => $model->path_to_archive ?? ''
+])
+    ->setLabel("Путь к файлу ядра")
+    ->render();
+
+$form->field(class: \itguild\forms\inputs\Select::class, name: "status", params: [
+    'class' => "form-control",
+    'value' => $model->status ?? ''
+])
+    ->setLabel("Статус")
+    ->setOptions(ModuleShop::getStatus())
+    ->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 class="col-sm-2">
+            <?php
+            $form->field(\itguild\forms\inputs\Button::class, name: "btn-reset", params: [
+                'class' => "btn btn-warning",
+                'value' => 'Сбросить',
+                'typeInput' => 'reset'
+            ])
+                ->render();
+            ?>
+        </div>
+    </div>
+<?php
+$form->endForm();

app/modules/module_shop/views/theme/form.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * @var ModuleShop $model
+ */
+
+use app\modules\module_shop\models\ModuleShop;
+
+$form = new \itguild\forms\ActiveForm();
+$form->beginForm("/admin/module_shop/theme", enctype: 'multipart/form-data');
+
+$form->field(class: \itguild\forms\inputs\File::class, name: "path_to_archive", params: [
+    'class' => "form-control",
+    'placeholder' => 'Путь к файлу темы сайта',
+    'value' => $model->path_to_archive ?? ''
+])
+    ->setLabel("Путь к файлу темы сайта")
+    ->render();
+
+$form->field(class: \itguild\forms\inputs\Select::class, name: "status", params: [
+    'class' => "form-control",
+    'value' => $model->status ?? ''
+])
+    ->setLabel("Статус")
+    ->setOptions(ModuleShop::getStatus())
+    ->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 class="col-sm-2">
+            <?php
+            $form->field(\itguild\forms\inputs\Button::class, name: "btn-reset", params: [
+                'class' => "btn btn-warning",
+                'value' => 'Сбросить',
+                'typeInput' => 'reset'
+            ])
+                ->render();
+            ?>
+        </div>
+    </div>
+<?php
+$form->endForm();

app/themes/custom/assets/CustomThemesAssets.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace app\themes\custom\assets;
+
+use kernel\Assets;
+
+class CustomThemesAssets extends Assets
+{
+    protected function createCSS(): void
+    {
+        $this->registerCSS(slug: "main", resource: "/css/styles.css");
+    }
+
+    protected function createJS(): void
+    {
+        $this->registerJS(slug: "webpack", resource: "/js/scripts.js");
+    }
+}

app/themes/custom/controllers/MainController.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace app\themes\custom\controllers;
+
+use kernel\Controller;
+
+class MainController extends Controller
+{
+
+    protected function init(): void
+    {
+        parent::init();
+        $this->cgView->viewPath = APP_DIR . "/themes/custom/views/main/";
+        $this->cgView->layout = "main.php";
+        $this->cgView->layoutPath = APP_DIR . "/themes/custom/views/layout/";
+        $this->cgView->addVarToLayout("resources", "/resources/themes/custom");
+    }
+
+    public function actionIndex(): void
+    {
+        $this->cgView->render("index.php");
+    }
+
+    public function actionAbout(): void
+    {
+        $this->cgView->render("about.php");
+    }
+}

app/themes/custom/manifest.json

@@ -0,0 +1,12 @@
+{
+  "name": "Custom",
+  "version": "0.1",
+  "author": "ItGuild",
+  "slug": "custom",
+  "type": "theme",
+  "description": "Custom theme",
+  "preview": "preview.png",
+  "resource": "/resources/themes/custom",
+  "resource_path": "{RESOURCES}/themes/custom",
+  "routs": "routs/custom.php"
+}

app/themes/custom/routs/custom.php

@@ -0,0 +1,12 @@
+<?php
+
+use kernel\App;
+
+
+App::$collector->get('/', [\app\themes\custom\controllers\MainController::class, 'actionIndex']);
+App::$collector->get('/about', [\app\themes\custom\controllers\MainController::class, 'actionAbout']);
+//App::$collector->get('/page/{page_number}', [\app\modules\tag\controllers\TagController::class, 'actionIndex']);
+//App::$collector->get('/create', [\app\modules\tag\controllers\TagController::class, 'actionCreate']);
+
+
+

app/themes/custom/views/layout/main.php

@@ -0,0 +1,92 @@
+<?php
+/**
+ * @var string $content
+ * @var string $resources
+ * @var string $title
+ * @var \kernel\CgView $view
+ */
+$assets = new \app\themes\custom\assets\CustomThemesAssets($resources);
+?>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
+    <?php $assets->getCSSAsSTR(); ?>
+    <meta name="description" content=""/>
+    <meta name="author" content=""/>
+    <title><?= $title ?></title>
+    <?= $view->getMeta() ?>
+    <link rel="icon" type="image/x-icon" href="<?= $resources ?>/assets/favicon.ico"/>
+    <!-- Font Awesome icons (free version)-->
+    <script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
+    <!-- Google fonts-->
+    <link href="https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic" rel="stylesheet"
+          type="text/css"/>
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800"
+          rel="stylesheet" type="text/css"/>
+    <!-- Core theme CSS (includes Bootstrap)-->
+</head>
+<body>
+<!-- Navigation-->
+<nav class="navbar navbar-expand-lg navbar-light" id="mainNav">
+    <div class="container px-4 px-lg-5">
+        <a class="navbar-brand" href="/">Custom theme</a>
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive"
+                aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
+            Menu
+            <i class="fas fa-bars"></i>
+        </button>
+        <div class="collapse navbar-collapse" id="navbarResponsive">
+            <ul class="navbar-nav ms-auto py-4 py-lg-0">
+                <li class="nav-item"><a class="nav-link px-lg-3 py-3 py-lg-4" href="/">На главную</a></li>
+                <li class="nav-item"><a class="nav-link px-lg-3 py-3 py-lg-4" href="/about">О нас</a></li>
+            </ul>
+        </div>
+    </div>
+</nav>
+
+<?= $content ?>
+
+<!-- Footer-->
+<footer class="border-top">
+    <div class="container px-4 px-lg-5">
+        <div class="row gx-4 gx-lg-5 justify-content-center">
+            <div class="col-md-10 col-lg-8 col-xl-7">
+                <ul class="list-inline text-center">
+                    <li class="list-inline-item">
+                        <a href="#!">
+                                    <span class="fa-stack fa-lg">
+                                        <i class="fas fa-circle fa-stack-2x"></i>
+                                        <i class="fab fa-twitter fa-stack-1x fa-inverse"></i>
+                                    </span>
+                        </a>
+                    </li>
+                    <li class="list-inline-item">
+                        <a href="#!">
+                                    <span class="fa-stack fa-lg">
+                                        <i class="fas fa-circle fa-stack-2x"></i>
+                                        <i class="fab fa-facebook-f fa-stack-1x fa-inverse"></i>
+                                    </span>
+                        </a>
+                    </li>
+                    <li class="list-inline-item">
+                        <a href="#!">
+                                    <span class="fa-stack fa-lg">
+                                        <i class="fas fa-circle fa-stack-2x"></i>
+                                        <i class="fab fa-github fa-stack-1x fa-inverse"></i>
+                                    </span>
+                        </a>
+                    </li>
+                </ul>
+                <div class="small text-center text-muted fst-italic">Copyright &copy; IT Guild Micro Framework</div>
+            </div>
+        </div>
+    </div>
+</footer>
+<!-- Bootstrap core JS-->
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js"></script>
+<!-- Core theme JS-->
+<?php $assets->getJSAsStr(); ?>
+</body>
+</html>

app/themes/custom/views/main/about.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * @var string $resources;
+ * @var \kernel\CgView $view
+ */
+
+$view->setTitle("Старт Bootstrap");
+$view->setMeta([
+    'description' => 'Дефолтная bootstrap тема'
+]);
+?>
+<!-- Page Header-->
+<header class="masthead" style="background-image: url('<?= $resources ?>/assets/img/about-bg.jpeg')">
+    <div class="container position-relative px-4 px-lg-5">
+        <div class="row gx-4 gx-lg-5 justify-content-center">
+            <div class="col-md-10 col-lg-8 col-xl-7">
+                <div class="page-heading">
+                    <h1>About Me</h1>
+                    <span class="subheading">This is what I do.</span>
+                </div>
+            </div>
+        </div>
+    </div>
+</header>
+<!-- Main Content-->
+<main class="mb-4">
+    <div class="container px-4 px-lg-5">
+        <div class="row gx-4 gx-lg-5 justify-content-center">
+            <div class="col-md-10 col-lg-8 col-xl-7">
+                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Saepe nostrum ullam eveniet pariatur voluptates odit, fuga atque ea nobis sit soluta odio, adipisci quas excepturi maxime quae totam ducimus consectetur?</p>
+                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Eius praesentium recusandae illo eaque architecto error, repellendus iusto reprehenderit, doloribus, minus sunt. Numquam at quae voluptatum in officia voluptas voluptatibus, minus!</p>
+                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aut consequuntur magnam, excepturi aliquid ex itaque esse est vero natus quae optio aperiam soluta voluptatibus corporis atque iste neque sit tempora!</p>
+            </div>
+        </div>
+    </div>
+</main>

app/themes/custom/views/main/index.php

@@ -0,0 +1,86 @@
+<?php
+/**
+ * @var string $resources;
+ * @var \kernel\CgView $view
+ */
+
+$view->setTitle("IT Guild Micro Framework");
+$view->setMeta([
+    'description' => 'Default IT Guild Micro Framework theme'
+]);
+?>
+<!-- Page Header-->
+<header class="masthead" style="background-image: url('<?= $resources ?>/assets/img/home-bg.jpeg')">
+    <div class="container position-relative px-4 px-lg-5">
+        <div class="row gx-4 gx-lg-5 justify-content-center">
+            <div class="col-md-10 col-lg-8 col-xl-7">
+                <div class="site-heading">
+                    <h1>Clean Blog</h1>
+                    <span class="subheading">A Blog Theme by IT Guild Micro Framework</span>
+                </div>
+            </div>
+        </div>
+    </div>
+</header>
+<!-- Main Content-->
+<div class="container px-4 px-lg-5">
+    <div class="row gx-4 gx-lg-5 justify-content-center">
+        <div class="col-md-10 col-lg-8 col-xl-7">
+            <!-- Post preview-->
+            <div class="post-preview">
+                <a href="#!">
+                    <h2 class="post-title">Man must explore, and this is exploration at its greatest</h2>
+                    <h3 class="post-subtitle">Problems look mighty small from 150 miles up</h3>
+                </a>
+                <p class="post-meta">
+                    Posted by
+                    <a href="#!">Start Bootstrap</a>
+                    on September 24, 2023
+                </p>
+            </div>
+            <!-- Divider-->
+            <hr class="my-4" />
+            <!-- Post preview-->
+            <div class="post-preview">
+                <a href="#!"><h2 class="post-title">I believe every human has a finite number of heartbeats. I don't intend to waste any of mine.</h2></a>
+                <p class="post-meta">
+                    Posted by
+                    <a href="#!">Start Bootstrap</a>
+                    on September 18, 2023
+                </p>
+            </div>
+            <!-- Divider-->
+            <hr class="my-4" />
+            <!-- Post preview-->
+            <div class="post-preview">
+                <a href="#!">
+                    <h2 class="post-title">Science has not yet mastered prophecy</h2>
+                    <h3 class="post-subtitle">We predict too much for the next year and yet far too little for the next ten.</h3>
+                </a>
+                <p class="post-meta">
+                    Posted by
+                    <a href="#!">Start Bootstrap</a>
+                    on August 24, 2023
+                </p>
+            </div>
+            <!-- Divider-->
+            <hr class="my-4" />
+            <!-- Post preview-->
+            <div class="post-preview">
+                <a href="#!">
+                    <h2 class="post-title">Failure is not an option</h2>
+                    <h3 class="post-subtitle">Many say exploration is part of our destiny, but it’s actually our duty to future generations.</h3>
+                </a>
+                <p class="post-meta">
+                    Posted by
+                    <a href="#!">Start Bootstrap</a>
+                    on July 8, 2023
+                </p>
+            </div>
+            <!-- Divider-->
+            <hr class="my-4" />
+            <!-- Pager-->
+            <div class="d-flex justify-content-end mb-4"><a class="btn btn-primary text-uppercase" href="#!">Older Posts →</a></div>
+        </div>
+    </div>
+</div>

bootstrap.php

@@ -13,7 +13,7 @@ const KERNEL_MODULES_DIR = __DIR__ . "/kernel/modules";
 const KERNEL_ADMIN_THEMES_DIR = __DIR__ . "/kernel/admin_themes";
 const CONSOLE_DIR = __DIR__ . "/kernel/console";
 const RESOURCES_DIR = __DIR__ . "/resources";
-
+const KERNEL_TEMPLATES_DIR = __DIR__ . "/kernel/templates";
 const KERNEL_APP_MODULES_DIR = KERNEL_DIR . "/app_modules";
 
 const APP_DIR = ROOT_DIR . "/app";
@@ -29,6 +29,7 @@ function getConst($text): array|false|string
         "{KERNEL}" => KERNEL_DIR,
         "{KERNEL_MODULES}" => KERNEL_MODULES_DIR,
         "{KERNEL_APP_MODULES}" => KERNEL_APP_MODULES_DIR,
+        "{KERNEL_TEMPLATES}" => KERNEL_TEMPLATES_DIR,
         "{CONSOLE}" => CONSOLE_DIR,
         "{APP}" => APP_DIR,
     ];

bootstrap/secure.php

@@ -1,8 +1,8 @@
 <?php
 
 $secure_config = [
-    'web_auth_type' => 'email_code', // login_password, email_code
-    'token_type' => 'crypt', // random_bytes, md5, crypt, hash, JWT
+    'web_auth_type' => 'login_password', // login_password, email_code
+    'token_type' => 'hash', // random_bytes, md5, crypt, hash, JWT
     'token_expired_time' => "+30 days", // +1 day
 ];
 

composer.json

@@ -19,7 +19,9 @@
     "firebase/php-jwt": "^6.10",
     "k-adam/env-editor": "^2.0",
     "guzzlehttp/guzzle": "^7.9",
-    "phpmailer/phpmailer": "^6.9"
+    "phpmailer/phpmailer": "^6.9",
+    "zircote/swagger-php": "^4.11",
+    "doctrine/annotations": "^2.0"
   },
   "autoload": {
     "psr-4": {

kernel/AdminController.php

@@ -5,14 +5,17 @@ namespace kernel;
 use kernel\Controller;
 use kernel\helpers\Debug;
 use kernel\services\AdminThemeService;
+use kernel\services\ThemeService;
 
 class AdminController extends Controller
 {
     protected AdminThemeService $adminThemeService;
+    protected ThemeService $themeService;
 
     protected function init(): void
     {
         $this->adminThemeService = new AdminThemeService();
+        $this->themeService = new ThemeService();
         $active_theme = $this->adminThemeService->getActiveAdminThemeInfo();
         $this->cgView->layoutPath = getConst($active_theme['layout_path']);
         $this->cgView->layout = "/" . $active_theme['layout'];

kernel/App.php

@@ -7,6 +7,7 @@ namespace kernel;
 use kernel\helpers\Debug;
 use kernel\modules\user\models\User;
 use kernel\services\ModuleService;
+use kernel\services\ThemeService;
 use Phroute\Phroute\Dispatcher;
 
 class App
@@ -24,6 +25,8 @@ class App
 
     public ModuleService $moduleService;
 
+    public ThemeService $themeService;
+
     public static Database $db;
 
     public function run(): void
@@ -53,6 +56,12 @@ class App
         foreach ($modules_routs as $rout){
             include "$rout";
         }
+
+        $themeService = new ThemeService();
+        $activeTheme = getConst($themeService->getActiveTheme());
+        if (!empty($activeTheme)){
+            include $activeTheme . "/" .  $themeService->getThemeRout($activeTheme);
+        }
     }
 
     public static function create(): App

kernel/Assets.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace kernel;
+
+class Assets
+{
+    protected array $jsHeader = [];
+    protected array $jsBody = [];
+
+    protected array $css = [];
+
+    protected string $resourceURI = "/resource";
+
+    public function __construct(string $resourceURI)
+    {
+        $this->setResourceURI($resourceURI);
+        $this->createCSS();
+        $this->createJS();
+    }
+
+    protected function createCSS(){}
+    protected function createJS(){}
+
+    public function setResourceURI(string $resourceURI): void
+    {
+        $this->resourceURI = $resourceURI;
+    }
+
+    public function registerJS(string $slug, string $resource, bool $body = true, bool $addResourceURI = true): void
+    {
+        $resource = $addResourceURI ? $this->resourceURI . $resource : $resource;
+        if ($body) {
+            $this->jsBody[$slug] = $resource;
+        } else {
+            $this->jsHeader[$slug] = $resource;
+        }
+    }
+
+    public function registerCSS(string $slug, string $resource, bool $addResourceURI = true): void
+    {
+        $resource = $addResourceURI ? $this->resourceURI . $resource : $resource;
+        $this->css[$slug] = $resource;
+    }
+
+    public function getJSAsStr(bool $body = true): void
+    {
+        if ($body) {
+            foreach ($this->jsBody as $key => $item){
+                echo "<script src='$item'></script>";
+            }
+        }
+        else {
+            foreach ($this->jsHeader as $key => $item){
+                echo "<script src='$item'></script>";
+            }
+        }
+    }
+
+    public function getCSSAsSTR(): void
+    {
+        foreach ($this->css as $key => $item){
+            echo "<link rel='stylesheet' href='$item'>";
+        }
+    }
+
+}

kernel/CgRouteCollector.php

@@ -46,8 +46,16 @@ class CgRouteCollector extends RouteCollector
         //TODO
     }
 
-    public function console($route, $handler, array $filters = []): void
+    /**
+     * @param $route
+     * @param $handler
+     * @param array $filters
+     * @param array $additionalInfo
+     * @return void
+     */
+    public function console($route, $handler, array $filters = [], array $additionalInfo = []): void
     {
-        $this->addRoute(Route::GET, $route, $handler, $filters);
+        $additionalInfo['type'] = "console";
+        $this->addRoute(Route::GET, $route, $handler, $filters, $additionalInfo);
     }
 }

kernel/CgView.php

@@ -2,6 +2,8 @@
 
 namespace kernel;
 
+use kernel\helpers\Debug;
+
 class CgView
 {
     public string $viewPath = '';
@@ -10,6 +12,8 @@ class CgView
     public array $varToLayout = [];
     public bool|string $layout = false;
 
+    protected array $metaArr = [];
+
     public function __construct()
     {
 
@@ -34,14 +38,44 @@ class CgView
         $this->varToLayout[$key] = $value;
     }
 
-    private function createContent(string $view, array $data = []): false|string
+    public function setTitle(string $title): void
+    {
+        $this->addVarToLayout('title', $title);
+    }
+
+    public function setMeta(array $meta): void
+    {
+        foreach ($meta as $key => $value){
+            $this->metaArr[$key] = $value;
+        }
+    }
+
+    public function getMeta(): string
+    {
+        $meta = "";
+        foreach ($this->metaArr as $key => $value){
+            $meta .= "<meta name='$key' content='$value'>";
+        }
+
+        return $meta;
+    }
+
+    private function createContent(string $viewFile, array $data = []): false|string
     {
         ob_start();
+
+        if ($this->varToLayout){
+            foreach ($this->varToLayout as $key => $datum) {
+                ${"$key"} = $datum;
+            }
+        }
+
+        $view = $this;
         foreach ($data as $key => $datum) {
             ${"$key"} = $datum;
         }
 
-        include($this->viewPath . $view);
+        include($this->viewPath . $viewFile);
 
         $content = ob_get_contents();
         ob_end_clean();
@@ -50,6 +84,10 @@ class CgView
 
         $file_content = $content;
 
+        if (!isset($title)){
+            $title = "No Title";
+        }
+
         $layoutPath = $this->viewPath;
 
         if ($this->layout) {

kernel/FileUpload.php

@@ -36,7 +36,9 @@ class FileUpload
             $newFileName = md5(time() . $this->fileName) . '.' . $this->fileExtension;
             if (in_array($this->fileExtension, $this->allowedFileExtensions)) {
                 $this->uploadDir = $uploadDir . mb_substr($newFileName, 0, 2) . '/' . mb_substr($newFileName, 2, 2) . '/';
-                mkdir(ROOT_DIR . $this->uploadDir, 0777, true);
+                $oldMask = umask(0);
+                mkdir(ROOT_DIR . $this->uploadDir, 0775, true);
+                umask($oldMask);
                 $uploadFileDir = ROOT_DIR . $this->uploadDir;
                 $this->destPath = $uploadFileDir . $newFileName;
                 $this->uploadFile = $this->uploadDir . $newFileName;
@@ -49,7 +51,9 @@ class FileUpload
         } else {
             if (in_array($this->fileExtension, $this->allowedFileExtensions)) {
                 $this->uploadDir = $uploadDir;
-                mkdir(ROOT_DIR . $this->uploadDir, 0777, true);
+                $oldMask = umask(0);
+                mkdir(ROOT_DIR . $this->uploadDir, 0775, true);
+                umask($oldMask);
                 $uploadFileDir = ROOT_DIR . $this->uploadDir;
                 $this->destPath = $uploadFileDir . $this->fileName;
                 $this->uploadFile = $this->uploadDir . $this->fileName;

kernel/IGTabel/btn/PrimaryBtn.php

@@ -6,9 +6,9 @@ class PrimaryBtn
 {
     protected string $btn = '';
 
-    public function __construct(string $title, string $url)
+    public function __construct(string $title, string $url, $width)
     {
-        $this->btn = "<a class='btn btn-primary' href='$url' style='margin: 3px; width: 150px;' >$title</a>";
+        $this->btn = "<a class='btn btn-primary' href='$url' style='margin: 3px; width: '$width >$title</a>";
     }
 
     public function fetch(): string
@@ -16,9 +16,9 @@ class PrimaryBtn
         return $this->btn;
     }
 
-    public static function create(string $title, string $url): PrimaryBtn
+    public static function create(string $title, string $url, $width = '150px'): PrimaryBtn
     {
-        return new self($title, $url);
+        return new self($title, $url, $width);
     }
 
 }

kernel/RestController.php

@@ -17,13 +17,32 @@ class RestController
         return [];
     }
 
+    protected function filters(): array
+    {
+        return [];
+    }
+
     #[NoReturn] public function actionIndex(): void
     {
         $request = new Request();
+        $get = $request->get();
         $page = $request->get('page') ?? 1;
         $perPage = $request->get('per_page') ?? 10;
         $query = $this->model->query();
 
+        if ($this->filters()) {
+            foreach ($this->filters() as $filter){
+                if (key_exists($filter, $get)){
+                    if (is_numeric($get[$filter])){
+                        $query->where($filter, $get[$filter]);
+                    }
+                    elseif (is_string($get[$filter])){
+                        $query->where($filter,'like', '%' . $get[$filter] . '%');
+                    }
+                }
+            }
+        }
+
         if ($page > 1) {
             $query->skip(($page - 1) * $perPage)->take($perPage);
         } else {
@@ -31,7 +50,7 @@ class RestController
         }
 
         $expand = $this->expand();
-        $expandParams = explode( ",", $request->get('expand') ?? "");
+        $expandParams = explode(",", $request->get('expand') ?? "");
         $finalExpand = array_intersect($expandParams, $expand);
         if ($finalExpand) {
             $res = $query->get()->load($finalExpand)->toArray();
@@ -46,14 +65,14 @@ class RestController
     {
         $expand = $this->expand();
         $request = new Request();
-        $expandParams = explode( ",", $request->get('expand') ?? "");
+        $expandParams = explode(",", $request->get('expand') ?? "");
         $model = $this->model->where("id", $id)->first();
         $finalExpand = array_intersect($expandParams, $expand);
-        if ($finalExpand){
+        if ($finalExpand) {
             $model->load($finalExpand);
         }
         $res = [];
-        if ($model){
+        if ($model) {
             $res = $model->toArray();
         }
 
@@ -64,7 +83,7 @@ class RestController
     {
         $model = $this->model->where("id", $id)->first();
         $res = [];
-        if ($model){
+        if ($model) {
             $res = $model->toArray();
         }
 
@@ -78,7 +97,7 @@ class RestController
     {
         $request = new Request();
         $data = $request->post();
-        foreach ($this->model->getFillable() as $item){
+        foreach ($this->model->getFillable() as $item) {
             $this->model->{$item} = $data[$item] ?? null;
         }
         $this->model->save();
@@ -93,8 +112,10 @@ class RestController
 
         $model = $this->model->where('id', $id)->first();
 
-        foreach ($model->getFillable() as $item){
-            $model->{$item} = $data[$item] ?? null;
+        foreach ($model->getFillable() as $item) {
+            if (!empty($data[$item])) {
+                $model->{$item} = $data[$item] ?? null;
+            }
         }
 
         $model->save();
@@ -115,5 +136,4 @@ class RestController
     }
 
 
-
 }

kernel/admin_themes/default/DefaultAdminThemeAssets.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace kernel\admin_themes\default;
+
+use kernel\Assets;
+
+class DefaultAdminThemeAssets extends Assets
+{
+
+    protected function createJS(): void
+    {
+        $this->registerJS(slug: "jquery", resource: "/js/jquery.min.js");
+        $this->registerJS(slug: "popper", resource: "/js/popper.js");
+        $this->registerJS(slug: "bootstrap", resource: "/js/bootstrap.min.js");
+        $this->registerJS(slug: "main", resource: "/js/main.js");
+    }
+
+    protected function createCSS()
+    {
+        $this->registerCSS(slug: "font-awesome", resource: "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.6.0/css/all.min.css", addResourceURI: false);
+        $this->registerCSS(slug: "bootstrap", resource: "/css/bootstrap.min.css");
+        $this->registerCSS(slug: "style", resource: "/css/style.css");
+    }
+
+}

kernel/admin_themes/default/layout/main.php

@@ -2,31 +2,37 @@
 /**
  * @var $content
  * @var string $resources
+ * @var string $title
+ * @var \kernel\CgView $view
  */
 \Josantonius\Session\Facades\Session::start();
+$assets = new \kernel\admin_themes\default\DefaultAdminThemeAssets($resources)
 ?>
 <!doctype html>
 <html lang="en">
 <head>
-    <title>Sidebar 01</title>
+    <title><?= $title ?></title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <?= $view->getMeta() ?>
 
     <link href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700,800,900" rel="stylesheet">
 
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.6.0/css/all.min.css">
-    <link rel="stylesheet" href="<?= $resources ?>/css/bootstrap.min.css">
-    <link rel="stylesheet" href="<?= $resources ?>/css/style.css">
+    <?php $assets->getCSSAsSTR(); ?>
+    <?php $assets->getJSAsStr(body: false); ?>
 </head>
 <body>
 
 <div class="wrapper d-flex align-items-stretch">
     <nav id="sidebar">
         <div class="p-4 pt-5">
-            <a href="#" class="img logo rounded-circle mb-5"
-               style="background-image: url(/resources/admin_theme/images/logo.jpg);"></a>
+            <a href="<?= '/admin/user/profile' ?>" class="img logo rounded-circle mb-5"
+               style="background-image: url(<?= \kernel\modules\user\service\UserService::getAuthUserPhoto() ?? '/resources/default_user_photo/noPhoto.png' ?>);">
+            </a>
             <p>
-                <?= \kernel\modules\user\service\UserService::getAuthUsername() ?>
+                <a href="<?= '/admin/user/profile' ?>">
+                    <?= \kernel\modules\user\service\UserService::getAuthUsername() ?>
+                </a>
             </p>
             <?php \kernel\widgets\MenuWidget::create()->run(); ?>
             <div class="footer">
@@ -71,24 +77,21 @@
             </div>
         </nav>
         <?php if (\kernel\Flash::hasMessage("error")): ?>
-        <div class="alert alert-danger alert-dismissible mainAlert">
-            <?= \kernel\Flash::getMessage("error"); ?>
-            <button type="button" class="btn-close closeAlertBtn"></button>
-        </div>
+            <div class="alert alert-danger alert-dismissible mainAlert">
+                <?= \kernel\Flash::getMessage("error"); ?>
+                <button type="button" class="btn-close closeAlertBtn"></button>
+            </div>
         <?php endif; ?>
         <?php if (\kernel\Flash::hasMessage("success")): ?>
             <div class="alert alert-success alert-dismissible">
                 <?= \kernel\Flash::getMessage("success"); ?>
-                <button type="button" class="btn-close closeAlertBtn" ></button>
+                <button type="button" class="btn-close closeAlertBtn"></button>
             </div>
         <?php endif; ?>
         <?= $content ?>
     </div>
 </div>
 
-<script src="<?= $resources ?>/js/jquery.min.js"></script>
-<script src="<?= $resources ?>/js/popper.js"></script>
-<script src="<?= $resources ?>/js/bootstrap.min.js"></script>
-<script src="<?= $resources ?>/js/main.js"></script>
+<?php $assets->getJSAsStr(); ?>
 </body>
 </html>

kernel/admin_themes/default/manifest.json

@@ -3,10 +3,11 @@
   "version": "0.1",
   "author": "ItGuild",
   "slug": "default",
+  "type": "admin_theme",
   "description": "Default admin theme",
   "preview": "preview.png",
-  "resource": "/resources/default",
-  "resource_path": "{RESOURCES}/default",
+  "resource": "/resources/admin_themes/default",
+  "resource_path": "{RESOURCES}/admin_themes/default",
   "layout": "main.php",
   "layout_path": "{KERNEL_ADMIN_THEMES}/default/layout"
 }

kernel/admin_themes/simple/manifest.json

@@ -5,8 +5,8 @@
   "slug": "simple",
   "description": "Simple admin theme",
   "preview": "preview.png",
-  "resource": "/resources/simple",
-  "resource_path": "{RESOURCES}/simple",
+  "resource": "/resources/admin_themes/simple",
+  "resource_path": "{RESOURCES}/admin_themes/simple",
   "layout": "main.php",
   "layout_path": "{KERNEL_ADMIN_THEMES}/simple/layout"
 }

kernel/console/Out.php

@@ -4,6 +4,8 @@
 namespace kernel\console;
 
 
+use kernel\helpers\Debug;
+
 class Out
 {
     private $foreground_colors = array();
@@ -64,6 +66,11 @@ class Out
         echo $this->get($string, $foreground_color, $background_color) . "\n";
     }
 
+    public function inLine($string, $foreground_color = null, $background_color = null): void
+    {
+        echo $this->get($string, $foreground_color, $background_color) ;
+    }
+
     // Returns all foreground color names
     public function getForegroundColors()
     {
@@ -75,4 +82,16 @@ class Out
     {
         return array_keys($this->background_colors);
     }
+
+//    public function printHeaderTable(): void
+//    {
+//        echo "\n+-----------------------------+-----------------------------+-----------------------------+-----------------------------+\n";
+//        printf("%-30s", "| Routs");
+//        printf("%-30s", "| Description");
+//        printf("%-30s", "| Params");
+//        printf("%-30s", "| Params description");
+//        printf("%-30s", "|");
+//        echo "\n+-----------------------------+-----------------------------+-----------------------------+-----------------------------+\n";
+//    }
+
 }

kernel/console/controllers/AdminConsoleController.php

@@ -63,6 +63,20 @@ class AdminConsoleController extends ConsoleController
         );
         $this->out->r("create option active_admin_theme", "green");
 
+        $this->optionService->createFromParams(
+            key: "theme_paths",
+            value: "{\"paths\": [\"{KERNEL}/themes\", \"{APP}/themes\"]}",
+            label: "Пути к темам сайта"
+        );
+        $this->out->r("create option theme_paths", "green");
+
+        $this->optionService->createFromParams(
+            key: "active_theme",
+            value: "{KERNEL}/themes/default",
+            label: "Активная тема сайта"
+        );
+        $this->out->r("create option active_theme", "green");
+
         $this->optionService->createFromParams(
             key: "module_paths",
             value: "{\"paths\": [\"{KERNEL_MODULES}\", \"{APP}/modules\"]}",
@@ -72,7 +86,7 @@ class AdminConsoleController extends ConsoleController
 
         $this->optionService->createFromParams(
             key: "active_modules",
-            value: "{\"modules\":[\"admin_themes\", \"secure\", \"user\", \"menu\", \"post\", \"option\"]}",
+            value: "{\"modules\":[\"admin_themes\",\"themes\",\"secure\", \"user\", \"menu\", \"post\", \"option\"]}",
             label: "Активные модули"
         );
         $this->out->r("create option active_modules", "green");
@@ -133,6 +147,14 @@ class AdminConsoleController extends ConsoleController
         ]);
         $this->out->r("create item menu admin-themes", "green");
 
+        $this->menuService->createItem([
+            "label" => "Темы сайта",
+            "url" => "/admin/settings/themes",
+            "slug" => "themes",
+            "parent_slug" => "settings"
+        ]);
+        $this->out->r("create item menu themes", "green");
+
         $this->menuService->createItem([
             "label" => "Меню",
             "url" => "/admin/settings/menu",

kernel/console/controllers/AdminThemeController.php

@@ -18,31 +18,15 @@ class AdminThemeController extends ConsoleController
             throw new \Exception('Missing admin theme path "--path" specified');
         }
 
-        $zip = new ZipArchive;
-        $tmpThemeDir = md5(time());
-        $res = $zip->open(ROOT_DIR . $this->argv['path']);
-        if ($res === TRUE) {
-            $tmpThemeDirFull = RESOURCES_DIR . '/tmp/ad/' . $tmpThemeDir . "/";
-            $zip->extractTo($tmpThemeDirFull);
-            $zip->close();
-            $this->out->r('Архив распакован', 'green');
+        if (file_exists(ROOT_DIR . $this->argv['path'])) {
+            $adminThemeService = new AdminThemeService();
+            if ($adminThemeService->install($this->argv['path'])) {
+                $this->out->r("Тема админ-панели установлена", 'green');
+            } else {
+                $this->out->r("Ошибка установки темы админ-панели", 'red');
+            }
         } else {
-            $this->out->r('Message: Ошибка чтения архива', 'red');
-        }
-
-        if (file_exists($tmpThemeDirFull . "meta/manifest.json")){
-            $manifestJson = getConst(file_get_contents($tmpThemeDirFull . "meta/manifest.json"));
-            $manifest = Manifest::getWithVars($manifestJson);
-            $this->out->r('manifest.json инициализирован', 'green');
-
-            $fileHelper = new Files();
-            $fileHelper->copy_folder($tmpThemeDirFull . "meta", $manifest['theme_path']);
-            $fileHelper->copy_folder($tmpThemeDirFull . "resources", $manifest['resource_path']);
-
-            $this->out->r("Удаляем временные файлы", 'green');
-            $fileHelper->recursiveRemoveDir($tmpThemeDirFull);
-
-            $this->out->r("Тема " . $manifest['name'] . " установлена", 'green');
+            $this->out->r("Тема админ-панели не найдена", 'red');
         }
     }
 
@@ -53,17 +37,11 @@ class AdminThemeController extends ConsoleController
         }
 
         if (file_exists(ROOT_DIR . $this->argv['path'])) {
-            $themeName = basename($this->argv['path']);
-            $active_admin_theme = Option::where("key", "active_admin_theme")->first();
-            if ($active_admin_theme->value === ROOT_DIR . $this->argv['path']) {
-                $this->out->r("Меняем тему на базовую", 'green');
-                $adminThemeService = new AdminThemeService();
-                $adminThemeService->setActiveAdminTheme(KERNEL_ADMIN_THEMES_DIR . '/default');
-                $this->out->r("Тема изменена", 'green');
-            }
-            $fileHelper = new Files();
-            $fileHelper->recursiveRemoveDir(ROOT_DIR . $this->argv['path']);
-            $fileHelper->recursiveRemoveDir(RESOURCES_DIR . '/' . $themeName);
+            $adminThemeService = new AdminThemeService();
+            $adminThemeService->uninstall($this->argv['path']);
+
+
+
 
             $this->out->r("Тема удалена", 'green');
         } else {
@@ -71,4 +49,22 @@ class AdminThemeController extends ConsoleController
         }
     }
 
+    /**
+     * @throws \Exception
+     */
+    public function actionPackTheme(): void
+    {
+        if (!isset($this->argv['path'])) {
+            throw new \Exception('Missing admin theme path "--path" specified');
+        }
+
+        if (file_exists(ROOT_DIR . $this->argv['path'])) {
+            $adminThemeService = new AdminThemeService();
+            $adminThemeService->pack($this->argv['path']);
+            $this->out->r("Тема админ-панели заархивирована", 'green');
+        } else {
+            $this->out->r("Тема админ-панели не найдена", 'red');
+        }
+    }
+
 }

kernel/console/controllers/KernelController.php

@@ -27,7 +27,7 @@ class KernelController extends ConsoleController
 
         if (file_exists(ROOT_DIR . $this->argv['path'])) {
             $tmpKernelDirFull = RESOURCES_DIR . '/tmp/ad/kernel/kernel';
-            $this->files->copy_folder(KERNEL_DIR, $tmpKernelDirFull);
+            $this->files->copyKernelFolder(ROOT_DIR . $this->argv['path'], $tmpKernelDirFull);
             $this->out->r("Ядро скопировано во временную папку", 'green');
         } else {
             $this->out->r("Ядро не найдено", 'red');
@@ -35,7 +35,7 @@ class KernelController extends ConsoleController
 
         if (file_exists(ROOT_DIR . '/bootstrap')) {
             $tmpBootstrapDirFull = RESOURCES_DIR . '/tmp/ad/kernel/bootstrap';
-            $this->files->copy_folder(ROOT_DIR . '/bootstrap', $tmpBootstrapDirFull);
+            $this->files->copyKernelFolder(ROOT_DIR . '/bootstrap', $tmpBootstrapDirFull);
             $this->out->r("/bootstrap скопирован во временную папку", 'green');
         } else {
             $this->out->r("/bootstrap не найден", 'red');
@@ -65,11 +65,19 @@ class KernelController extends ConsoleController
             $this->out->r("/composer.json не найден", 'red');
         }
 
-        if (!is_dir(RESOURCES_DIR . '/tmp/app')) {
-            mkdir(RESOURCES_DIR . '/tmp/app');
+        if (!is_dir(RESOURCES_DIR . '/tmp/kernel')) {
+            mkdir(RESOURCES_DIR . '/tmp/kernel');
+        }
+
+        if (file_exists(KERNEL_DIR . '/manifest.json')) {
+            $manifest = json_decode(file_get_contents(KERNEL_DIR . '/manifest.json'), true);
+            $version = $manifest['version'] ?? '';
+            $this->files->pack(RESOURCES_DIR . '/tmp/ad/kernel/', RESOURCES_DIR . '/tmp/kernel/kernel_v' . $version . '.igk');
+        }
+        else {
+            $this->files->pack(RESOURCES_DIR . '/tmp/ad/kernel/', RESOURCES_DIR . '/tmp/kernel/kernel.igk');
         }
 
-        $this->files->pack(RESOURCES_DIR . '/tmp/ad/kernel/', RESOURCES_DIR . '/tmp/kernel/kernel.igk');
         $this->files->recursiveRemoveDir(RESOURCES_DIR . '/tmp/ad/kernel/');
     }
 
@@ -91,11 +99,11 @@ class KernelController extends ConsoleController
                 $zip->extractTo($tmpKernelDirFull);
                 $zip->close();
                 $this->files->recursiveRemoveKernelDir();
-                $this->files->copy_folder($tmpKernelDirFull . 'kernel' , ROOT_DIR . "/kernel");
+                $this->files->copyKernelFolder($tmpKernelDirFull . 'kernel' , ROOT_DIR . "/kernel");
 
                 if (isset($this->argv['bootstrap'])) {
                     $this->files->recursiveRemoveDir(ROOT_DIR . '/bootstrap');
-                    $this->files->copy_folder($tmpKernelDirFull . 'bootstrap' , ROOT_DIR . '/bootstrap');
+                    $this->files->copyKernelFolder($tmpKernelDirFull . 'bootstrap' , ROOT_DIR . '/bootstrap');
                     copy($tmpKernelDirFull . '/bootstrap.php' , ROOT_DIR . '/bootstrap.php');
                 }
 

kernel/console/controllers/MainController.php

@@ -2,7 +2,9 @@
 
 namespace kernel\console\controllers;
 
+use kernel\App;
 use kernel\console\ConsoleController;
+use kernel\helpers\Debug;
 
 class MainController extends ConsoleController
 {
@@ -12,4 +14,25 @@ class MainController extends ConsoleController
         $this->out->r("Привет", "green");
     }
 
+    public function actionHelp(): void
+    {
+        $routs = App::$collector->getData()->getStaticRoutes();
+        foreach ($routs as $rout => $data){
+            $additionalInfo = $data['GET'][3];
+            if (isset($additionalInfo['description']) and $additionalInfo['type'] === "console"){
+                $this->out->inLine($rout . " - ", "green");
+                $this->out->inLine($additionalInfo['description'], 'yellow');
+                $this->out->r("");
+                if (isset($additionalInfo['params'])){
+                    foreach ($additionalInfo['params'] as $key => $param){
+                        $this->out->inLine($key . " - ", "green");
+                        $this->out->inLine($param, 'yellow');
+                        $this->out->r("");
+                    }
+                }
+                $this->out->r("");
+            }
+        }
+    }
+
 }

kernel/console/controllers/ModuleController.php

@@ -90,4 +90,33 @@ class ModuleController extends ConsoleController
         }
     }
 
+    public function actionConstructModule(): void
+    {
+        $this->out->r("Введите slug модуля:", 'yellow');
+        $slug = substr(fgets(STDIN), 0, -1);
+        $slug = strtolower($slug);
+
+        $this->out->r("Введите название модуля:", 'yellow');
+        $name = substr(fgets(STDIN), 0, -1);
+
+        $this->out->r("Введите автора модуля:", 'yellow');
+        $author = substr(fgets(STDIN), 0, -1);
+
+        $this->out->r("Введите название пунтка меню для модуля:", 'yellow');
+        $label = substr(fgets(STDIN), 0, -1);
+
+        $moduleService = new ModuleService();
+        $moduleService->createDirs($slug);
+
+        $moduleService->createModuleByParams([
+            'slug' => $slug,
+            'model' => ucfirst($slug),
+            'author' => $author,
+            'name' => $name,
+            'label' => $label,
+        ]);
+
+        $this->out->r("Модуль $slug создан", 'green');
+    }
+
 }

kernel/console/controllers/ThemeController.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace kernel\console\controllers;
+
+use kernel\console\ConsoleController;
+use kernel\helpers\Files;
+use kernel\helpers\Manifest;
+use kernel\models\Option;
+use kernel\services\AdminThemeService;
+use kernel\services\ThemeService;
+use ZipArchive;
+
+class ThemeController extends ConsoleController
+{
+
+    /**
+     * @throws \Exception
+     */
+    public function actionInstallTheme(): void
+    {
+        if (!isset($this->argv['path'])) {
+            throw new \Exception('Missing theme path "--path" specified');
+        }
+
+        if (file_exists(ROOT_DIR . $this->argv['path'])) {
+            $themeService = new ThemeService();
+            if ($themeService->install($this->argv['path'])) {
+                $this->out->r("Тема сайта установлена", 'green');
+            } else {
+                $this->out->r("Ошибка установки темы сайта", 'red');
+            }
+        } else {
+            $this->out->r("Тема сайта не найдена", 'red');
+        }
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function actionUninstallTheme(): void
+    {
+        if (!isset($this->argv['path'])) {
+            throw new \Exception('Missing theme path "--path" specified');
+        }
+
+        if (file_exists(ROOT_DIR . $this->argv['path'])) {
+            $themeService = new ThemeService();
+            $themeService->uninstall($this->argv['path']);
+            $this->out->r("Тема сайта удалена", 'green');
+        } else {
+            $this->out->r("Тема сайта не найдена", 'red');
+        }
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function actionPackTheme(): void
+    {
+        if (!isset($this->argv['path'])) {
+            throw new \Exception('Missing theme path "--path" specified');
+        }
+
+        if (file_exists(ROOT_DIR . $this->argv['path'])) {
+            $themeService = new ThemeService();
+            $themeService->pack($this->argv['path']);
+            $this->out->r("Тема сайта заархивирована", 'green');
+        } else {
+            $this->out->r("Тема сайта не найдена", 'red');
+        }
+    }
+
+}

kernel/console/migrations/stubs/migration.stub

@@ -6,6 +6,7 @@ use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
+    public string $migration;
     /**
      * Run the migrations.
      */

kernel/console/routs/cli.php

@@ -1,41 +1,115 @@
 <?php
 
 use kernel\App;
+use kernel\console\controllers\MigrationController;
 use Phroute\Phroute\RouteCollector;
 
 App::$collector->console("hello", [\kernel\console\controllers\MainController::class, "indexAction"]);
+App::$collector->console("help", [\kernel\console\controllers\MainController::class, "actionHelp"]);
 
 App::$collector->group(["prefix" => "migration"], callback: function (RouteCollector $router){
-    App::$collector->console('run', [\kernel\console\controllers\MigrationController::class, 'actionRun']);
-    App::$collector->console('init', [\kernel\console\controllers\MigrationController::class, 'actionCreateMigrationTable']);
-    App::$collector->console('create', [\kernel\console\controllers\MigrationController::class, 'actionCreate']);
-    App::$collector->console('rollback', [\kernel\console\controllers\MigrationController::class, 'actionRollback']);
+    App::$collector->console('run',
+        [MigrationController::class, 'actionRun'],
+        additionalInfo: ['description' => 'Запуск существующих миграций']
+    );
+    App::$collector->console('init',
+        [MigrationController::class, 'actionCreateMigrationTable'],
+        additionalInfo: ['description' => 'Инициализация миграций']
+    );
+    App::$collector->console('create',
+        [MigrationController::class, 'actionCreate'],
+        additionalInfo: ['description' => 'Создание миграции', 'params' => ['--name' => 'Название миграции', '--path' => 'Путь по которому будет создана миграция']]
+    );
+    App::$collector->console('rollback',
+        [MigrationController::class, 'actionRollback'],
+        additionalInfo: ['description' => 'Откатить миграции']
+    );
 });
 
 App::$collector->group(["prefix" => "admin-theme"], callback: function (RouteCollector $router){
-    App::$collector->console('install', [\kernel\console\controllers\AdminThemeController::class, 'actionInstallTheme']);
-    App::$collector->console('uninstall', [\kernel\console\controllers\AdminThemeController::class, 'actionUninstallTheme']);
+    App::$collector->console('install',
+        [\kernel\console\controllers\AdminThemeController::class, 'actionInstallTheme'],
+        additionalInfo: ['description' => 'Установить тему админ-панели', 'params' => ['--path' => 'Путь к устанавливаемой теме']]
+    );
+    App::$collector->console('uninstall',
+        [\kernel\console\controllers\AdminThemeController::class, 'actionUninstallTheme'],
+        additionalInfo: ['description' => 'Удалить тему админ-панели', 'params' => ['--path' => 'Путь к удаляемой теме']]
+    );
+    App::$collector->console('pack',
+        [\kernel\console\controllers\AdminThemeController::class, 'actionPackTheme'],
+        additionalInfo: ['description' => 'Заархивировать тему админ-панели', 'params' => ['--path' => 'Путь к теме, которую нужно заархивировать']]
+    );
+});
+
+App::$collector->group(["prefix" => "theme"], callback: function (RouteCollector $router){
+    App::$collector->console('install',
+        [\kernel\console\controllers\ThemeController::class, 'actionInstallTheme'],
+        additionalInfo: ['description' => 'Установить тему сайта', 'params' => ['--path' => 'Путь к устанавливаемой теме']]
+    );
+    App::$collector->console('uninstall',
+        [\kernel\console\controllers\ThemeController::class, 'actionUninstallTheme'],
+        additionalInfo: ['description' => 'Удалить тему сайта', 'params' => ['--path' => 'Путь к удаляемой теме']]
+    );
+    App::$collector->console('pack',
+        [\kernel\console\controllers\ThemeController::class, 'actionPackTheme'],
+        additionalInfo: ['description' => 'Заархивировать тему сайта', 'params' => ['--path' => 'Путь к теме, которую нужно заархивировать']]
+    );
 });
 
 App::$collector->group(["prefix" => "secure"], callback: function (RouteCollector $router){
-    App::$collector->console('create-secret-key', [\kernel\console\controllers\SecureController::class, 'actionCreateSecretKey']);
+    App::$collector->console('create-secret-key',
+        [\kernel\console\controllers\SecureController::class, 'actionCreateSecretKey'],
+        additionalInfo: ['description' => 'Генерация секрктного ключа и запись его в .env']
+    );
 });
 
 App::$collector->group(["prefix" => "admin"], callback: function (RouteCollector $router){
-    App::$collector->console('init', [\kernel\console\controllers\AdminConsoleController::class, 'actionInit']);
+    App::$collector->console('init',
+        [\kernel\console\controllers\AdminConsoleController::class, 'actionInit'],
+        additionalInfo: ['description' => 'Инициализация админ-панели']
+    );
 });
 
 App::$collector->group(["prefix" => "module"], callback: function (RouteCollector $router){
-    App::$collector->console('install', [\kernel\console\controllers\ModuleController::class, 'actionInstallModule']);
-    App::$collector->console('uninstall', [\kernel\console\controllers\ModuleController::class, 'actionUninstallModule']);
-    App::$collector->console('pack', [\kernel\console\controllers\ModuleController::class, 'actionPackModule']);
-    App::$collector->console('update', [\kernel\console\controllers\ModuleController::class, 'actionUpdateModule']);
+    App::$collector->console('install',
+        [\kernel\console\controllers\ModuleController::class, 'actionInstallModule'],
+        additionalInfo: ['description' => 'Установка модуля', 'params' => ['--path' => 'Путь к устанавливаемому модулю']]
+    );
+    App::$collector->console('uninstall',
+        [\kernel\console\controllers\ModuleController::class, 'actionUninstallModule'],
+        additionalInfo: ['description' => 'Удалить модуль', 'params' => ['--path' => 'Путь к удаляемому модулю']]
+    );
+    App::$collector->console('pack',
+        [\kernel\console\controllers\ModuleController::class, 'actionPackModule'],
+        additionalInfo: ['description' => 'Заархивировать модуль', 'params' => ['--path' => 'Путь к модулю, который нужно заархивировать']]
+    );
+    App::$collector->console('update',
+        [\kernel\console\controllers\ModuleController::class, 'actionUpdateModule'],
+        additionalInfo: ['description' => 'Обновить модуль', 'params' => ['--path' => 'Путь к архиву с модулем']]
+    );
+    App::$collector->console('construct',
+        [\kernel\console\controllers\ModuleController::class, 'actionConstructModule'],
+        additionalInfo: ['description' => 'Сгенерировать модуль']
+    );
 });
 
 App::$collector->group(["prefix" => "kernel"], callback: function (RouteCollector $router){
-//    App::$collector->console('install', [\kernel\console\controllers\ModuleController::class, 'actionInstallModule']);
-//    App::$collector->console('uninstall', [\kernel\console\controllers\ModuleController::class, 'actionUninstallModule']);
-    App::$collector->console('pack', [\kernel\console\controllers\KernelController::class, 'actionPackKernel']);
-    App::$collector->console('update', [\kernel\console\controllers\KernelController::class, 'actionUpdateKernel']);
+    App::$collector->console('pack',
+        [\kernel\console\controllers\KernelController::class, 'actionPackKernel'],
+        additionalInfo: ['description' => 'Заархивировать ядро', 'params' => ['--path' => 'Путь к ядру']]
+    );
+    App::$collector->console('update',
+        [\kernel\console\controllers\KernelController::class, 'actionUpdateKernel'],
+        additionalInfo: [
+            'description' => 'Обновить модуль',
+            'params' =>
+                [
+                    '--path' => 'Путь к архиву ядра',
+                    'bootstrap' => 'Обновить bootstrap',
+                    'composer' => 'Обновить composer',
+                    'env' => 'Обновить .env.example'
+                ]
+        ]
+    );
 });
 

kernel/controllers/ModuleController.php

@@ -6,11 +6,8 @@ use DirectoryIterator;
 use JetBrains\PhpStorm\NoReturn;
 use Josantonius\Session\Facades\Session;
 use kernel\AdminController;
-use kernel\EntityRelation;
 use kernel\helpers\Debug;
 use kernel\models\Option;
-use kernel\modules\module_shop_client\services\ModuleShopClientService;
-use kernel\modules\user\service\UserService;
 use kernel\Request;
 use kernel\services\ModuleService;
 

kernel/filters/BootstrapSelectFilter.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace kernel\filters;
+
+use itguild\forms\builders\SelectBuilder;
+use Itguild\Tables\Filter\Filter;
+use kernel\helpers\Debug;
+
+class BootstrapSelectFilter extends Filter
+{
+
+    public function fetch(): string
+    {
+        $select = SelectBuilder::build($this->name, [
+            'class' => 'form-control',
+            'options' => $this->params['options'],
+            'value' => $this->value,
+            'prompt' => $this->params['prompt'] ?? null,
+        ]);
+
+        return "<td>" . $select->create()->fetch() . "</td>";
+    }
+}

kernel/filters/BootstrapTextFilter.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace kernel\filters;
+
+use itguild\forms\builders\TextInputBuilder;
+use Itguild\Tables\Filter\Filter;
+
+class BootstrapTextFilter extends Filter
+{
+
+    public function fetch()
+    {
+        $textInput = TextInputBuilder::build($this->name, [
+            'value' => $this->value,
+            'class' => "form-control"
+        ]);
+
+        return "<td>" . $textInput->create()->fetch() . "</td>";
+
+    }
+}

kernel/helpers/Files.php

@@ -7,11 +7,38 @@ use ZipArchive;
 
 class Files
 {
-    public function copy_folder($d1, $d2): void
+    public function copy_folder($d1, $d2, int $permissions = 0775, bool $recursive = true): void
     {
         if (is_dir($d1)) {
             if (!file_exists($d2)){
-                $_d2 = mkdir($d2, permissions: 0774, recursive: true);
+                $old_mask = umask(0);
+                $_d2 = mkdir($d2, permissions: $permissions, recursive: $recursive);
+                umask($old_mask);
+                if (!$_d2) {
+                    return;
+                }
+            }
+
+            $d = dir($d1);
+            while (false !== ($entry = $d->read())) {
+                if ($entry != '.' && $entry != '..') {
+                    $this->copy_folder("$d1/$entry", "$d2/$entry");
+                }
+            }
+            $d->close();
+        } else {
+            copy($d1, $d2);
+            chmod($d2, permissions: $permissions);
+        }
+    }
+
+    public function copyKernelFolder($d1, $d2, int $permissions = 0775, bool $recursive = true): void
+    {
+        if (is_dir($d1)) {
+            if (!file_exists($d2)){
+                $old_mask = umask(0);
+                $_d2 = mkdir($d2, permissions: $permissions, recursive: $recursive);
+                umask($old_mask);
                 if (!$_d2) {
                     return;
                 }
@@ -20,12 +47,13 @@ class Files
             $d = dir($d1);
             while (false !== ($entry = $d->read())) {
                 if ($entry != '.' && $entry != '..' && $entry != 'app_modules') {
-                    $this->copy_folder("$d1/$entry", "$d2/$entry");
+                    $this->copyKernelFolder("$d1/$entry", "$d2/$entry");
                 }
             }
             $d->close();
         } else {
             copy($d1, $d2);
+            chmod($d2, permissions: $permissions);
         }
     }
 

kernel/helpers/ImageGD.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace kernel\helpers;
+
+class ImageGD
+{
+    public \GdImage $img;
+
+    public function __construct(string $resource = '', int $width = 200, int $height = 200)
+    {
+        if ($resource){
+            $this->img = imagecreatefrompng($resource);
+        }
+        else {
+            $this->img = imagecreatetruecolor($width, $height);
+        }
+        imagesavealpha($this->img, true);
+    }
+
+    public function addText(string $font_size, int $degree, int $x, int $y, string $color, string $font, string $text): void
+    {
+        $rgbArr = $this->hexToRgb($color);
+        $color = imagecolorallocate($this->img, $rgbArr[0], $rgbArr[1], $rgbArr[2]);
+        imagettftext($this->img, $font_size, $degree, $x, $y, $color, $font, $text);
+    }
+
+    public function addImg(\GdImage $gdImage, int $location_x, int $location_y, int $offset_src_x, int $offset_src_y, int $src_width, int $src_height, int $no_transparent): void
+    {
+        imagecopymerge($this->img, $gdImage, $location_x, $location_y, $offset_src_x, $offset_src_y, $src_width, $src_height, $no_transparent);
+    }
+
+    public function getImg()
+    {
+        return $this->img;
+    }
+
+    public function save(string $path): void
+    {
+        imagepng($this->img, $path);
+        imagedestroy($this->img);
+    }
+
+    protected function hexToRgb(string $hex)
+    {
+        return sscanf($hex, "#%02x%02x%02x");
+    }
+
+}

kernel/helpers/Version.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace kernel\helpers;
+
+class Version
+{
+    public static function getIntVersionByString(string $version): int
+    {
+        $version = preg_replace('/[^0-9]+/', '', $version);
+        return match (strlen($version)) {
+            1 => intval($version) * 100,
+            2 => intval($version) * 10,
+            3 => intval($version),
+        };
+    }
+}

kernel/manifest.json

@@ -0,0 +1,8 @@
+{
+  "name": "Kernel",
+  "version": "0.1.5",
+  "author": "ITGuild",
+  "slug": "kernel",
+  "type": "kernel",
+  "description": "Kernel"
+}