From 28c8e24847fcadfa52bbbd0be86f42049f4cd494 Mon Sep 17 00:00:00 2001
From: stasbilay02 <stasbilay02@yandex.ru>
Date: Thu, 26 Dec 2024 14:04:35 +0300
Subject: [PATCH] some

---
 kernel/admin_themes/default/layout/main.php   |  6 +----
 .../BootstrapSelectFilterWithPrompt.php       | 23 +++++++++++++++++++
 kernel/filters/BootstrapTextFilter.php        | 21 +++++++++++++++++
 .../module_shop_client/views/index.php        |  2 +-
 kernel/modules/post/views/index.php           | 14 ++++++-----
 kernel/modules/user/service/UserService.php   | 10 ++++++++
 kernel/modules/user/views/index.php           |  9 +++++---
 7 files changed, 70 insertions(+), 15 deletions(-)
 create mode 100644 kernel/filters/BootstrapSelectFilterWithPrompt.php
 create mode 100644 kernel/filters/BootstrapTextFilter.php

diff --git a/kernel/admin_themes/default/layout/main.php b/kernel/admin_themes/default/layout/main.php
index 1574044..a8646d7 100644
--- a/kernel/admin_themes/default/layout/main.php
+++ b/kernel/admin_themes/default/layout/main.php
@@ -26,12 +26,8 @@
 <div class="wrapper d-flex align-items-stretch">
     <nav id="sidebar">
         <div class="p-4 pt-5">
-            <a href="#" class="img logo rounded-circle mb-5"
+            <a href="<?= '/admin/user/view/' . \kernel\modules\user\service\UserService::getAuthUser()->id ?>" class="img logo rounded-circle mb-5"
                style="background-image: url(<?= \kernel\modules\user\service\UserService::getAuthUserPhoto() ?? '/resources/images/noPhoto.png' ?>);"></a>
-
-
-<!--            style="background-image: url(/resources/images/noPhoto.png);"></a>-->
-
             <p>
                 <?= \kernel\modules\user\service\UserService::getAuthUsername() ?>
             </p>
diff --git a/kernel/filters/BootstrapSelectFilterWithPrompt.php b/kernel/filters/BootstrapSelectFilterWithPrompt.php
new file mode 100644
index 0000000..4b4f974
--- /dev/null
+++ b/kernel/filters/BootstrapSelectFilterWithPrompt.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace kernel\filters;
+
+use itguild\forms\builders\SelectBuilder;
+use Itguild\Tables\Filter\Filter;
+use kernel\helpers\Debug;
+
+class BootstrapSelectFilterWithPrompt extends Filter
+{
+
+    public function fetch(): string
+    {
+        $select = SelectBuilder::build($this->name, [
+            'class' => 'form-control',
+            'options' => $this->param,
+            'value' => $this->value,
+            'prompt' => "Не выбрано"
+        ]);
+
+        return "<td>" . $select->create()->fetch() . "</td>";
+    }
+}
\ No newline at end of file
diff --git a/kernel/filters/BootstrapTextFilter.php b/kernel/filters/BootstrapTextFilter.php
new file mode 100644
index 0000000..32aec8b
--- /dev/null
+++ b/kernel/filters/BootstrapTextFilter.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace kernel\filters;
+
+use itguild\forms\builders\TextInputBuilder;
+use Itguild\Tables\Filter\Filter;
+
+class BootstrapTextFilter extends Filter
+{
+
+    public function fetch()
+    {
+        $textInput = TextInputBuilder::build($this->name, [
+            'value' => $this->value,
+            'class' => "form-control"
+        ]);
+
+        return "<td>" . $textInput->create()->fetch() . "</td>";
+
+    }
+}
\ No newline at end of file
diff --git a/kernel/modules/module_shop_client/views/index.php b/kernel/modules/module_shop_client/views/index.php
index e3abbb6..b0bdf4c 100644
--- a/kernel/modules/module_shop_client/views/index.php
+++ b/kernel/modules/module_shop_client/views/index.php
@@ -42,7 +42,7 @@ $table->addAction(function ($row, $url) use ($moduleService) {
 $table->columns([
     'type' => [
         'filter' => [
-            'class' => \kernel\filters\BootstrapSelectFilter::class,
+            'class' => \kernel\filters\BootstrapSelectFilterWithPrompt::class,
             'param' => [
                 'kernel' => 'kernel',
                 'entity' => 'entity',
diff --git a/kernel/modules/post/views/index.php b/kernel/modules/post/views/index.php
index 75fe25f..b3a1067 100644
--- a/kernel/modules/post/views/index.php
+++ b/kernel/modules/post/views/index.php
@@ -23,7 +23,7 @@ $table = new ListEloquentTable(new EloquentDataProvider(Post::class, [
     'params' => ["class" => "table table-bordered", "border" => "2"],
     'baseUrl' => "/admin/post",
     'searchPrefix' => "",
-    'searchParams' => $get
+    'searchParams' => $get,
 ]));
 
 //\kernel\helpers\Debug::dd((new \kernel\Request())->get());
@@ -47,13 +47,13 @@ foreach ($additionals as $additional) {
 $table->columns([
     'title' => [
         'filter' => [
-            'class' => \Itguild\Tables\Filter\InputTextFilter::class,
+            'class' => \kernel\filters\BootstrapTextFilter::class,
             'value' => $get['title'] ?? ''
         ]
     ],
     'content' => [
         'filter' => [
-            'class' => \Itguild\Tables\Filter\InputTextFilter::class,
+            'class' => \kernel\filters\BootstrapTextFilter::class,
             'value' => $get['content'] ?? ''
         ]
     ],
@@ -72,10 +72,12 @@ $table->columns([
             return User::find($data)->username;
         },
         'filter' => [
-            'class' => \kernel\filters\BootstrapSelectFilter::class,
+            'class' => \kernel\filters\BootstrapSelectFilterWithPrompt::class,
             'param' => \kernel\modules\user\service\UserService::createUsernameArr(),
-            'value' => $get['user_id'] ?? ''
-        ]
+            'value' => $get['user_id'] ?? '',
+            'prompt' => 'dsds'
+        ],
+        'prompt' => 'dsds'
     ]
 ]);
 
diff --git a/kernel/modules/user/service/UserService.php b/kernel/modules/user/service/UserService.php
index 9f99f15..9915c2a 100644
--- a/kernel/modules/user/service/UserService.php
+++ b/kernel/modules/user/service/UserService.php
@@ -82,6 +82,16 @@ 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();
diff --git a/kernel/modules/user/views/index.php b/kernel/modules/user/views/index.php
index 9e6c806..abfce5b 100644
--- a/kernel/modules/user/views/index.php
+++ b/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,7 +39,8 @@ 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) {