stasbilay02/MicroFrameWork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

user photo add

Browse Source
This commit is contained in:
Билай Станислав 2024-12-25 16:32:23 +03:00
parent 2790105a7d
commit b5b7befd34
18 changed files with 92 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/FileUpload.php
View File

@ -36,7 +36,9 @@ class FileUpload
$newFileName = md5(time() . $this->fileName) . '.' . $this->fileExtension;
if (in_array($this->fileExtension, $this->allowedFileExtensions)) {
$this->uploadDir = $uploadDir . mb_substr($newFileName, 0, 2) . '/' . mb_substr($newFileName, 2, 2) . '/';
mkdir(ROOT_DIR . $this->uploadDir, 0777, true);
$oldMask = umask(0);
mkdir(ROOT_DIR . $this->uploadDir, 0775, true);
umask($oldMask);
$uploadFileDir = ROOT_DIR . $this->uploadDir;
$this->destPath = $uploadFileDir . $newFileName;
$this->uploadFile = $this->uploadDir . $newFileName;
@ -49,7 +51,9 @@ class FileUpload
} else {
if (in_array($this->fileExtension, $this->allowedFileExtensions)) {
$this->uploadDir = $uploadDir;
mkdir(ROOT_DIR . $this->uploadDir, 0777, true);
$oldMask = umask(0);
mkdir(ROOT_DIR . $this->uploadDir, 0775, true);
umask($oldMask);
$uploadFileDir = ROOT_DIR . $this->uploadDir;
$this->destPath = $uploadFileDir . $this->fileName;
$this->uploadFile = $this->uploadDir . $this->fileName;

6
kernel/admin_themes/default/layout/main.php
View File

@ -27,7 +27,11 @@
<nav id="sidebar">
<div class="p-4 pt-5">
<a href="#" class="img logo rounded-circle mb-5"
style="background-image: url(/resources/admin_theme/images/logo.jpg);"></a>
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>

2
kernel/filters/CustomSelectFilterForAssociativeArr.php → kernel/filters/BootstrapSelectFilter.php
View File

@ -6,7 +6,7 @@ use itguild\forms\builders\SelectBuilder;
use Itguild\Tables\Filter\Filter;
use kernel\helpers\Debug;
class CustomSelectFilterForAssociativeArr extends Filter
class BootstrapSelectFilter extends Filter
{
public function fetch(): string

23
kernel/filters/CustomSelectFilter.php
View File

@ -1,23 +0,0 @@
<?php
namespace kernel\filters;
use Itguild\Tables\Filter\Filter;
class CustomSelectFilter extends Filter
{
public function fetch()
{
$this->html = "<td><select class='form-control' name='$this->name'>";
foreach ($this->param as $value) {
if ($value === $this->value) {
$this->html .= "<option value='$value' selected>$value</option>";
} else {
$this->html .= "<option value='$value'>$value</option>";
}
}
$this->html .= "value='$this->value'</select></td>";
return $this->html;
}
}

7
kernel/modules/menu/views/index.php
View File

@ -19,12 +19,15 @@ $table = new ListEloquentTable(new EloquentDataProvider(Menu::class, [
'baseUrl' => "/admin/settings/menu",
]));
$table->columns([
'parent_id' => (function ($data) {
'parent_id' => function ($data) {
if ($data == 0) return null;
return Menu::find($data)->label;
}),
},
'icon_file' => function ($data) {
return $data ? "<img src='$data' width='150px'>" : "";
},
'status' => function ($data) {
return Menu::getStatus()[$data];
}
]);
$table->beforePrint(function () {

1
kernel/modules/module_shop_client/controllers/ModuleShopClientController.php
View File

@ -187,6 +187,7 @@ class ModuleShopClientController extends AdminController
'per_page' => $per_page,
'kernelService' => new KernelService(),
'adminThemeService' => new AdminThemeService(),
'filterValues' => $filters
]);
} else {
$this->cgView->render("module_shop_error_connection.php");

11
kernel/modules/module_shop_client/views/index.php
View File

@ -7,11 +7,11 @@
* @var \kernel\services\ModuleService $moduleService
* @var \kernel\services\KernelService $kernelService
* @var \kernel\services\AdminThemeService $adminThemeService
* @var array $filterValues
*/
use Itguild\Tables\ListJsonTable;
use kernel\widgets\ActionButtonWidget;
$meta = [];
$meta['columns'] = [
"name" => "Название",
@ -42,9 +42,12 @@ $table->addAction(function ($row, $url) use ($moduleService) {
$table->columns([
'type' => [
'filter' => [
'class' => \kernel\filters\CustomSelectFilter::class,
'param' => ['kernel', 'entity'],
'value' => "kernel"
'class' => \kernel\filters\BootstrapSelectFilter::class,
'param' => [
'kernel' => 'kernel',
'entity' => 'entity',
],
'value' => $filterValues['type'] ?? ''
],
]
]);

2
kernel/modules/post/views/index.php
View File

@ -72,7 +72,7 @@ $table->columns([
return User::find($data)->username;
},
'filter' => [
'class' => \kernel\filters\CustomSelectFilterForAssociativeArr::class,
'class' => \kernel\filters\BootstrapSelectFilter::class,
'param' => \kernel\modules\user\service\UserService::createUsernameArr(),
'value' => $get['user_id'] ?? ''
]

18
kernel/modules/user/controllers/UserController.php
View File

@ -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);

1
kernel/modules/user/migrations/2024_09_23_125827_create_user_table.php
View File

@ -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);

4
kernel/modules/user/models/User.php
View File

@ -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' => 'Обновлен',
];

7
kernel/modules/user/models/forms/CreateUserForm.php
View File

@ -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' => ''
];
}

14
kernel/modules/user/service/UserService.php
View File

@ -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,18 @@ class UserService
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);

10
kernel/modules/user/views/form.php
View File

@ -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();

3
kernel/modules/user/views/index.php
View File

@ -40,6 +40,9 @@ $table->columns([
'class' => \Itguild\Tables\Filter\InputTextFilter::class
]
],
'user_photo' => function ($data) {
return $data ? "<img src='$data' width='150px'>" : "";
},
'created_at' => function ($data) {
if (!$data){
return null;

3
kernel/modules/user/views/view.php
View File

@ -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;

10
kernel/templates/views/index_template
View File

@ -51,6 +51,16 @@ $table = new \Itguild\Tables\ListJsonTable(json_encode(
]
));
// Пример фильтра
$table->columns([
'title' => [
'filter' => [
'class' => \Itguild\Tables\Filter\InputTextFilter::class,
'value' => $get['title'] ?? ''
]
],
]
$table->beforePrint(function () {
return IconBtnCreateWidget::create(['url' => '/admin/{slug}/create'])->run();
});

BIN
resources/images/noPhoto.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB