diff --git a/kernel/modules/post/views/index.php b/kernel/modules/post/views/index.php
index 65134cd..d82ecb5 100644
--- a/kernel/modules/post/views/index.php
+++ b/kernel/modules/post/views/index.php
@@ -24,6 +24,16 @@ $table = new ListEloquentTable(new EloquentDataProvider(Post::class, [
'params' => ["class" => "table table-bordered", "border" => "2"],
'baseUrl' => "/admin/post"
]));
+
+$entityRelation = new \kernel\EntityRelation();
+$additionals = $entityRelation->getEntityRelationsBySlug("post");
+
+foreach ($additionals as $additional) {
+ $table->addColumn($additional, $additional, function ($id) use ($entityRelation, $additional) {
+ return $entityRelation->getAdditionalPropertyByEntityId("post", $id, $additional);
+ });
+}
+
$table->columns([
'created_at' => function ($data) {
if (!$data){
diff --git a/kernel/modules/post/views/view.php b/kernel/modules/post/views/view.php
index 36a61f6..e3693d1 100644
--- a/kernel/modules/post/views/view.php
+++ b/kernel/modules/post/views/view.php
@@ -25,15 +25,24 @@ $table->beforePrint(function () use ($content) {
return $btn;
});
+$entityRelation = new \kernel\EntityRelation();
+$additionals = $entityRelation->getEntityAdditionalProperty("post", $content);
+
+foreach ($additionals as $key => $additional) {
+ $table->addRow($key, function () use ($additional) {
+ return $additional;
+ }, ['after' => 'user_id']);
+}
+
$table->rows([
'created_at' => function ($data) {
- if (!$data){
+ if (!$data) {
return null;
}
return (new DateTimeImmutable($data))->format("d-m-Y");
},
'updated_at' => function ($data) {
- if (!$data){
+ if (!$data) {
return null;
}
return (new DateTimeImmutable($data))->format("d-m-Y");
diff --git a/kernel/modules/secure/controllers/SecureController.php b/kernel/modules/secure/controllers/SecureController.php
index e698424..bdea8ab 100644
--- a/kernel/modules/secure/controllers/SecureController.php
+++ b/kernel/modules/secure/controllers/SecureController.php
@@ -7,6 +7,7 @@ use kernel\AdminController;
use kernel\Flash;
use kernel\helpers\Debug;
use kernel\modules\secure\models\forms\LoginForm;
+use kernel\modules\secure\models\forms\RegisterForm;
use kernel\modules\user\service\UserService;
class SecureController extends AdminController
@@ -16,7 +17,6 @@ class SecureController extends AdminController
protected function init(): void
{
parent::init();
-// $this->cgView->viewPath = KERNEL_DIR . "/views/secure/";
$this->cgView->viewPath = KERNEL_MODULES_DIR. "/secure/views/";
$this->cgView->layout = "/login.php";
$this->userService = new UserService();
@@ -61,4 +61,31 @@ class SecureController extends AdminController
$this->redirect("/", code: 302);
}
+ public function actionRegister()
+ {
+ $this->cgView->render('register.php');
+ }
+
+ public function actionRegistration(): void
+ {
+ $regForm = new RegisterForm();
+ $regForm->load($_REQUEST);
+
+ if ($this->userService->getByField('username', $regForm->getItem("username"))) {
+ Flash::setMessage("error", "Username already exists.");
+ $this->redirect("/admin/register", code: 302);
+ }
+
+ if ($this->userService->getByField('email', $regForm->getItem("email"))) {
+ Flash::setMessage("error", "Email already exists.");
+ $this->redirect("/admin/register", code: 302);
+ }
+
+ $user = $this->userService->create($regForm);
+ if ($user){
+ setcookie('user_id', $user->id, time()+60*60*24, '/', $_SERVER['SERVER_NAME'], false);
+ $this->redirect("/admin", code: 302);
+ }
+ }
+
}
\ No newline at end of file
diff --git a/kernel/modules/secure/models/forms/RegisterForm.php b/kernel/modules/secure/models/forms/RegisterForm.php
new file mode 100644
index 0000000..9d4a18e
--- /dev/null
+++ b/kernel/modules/secure/models/forms/RegisterForm.php
@@ -0,0 +1,19 @@
+ 'required|min-str-len:5|max-str-len:50',
+ 'email' => 'required|email|max-str-len:50',
+ 'password' => 'required|min-str-len:6|max-str-len:50',
+ ];
+ }
+
+}
\ No newline at end of file
diff --git a/kernel/modules/secure/routs/secure.php b/kernel/modules/secure/routs/secure.php
index 84b37c3..0377475 100644
--- a/kernel/modules/secure/routs/secure.php
+++ b/kernel/modules/secure/routs/secure.php
@@ -14,6 +14,8 @@ App::$collector->group(["prefix" => "admin"], function (RouteCollector $router){
App::$collector->get('/login', [\kernel\modules\secure\controllers\SecureController::class, 'actionLogin']);
App::$collector->get('/logout', [\kernel\modules\secure\controllers\SecureController::class, 'actionLogout']);
App::$collector->post('/auth', [\kernel\modules\secure\controllers\SecureController::class, 'actionAuth']);
+ App::$collector->get('/register', [\kernel\modules\secure\controllers\SecureController::class, 'actionRegister']);
+ App::$collector->post('/registration', [\kernel\modules\secure\controllers\SecureController::class, 'actionRegistration']);
});
App::$collector->group(["prefix" => "api"], function (CgRouteCollector $router){
diff --git a/kernel/modules/secure/views/login.php b/kernel/modules/secure/views/login.php
index c6cd7c3..9503fce 100644
--- a/kernel/modules/secure/views/login.php
+++ b/kernel/modules/secure/views/login.php
@@ -24,6 +24,9 @@
+
+
Авторизация
+
+
+
+
diff --git a/kernel/modules/secure/views/register.php b/kernel/modules/secure/views/register.php
new file mode 100644
index 0000000..ecc8752
--- /dev/null
+++ b/kernel/modules/secure/views/register.php
@@ -0,0 +1,71 @@
+
+
+
+ Регистрация
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+ Регистрация
+
diff --git a/kernel/modules/user/views/index.php b/kernel/modules/user/views/index.php
index ef5976c..e492f5e 100644
--- a/kernel/modules/user/views/index.php
+++ b/kernel/modules/user/views/index.php
@@ -24,6 +24,16 @@ $table = new ListEloquentTable(new EloquentDataProvider(User::class, [
'baseUrl' => "/admin/user",
'filters' => ['email'],
]));
+
+$entityRelation = new \kernel\EntityRelation();
+$additionals = $entityRelation->getEntityRelationsBySlug("user");
+
+foreach ($additionals as $additional) {
+ $table->addColumn($additional, $additional, function ($id) use ($entityRelation, $additional) {
+ return $entityRelation->getAdditionalPropertyByEntityId("user", $id, $additional);
+ });
+}
+
$table->columns([
'username' => [
"filter" => [
diff --git a/kernel/modules/user/views/view.php b/kernel/modules/user/views/view.php
index 5cab5ea..856186f 100644
--- a/kernel/modules/user/views/view.php
+++ b/kernel/modules/user/views/view.php
@@ -25,6 +25,15 @@ $table->beforePrint(function () use ($user) {
return $btn;
});
+$entityRelation = new \kernel\EntityRelation();
+$additionals = $entityRelation->getEntityAdditionalProperty("user", $user);
+
+foreach ($additionals as $key => $additional) {
+ $table->addRow($key, function () use ($additional) {
+ return $additional;
+ }, ['after' => 'email']);
+}
+
$table->rows([
'created_at' => function ($data) {
if (!$data){
diff --git a/kernel/services/MigrationService.php b/kernel/services/MigrationService.php
index 8205fa7..aabee7b 100644
--- a/kernel/services/MigrationService.php
+++ b/kernel/services/MigrationService.php
@@ -23,6 +23,7 @@ class MigrationService
public function runAtPath(string $path = ROOT_DIR . '/migrations'): array
{
$path = getConst($path);
+// Debug::dd($path);
try {
$dmr = new DatabaseMigrationRepository(App::$db->capsule->getDatabaseManager(), 'migration');
@@ -31,7 +32,7 @@ class MigrationService
return $m->run($path);
} catch (\Exception $e) {
- throw new \Exception('Не удалось поднять играции');
+ throw new \Exception('Не удалось поднять миграции');
}
}
diff --git a/kernel/services/ModuleService.php b/kernel/services/ModuleService.php
index 3840192..c112e2f 100644
--- a/kernel/services/ModuleService.php
+++ b/kernel/services/ModuleService.php
@@ -3,18 +3,22 @@
namespace kernel\services;
use DirectoryIterator;
-use GuzzleHttp\Client;
+use kernel\EntityRelation;
+use kernel\Flash;
use kernel\helpers\Debug;
use kernel\helpers\Files;
use kernel\helpers\Manifest;
use kernel\helpers\RESTClient;
use kernel\models\Option;
+use MongoDB\Driver\Session;
use ZipArchive;
class ModuleService
{
protected array $errors = [];
+ protected null|bool $serverAvailable = null;
+
/**
* @param string $module
* @return false|array|string
@@ -67,9 +71,9 @@ class ModuleService
{
$active_modules = Option::where("key", "active_modules")->first();
if ($active_modules) {
- $path = json_decode($active_modules->value);
- foreach ($path->modules as $p) {
- if ($p === $slug) {
+ $modules = json_decode($active_modules->value);
+ foreach ($modules->modules as $mod) {
+ if ($mod === $slug) {
return true;
}
}
@@ -109,7 +113,7 @@ class ModuleService
if (isset($module_info['dependence'])) {
$dependence_array = explode(',', $module_info['dependence']);
foreach ($dependence_array as $depend) {
- if (!in_array($depend, $active_modules->modules)) {
+ if (!in_array(trim($depend), $active_modules->modules)) {
$this->addError("first activate the $depend module");
return false;
}
@@ -131,6 +135,10 @@ class ModuleService
public function deactivateModule(string $module): bool
{
$active_modules_info = Option::where("key", "active_modules")->first();
+
+ EntityRelation::removeEntityRelation($module);
+ EntityRelation::removePropertyRelation($module);
+
$active_modules = json_decode($active_modules_info->value);
if (!in_array($module, $active_modules->modules)) {
return true;
@@ -355,8 +363,6 @@ class ModuleService
mkdir(RESOURCES_DIR . '/tmp/modules', 0777, true);
}
$fileHelper->pack($tmpModuleDirFull, RESOURCES_DIR . '/tmp/modules/' . $moduleName . '.igm');
-
- //$fileHelper->recursiveRemoveDir($tmpModuleDirFull);
}
/**
@@ -438,17 +444,19 @@ class ModuleService
public function isLastVersion(string $slug): bool
{
- $modules_info = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug');
+ if ($this->isServerAvailable()){
+ $modules_info = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug');
- $modules_info = json_decode($modules_info->getBody()->getContents(), true);
- $mod_info = $this->getModuleInfoBySlug($slug);
- foreach ($modules_info as $mod) {
- if ($mod['slug'] === $mod_info['slug'] && $mod['version'] === $mod_info['version']) {
- return true;
+ $modules_info = json_decode($modules_info->getBody()->getContents(), true);
+ $mod_info = $this->getModuleInfoBySlug($slug);
+ foreach ($modules_info as $mod) {
+ if ($mod['slug'] === $mod_info['slug'] && $mod['version'] === $mod_info['version']) {
+ return true;
+ }
}
}
- return false;
+ return false;
}
public function isKernelModule(string $slug): bool
@@ -463,6 +471,23 @@ class ModuleService
return false;
}
+ public function isShopModule(string $slug): bool
+ {
+ if ($this->isServerAvailable()){
+ $modules_info = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug');
+
+ $modules_info = json_decode($modules_info->getBody()->getContents(), true);
+ $mod_info = $this->getModuleInfoBySlug($slug);
+ foreach ($modules_info as $mod) {
+ if ($mod['slug'] === $mod_info['slug']) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
public function getKernelModules(): array
{
$modules_info = [];
@@ -474,4 +499,21 @@ class ModuleService
return $modules_info;
}
+ public function isServerAvailable(): bool
+ {
+ if (null !== $this->serverAvailable){
+ return $this->serverAvailable;
+ }
+
+ try {
+ RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug');
+ $this->serverAvailable = true;
+
+ return true;
+ } catch (\Exception $e) {
+ $this->serverAvailable = false;
+ return false;
+ }
+ }
+
}
\ No newline at end of file
diff --git a/kernel/views/module/index.php b/kernel/views/module/index.php
index ed319e6..52c6bcb 100644
--- a/kernel/views/module/index.php
+++ b/kernel/views/module/index.php
@@ -7,6 +7,7 @@
* @var \kernel\services\ModuleService $moduleService
*/
+use kernel\Flash;
use kernel\widgets\IconBtn\IconBtnActivateWidget;
use kernel\widgets\IconBtn\IconBtnDeactivateWidget;
use kernel\widgets\IconBtn\IconBtnDeleteWidget;
@@ -32,7 +33,6 @@ $info_to_table['data'] = $modules_info;
$table = new \Itguild\Tables\ListJsonTable(json_encode($info_to_table, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
-
$table->addAction(function ($row, $url) use ($moduleService) {
$slug = $row['slug'];
if ($moduleService->isActive($slug)) {
@@ -54,7 +54,7 @@ $table->addAction(function ($row, $url) use ($moduleService) {
});
$table->addAction(function ($row, $url) use ($moduleService){
- if (!$moduleService->isKernelModule($row['slug'])){
+ if ($moduleService->isShopModule($row['slug'])){
if (!$moduleService->isLastVersion($row['slug'])) {
$url = "$url/update/?slug=". $row['slug'];
@@ -75,7 +75,7 @@ $table->addAction(function ($row) use ($moduleService){
return false;
});
-if ($moduleService->isActive('module_shop_client')) {
+if ($moduleService->isActive('module_shop_client') && $moduleService->isServerAvailable()) {
ModuleTabsWidget::create()->run();
}
diff --git a/kernel/views/widgets/menu.php b/kernel/views/widgets/menu.php
index 124c239..fe5773b 100644
--- a/kernel/views/widgets/menu.php
+++ b/kernel/views/widgets/menu.php
@@ -18,7 +18,7 @@
- ">
+ ">
label ?>
diff --git a/kernel/views/widgets/module_tabs.php b/kernel/views/widgets/tabs.php
similarity index 100%
rename from kernel/views/widgets/module_tabs.php
rename to kernel/views/widgets/tabs.php
diff --git a/kernel/widgets/ModuleTabsWidget.php b/kernel/widgets/ModuleTabsWidget.php
index ef41ec2..d740dcf 100644
--- a/kernel/widgets/ModuleTabsWidget.php
+++ b/kernel/widgets/ModuleTabsWidget.php
@@ -13,6 +13,6 @@ class ModuleTabsWidget extends Widget
'/admin' => 'Локальные',
'/admin/module_shop_client' => 'Каталог'
];
- $this->cgView->render('/module_tabs.php', ['tabs' => $tabs]);
+ $this->cgView->render('/tabs.php', ['tabs' => $tabs]);
}
}
\ No newline at end of file
diff --git a/kernel/widgets/TagTabsWidget.php b/kernel/widgets/TagTabsWidget.php
new file mode 100644
index 0000000..a569dda
--- /dev/null
+++ b/kernel/widgets/TagTabsWidget.php
@@ -0,0 +1,18 @@
+ 'tag',
+ '/admin/tag_entity' => 'tag entity'
+ ];
+ $this->cgView->render('/tabs.php', ['tabs' => $tabs]);
+ }
+}
\ No newline at end of file