themes add and some fix

kernel/modules/user/controllers/UserController.php

@@ -6,6 +6,8 @@ use Exception;
 use JetBrains\PhpStorm\NoReturn;
 use kernel\AdminController;
 use kernel\EntityRelation;
+use kernel\FileUpload;
+use kernel\helpers\Debug;
 use kernel\modules\user\models\forms\CreateUserForm;
 use kernel\modules\user\models\User;
 use kernel\modules\user\service\UserService;
@@ -35,10 +37,17 @@ class UserController extends AdminController
     {
         $userForm = new CreateUserForm();
         $userForm->load($_REQUEST);
+
+
+        if (isset($_FILES['user_photo']) && $_FILES['user_photo']['error'] === UPLOAD_ERR_OK) {
+            $file = new FileUpload($_FILES['user_photo'], ['jpg', 'jpeg', 'png']);
+            $file->upload();
+            $userForm->setItem('user_photo', $file->getUploadFile());
+        }
+
         if ($userForm->validate()){
             $user = $this->userService->create($userForm);
 
-
             $entityRelation = new EntityRelation();
             $entityRelation->saveEntityRelation(entity: "user", model: $user, request: new Request());
 
@@ -98,6 +107,13 @@ class UserController extends AdminController
         $userForm = new CreateUserForm();
         $userService = new UserService();
         $userForm->load($_REQUEST);
+
+        if (isset($_FILES['user_photo']) && $_FILES['user_photo']['error'] === UPLOAD_ERR_OK) {
+            $file = new FileUpload($_FILES['user_photo'], ['jpg', 'jpeg', 'png']);
+            $file->upload();
+            $userForm->setItem('user_photo', $file->getUploadFile());
+        }
+
         if ($userForm->validateForUpdate()){
             $user = $userService->update($userForm, $user);
 
@@ -128,4 +144,53 @@ class UserController extends AdminController
         $this->redirect("/admin/user/");
     }
 
+    public function actionProfile(): void
+    {
+        $user = UserService::getAuthUser();
+        if (!$user){
+            throw new Exception(message: "The user not found");
+        }
+        $this->cgView->render("view_profile.php", ['user' => $user]);
+    }
+
+    public function actionProfileUpdate(): void
+    {
+        $model = UserService::getAuthUser();
+        if (!$model){
+            throw new Exception(message: "The user not found");
+        }
+
+        $this->cgView->render("form_profile.php", ['model' => $model]);
+    }
+
+    public function actionProfileEdit(): void
+    {
+        $user = UserService::getAuthUser();
+        if (!$user){
+            throw new Exception(message: "The user not found");
+        }
+
+        $userForm = new CreateUserForm();
+        $userService = new UserService();
+        $userForm->load($_REQUEST);
+
+        if (isset($_FILES['user_photo']) && $_FILES['user_photo']['error'] === UPLOAD_ERR_OK) {
+            $file = new FileUpload($_FILES['user_photo'], ['jpg', 'jpeg', 'png']);
+            $file->upload();
+            $userForm->setItem('user_photo', $file->getUploadFile());
+        }
+
+        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/profile");
+            }
+        }
+        $this->redirect("/admin/user/profile/update");
+    }
+
 }

kernel/modules/user/migrations/2024_09_23_125827_create_user_table.php

@@ -20,6 +20,7 @@ return new class extends Migration
             $table->string('username', 255)->nullable(false);
             $table->string('email', 255);
             $table->string('password_hash', 255);
+            $table->string('user_photo', 255)->nullable();
             $table->integer('role')->default(1);
             $table->string('access_token', 255)->nullable(true);
             $table->dateTime('access_token_expires_at')->nullable(true);

kernel/modules/user/models/User.php

@@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $username
  * @property string $email
  * @property string $password_hash
+ * @property string $user_photo
  * @property string $access_token
  * @property string $access_token_expires_at
  * @method static find($id)
