update full

2024-12-04 13:11:12 +03:00
parent fd9439c9e2
commit 49399e456a
34 changed files with 780 additions and 121 deletions
--- 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 ? "<img src='$data' width='150px'>" : "";
+    }
 ]);
 $table->beforePrint(function () {
    return IconBtnCreateWidget::create(['url' => '/admin/settings/menu/create'])->run();
--- 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 ? "<img src='$data' width='300px'>" : "";
+    }
 ]);
 $table->create();
 $table->render();
--- 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) {
--- 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/");
    }
--- 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",
--- 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);
+
 ?>
    <div class="row">
        <div class="col-sm-2">
--- 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){
--- 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");
--- 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);
+        }
+    }
+
 }
--- a/kernel/modules/secure/models/forms/RegisterForm.php
+++ b/kernel/modules/secure/models/forms/RegisterForm.php
@ -0,0 +1,19 @@
+<?php
+
+namespace kernel\modules\secure\models\forms;
+
+use kernel\FormModel;
+
+class RegisterForm extends FormModel
+{
+
+    public function rules(): array
+    {
+        return [
+            'username' => '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',
+        ];
+    }
+
+}
--- 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){
--- a/kernel/modules/secure/views/login.php
+++ b/kernel/modules/secure/views/login.php
@ -24,6 +24,9 @@
            </div>
            <div class="col-lg-8">
                <div class="card-body py-5 px-md-5">
+                    <div class="row md-4 text-md-center">
+                        <h1>Авторизация</h1>
+                    </div>

                    <form action="/admin/auth" method="post">
                        <!-- Email input -->
@ -48,10 +51,15 @@
                                </div>
                            </div>

-                            <div class="col">
+                            <div class="col-3">
                                <!-- Simple link -->
                                <a href="#!">Забыл пароль?</a>
                            </div>
+
+                            <div class="col">
+                                <!-- Simple link -->
+                                <a href="/admin/register">Регистрация</a>
+                            </div>
                        </div>

                        <!-- Submit button -->
--- a/kernel/modules/secure/views/register.php
+++ b/kernel/modules/secure/views/register.php
@ -0,0 +1,71 @@
+<!-- Section: Design Block -->
+<section class=" text-center text-lg-start">
+    <style>
+        .rounded-t-5 {
+            border-top-left-radius: 0.5rem;
+            border-top-right-radius: 0.5rem;
+        }
+
+        @media (min-width: 992px) {
+            .rounded-tr-lg-0 {
+                border-top-right-radius: 0;
+            }
+
+            .rounded-bl-lg-5 {
+                border-bottom-left-radius: 0.5rem;
+            }
+        }
+    </style>
+    <div class="card mb-3">
+        <div class="row g-0 d-flex align-items-center">
+            <div class="col-lg-4 d-none d-lg-flex">
+                <img src="https://mdbootstrap.com/img/new/ecommerce/vertical/004.jpg" alt="Trendy Pants and Shoes"
+                     class="w-100 rounded-t-5 rounded-tr-lg-0 rounded-bl-lg-5" />
+            </div>
+            <div class="col-lg-8">
+                <div class="card-body py-5 px-md-5">
+
+                    <div class="row md-4 text-md-center">
+                        <h1>Регистрация</h1>
+                    </div>
+
+                    <form action="/admin/registration" method="post">
+                        <!--Username input -->
+                        <div data-mdb-input-init class="form-outline mb-4">
+                            <input type="text" id="form2Example1" class="form-control" name="username" />
+                            <label class="form-label" for="form2Example1">Логин</label>
+                        </div>
+
+                        <!-- Email input -->
+                        <div data-mdb-input-init class="form-outline mb-4">
+                            <input type="email" id="form2Example1" class="form-control" name="email" />
+                            <label class="form-label" for="form2Example1">Email</label>
+                        </div>
+
+                        <!-- Password input -->
+                        <div data-mdb-input-init class="form-outline mb-4">
+                            <input type="password" id="form2Example2" class="form-control" name="password" />
+                            <label class="form-label" for="form2Example2">Пароль</label>
+                        </div>
+
+                        <div class="row mb-4">
+                            <div class="col-4">
+                                <!-- Submit button -->
+                                <button  type="submit" data-mdb-button-init data-mdb-ripple-init class="btn btn-primary btn-block mb-4">Регистрация</button>
+                            </div>
+                            <div class="col-4">
+                                <!-- Simple link -->
+                                <a href="/admin/login">Войти в существующий аккаунт</a>
+                            </div>
+                        </div>
+
+
+
+                    </form>
+
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+<!-- Section: Design Block -->
--- 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/");
    }

--- 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",
--- 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'
+        ];
+    }
+
 }
--- 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;
        }
--- 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);
 ?>
    <div class="row">
        <div class="col-sm-2">
--- 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" => [
--- 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){