From 49399e456a4268de0189a98e37c976944db73779 Mon Sep 17 00:00:00 2001 From: stasbilay02 Date: Wed, 4 Dec 2024 13:11:12 +0300 Subject: [PATCH] update full --- .env.example | 13 +- composer.lock | 170 +++++------ kernel/EntityRelation.php | 279 ++++++++++++++++++ kernel/FormModel.php | 10 + .../controllers/AdminConsoleController.php | 31 +- kernel/controllers/ModuleController.php | 1 + kernel/helpers/Html.php | 30 ++ kernel/modules/menu/views/index.php | 3 + kernel/modules/menu/views/view.php | 5 +- .../modules/option/service/OptionService.php | 13 +- .../post/controllers/PostController.php | 15 + kernel/modules/post/manifest.json | 1 + kernel/modules/post/views/form.php | 8 +- kernel/modules/post/views/index.php | 10 + kernel/modules/post/views/view.php | 13 +- .../secure/controllers/SecureController.php | 29 +- .../secure/models/forms/RegisterForm.php | 19 ++ kernel/modules/secure/routs/secure.php | 2 + kernel/modules/secure/views/login.php | 10 +- kernel/modules/secure/views/register.php | 71 +++++ .../user/controllers/UserController.php | 26 +- kernel/modules/user/manifest.json | 1 + .../user/models/forms/CreateUserForm.php | 9 + kernel/modules/user/service/UserService.php | 5 +- kernel/modules/user/views/form.php | 7 +- kernel/modules/user/views/index.php | 10 + kernel/modules/user/views/view.php | 9 + kernel/services/MigrationService.php | 3 +- kernel/services/ModuleService.php | 70 ++++- kernel/views/module/index.php | 6 +- kernel/views/widgets/menu.php | 2 +- .../widgets/{module_tabs.php => tabs.php} | 0 kernel/widgets/ModuleTabsWidget.php | 2 +- kernel/widgets/TagTabsWidget.php | 18 ++ 34 files changed, 780 insertions(+), 121 deletions(-) create mode 100644 kernel/EntityRelation.php create mode 100644 kernel/helpers/Html.php create mode 100644 kernel/modules/secure/models/forms/RegisterForm.php create mode 100644 kernel/modules/secure/views/register.php rename kernel/views/widgets/{module_tabs.php => tabs.php} (100%) create mode 100644 kernel/widgets/TagTabsWidget.php diff --git a/.env.example b/.env.example index a9a285c..64e043c 100644 --- a/.env.example +++ b/.env.example @@ -1,13 +1,16 @@ DB_HOST=localhost -DB_USER=root +DB_USER=user DB_DRIVER=mysql -DB_PASSWORD=123edsaqw -DB_NAME=mfw -DB_CHARSET=utf8 -DB_COLLATION=utf8_unicode_ci +DB_PASSWORD=password +DB_NAME=name +DB_CHARSET=utf8mb4 +DB_COLLATION=utf8mb4_unicode_ci DB_PREFIX='' VIEWS_PATH=/views VIEWS_CACHE_PATH=/views_cache +MODULE_SHOP_URL='http://igfs.loc' +MODULE_SHOP_TOKEN='your token' + SECRET_KEY='' \ No newline at end of file diff --git a/composer.lock b/composer.lock index ca65c63..b3e6d6e 100644 --- a/composer.lock +++ b/composer.lock @@ -275,16 +275,16 @@ }, { "name": "firebase/php-jwt", - "version": "v6.10.1", + "version": "v6.10.2", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "500501c2ce893c824c801da135d02661199f60c5" + "reference": "30c19ed0f3264cb660ea496895cfb6ef7ee3653b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/500501c2ce893c824c801da135d02661199f60c5", - "reference": "500501c2ce893c824c801da135d02661199f60c5", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/30c19ed0f3264cb660ea496895cfb6ef7ee3653b", + "reference": "30c19ed0f3264cb660ea496895cfb6ef7ee3653b", "shasum": "" }, "require": { @@ -332,9 +332,9 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v6.10.1" + "source": "https://github.com/firebase/php-jwt/tree/v6.10.2" }, - "time": "2024-05-18T18:05:11+00:00" + "time": "2024-11-24T11:22:49+00:00" }, { "name": "graham-campbell/result-type", @@ -725,16 +725,16 @@ }, { "name": "illuminate/collections", - "version": "v11.32.0", + "version": "v11.34.2", "source": { "type": "git", "url": "https://github.com/illuminate/collections.git", - "reference": "a01a9d0799700bf34ab3797988fdd5f420d42bfe" + "reference": "fd2103ddc121449a7926fc34a9d220e5b88183c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/collections/zipball/a01a9d0799700bf34ab3797988fdd5f420d42bfe", - "reference": "a01a9d0799700bf34ab3797988fdd5f420d42bfe", + "url": "https://api.github.com/repos/illuminate/collections/zipball/fd2103ddc121449a7926fc34a9d220e5b88183c1", + "reference": "fd2103ddc121449a7926fc34a9d220e5b88183c1", "shasum": "" }, "require": { @@ -776,20 +776,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-11-15T15:43:48+00:00" + "time": "2024-11-27T14:51:56+00:00" }, { "name": "illuminate/conditionable", - "version": "v11.32.0", + "version": "v11.34.2", "source": { "type": "git", "url": "https://github.com/illuminate/conditionable.git", - "reference": "362dd761b9920367bca1427a902158225e9e3a23" + "reference": "911df1bda950a3b799cf80671764e34eede131c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/conditionable/zipball/362dd761b9920367bca1427a902158225e9e3a23", - "reference": "362dd761b9920367bca1427a902158225e9e3a23", + "url": "https://api.github.com/repos/illuminate/conditionable/zipball/911df1bda950a3b799cf80671764e34eede131c6", + "reference": "911df1bda950a3b799cf80671764e34eede131c6", "shasum": "" }, "require": { @@ -822,20 +822,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-06-28T20:10:30+00:00" + "time": "2024-11-21T16:28:56+00:00" }, { "name": "illuminate/container", - "version": "v11.32.0", + "version": "v11.34.2", "source": { "type": "git", "url": "https://github.com/illuminate/container.git", - "reference": "6e31eb49e9c9e68356a55cd8f18fb8830b8158cd" + "reference": "b057b0bbb38d7c7524df1ca5c38e7318f4c64d26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/container/zipball/6e31eb49e9c9e68356a55cd8f18fb8830b8158cd", - "reference": "6e31eb49e9c9e68356a55cd8f18fb8830b8158cd", + "url": "https://api.github.com/repos/illuminate/container/zipball/b057b0bbb38d7c7524df1ca5c38e7318f4c64d26", + "reference": "b057b0bbb38d7c7524df1ca5c38e7318f4c64d26", "shasum": "" }, "require": { @@ -873,20 +873,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-11-14T15:31:35+00:00" + "time": "2024-11-21T20:07:31+00:00" }, { "name": "illuminate/contracts", - "version": "v11.32.0", + "version": "v11.34.2", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", - "reference": "44c15aec6ea0d997e0885aa5b04876fe8a141433" + "reference": "184317f701ba20ca265e36808ed54b75b115972d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/44c15aec6ea0d997e0885aa5b04876fe8a141433", - "reference": "44c15aec6ea0d997e0885aa5b04876fe8a141433", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/184317f701ba20ca265e36808ed54b75b115972d", + "reference": "184317f701ba20ca265e36808ed54b75b115972d", "shasum": "" }, "require": { @@ -921,7 +921,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-11-15T15:40:33+00:00" + "time": "2024-11-25T15:33:38+00:00" }, { "name": "illuminate/database", @@ -1060,7 +1060,7 @@ }, { "name": "illuminate/macroable", - "version": "v11.32.0", + "version": "v11.34.2", "source": { "type": "git", "url": "https://github.com/illuminate/macroable.git", @@ -1106,16 +1106,16 @@ }, { "name": "illuminate/support", - "version": "v11.32.0", + "version": "v11.34.2", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "213bc04ed2a75dac441e602df4568154c36a3670" + "reference": "2b718a86571baed50fdc5d5748a846c2e58e07eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/213bc04ed2a75dac441e602df4568154c36a3670", - "reference": "213bc04ed2a75dac441e602df4568154c36a3670", + "url": "https://api.github.com/repos/illuminate/support/zipball/2b718a86571baed50fdc5d5748a846c2e58e07eb", + "reference": "2b718a86571baed50fdc5d5748a846c2e58e07eb", "shasum": "" }, "require": { @@ -1127,9 +1127,9 @@ "illuminate/conditionable": "^11.0", "illuminate/contracts": "^11.0", "illuminate/macroable": "^11.0", - "nesbot/carbon": "^2.72.2|^3.0", + "nesbot/carbon": "^2.72.2|^3.4", "php": "^8.2", - "voku/portable-ascii": "^2.0" + "voku/portable-ascii": "^2.0.2" }, "conflict": { "tightenco/collect": "<5.5.33" @@ -1145,7 +1145,7 @@ "symfony/process": "Required to use the composer class (^7.0).", "symfony/uid": "Required to use Str::ulid() (^7.0).", "symfony/var-dumper": "Required to use the dd function (^7.0).", - "vlucas/phpdotenv": "Required to use the Env class and env helper (^5.4.1)." + "vlucas/phpdotenv": "Required to use the Env class and env helper (^5.6.1)." }, "type": "library", "extra": { @@ -1178,7 +1178,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-11-14T16:30:16+00:00" + "time": "2024-11-27T14:58:17+00:00" }, { "name": "itguild/eloquent-table", @@ -1217,11 +1217,11 @@ }, { "name": "itguild/forms", - "version": "0.1.4", + "version": "0.1.5", "source": { "type": "git", "url": "https://git.itguild.info/ItGuild/forms_bundle.git", - "reference": "ddb17cc47360910b3875b88e10e14f91fcd875be" + "reference": "45e57367d3f9571fde2b82fa2fd8126469ba6db6" }, "require": { "itguild/php-cg-select-v2": "^0.1.0", @@ -1245,7 +1245,7 @@ "email": "apuc06@mail.ru" } ], - "time": "2024-09-10T08:41:16+00:00" + "time": "2024-11-28T10:18:58+00:00" }, { "name": "itguild/php-cg-select-v2", @@ -1276,11 +1276,11 @@ }, { "name": "itguild/tables", - "version": "1.0.8", + "version": "1.0.9", "source": { "type": "git", "url": "https://git.itguild.info/ItGuild/tables", - "reference": "5f46431d4562d2b4d8bff43b446fef82ecf73b83" + "reference": "5effacf12fd68d31181304562deb7331cf42c1db" }, "type": "library", "autoload": { @@ -1298,7 +1298,7 @@ "email": "apuc06@mail.ru" } ], - "time": "2024-10-11T13:31:11+00:00" + "time": "2024-11-28T08:57:17+00:00" }, { "name": "josantonius/session", @@ -2139,16 +2139,16 @@ }, { "name": "symfony/clock", - "version": "v7.1.6", + "version": "v7.2.0", "source": { "type": "git", "url": "https://github.com/symfony/clock.git", - "reference": "97bebc53548684c17ed696bc8af016880f0f098d" + "reference": "b81435fbd6648ea425d1ee96a2d8e68f4ceacd24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/clock/zipball/97bebc53548684c17ed696bc8af016880f0f098d", - "reference": "97bebc53548684c17ed696bc8af016880f0f098d", + "url": "https://api.github.com/repos/symfony/clock/zipball/b81435fbd6648ea425d1ee96a2d8e68f4ceacd24", + "reference": "b81435fbd6648ea425d1ee96a2d8e68f4ceacd24", "shasum": "" }, "require": { @@ -2193,7 +2193,7 @@ "time" ], "support": { - "source": "https://github.com/symfony/clock/tree/v7.1.6" + "source": "https://github.com/symfony/clock/tree/v7.2.0" }, "funding": [ { @@ -2209,20 +2209,20 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-09-25T14:21:43+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" + "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", - "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", + "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", "shasum": "" }, "require": { @@ -2260,7 +2260,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1" }, "funding": [ { @@ -2276,20 +2276,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/finder", - "version": "v7.1.6", + "version": "v7.2.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8" + "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/2cb89664897be33f78c65d3d2845954c8d7a43b8", - "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8", + "url": "https://api.github.com/repos/symfony/finder/zipball/6de263e5868b9a137602dd1e33e4d48bfae99c49", + "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49", "shasum": "" }, "require": { @@ -2324,7 +2324,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.1.6" + "source": "https://github.com/symfony/finder/tree/v7.2.0" }, "funding": [ { @@ -2340,7 +2340,7 @@ "type": "tidelift" } ], - "time": "2024-10-01T08:31:23+00:00" + "time": "2024-10-23T06:56:12+00:00" }, { "name": "symfony/polyfill-ctype", @@ -2735,20 +2735,21 @@ }, { "name": "symfony/translation", - "version": "v7.1.6", + "version": "v7.2.0", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "b9f72ab14efdb6b772f85041fa12f820dee8d55f" + "reference": "dc89e16b44048ceecc879054e5b7f38326ab6cc5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/b9f72ab14efdb6b772f85041fa12f820dee8d55f", - "reference": "b9f72ab14efdb6b772f85041fa12f820dee8d55f", + "url": "https://api.github.com/repos/symfony/translation/zipball/dc89e16b44048ceecc879054e5b7f38326ab6cc5", + "reference": "dc89e16b44048ceecc879054e5b7f38326ab6cc5", "shasum": "" }, "require": { "php": ">=8.2", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0", "symfony/translation-contracts": "^2.5|^3.0" }, @@ -2809,7 +2810,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v7.1.6" + "source": "https://github.com/symfony/translation/tree/v7.2.0" }, "funding": [ { @@ -2825,20 +2826,20 @@ "type": "tidelift" } ], - "time": "2024-09-28T12:35:13+00:00" + "time": "2024-11-12T20:47:56+00:00" }, { "name": "symfony/translation-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a" + "reference": "4667ff3bd513750603a09c8dedbea942487fb07c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", - "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/4667ff3bd513750603a09c8dedbea942487fb07c", + "reference": "4667ff3bd513750603a09c8dedbea942487fb07c", "shasum": "" }, "require": { @@ -2887,7 +2888,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/translation-contracts/tree/v3.5.1" }, "funding": [ { @@ -2903,7 +2904,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "twbs/bootstrap", @@ -2957,16 +2958,16 @@ }, { "name": "twig/twig", - "version": "v3.15.0", + "version": "v3.16.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "2d5b3964cc21d0188633d7ddce732dc8e874db02" + "reference": "475ad2dc97d65d8631393e721e7e44fb544f0561" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/2d5b3964cc21d0188633d7ddce732dc8e874db02", - "reference": "2d5b3964cc21d0188633d7ddce732dc8e874db02", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/475ad2dc97d65d8631393e721e7e44fb544f0561", + "reference": "475ad2dc97d65d8631393e721e7e44fb544f0561", "shasum": "" }, "require": { @@ -2977,6 +2978,7 @@ "symfony/polyfill-php81": "^1.29" }, "require-dev": { + "phpstan/phpstan": "^2.0", "psr/container": "^1.0|^2.0", "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0" }, @@ -3020,7 +3022,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.15.0" + "source": "https://github.com/twigphp/Twig/tree/v3.16.0" }, "funding": [ { @@ -3032,7 +3034,7 @@ "type": "tidelift" } ], - "time": "2024-11-17T15:59:19+00:00" + "time": "2024-11-29T08:27:05+00:00" }, { "name": "vlucas/phpdotenv", @@ -3120,16 +3122,16 @@ }, { "name": "voku/portable-ascii", - "version": "2.0.1", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/voku/portable-ascii.git", - "reference": "b56450eed252f6801410d810c8e1727224ae0743" + "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b56450eed252f6801410d810c8e1727224ae0743", - "reference": "b56450eed252f6801410d810c8e1727224ae0743", + "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b1d923f88091c6bf09699efcd7c8a1b1bfd7351d", + "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d", "shasum": "" }, "require": { @@ -3154,7 +3156,7 @@ "authors": [ { "name": "Lars Moelleken", - "homepage": "http://www.moelleken.org/" + "homepage": "https://www.moelleken.org/" } ], "description": "Portable ASCII library - performance optimized (ascii) string functions for php.", @@ -3166,7 +3168,7 @@ ], "support": { "issues": "https://github.com/voku/portable-ascii/issues", - "source": "https://github.com/voku/portable-ascii/tree/2.0.1" + "source": "https://github.com/voku/portable-ascii/tree/2.0.3" }, "funding": [ { @@ -3190,7 +3192,7 @@ "type": "tidelift" } ], - "time": "2022-03-08T17:03:00+00:00" + "time": "2024-11-21T01:49:47+00:00" } ], "packages-dev": [], diff --git a/kernel/EntityRelation.php b/kernel/EntityRelation.php new file mode 100644 index 0000000..6050f20 --- /dev/null +++ b/kernel/EntityRelation.php @@ -0,0 +1,279 @@ +moduleService = new ModuleService(); + } + + + public static function getEntityList(): array + { + $list = []; + $moduleService = new ModuleService(); + $activeModules = $moduleService->getActiveModules(); + foreach ($activeModules as $module) { + if (isset($module['type']) and $module['type'] === "entity") { + $list[$module['slug']] = $module['slug']; + } + } + + return $list; + } + + public function getAdditionalPropertyList(): array + { + $list = []; + $activeModules = $this->moduleService->getActiveModules(); + foreach ($activeModules as $module) { + if (isset($module['type']) and $module['type'] === "additional_property") { + $list[] = $module['slug']; + } + } + + return $list; + } + + public static function getEntitiesRelations(): array|bool + { + $entity_relations = OptionService::getItem("entity_relations"); + if ($entity_relations) { + return json_decode($entity_relations, true); + } + + return false; + } + + public static function removePropertyFromEntityRelations(string $entity, string $property): bool + { + $entity_relations_info = Option::where("key", "entity_relations")->first(); + if ($entity_relations_info) { + $entity_relations = json_decode($entity_relations_info->value, true); + if ($entity_relations[$entity]) { + $propertyKey = array_search($property, $entity_relations[$entity]); + if ($entity_relations[$entity][$propertyKey] === $property) { + unset($entity_relations[$entity][$propertyKey]); + $entity_relations[$entity] = array_values($entity_relations[$entity]); + if (empty($entity_relations[$entity])) { + unset($entity_relations[$entity]); + } + $entity_relations_info->value = json_encode($entity_relations, JSON_UNESCAPED_UNICODE); + $entity_relations_info->save(); + return true; + } + } + } + + return false; + } + + public static function removePropertyRelation(string $property): bool + { + $entity_relations_info = Option::where("key", "entity_relations")->first(); + if ($entity_relations_info) { + $entity_relations = json_decode($entity_relations_info->value, true); + foreach ($entity_relations as $entity => $entity_relation) { + if (in_array($property, $entity_relation)) { + $index = array_search($property, $entity_relation); + unset($entity_relations[$entity][$index]); + } + } + $entity_relations_info->value = json_encode($entity_relations, JSON_UNESCAPED_UNICODE); + $entity_relations_info->save(); + + return true; + } + + return false; + } + + public static function removeEntityRelation(string $entity): bool + { + $entity_relations_info = Option::where("key", "entity_relations")->first(); + if ($entity_relations_info) { + $entity_relations = json_decode($entity_relations_info->value, true); + if (isset($entity_relations[$entity])) { + unset($entity_relations[$entity]); + $entity_relations_info->value = json_encode($entity_relations, JSON_UNESCAPED_UNICODE); + $entity_relations_info->save(); + return true; + } + } + + return false; + } + + public function getEntityRelationsBySlug(string $slug) + { + $entityRelations = $this->getEntitiesRelations(); + if ($entityRelations) { + if (isset($entityRelations[$slug])) { + return $entityRelations[$slug]; + } + } + + return []; + } + + public static function addEntityRelation(string $entity, string $property): bool + { + $entity_relations_info = Option::where("key", "entity_relations")->first(); + if ($entity_relations_info) { + $entity_relations = json_decode($entity_relations_info->value, true); + if (isset($entity_relations[$entity])) { + $entity_relations[$entity][] = $property; + } else { + $entity_relations[$entity][] = $property; + } + $entity_relations_info->value = json_encode($entity_relations, JSON_UNESCAPED_UNICODE); + $entity_relations_info->save(); + + return true; + } + + return false; + } + + public function getAdditionalPropertyClassBySlug(string $slug) + { + $module = $this->moduleService->getModuleInfoBySlug($slug); + if (isset($module['module_class'])) { + return new $module['module_class'](); + } + + return false; + } + + public function renderFormInputsBySlug(string $entity, string $slug, Model $model): void + { + $moduleClass = $this->getAdditionalPropertyClassBySlug($slug); + if ($moduleClass and method_exists($moduleClass, "formInputs")) { + $moduleClass->formInputs($entity, $model); + } + } + + public function renderEntityAdditionalPropertyFormBySlug(string $entity, Model $model = null): void + { + $relations = $this->getEntityRelationsBySlug($entity); + if ($relations) { + foreach ($relations as $relation) { + $this->renderFormInputsBySlug($entity, $relation, $model); + } + } + } + + public function saveEntityRelationBySlug(string $slug, string $entity, Model $model, Request $request): void + { + $moduleClass = $this->getAdditionalPropertyClassBySlug($slug); + if ($moduleClass and method_exists($moduleClass, "saveInputs")) { + $moduleClass->saveInputs($entity, $model, $request); + } + } + + public function saveEntityRelation(string $entity, Model $model, Request $request): void + { + $relations = $this->getEntityRelationsBySlug($entity); + if ($relations) { + foreach ($relations as $relation) { + $this->saveEntityRelationBySlug($relation, $entity, $model, $request); + } + } + } + + public function getEntityAdditionalProperty(string $entity, Model $model): array + { + $relations = $this->getEntityRelationsBySlug($entity); + if ($relations) { + $relationsArr = []; + foreach ($relations as $relation) { + $moduleClass = $this->getAdditionalPropertyClassBySlug($relation); + if ($moduleClass and method_exists($moduleClass, "getItems")) { + $relationsArr[$relation] = $moduleClass->getItems($entity, $model); + } + } + + return $relationsArr; + } + + return []; + } + + public function getAdditionalPropertyByEntityId(string $entity, string $entity_id, string $additionalPropertySlug): string + { + $moduleClass = $this->getAdditionalPropertyClassBySlug($additionalPropertySlug); + if ($moduleClass and method_exists($moduleClass, "getItem")) { + return $moduleClass->getItem($entity, $entity_id); + } + + return ""; + } + + public function deleteEntityRelationBySlug(string $slug, string $entity, Model $model): void + { + $moduleClass = $this->getAdditionalPropertyClassBySlug($slug); + if ($moduleClass and method_exists($moduleClass, "deleteItems")) { + $moduleClass->deleteItems($entity, $model); + } + } + + public function deleteEntityRelation(string $entity, Model $model): void + { + $relations = $this->getEntityRelationsBySlug($entity); + if ($relations) { + foreach ($relations as $relation) { + $this->deleteEntityRelationBySlug($relation, $entity, $model); + } + } + } + + public static function getEntityByProperty(string $data): array + { + $entityRelations = self::getEntitiesRelations(); + $entities = []; + foreach ($entityRelations as $entity => $property) { + if (in_array($data, $property)) { + $entities[] = $entity; + } + } + + return $entities; + } + + public static function configurationEntitiesByProperty(array|null $entities, string $property): void + { + $entityRelations = self::getEntitiesRelations(); + if (isset($entities)) { + foreach ($entities as $entity) { + if (!isset($entityRelations[$entity])) { + EntityRelation::addEntityRelation($entity, $property); + } + } + foreach ($entityRelations as $entity => $additionalProperty) { + if (in_array($entity, $entities)) { + if (!in_array($property, $additionalProperty)) { + EntityRelation::addEntityRelation($entity, $property); + } + } else { + if (in_array($property, $additionalProperty)) { + EntityRelation::removePropertyFromEntityRelations($entity, $property); + } + } + } + } else { + foreach ($entityRelations as $entity => $additionalProperty) { + EntityRelation::removePropertyFromEntityRelations($entity, $property); + } + } + } +} \ No newline at end of file diff --git a/kernel/FormModel.php b/kernel/FormModel.php index 998d13b..92bc880 100644 --- a/kernel/FormModel.php +++ b/kernel/FormModel.php @@ -59,6 +59,16 @@ class FormModel return false; } + public function validateForUpdate(): bool + { + $res = $this->validator->validate($this->data, $this->rulesForUpdate()); + if (!$res) { + return true; + } + + return false; + } + public function getErrors(): array { return $this->validator->getProcessedErrors(); diff --git a/kernel/console/controllers/AdminConsoleController.php b/kernel/console/controllers/AdminConsoleController.php index 4b1bce3..bce72d6 100644 --- a/kernel/console/controllers/AdminConsoleController.php +++ b/kernel/console/controllers/AdminConsoleController.php @@ -69,11 +69,18 @@ class AdminConsoleController extends ConsoleController $this->optionService->createFromParams( key: "active_modules", - value: "{\"modules\":[\"admin_themes\", \"secure\", \"user\", \"menu\"]}", + value: "{\"modules\":[\"admin_themes\", \"secure\", \"user\", \"menu\", \"post\", \"option\"]}", label: "Активные модули" ); $this->out->r("create option active_modules", "green"); + $this->optionService->createFromParams( + key: "entity_relations", + value: "{}", + label: "Свойства сущностей" + ); + $this->out->r("create option entity_relations", "green"); + $this->menuService->createItem([ "label" => "Модули", "url" => "/admin", @@ -101,6 +108,13 @@ class AdminConsoleController extends ConsoleController ]); $this->out->r("create item menu user", "green"); + $this->menuService->createItem([ + "label" => "Посты", + "url" => "/admin/post", + "slug" => "post", + ]); + $this->out->r("create item menu post", "green"); + $this->menuService->createItem([ "label" => "Настройки", "url" => "#", @@ -116,6 +130,21 @@ class AdminConsoleController extends ConsoleController ]); $this->out->r("create item menu admin-themes", "green"); + $this->menuService->createItem([ + "label" => "Меню", + "url" => "/admin/settings/menu", + "slug" => "menu", + "parent_slug" => "settings" + ]); + $this->out->r("create item menu menu", "green"); + + $this->menuService->createItem([ + "label" => "Опции", + "url" => "/admin/option", + "slug" => "option" + ]); + $this->out->r("create item menu option", "green"); + $user = new CreateUserForm(); $user->load([ 'username' => 'admin', diff --git a/kernel/controllers/ModuleController.php b/kernel/controllers/ModuleController.php index 3e2bb18..ea08cd4 100644 --- a/kernel/controllers/ModuleController.php +++ b/kernel/controllers/ModuleController.php @@ -6,6 +6,7 @@ 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; diff --git a/kernel/helpers/Html.php b/kernel/helpers/Html.php new file mode 100644 index 0000000..0b834c7 --- /dev/null +++ b/kernel/helpers/Html.php @@ -0,0 +1,30 @@ +"; + } + + /** + * @param array $data + * @return string + */ + public static function createParams(array $data = []): string + { + $paramsString = ""; + foreach($data as $key => $param){ + if(is_string($param)){ + $paramsString .= $key . "='" . $param . "'"; + } + } + + return $paramsString; + } + +} \ No newline at end of file diff --git a/kernel/modules/menu/views/index.php b/kernel/modules/menu/views/index.php index 35db706..0cad83d 100644 --- a/kernel/modules/menu/views/index.php +++ b/kernel/modules/menu/views/index.php @@ -23,6 +23,9 @@ $table->columns([ if ($data == 0) return null; return Menu::find($data)->label; }), + 'icon_file' => function ($data) { + return $data ? "" : ""; + } ]); $table->beforePrint(function () { return IconBtnCreateWidget::create(['url' => '/admin/settings/menu/create'])->run(); diff --git a/kernel/modules/menu/views/view.php b/kernel/modules/menu/views/view.php index 00c404c..ecd3104 100644 --- a/kernel/modules/menu/views/view.php +++ b/kernel/modules/menu/views/view.php @@ -26,7 +26,10 @@ $table->rows([ 'parent_id' => (function ($data) { if ($data == 0) return null; return Menu::find($data)->label; - }) + }), + 'icon_file' => function ($data) { + return $data ? "" : ""; + } ]); $table->create(); $table->render(); \ No newline at end of file diff --git a/kernel/modules/option/service/OptionService.php b/kernel/modules/option/service/OptionService.php index 139d0fb..15eb5a5 100644 --- a/kernel/modules/option/service/OptionService.php +++ b/kernel/modules/option/service/OptionService.php @@ -35,7 +35,7 @@ class OptionService return false; } - public function createFromParams(string $key, string $value, string $label): false|Option + public static function createFromParams(string $key, string $value, string $label): false|Option { $model = new Option(); $model->key = $key; @@ -63,6 +63,17 @@ class OptionService return false; } + public static function removeOptionByKey(string $key): bool + { + $option = Option::where("key", $key)->first(); + if (!$option){ + return false; + } + + $option->delete(); + return true; + } + // public function createOptionArr(): array // { // foreach (Option::all()->toArray() as $option) { diff --git a/kernel/modules/post/controllers/PostController.php b/kernel/modules/post/controllers/PostController.php index ccd0d44..eef11f3 100644 --- a/kernel/modules/post/controllers/PostController.php +++ b/kernel/modules/post/controllers/PostController.php @@ -6,9 +6,12 @@ namespace kernel\modules\post\controllers; use Exception; use JetBrains\PhpStorm\NoReturn; use kernel\AdminController; +use kernel\EntityRelation; +use kernel\helpers\Debug; use kernel\modules\post\models\forms\CreatePostForm; use kernel\modules\post\models\Post; use kernel\modules\post\service\PostService; +use kernel\Request; class PostController extends AdminController { @@ -31,6 +34,10 @@ class PostController extends AdminController $postForm->load($_REQUEST); if ($postForm->validate()) { $post = $this->postService->create($postForm); + + $entityRelation = new EntityRelation(); + $entityRelation->saveEntityRelation(entity: "post", model: $post, request: new Request()); + if ($post) { $this->redirect("/admin/post/view/" . $post->id); } @@ -86,6 +93,10 @@ class PostController extends AdminController $postForm->load($_REQUEST); if ($postForm->validate()) { $post = $this->postService->update($postForm, $post); + + $entityRelation = new EntityRelation(); + $entityRelation->saveEntityRelation(entity: "post", model: $post, request: new Request()); + if ($post) { $this->redirect("/admin/post/view/" . $post->id); } @@ -102,6 +113,10 @@ class PostController extends AdminController if (!$post){ throw new Exception(message: "The post not found"); } + + $entityRelation = new EntityRelation(); + $entityRelation->deleteEntityRelation(entity: "post", model: $post); + $post->delete(); $this->redirect("/admin/post/"); } diff --git a/kernel/modules/post/manifest.json b/kernel/modules/post/manifest.json index 7ff222b..35d04c9 100644 --- a/kernel/modules/post/manifest.json +++ b/kernel/modules/post/manifest.json @@ -3,6 +3,7 @@ "version": "0.2", "author": "ITGuild", "slug": "post", + "type": "entity", "description": "Post module", "module_class": "kernel\\modules\\post\\PostModule", "module_class_file": "{KERNEL_MODULES}/post/PostModule.php", diff --git a/kernel/modules/post/views/form.php b/kernel/modules/post/views/form.php index ed898ea..39648da 100644 --- a/kernel/modules/post/views/form.php +++ b/kernel/modules/post/views/form.php @@ -6,7 +6,7 @@ use kernel\modules\post\models\Post; $form = new \itguild\forms\ActiveForm(); -$form->beginForm(isset($model) ? "/admin/post/edit/" . $model->id : "/admin/post"); +$form->beginForm(isset($model) ? "/admin/post/edit/" . $model->id : "/admin/post", 'multipart/form-data'); $form->field(\itguild\forms\inputs\TextInput::class, 'title', [ 'class' => "form-control", @@ -33,6 +33,12 @@ $form->field(class: \itguild\forms\inputs\Select::class, name: "user_id", params ->setOptions(\kernel\modules\user\service\UserService::createUsernameArr()) ->render(); +$entityRelations = new \kernel\EntityRelation(); +if (!isset($model)) { + $model = new Post(); +} +$entityRelations->renderEntityAdditionalPropertyFormBySlug("post", $model); + ?>
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 @@
+
+

Авторизация

+
@@ -48,10 +51,15 @@
-
+
Забыл пароль?
+ +
+ + Регистрация +
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 @@ + +
+ +
+
+
+ Trendy Pants and Shoes +
+
+
+ +
+

Регистрация

+
+ + + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ +
+
+ + +
+
+ + Войти в существующий аккаунт +
+
+ + + + + +
+
+
+
+
+ \ No newline at end of file diff --git a/kernel/modules/user/controllers/UserController.php b/kernel/modules/user/controllers/UserController.php index 47d439f..fdd8534 100644 --- a/kernel/modules/user/controllers/UserController.php +++ b/kernel/modules/user/controllers/UserController.php @@ -5,9 +5,11 @@ namespace kernel\modules\user\controllers; use Exception; use JetBrains\PhpStorm\NoReturn; use kernel\AdminController; +use kernel\EntityRelation; use kernel\modules\user\models\forms\CreateUserForm; use kernel\modules\user\models\User; use kernel\modules\user\service\UserService; +use kernel\Request; use Twig\Error\LoaderError; use Twig\Error\RuntimeError; use Twig\Error\SyntaxError; @@ -35,6 +37,11 @@ class UserController extends AdminController $userForm->load($_REQUEST); if ($userForm->validate()){ $user = $this->userService->create($userForm); + + + $entityRelation = new EntityRelation(); + $entityRelation->saveEntityRelation(entity: "user", model: $user, request: new Request()); + if ($user){ $this->redirect("/admin/user/view/" . $user->id); } @@ -91,8 +98,12 @@ class UserController extends AdminController $userForm = new CreateUserForm(); $userService = new UserService(); $userForm->load($_REQUEST); - if ($userForm->validate()){ + if ($userForm->validateForUpdate()){ $user = $userService->update($userForm, $user); + + $entityRelation = new EntityRelation(); + $entityRelation->saveEntityRelation(entity: "user", model: $user, request: new Request()); + if ($user){ $this->redirect("/admin/user/view/" . $user->id); } @@ -100,9 +111,20 @@ class UserController extends AdminController $this->redirect("/admin/user/update/" . $id); } + /** + * @throws Exception + */ #[NoReturn] public function actionDelete($id): void { - User::find($id)->delete(); + $user = User::find($id)->first(); + if (!$user){ + throw new Exception(message: "The user not found"); + } + + $entityRelation = new EntityRelation(); + $entityRelation->deleteEntityRelation(entity: "user", model: $user); + + $user->delete(); $this->redirect("/admin/user/"); } diff --git a/kernel/modules/user/manifest.json b/kernel/modules/user/manifest.json index 72e1b80..1892127 100644 --- a/kernel/modules/user/manifest.json +++ b/kernel/modules/user/manifest.json @@ -3,6 +3,7 @@ "version": "0.1", "author": "ITGuild", "slug": "user", + "type": "entity", "description": "User module", "module_class": "kernel\\modules\\user\\UserModule", "module_class_file": "{KERNEL_MODULES}/user/UserModule.php", diff --git a/kernel/modules/user/models/forms/CreateUserForm.php b/kernel/modules/user/models/forms/CreateUserForm.php index 632cfd9..73c5f77 100644 --- a/kernel/modules/user/models/forms/CreateUserForm.php +++ b/kernel/modules/user/models/forms/CreateUserForm.php @@ -16,4 +16,13 @@ class CreateUserForm extends FormModel ]; } + public function rulesForUpdate(): array + { + return [ + 'username' => 'required|min-str-len:5|max-str-len:30', + 'password' => '', + 'email' => 'required|email' + ]; + } + } \ No newline at end of file diff --git a/kernel/modules/user/service/UserService.php b/kernel/modules/user/service/UserService.php index 8619038..077edab 100644 --- a/kernel/modules/user/service/UserService.php +++ b/kernel/modules/user/service/UserService.php @@ -3,6 +3,7 @@ namespace kernel\modules\user\service; use kernel\FormModel; +use kernel\helpers\Debug; use kernel\modules\user\models\User; class UserService @@ -25,7 +26,9 @@ class UserService { $user->username = $form_model->getItem('username'); $user->email = $form_model->getItem('email'); - $user->password_hash = password_hash($form_model->getItem('password'), PASSWORD_DEFAULT); + if ($form_model->getItem('password')) { + $user->password_hash = password_hash($form_model->getItem('password'), PASSWORD_DEFAULT); + } if ($user->save()){ return $user; } diff --git a/kernel/modules/user/views/form.php b/kernel/modules/user/views/form.php index 8c49d1e..e32d35f 100644 --- a/kernel/modules/user/views/form.php +++ b/kernel/modules/user/views/form.php @@ -6,7 +6,7 @@ use kernel\modules\user\models\User; $form = new \itguild\forms\ActiveForm(); -$form->beginForm(isset($model) ? "/admin/user/edit/" . $model->id : "/admin/user"); +$form->beginForm(isset($model) ? "/admin/user/edit/" . $model->id : "/admin/user", enctype: 'multipart/form-data'); $form->field(class: \itguild\forms\inputs\TextInput::class, name: "username", params: [ 'class' => "form-control", @@ -32,6 +32,11 @@ $form->field(class: \itguild\forms\inputs\TextInput::class, name: "email", param ->setLabel("Email") ->render(); +$entityRelations = new \kernel\EntityRelation(); +if (!isset($model)) { + $model = new User(); +} +$entityRelations->renderEntityAdditionalPropertyFormBySlug("user", $model); ?>
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