add modules and upload file

kernel/modules/menu/controllers/MenuController.php

@@ -4,22 +4,26 @@ namespace kernel\modules\menu\controllers;
 
 use app\helpers\Debug;
 use app\models\forms\CreateMenuForm;
-use app\services\MenuService;
+use kernel\FileUpload;
+use kernel\modules\menu\service\MenuService;
 use Exception;
 use JetBrains\PhpStorm\NoReturn;
+use kernel\AdminController;
 use kernel\Controller;
 use kernel\models\Menu;
 use Twig\Error\LoaderError;
 use Twig\Error\RuntimeError;
 use Twig\Error\SyntaxError;
 
-class MenuController extends Controller
+class MenuController extends AdminController
 {
+    private MenuService $menuService;
+
     protected function init(): void
     {
+        parent::init();
         $this->cgView->viewPath = KERNEL_MODULES_DIR . "/menu/views/";
-        $this->cgView->layoutPath = ROOT_DIR . "/views/admin/";
-        $this->cgView->layout = "layouts/main.php";
+        $this->menuService = new MenuService();
     }
 
     public function actionCreate(): void
@@ -29,11 +33,15 @@ class MenuController extends Controller
 
     #[NoReturn] public function actionAdd(): void
     {
+        if (isset($_FILES['icon_file']) && $_FILES['icon_file']['error'] === UPLOAD_ERR_OK) {
+            $file = new FileUpload($_FILES['icon_file']);
+            $file->upload();
+        }
+
         $menuForm = new CreateMenuForm();
-        $menuService = new MenuService();
         $menuForm->load($_REQUEST);
         if ($menuForm->validate()){
-            $menuItem = $menuService->create($menuForm);
+            $menuItem = $this->menuService->create($menuForm);
             if ($menuItem){
                 $this->redirect("/admin/settings/menu/" . $menuItem->id);
             }
@@ -82,15 +90,20 @@ class MenuController extends Controller
      */
     public function actionEdit($id): void
     {
+//        Debug::prn($_REQUEST);
+//        Debug::prn($_FILES);
         $menuItem = Menu::find($id);
         if (!$menuItem){
             throw new Exception(message: "The menu item not found");
         }
+        if (isset($_FILES['icon_file']) && $_FILES['icon_file']['error'] === UPLOAD_ERR_OK) {
+            $file = new FileUpload($_FILES['icon_file']);
+            $file->upload();
+        }
         $menuForm = new CreateMenuForm();
-        $menuService = new MenuService();
         $menuForm->load($_REQUEST);
         if ($menuForm->validate()){
-            $menuItem = $menuService->update($menuForm, $menuItem);
+            $menuItem = $this->menuService->update($menuForm, $menuItem);
             if ($menuItem){
                 $this->redirect("/admin/settings/menu/" . $menuItem->id);
             }

kernel/modules/menu/service/MenuService.php

@@ -0,0 +1,91 @@
+<?php
+
+namespace kernel\modules\menu\service;
+
+use kernel\FormModel;
+use kernel\models\Menu;
+use kernel\Request;
+
+class MenuService
+{
+    public function create(FormModel $form_model): false|Menu
+    {
+        $model = new Menu();
+        $model->parent_id = $form_model->getItem('parent_id');
+        $model->icon_file = $form_model->getItem('icon_file');
+        $model->icon_font = $form_model->getItem('icon_font');
+        $model->label = $form_model->getItem('label');
+        $model->url = $form_model->getItem('url');
+        $model->status = $form_model->getItem('status');
+        if ($model->save()){
+            return $model;
+        }
+
+        return false;
+    }
+
+    public function update(FormModel $form_model, Menu $menuItem): false|Menu
+    {
+        $menuItem->parent_id = $form_model->getItem('parent_id');
+        $menuItem->icon_file = $form_model->getItem('icon_file');
+        $menuItem->icon_font = $form_model->getItem('icon_font');
+        $menuItem->label = $form_model->getItem('label');
+        $menuItem->url = $form_model->getItem('url');
+        $menuItem->status = $form_model->getItem('status');
+        if ($menuItem->save()){
+            return $menuItem;
+        }
+
+        return false;
+    }
+
+    public static function createLabelArr(): array
+    {
+        $labelArr[0] = "Корневой пункт меню";
+        foreach (Menu::where("parent_id", 0)->get()->toArray() as $menuItem) {
+            $labelArr[$menuItem['id']] = $menuItem['label'];
+        }
+        if (!empty($labelArr)) {
+            return $labelArr;
+        }
+        return [];
+    }
+    public static function getChild(int $id)
+    {
+        $collection = Menu::where("parent_id", $id)->get();
+        if (!$collection->isEmpty()){
+            return $collection;
+        }
+
+        return false;
+    }
+
+    public static function hasActiveChild(int $id): bool
+    {
+        $child = self::getChild($id);
+        if (!$child->isEmpty()){
+            foreach ($child as $item){
+//                if ($item->url === \kernel\Request::getUrlPath()){
+//                    return true;
+//                }
+                if (strripos(Request::getUrlPath(), $item->url) !== false) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    public static function isActive($url): bool
+    {
+        if ($url === Request::getUrlPath()){
+            return true;
+        } else {
+            if (strripos(\kernel\Request::getUrlPath(), ($url . "/page")) !== false) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

kernel/modules/menu/views/form.php

@@ -13,7 +13,7 @@ $form->field(class: \itguild\forms\inputs\Select::class, name: "parent_id", para
     'value' => $model->parent_id ?? ''
 ])
     ->setLabel("Родительский пункт меню")
-    ->setOptions(\app\services\MenuService::createLabelArr())
+    ->setOptions(\kernel\modules\menu\service\MenuService::createLabelArr())
     ->render();
 
 $form->field(class: \itguild\forms\inputs\File::class, name: "icon_file", params: [

kernel/modules/post/controllers/PostController.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace kernel\modules\post\controllers;
+
+
+use app\helpers\Debug;
+use app\models\forms\CreatePostForm;
+use kernel\AdminController;
+use kernel\modules\post\models\Post;
+use kernel\modules\post\service\PostService;
+use Exception;
+use JetBrains\PhpStorm\NoReturn;
+
+class PostController extends AdminController
+{
+    private PostService $postService;
+
+    protected function init(): void
+    {
+        $this->cgView->viewPath = KERNEL_MODULES_DIR . "/post/views/";
+        $this->postService = new PostService();
+    }
+    public function actionCreate(): void
+    {
+        $this->cgView->render("form.php");
+    }
+
+    #[NoReturn] public function actionAdd(): void
+    {
+        $postForm = new CreatePostForm();
+        $postForm->load($_REQUEST);
+        if ($postForm->validate()) {
+            $post = $this->postService->create($postForm);
+            if ($post) {
+                $this->redirect("/admin/post/" . $post->id);
+            }
+        }
+        $this->redirect("/admin/post/create");
+    }
+
+    /**
+     * @throws Exception
+     */
+
+    public function actionIndex($page_number = 1): void
+    {
+        $this->cgView->render("index.php", ['page_number' => $page_number]);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function actionView($id): void
+    {
+        $content = Post::find($id);
+
+        if (!$content){
+            throw new Exception(message: "The post not found");
+        }
+        $this->cgView->render("view.php", ['content' => $content]);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function actionUpdate($id): void
+    {
+        $model = Post::find($id);
+        if (!$model){
+            throw new Exception(message: "The post not found");
+        }
+
+        $this->cgView->render("form.php", ['model' => $model]);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function actionEdit($id): void
+    {
+        $post = Post::find($id);
+        if (!$post){
+            throw new Exception(message: "The post not found");
+        }
+        $postForm = new CreatePostForm();
+        $postService = new PostService();
+        $postForm->load($_REQUEST);
+        if ($postForm->validate()) {
+            $post = $postService->update($postForm, $post);
+            if ($post) {
+                $this->redirect("/admin/post/" . $post->id);
+            }
+        }
+        $this->redirect("/admin/post/update/" . $id);
+    }
+
+    #[NoReturn] public function actionDelete($id): void
+    {
+        $post = Post::find($id)->first();
+        $post->delete();
+        $this->redirect("/admin/post/");
+    }
+}

kernel/modules/post/models/Post.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace kernel\modules\post\models;
+use \Illuminate\Database\Eloquent\Model;
+
+/**
+ * @property int $id
+ * @property string $content
+// * @property string $username
+ * @property int $user_id
+ * @method static where(int[] $array)
+ * @method static find($id)
+ */
+class Post extends Model
+{
+    protected $table = 'post';
+    protected $fillable = ['content', 'user_id'];
+
+    public static function labels(): array
+    {
+        return [
+            'content' => 'Контент',
+            'user_id' => 'Id пользователя',
+            'created_at' => 'Создан',
+            'updated_at' => 'Обновлен'
+        ];
+    }
+}

kernel/modules/post/service/PostService.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace kernel\modules\post\service;
+
+use kernel\modules\post\models\Post;
+use kernel\FormModel;
+
+class PostService
+{
+    public function create(FormModel $form_model): false|Post
+    {
+        $model = new Post();
+        $model->content = $form_model->getItem('content');
+        $model->user_id = $form_model->getItem('user_id');
+        if ($model->save()){
+            return $model;
+        }
+
+        return false;
+    }
+
+    public function update(FormModel $form_model, Post $post): false|Post
+    {
+        $post->content = $form_model->getItem('content');
+        $post->user_id = $form_model->getItem('user_id');
+        if ($post->save()){
+            return $post;
+        }
+
+        return false;
+    }
+}

kernel/modules/post/views/form.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * @var Post $model
+ */
+
+use kernel\modules\post\models\Post;
+
+$form = new \itguild\forms\ActiveForm();
+$form->beginForm(isset($model) ? "/admin/post/edit/" . $model->id : "/admin/post");
+
+$form->field(class: \itguild\forms\inputs\TextArea::class, name: "content", params: [
+    'class' => "form-control",
+    'placeholder' => 'Контент',
+    'rows' => '10',
+    'value' => $model->content ?? ''
+])
+    ->setLabel("Пост")
+    ->render();
+$form->field(class: \itguild\forms\inputs\Select::class, name: "user_id", params: [
+    'class' => "form-control",
+    'value' => $model->user_id ?? ''
+])
+    ->setLabel("Пользователи")
+    ->setOptions(\kernel\modules\user\service\UserService::createUsernameArr())
+    ->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();

kernel/modules/post/views/index.php

@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @var \Illuminate\Database\Eloquent\Collection $contents
+ * @var int $page_number
+ */
+
+use kernel\modules\post\models\Post;
+use kernel\modules\user\models\User;
+use app\tables\columns\post\PostDeleteActionColumn;
+use app\tables\columns\post\PostEditActionColumn;
+use app\tables\columns\post\PostViewActionColumn;
+use Itguild\EloquentTable\EloquentDataProvider;
+use Itguild\EloquentTable\ListEloquentTable;
+use kernel\IGTabel\btn\PrimaryBtn;
+
+$table = new ListEloquentTable(new EloquentDataProvider(Post::class, [
+    'currentPage' => $page_number,
+    'perPage' => 3,
+    'params' => ["class" => "table table-bordered", "border" => "2"],
+    'baseUrl' => "/admin/post"
+]));
+$table->columns([
+    'created_at' => function ($data) {
+        if (!$data){
+            return null;
+        }
+
+        return (new DateTimeImmutable($data))->format("d-m-Y");
+    },
+    'updated_at' => function ($data) {
+        if (!$data){
+            return null;
+        }
+
+        return (new DateTimeImmutable($data))->format("d-m-Y");
+    },
+    'user_id' => (function ($data) {
+        return User::find($data)->username;
+    })
+]);
+$table->beforePrint(function () {
+    return PrimaryBtn::create("Создать", "/admin/post/create")->fetch();
+    //return (new PrimaryBtn("Создать", "/admin/user/create"))->fetch();
+});
+$table->addAction(PostViewActionColumn::class);
+$table->addAction(PostEditActionColumn::class);
+$table->addAction(PostDeleteActionColumn::class);
+$table->create();
+$table->render();

kernel/modules/post/views/view.php

@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @var \Illuminate\Database\Eloquent\Collection $content
+ */
+
+use kernel\modules\user\models\User;
+use Itguild\EloquentTable\ViewEloquentTable;
+use Itguild\EloquentTable\ViewJsonTableEloquentModel;
+use kernel\IGTabel\btn\DangerBtn;
+use kernel\IGTabel\btn\PrimaryBtn;
+use kernel\IGTabel\btn\SuccessBtn;
+
+$table = new ViewEloquentTable(new ViewJsonTableEloquentModel($content, [
+    'params' => ["class" => "table table-bordered", "border" => "2"],
+    'baseUrl' => "/admin/post",
+]));
+$table->beforePrint(function () use ($content) {
+    $btn = PrimaryBtn::create("Список", "/admin/post")->fetch();
+    $btn .= SuccessBtn::create("Редактировать", "/admin/post/update/" . $content->id)->fetch();
+    $btn .= DangerBtn::create("Удалить", "/admin/post/delete/" . $content->id)->fetch();
+    return $btn;
+});
+$table->rows([
+    'created_at' => function ($data) {
+        if (!$data){
+            return null;
+        }
+        return (new DateTimeImmutable($data))->format("d-m-Y");
+    },
+    'updated_at' => function ($data) {
+        if (!$data){
+            return null;
+        }
+        return (new DateTimeImmutable($data))->format("d-m-Y");
+    },
+    'user_id' => (function ($data) {
+        return User::find($data)->username;
+    })
+]);
+$table->create();
+$table->render();

kernel/modules/user/controllers/UserController.php

@@ -0,0 +1,109 @@
+<?php
+namespace kernel\modules\user\controllers;
+
+
+use app\models\forms\CreateUserForm;
+use kernel\modules\user\models\User;
+use kernel\AdminController;
+use kernel\modules\user\service\UserService;
+use Exception;
+use JetBrains\PhpStorm\NoReturn;
+use kernel\Controller;
+use Twig\Error\LoaderError;
+use Twig\Error\RuntimeError;
+use Twig\Error\SyntaxError;
+
+class UserController extends AdminController
+{
+
+    private UserService $userService;
+
+    protected function init(): void
+    {
+        parent::init();
+        $this->cgView->viewPath = KERNEL_MODULES_DIR . "/user/views/";
+        $this->userService = new UserService();
+    }
+
+    public function actionCreate(): void
+    {
+        $this->cgView->render("form.php");
+    }
+
+    #[NoReturn] public function actionAdd(): void
+    {
+        $userForm = new CreateUserForm();
+        $userForm->load($_REQUEST);
+        if ($userForm->validate()){
+            $user = $this->userService->create($userForm);
+            if ($user){
+                $this->redirect("/admin/user/" . $user->id);
+            }
+        }
+        $this->redirect("/admin/user/create");
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function actionIndex($page_number = 1): void
+    {
+        $this->cgView->render("index.php", ['page_number' => $page_number]);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function actionView($id): void
+    {
+        $user = User::find($id);
+
+        if (!$user){
+            throw new Exception(message: "The user not found");
+        }
+        $this->cgView->render("view.php", ['user' => $user]);
+    }
+
+    /**
+     * @throws RuntimeError
+     * @throws SyntaxError
+     * @throws LoaderError
+     */
+    public function actionUpdate($id): void
+    {
+        $model = User::find($id);
+        if (!$model){
+            throw new Exception(message: "The user not found");
+        }
+
+        $this->cgView->render("form.php", ['model' => $model]);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function actionEdit($id): void
+    {
+        $user = User::find($id);
+        if (!$user){
+            throw new Exception(message: "The user not found");
+        }
+        $userForm = new CreateUserForm();
+        $userService = new UserService();
+        $userForm->load($_REQUEST);
+        if ($userForm->validate()){
+            $user = $userService->update($userForm, $user);
+            if ($user){
+                $this->redirect("/admin/user/" . $user->id);
+            }
+        }
+        $this->redirect("/admin/user/update/" . $id);
+    }
+
+    #[NoReturn] public function actionDelete($id): void
+    {
+        User::find($id)->delete();
+        $this->redirect("/admin/user/");
+    }
+
+}

kernel/modules/user/models/User.php

@@ -0,0 +1,27 @@
+<?php
+namespace kernel\modules\user\models;
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * @property int $id
+ * @property string $username
+ * @property string $email
+ * @property string $password_hash
+ * @method static where(int[] $array)
+ * @method static find($id)
+ */
+class User extends Model {
+    protected $table = 'user';
+    protected $fillable = ['username', 'email', 'password_hash', 'role'];
+    protected array $dates = ['deleted at'];
+
+    public static function labels(): array
+    {
+        return [
+            'username' => 'Логин',
+            'email' => 'Email',
+            'created_at' => 'Создан',
+            'updated_at' => 'Обновлен'
+        ];
+    }
+}

kernel/modules/user/service/UserService.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace kernel\modules\user\service;
+
+use app\helpers\Debug;
+use kernel\modules\user\models\User;
+use kernel\FormModel;
+
+class UserService
+{
+
+    public function create(FormModel $form_model): false|User
+    {
+        $model = new User();
+        $model->username = $form_model->getItem('username');
+        $model->email = $form_model->getItem('email');
+        $model->password_hash = password_hash($form_model->getItem('password'), PASSWORD_DEFAULT);
+        if ($model->save()){
+            return $model;
+        }
+
+        return false;
+    }
+
+    public function update(FormModel $form_model, User $user): false|User
+    {
+        $user->username = $form_model->getItem('username');
+        $user->email = $form_model->getItem('email');
+        $user->password_hash = password_hash($form_model->getItem('password'), PASSWORD_DEFAULT);
+        if ($user->save()){
+            return $user;
+        }
+
+        return false;
+    }
+
+    public static function createUsernameArr(): array
+    {
+        foreach (User::all()->toArray() as $user) {
+
+            $userArr[$user['id']] = $user['username'];
+        }
+        if (!empty($userArr)) {
+            return $userArr;
+        }
+        return [];
+    }
+
+}

kernel/modules/user/views/form.php

@@ -0,0 +1,59 @@
+<?php
+/**
+ * @var User $model
+ */
+
+use kernel\modules\user\models\User;
+
+$form = new \itguild\forms\ActiveForm();
+$form->beginForm(isset($model) ? "/admin/user/edit/" . $model->id : "/admin/user");
+
+$form->field(class: \itguild\forms\inputs\TextInput::class, name: "username", params: [
+    'class' => "form-control",
+    'placeholder' => 'Логин',
+    'value' => $model->username ?? ''
+])
+    ->setLabel("Логин")
+    ->render();
+
+$form->field(class: \itguild\forms\inputs\TextInput::class, name: "password", params: [
+    'class' => "form-control",
+    'type' => "password",
+])
+    ->setLabel("Пароль")
+    ->render();
+
+$form->field(class: \itguild\forms\inputs\TextInput::class, name: "email", params: [
+    'class' => "form-control",
+    'type' => "email",
+    'placeholder' => 'test@mail.ru',
+    'value' => $model->email ?? ''
+])
+    ->setLabel("Email")
+    ->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();

kernel/modules/user/views/index.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * @var \Illuminate\Database\Eloquent\Collection $users
+ * @var int $page_number
+ */
+
+use app\tables\columns\user\UserDeleteActionColumn;
+use app\tables\columns\user\UserEditActionColumn;
+use app\tables\columns\user\UserViewActionColumn;
+use Itguild\EloquentTable\EloquentDataProvider;
+use Itguild\EloquentTable\ListEloquentTable;
+use kernel\IGTabel\btn\PrimaryBtn;
+use kernel\modules\user\models\User;
+
+$table = new ListEloquentTable(new EloquentDataProvider(User::class, [
+    'currentPage' => $page_number,
+    'perPage' => 3,
+    'params' => ["class" => "table table-bordered", "border" => "2"],
+    'baseUrl' => "/admin/user",
+    'filters' => ['email'],
+]));
+$table->columns([
+    'username' => [
+        "filter" => [
+            'class' => \Itguild\Tables\Filter\InputTextFilter::class
+        ]
+    ],
+    'created_at' => function ($data) {
+        if (!$data){
+            return null;
+        }
+
+        return (new DateTimeImmutable($data))->format("d-m-Y");
+    },
+    'updated_at' => function ($data) {
+        if (!$data){
+            return null;
+        }
+
+        return (new DateTimeImmutable($data))->format("d-m-Y");
+    }
+]);
+$table->beforePrint(function () {
+    return PrimaryBtn::create("Создать", "/admin/user/create")->fetch();
+    //return (new PrimaryBtn("Создать", "/admin/user/create"))->fetch();
+});
+$table->addAction(UserViewActionColumn::class);
+$table->addAction(UserEditActionColumn::class);
+$table->addAction(UserDeleteActionColumn::class);
+$table->create();
+$table->render();

kernel/modules/user/views/view.php

@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @var \Illuminate\Database\Eloquent\Collection $user
+ */
+
+use kernel\modules\user\models\User;
+use Itguild\EloquentTable\ViewEloquentTable;
+use Itguild\EloquentTable\ViewJsonTableEloquentModel;
+use kernel\IGTabel\btn\DangerBtn;
+use kernel\IGTabel\btn\PrimaryBtn;
+use kernel\IGTabel\btn\SuccessBtn;
+
+$table = new ViewEloquentTable(new ViewJsonTableEloquentModel($user, [
+    'params' => ["class" => "table table-bordered", "border" => "2"],
+    'baseUrl' => "/admin/user",
+]));
+$table->beforePrint(function () use ($user) {
+    $btn = PrimaryBtn::create("Список", "/admin/user")->fetch();
+    $btn .= SuccessBtn::create("Редактировать", "/admin/user/update/" . $user->id)->fetch();
+    $btn .= DangerBtn::create("Удалить", "/admin/user/delete/" . $user->id)->fetch();
+    return $btn;
+});
+$table->rows([
+    'created_at' => function ($data) {
+        if (!$data){
+            return null;
+        }
+
+        return (new DateTimeImmutable($data))->format("d-m-Y");
+    },
+    'updated_at' => function ($data) {
+        if (!$data){
+            return null;
+        }
+
+        return (new DateTimeImmutable($data))->format("d-m-Y");
+    }
+]);
+$table->create();
+$table->render();