@@ -17,7 +18,7 @@ class User extends Model {
     const ADMIN_USER_ROLE = 9;
 
     protected $table = 'user';
-    protected $fillable = ['username', 'email', 'password_hash', 'role', 'access_token', 'access_token_expires_at'];
+    protected $fillable = ['username', 'email', 'password_hash', 'user_photo', 'role', 'access_token', 'access_token_expires_at'];
     protected array $dates = ['deleted at'];
 
     public static function labels(): array
@@ -25,6 +26,7 @@ class User extends Model {
         return [
             'username' => 'Логин',
             'email' => 'Email',
+            'user_photo' => 'Фото профиля',
             'created_at' => 'Создан',
             'updated_at' => 'Обновлен',
         ];

kernel/modules/user/models/forms/CreateUserForm.php

@@ -12,7 +12,8 @@ class CreateUserForm extends FormModel
         return [
             'username' => 'required|min-str-len:5|max-str-len:30',
             'password' => 'required|min-str-len:5|max-str-len:30',
-            'email' => 'required|email'
+            'email' => 'required|email',
+            'user_photo' => ''
         ];
     }
 
@@ -21,7 +22,9 @@ class CreateUserForm extends FormModel
         return [
             'username' => 'required|min-str-len:5|max-str-len:30',
             'password' => '',
-            'email' => 'required|email'
+            'email' => 'required|email',
+            'user_photo' => ''
+
         ];
     }
 

kernel/modules/user/routs/user.php

@@ -17,6 +17,11 @@ App::$collector->group(["prefix" => "admin"], function (RouteCollector $router){
             App::$collector->any('/update/{id}', [\kernel\modules\user\controllers\UserController::class, 'actionUpdate']);
             App::$collector->any("/edit/{id}", [\kernel\modules\user\controllers\UserController::class, 'actionEdit']);
             App::$collector->get('/delete/{id}', [\kernel\modules\user\controllers\UserController::class, 'actionDelete']);
+            App::$collector->group(["prefix" => "profile"], callback: function (RouteCollector $router) {
+                App::$collector->get('/', [\kernel\modules\user\controllers\UserController::class, 'actionProfile']);
+                App::$collector->get('/update', [\kernel\modules\user\controllers\UserController::class, 'actionProfileUpdate']);
+                App::$collector->post('/edit', [\kernel\modules\user\controllers\UserController::class, 'actionProfileEdit']);
+            });
         });
     });
 });

kernel/modules/user/service/UserService.php

@@ -15,6 +15,7 @@ class UserService
         $model->username = $form_model->getItem('username');
         $model->email = $form_model->getItem('email');
         $model->password_hash = password_hash($form_model->getItem('password'), PASSWORD_DEFAULT);
+        $model->user_photo = $form_model->getItem('user_photo');
         if ($model->save()){
             return $model;
         }
@@ -29,6 +30,7 @@ class UserService
         if ($form_model->getItem('password')) {
             $user->password_hash = password_hash($form_model->getItem('password'), PASSWORD_DEFAULT);
         }
+        $user->user_photo = $form_model->getItem('user_photo');
         if ($user->save()){
             return $user;
         }
@@ -80,6 +82,28 @@ class UserService
         return  '';
     }
 
