failj/ntspi-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes

Browse Source
This commit is contained in:
f4ilji
2024-11-13 13:38:58 +05:00
parent 462680ba77
commit f091b29b63
22 changed files with 488 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Filament/Components/Forms/ItemForm/Pages/ContentBuilderItem.php
+2 -2
View File
@@ -27,10 +27,10 @@ use Mohamedsabil83\FilamentFormsTinyeditor\Components\TinyEditor;
class ContentBuilderItem
{
public static function getItem()
public static function getItem(string $name)
{
return
Builder::make('content')->label('')->blocks([
Builder::make($name)->label('')->blocks([
Builder\Block::make('heading')->label('Заголовок')
->schema([
TextInput::make('id')->hidden()->integer()->default(rand(2335235,324634264263426)),
app/Filament/Components/Forms/PageForm.php
+1 -1
View File
@@ -95,7 +95,7 @@ class PageForm
TextInput::make('search_data')->hidden(),
]),
Forms\Components\Tabs\Tab::make('Контент')->schema([
ContentBuilderItem::getItem()
ContentBuilderItem::getItem('content')
]),
Forms\Components\Tabs\Tab::make('Настройки')->schema([
Select::make('template')->options(self::getPageTemplates())->required(),
app/Filament/Components/Forms/UserDetailForm.php
+130
View File
@@ -0,0 +1,130 @@
<?php
namespace App\Filament\Components\Forms;
use App\Enums\CustomFormStatus;
use App\Enums\PostStatus;
use App\Filament\Components\Forms\ItemForm\Pages\ContentBuilderItem;
use App\Helpers\ByteConverter;
use App\Models\Category;
use App\Models\CustomForm;
use App\Models\Page;
use App\Models\Post;
use Filament\Forms;
use Filament\Forms\Components\Builder;
use Filament\Forms\Components\FileUpload;
use Filament\Forms\Components\Hidden;
use Filament\Forms\Components\RichEditor;
use Filament\Forms\Components\Section;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\Tabs;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Components\Toggle;
use Filament\Forms\Form;
use Filament\Resources\Components\Tab;
use Illuminate\Support\Carbon;
use Illuminate\Support\Str;
use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
use Mohamedsabil83\FilamentFormsTinyeditor\Components\TinyEditor;
use Symfony\Component\Finder\Finder;
class UserDetailForm
{
public static function getForm(Form $form): Form
{
return $form
->schema([
Forms\Components\Card::make()->schema([
Forms\Components\Grid::make(2)->schema([
Forms\Components\Toggle::make('is_only_worker')
->inline(false)
->label('Только сотрудник')
]),
]),
Tabs::make('Tabs')
->tabs([
Tabs\Tab::make('Основная информация')
->schema([
Forms\Components\FileUpload::make('photo')
->label('Фотография')
->image()
->optimize('jpg')
->resize(30)
->disk('public')
->imageEditor()
->directory('images')
->imageEditor(),
Forms\Components\Grid::make()->schema([
Forms\Components\TextInput::make('contactEmail')
->label('Контактный Email')
->maxLength(255),
Forms\Components\TextInput::make('contactPhone')
->label('Контактный телефон')
->maxLength(255),
]),
]),
Tabs\Tab::make('Образование')
->schema([
Forms\Components\Grid::make()->schema([
Forms\Components\TextInput::make('academicTitle')
->label('Ученая степень')
->maxLength(255),
Forms\Components\TextInput::make('AcademicDegree')
->label('Ученое звание')
->maxLength(255),
]),
Forms\Components\Repeater::make('education')->schema([
Forms\Components\TextInput::make('year')->label('Года обучения')->string()->required(),
Forms\Components\TextInput::make('content')->label('Общая информация')->string()->required(),
Forms\Components\TextInput::make('institution')->label('Учебное заведение')->string()->required()
])->label('Образование'),
Forms\Components\Repeater::make('professionalRetraining')->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Профессиональная переподготовка'),
Forms\Components\Repeater::make('professionalDevelopment')
->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Повышение квалификации'),
Forms\Components\Repeater::make('awards')->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Награды'),
]),
Tabs\Tab::make('Преподавание')
->schema([
Forms\Components\Grid::make(2)->schema([
Forms\Components\TextInput::make('workExperience.total')
->label('Стаж работы в общем')
->numeric(),
Forms\Components\TextInput::make('workExperience.byProf')
->label('Стаж работы по специальности')
->numeric(),
]),
Forms\Components\Repeater::make('professDisciplines')->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Преподаваемые дисциплины'),
]),
Tabs\Tab::make('Научная деятельность')
->schema([
Forms\Components\Repeater::make('attendedConferences')->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Преподаваемые дисциплины'),
Forms\Components\Repeater::make('participationScienceProjects')->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Преподаваемые дисциплины'),
Forms\Components\Repeater::make('publications')->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Преподаваемые дисциплины'),
]),
Tabs\Tab::make('Другое')
->schema([
ContentBuilderItem::getItem('other')
]),
])->columnSpanFull(),
]);
}
}
app/Filament/Resources/PostResource/Pages/CreatePost.php
+3 -1
View File
@@ -51,7 +51,8 @@ class CreatePost extends CreateRecord
{
$this->record->seo()->create($this->seoData);
$this->sendNotify($this->record, auth()->user());
$this->postToSocialMedia($this->publicationAgreements, $this->record->content, $this->record->title, Carbon::parse($this->record->publish_at)->timestamp);
$publish_date = ($this->record->publish_at > now()) ? Carbon::parse($this->record->publish_at)->timestamp : null;
$this->postToSocialMedia($this->publicationAgreements, $this->record->content, $this->record->title, $publish_date);
}
private function generateSeo(array $data) : array
@@ -268,6 +269,7 @@ class CreatePost extends CreateRecord
$post_id = $this->record->id;
dispatch(new CreateVkPost($title, $text, $images, $post_id, $publish_date));
}
}
app/Filament/Resources/PostResource/Pages/EditPost.php
+2 -1
View File
@@ -36,7 +36,8 @@ class EditPost extends EditRecord
protected function afterSave(): void
{
$this->record->seo()->update($this->seoData);
$this->postToSocialMedia($this->publicationAgreements, $this->record->content, $this->record->title, Carbon::parse($this->record->publish_at)->timestamp);
$publish_date = ($this->record->publish_at > now()) ? Carbon::parse($this->record->publish_at)->timestamp : null;
$this->postToSocialMedia($this->publicationAgreements, $this->record->content, $this->record->title, $publish_date);
}
private function setPreviewText(array $data) : string|null
app/Filament/Resources/UserDetailResource.php
+2 -91
View File
@@ -2,6 +2,7 @@
namespace App\Filament\Resources;
use App\Filament\Components\Forms\UserDetailForm;
use App\Filament\Resources\UserDetailResource\Pages;
use App\Filament\Resources\UserDetailResource\RelationManagers;
use App\Models\UserDetail;
@@ -30,97 +31,7 @@ class UserDetailResource extends Resource
public static function form(Form $form): Form
{
return $form
->schema([
Forms\Components\Card::make()->schema([
Forms\Components\Grid::make(2)->schema([
Forms\Components\Select::make('user_id')
->relationship('user', 'email')
->searchable()
->required()
->preload()
->label('Пользователь'),
Forms\Components\Toggle::make('is_only_worker')
->inline(false)
->label('Только сотрудник')
]),
]),
Tabs::make('Tabs')
->tabs([
Tabs\Tab::make('Основная информация')
->schema([
Forms\Components\FileUpload::make('photo')
->label('Фотография')
->image()
->optimize('jpg')
->resize(30)
->disk('public')
->imageEditor()
->directory('images')
->imageEditor(),
Forms\Components\Grid::make()->schema([
Forms\Components\TextInput::make('contactEmail')
->label('Контактный Email')
->maxLength(255),
Forms\Components\TextInput::make('contactPhone')
->label('Контактный телефон')
->maxLength(255),
]),
]),
Tabs\Tab::make('Образование')
->schema([
Forms\Components\Grid::make()->schema([
Forms\Components\TextInput::make('academicTitle')
->label('Ученая степень')
->maxLength(255),
Forms\Components\TextInput::make('AcademicDegree')
->label('Ученое звание')
->maxLength(255),
]),
Forms\Components\TextInput::make('education')
->label('Образование')
->maxLength(255),
Forms\Components\Repeater::make('professionalRetraining')->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Профессиональная переподготовка'),
Forms\Components\Repeater::make('professionalDevelopment')
->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Повышение квалификации'),
Forms\Components\Repeater::make('awards')->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Награды'),
]),
Tabs\Tab::make('Преподавание')
->schema([
Forms\Components\TextInput::make('workExperience')
->label('Стаж работы')
->numeric(),
Forms\Components\Repeater::make('professDisciplines')->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Преподаваемые дисциплины'),
]),
Tabs\Tab::make('Научная деятельность')
->schema([
Forms\Components\Repeater::make('attendedConferences')->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Преподаваемые дисциплины'),
Forms\Components\Repeater::make('participationScienceProjects')->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Преподаваемые дисциплины'),
Forms\Components\Repeater::make('publications')->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Преподаваемые дисциплины'),
]),
Tabs\Tab::make('Другое')
->schema([
Forms\Components\Textarea::make('other')
->columnSpanFull(),
]),
])->columnSpanFull(),
]);
return UserDetailForm::getForm($form);
}
public static function table(Table $table): Table
app/Filament/Resources/UserResource/RelationManagers/UserDetailRelationManager.php
+2 -81
View File
@@ -2,6 +2,7 @@
namespace App\Filament\Resources\UserResource\RelationManagers;
use App\Filament\Components\Forms\UserDetailForm;
use App\Models\User;
use Filament\Forms;
use Filament\Forms\Components\Tabs;
@@ -20,87 +21,7 @@ class UserDetailRelationManager extends RelationManager
public function form(Form $form): Form
{
return $form
->schema([
Forms\Components\Card::make()->schema([
Forms\Components\Toggle::make('is_only_worker')
->inline(false)
->label('Только сотрудник')
]),
Tabs::make('Tabs')
->tabs([
Tabs\Tab::make('Основная информация')
->schema([
Forms\Components\FileUpload::make('photo')
->label('Фото')
->image()
->disk('public')
->directory('images')
->imageEditor()
->required(),
Forms\Components\Grid::make()->schema([
Forms\Components\TextInput::make('contactEmail')
->label('Контактный Email')
->maxLength(255),
Forms\Components\TextInput::make('contactPhone')
->label('Контактный телефон')
->maxLength(255),
]),
]),
Tabs\Tab::make('Образование')
->schema([
Forms\Components\Grid::make()->schema([
Forms\Components\TextInput::make('academicTitle')
->label('Ученая степень')
->maxLength(255),
Forms\Components\TextInput::make('AcademicDegree')
->label('Ученое звание')
->maxLength(255),
]),
Forms\Components\TextInput::make('education')
->label('Образование')
->maxLength(255),
Forms\Components\Repeater::make('professionalRetraining')->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Профессиональная переподготовка'),
Forms\Components\Repeater::make('professionalDevelopment')
->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Повышение квалификации'),
Forms\Components\Repeater::make('awards')->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Награды'),
]),
Tabs\Tab::make('Преподавание')
->schema([
Forms\Components\TextInput::make('workExperience')
->label('Стаж работы')
->numeric(),
Forms\Components\Repeater::make('professDisciplines')->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Преподаваемые дисциплины'),
]),
Tabs\Tab::make('Научная деятельность')
->schema([
Forms\Components\Repeater::make('attendedConferences')->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Участие в конференциях'),
Forms\Components\Repeater::make('participationScienceProjects')->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Участие в научных проектах'),
Forms\Components\Repeater::make('publications')->schema([
Forms\Components\TextInput::make('item')->label('')->string()->required()
])->label('Публикации'),
]),
Tabs\Tab::make('Другое')
->schema([
Forms\Components\Textarea::make('other')
->columnSpanFull(),
]),
])->columnSpanFull(),
]);
return UserDetailForm::getForm($form);
}
app/Jobs/CreateVkPost.php
+1 -1
View File
@@ -32,7 +32,7 @@ class CreateVkPost implements ShouldQueue
readonly private string $text,
readonly private array $images = [],
readonly private int $post_id,
readonly private int $publish_date,
readonly private int|null $publish_date = null,
)
{}
app/Jobs/UpdateVkPost.php
+1 -1
View File
@@ -32,7 +32,7 @@ class UpdateVkPost implements ShouldQueue
readonly private string $text,
readonly private array $images = [],
readonly private int $post_id,
readonly private int $publish_date,
readonly private int|null $publish_date = null,
)
{}
app/Models/UserDetail.php
+2
View File
@@ -14,6 +14,8 @@ class UserDetail extends Model
protected $casts = [
'is_only_worker' => 'boolean',
'awards' => 'array',
'education' => 'array',
'workExperience' => 'array',
'professDisciplines' => 'array',
'professionalRetraining' => 'array',
'professionalDevelopment' => 'array',
app/Services/VK/VkService.php
+2 -2
View File
@@ -28,7 +28,7 @@ class VkService
return $this->wallService->getPostById($id);
}
public function createPost(string $title, string $message, array $images = [], int $publish_date = null)
public function createPost(string $title, string $message, array $images = [], int|null $publish_date = null)
{
$from_group = 1;
$album_attachment = '';
@@ -40,7 +40,7 @@ class VkService
return $this->wallService->createPost($message, $from_group, $album_attachment, $publish_date);
}
public function updatePost(int $id, string $title, string $message, array $images = [], int $publish_date = null)
public function updatePost(int $id, string $title, string $message, array $images = [], int|null $publish_date = null)
{
$from_group = 1;
$vk_post = $this->wallService->getPostById($id);
app/Services/VK/Wall/VkWallService.php
+2 -14
View File
@@ -46,7 +46,7 @@ class VkWallService
public function createPost(string $message, int $from_group, string $attachments = '', int $publish_date)
public function createPost(string $message, int $from_group, string $attachments = '', int|null $publish_date = null)
{
$params = [
'owner_id' => '-' . $this->publicId,
@@ -79,7 +79,7 @@ class VkWallService
}
}
public function updatePost(int $post_id, string $message = '', int $from_group = 1, string $attachments = '', int $publish_date)
public function updatePost(int $post_id, string $message = '', int $from_group = 1, string $attachments = '', int|null $publish_date = null)
{
if (empty($message) && empty($attachments)) {
return [
@@ -89,18 +89,6 @@ class VkWallService
}
$params = [
'owner_id' => '-' . $this->publicId,
'post_id' => $post_id,
'message' => $message,
'attachments' => $attachments,
'access_token' => $this->wallToken,
'v' => '5.131',
];
try {
return $this->vk->wall()->edit(
$this->vkAuthService->getToken()->access_token,