+    public static function getAuthUserId(): string
+    {
+        $user = self::getAuthUser();
+        if ($user){
+            return $user->id;
+        }
+
+        return  '';
+    }
+
+    public static function getAuthUserPhoto(): string|null
+    {
+        $user = self::getAuthUser();
+        if ($user){
+            if ($user->user_photo) {
+                return $user->user_photo;
+            }
+        }
+
+        return  null;
+    }
+
     public function getByAccessToken(string $token)
     {
         return $this->getByField("access_token", $token);

kernel/modules/user/views/form.php

@@ -32,6 +32,16 @@ $form->field(class: \itguild\forms\inputs\TextInput::class, name: "email", param
     ->setLabel("Email")
     ->render();
 
+if (!empty($model->user_photo)){
+    echo "<div><img src='$model->user_photo' width='200px'></div>";
+}
+$form->field(class: \itguild\forms\inputs\File::class, name: "user_photo", params: [
+    'class' => "form-control",
+    'value' => $model->user_photo ?? ''
+])
+    ->setLabel("Фото профиля")
+    ->render();
+
 $entityRelations = new \kernel\EntityRelation();
 if (!isset($model)) {
     $model = new User();

kernel/modules/user/views/form_profile.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ * @var User $model
+ */
+
+use kernel\modules\user\models\User;
+
+$form = new \itguild\forms\ActiveForm();
+$form->beginForm("/admin/user/profile/edit", enctype: 'multipart/form-data');
+
+$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();
+
+if (!empty($model->user_photo)){
+    echo "<div><img src='$model->user_photo' width='200px'></div>";
+}
+$form->field(class: \itguild\forms\inputs\File::class, name: "user_photo", params: [
+    'class' => "form-control",
+    'value' => $model->user_photo ?? ''
+])
+    ->setLabel("Фото профиля")
+    ->render();
+
+$entityRelations = new \kernel\EntityRelation();
+if (!isset($model)) {
+    $model = new User();
+}
+$entityRelations->renderEntityAdditionalPropertyFormBySlug("user", $model);
+?>
+    <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

@@ -17,13 +17,15 @@ use kernel\widgets\IconBtn\IconBtnDeleteWidget;
 use kernel\widgets\IconBtn\IconBtnEditWidget;
 use kernel\widgets\IconBtn\IconBtnViewWidget;
 
+$get = (new \kernel\Request())->get();
+
 $table = new ListEloquentTable(new EloquentDataProvider(User::class, [
     'currentPage' => $page_number,
     'perPage' => 3,
     'params' => ["class" => "table table-bordered", "border" => "2"],
     'baseUrl' => "/admin/user",
-    'filters' => ['email'],
-]));
+    'searchPrefix' => "",
+    'searchParams' => $get,]));
 
 $entityRelation = new \kernel\EntityRelation();
 $additionals = $entityRelation->getEntityRelationsBySlug("user");
@@ -37,9 +39,13 @@ foreach ($additionals as $additional) {
 $table->columns([
     'username' => [
         "filter" => [
-            'class' => \Itguild\Tables\Filter\InputTextFilter::class
+            'class' => \kernel\filters\BootstrapTextFilter::class,
+            'value' => $get['username'] ?? null,
         ]
     ],
+    'user_photo' => function ($data) {
+        return $data ? "<img src='$data' width='150px'>" : "";
+    },
     'created_at' => function ($data) {
         if (!$data){
             return null;

kernel/modules/user/views/view.php

@@ -35,6 +35,9 @@ foreach ($additionals as $key => $additional) {
 }
 
 $table->rows([
+    'user_photo' => function ($data) {
+        return $data ? "<img src='$data' width='300px'>" : "";
+    },
     'created_at' => function ($data) {
         if (!$data){
             return null;

kernel/modules/user/views/view_profile.php

@@ -0,0 +1,56 @@
+<?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;
+use kernel\widgets\IconBtn\IconBtnDeleteWidget;
+use kernel\widgets\IconBtn\IconBtnEditWidget;
+use kernel\widgets\IconBtn\IconBtnListWidget;
+
+$table = new ViewEloquentTable(new ViewJsonTableEloquentModel($user, [
+    'params' => ["class" => "table table-bordered", "border" => "2"],
+    'baseUrl' => "/admin/user",
+]));
+$table->beforePrint(function () use ($user) {
+    $btn = IconBtnEditWidget::create(['url' => '/admin/user/profile/edit'])->run();
+    $btn .= IconBtnDeleteWidget::create(['url' => '/admin/user/delete/' . $user->id])->run();
+    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([
+    'user_photo' => function ($data) {
+        return $data ? "<img src='$data' width='300px'>" : "";
+    },
+    '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();