Migrate backend to Porto architecture and fix minor bugs

- Fully transitioned the backend to the Porto architectural pattern
- Improved code organization and maintainability
- Fixed minor bugs and inconsistencies

app/Filament/Resources/AcademicJournalResource.php

@@ -2,38 +2,22 @@
 
 namespace App\Filament\Resources;
 
-use App\Enums\CustomFormStatus;
-use App\Enums\PostStatus;
+
+use App\Containers\Science\Models\AcademicJournal;
 use App\Filament\Components\Forms\ItemForm\Pages\ContentBuilderItem;
 use App\Filament\Resources\AcademicJournalResource\Pages;
-use App\Filament\Resources\AcademicJournalResource\RelationManagers;
 use App\Filament\Resources\AcademicJournalResource\RelationManagers\JournalsRelationManager;
-use App\Helpers\ByteConverter;
-use App\Models\AcademicJournal;
-use App\Models\Category;
-use App\Models\CustomForm;
-use App\Models\Page;
-use App\Models\Post;
 use Filament\Forms;
 use Filament\Forms\Components\Actions\Action;
-use Filament\Forms\Components\Builder;
-use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Grid;
-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\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
-use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
-use Mohamedsabil83\FilamentFormsTinyeditor\Components\TinyEditor;
 
 class AcademicJournalResource extends Resource
 {

app/Filament/Resources/AcademicJournalResource/Pages/CreateAcademicJournal.php

@@ -4,9 +4,7 @@ namespace App\Filament\Resources\AcademicJournalResource\Pages;
 
 use App\Filament\Resources\AcademicJournalResource;
 use App\Services\Filament\Traits\SeoGenerate;
-use Filament\Actions;
 use Filament\Resources\Pages\CreateRecord;
-use Illuminate\Support\Str;
 
 class CreateAcademicJournal extends CreateRecord
 {

app/Filament/Resources/AcademicJournalResource/Pages/EditAcademicJournal.php

@@ -6,7 +6,6 @@ use App\Filament\Resources\AcademicJournalResource;
 use App\Services\Filament\Traits\SeoGenerate;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
-use Illuminate\Support\Str;
 
 class EditAcademicJournal extends EditRecord
 {

app/Filament/Resources/AcademicJournalResource/RelationManagers/JournalsRelationManager.php

@@ -2,9 +2,6 @@
 
 namespace App\Filament\Resources\AcademicJournalResource\RelationManagers;
 
-use App\Models\AcademicJournal;
-use Filament\Forms;
-use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
@@ -13,7 +10,6 @@ use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 
 class JournalsRelationManager extends RelationManager
 {

app/Filament/Resources/AcceptedInvitationResource.php

@@ -2,18 +2,14 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\User\Models\AcceptedInvitation;
 use App\Filament\Resources\AcceptedInvitationResource\Pages;
-use App\Filament\Resources\AcceptedInvitationResource\RelationManagers;
-use App\Models\AcceptedInvitation;
 use BezhanSalleh\FilamentShield\Contracts\HasShieldPermissions;
-use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Columns\TextInputColumn;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 
 class AcceptedInvitationResource extends Resource implements HasShieldPermissions
 {

app/Filament/Resources/AcceptedInvitationResource/Pages/ListAcceptedInvitations.php

@@ -2,11 +2,10 @@
 
 namespace App\Filament\Resources\AcceptedInvitationResource\Pages;
 
+use App\Containers\User\Mails\InvitationMail;
+use App\Containers\User\Models\Invitation;
 use App\Filament\Resources\AcceptedInvitationResource;
-use App\Mail\InvitationMail;
-use App\Models\Invitation;
-use App\Models\User;
-use BezhanSalleh\FilamentShield\Contracts\HasShieldPermissions;
+use App\Containers\User\Models\User;
 use Filament\Actions;
 use Filament\Forms\Components\TextInput;
 use Filament\Notifications\Notification;

app/Filament/Resources/AdditionalEducationCategoryResource.php

@@ -2,9 +2,9 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\AdditionalEducation\Models\AdditionalEducationCategory;
+use App\Containers\AdditionalEducation\Models\DirectionAdditionalEducation;
 use App\Filament\Resources\AdditionalEducationCategoryResource\Pages;
-use App\Models\AdditionalEducationCategory;
-use App\Models\DirectionAdditionalEducation;
 use Filament\Forms;
 use Filament\Forms\Components\Grid;
 use Filament\Forms\Components\Section;

app/Filament/Resources/AdditionalEducationResource.php

@@ -2,11 +2,11 @@
 
 namespace App\Filament\Resources;
 
-use App\Enums\FormEducation;
+use App\Containers\AdditionalEducation\Models\AdditionalEducation;
+use App\Containers\AdditionalEducation\Models\AdditionalEducationCategory;
 use App\Filament\Components\Forms\ItemForm\Pages\ContentBuilderItem;
 use App\Filament\Resources\AdditionalEducationResource\Pages;
-use App\Models\AdditionalEducation;
-use App\Models\AdditionalEducationCategory;
+use App\Ship\Enums\Education\FormEducation;
 use Filament\Forms;
 use Filament\Forms\Components\Grid;
 use Filament\Forms\Components\Section;

app/Filament/Resources/AdmissionCampaignResource.php

@@ -2,11 +2,10 @@
 
 namespace App\Filament\Resources;
 
-use App\Enums\AdmissionCampaignStatus;
-use App\Enums\LevelEducational;
+use App\Containers\Education\Models\AdmissionCampaign;
 use App\Filament\Resources\AdmissionCampaignResource\Pages;
-use App\Models\AdmissionCampaign;
-use Filament\Forms;
+use App\Ship\Enums\Education\AdmissionCampaignStatus;
+use App\Ship\Enums\Education\LevelEducational;
 use Filament\Forms\Components\Grid;
 use Filament\Forms\Components\Repeater;
 use Filament\Forms\Components\Section;

app/Filament/Resources/AdmissionPlanResource.php

@@ -2,14 +2,14 @@
 
 namespace App\Filament\Resources;
 
-use App\Enums\BudgetEducation;
-use App\Enums\EducationalProgramStatus;
-use App\Enums\FormEducation;
-use App\Enums\TypeExam;
+use App\Containers\Education\Enums\TypeExam;
+use App\Containers\Education\Models\AdmissionCampaign;
+use App\Containers\Education\Models\AdmissionPlan;
+use App\Containers\Education\Models\EducationalProgram;
 use App\Filament\Resources\AdmissionPlanResource\Pages;
-use App\Models\AdmissionCampaign;
-use App\Models\AdmissionPlan;
-use App\Models\EducationalProgram;
+use App\Ship\Enums\Education\BudgetEducation;
+use App\Ship\Enums\Education\EducationalProgramStatus;
+use App\Ship\Enums\Education\FormEducation;
 use Filament\Forms\Components\Repeater;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;

app/Filament/Resources/CategoryResource.php

@@ -2,9 +2,8 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\Article\Models\Category;
 use App\Filament\Resources\CategoryResource\Pages;
-use App\Filament\Resources\CategoryResource\RelationManagers;
-use App\Models\Category;
 use Filament\Forms;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
@@ -13,8 +12,6 @@ use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 use Illuminate\Support\Str;
 
 class CategoryResource extends Resource

app/Filament/Resources/ContactWidgetResource.php

@@ -2,10 +2,8 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\Widget\Models\ContactWidget;
 use App\Filament\Resources\ContactWidgetResource\Pages;
-use App\Filament\Resources\ContactWidgetResource\RelationManagers;
-use App\Models\ContactWidget;
-use App\Models\Page;
 use Filament\Forms;
 use Filament\Forms\Components\Repeater;
 use Filament\Forms\Components\Tabs;
@@ -16,8 +14,6 @@ use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 use Illuminate\Support\Str;
 
 class ContactWidgetResource extends Resource

app/Filament/Resources/CustomFormResource.php

@@ -2,37 +2,14 @@
 
 namespace App\Filament\Resources;
 
-use App\Enums\CustomFormStatus;
-use App\Enums\PostStatus;
+use App\Containers\Widget\Models\CustomForm;
 use App\Filament\Components\Forms\CustomFormForm;
-use App\Filament\Exports\CustomFormExporter;
 use App\Filament\Resources\CustomFormResource\Pages;
-use App\Filament\Resources\CustomFormResource\RelationManagers;
 use App\Filament\Resources\CustomFormResource\RelationManagers\ResponsesRelationManager;
-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\RichEditor;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\SpatieTagsInput;
-use Filament\Forms\Components\Tabs;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Toggle;
 use Filament\Forms\Form;
-use Filament\Forms\Get;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Str;
-use Mohamedsabil83\FilamentFormsTinyeditor\Components\TinyEditor;
-use PhpParser\Node\Stmt\Block;
 
 class CustomFormResource extends Resource
 {

app/Filament/Resources/CustomFormResource/RelationManagers/ResponsesRelationManager.php

@@ -2,18 +2,12 @@
 
 namespace App\Filament\Resources\CustomFormResource\RelationManagers;
 
-use App\Filament\Exports\CustomFormExporter;
-use App\Models\CustomFormResponse;
 use Filament\Forms;
 use Filament\Forms\Form;
-use Filament\Infolists\Components\Section;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
-use Filament\Tables\Columns\ViewColumn;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 use pxlrbt\FilamentExcel\Actions\Tables\ExportAction;
 use pxlrbt\FilamentExcel\Actions\Tables\ExportBulkAction;
 use pxlrbt\FilamentExcel\Columns\Column;

app/Filament/Resources/CustomFormResponseResource.php

@@ -2,16 +2,12 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\Widget\Models\CustomFormResponse;
 use App\Filament\Resources\CustomFormResponseResource\Pages;
-use App\Filament\Resources\CustomFormResponseResource\RelationManagers;
-use App\Models\CustomFormResponse;
-use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 
 class CustomFormResponseResource extends Resource
 {

app/Filament/Resources/DepartmentResource.php

@@ -2,11 +2,11 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\InstituteStructure\Models\Department;
+use App\Containers\InstituteStructure\Models\Faculty;
 use App\Filament\Components\Forms\ItemForm\Pages\ContentBuilderItem;
 use App\Filament\Resources\DepartmentResource\Pages;
 use App\Filament\Resources\DepartmentResource\RelationManagers;
-use App\Models\Department;
-use App\Models\Faculty;
 use Filament\Forms;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;

app/Filament/Resources/DepartmentResource/RelationManagers/ProgramsRelationManager.php

@@ -2,7 +2,7 @@
 
 namespace App\Filament\Resources\DepartmentResource\RelationManagers;
 
-use App\Enums\EducationalProgramStatus;
+use App\Ship\Enums\Education\EducationalProgramStatus;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
@@ -10,7 +10,6 @@ use Filament\Tables;
 use Filament\Tables\Actions\AttachAction;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 
 class ProgramsRelationManager extends RelationManager
 {

app/Filament/Resources/DirectionAdditionalEducationResource.php

@@ -2,8 +2,8 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\AdditionalEducation\Models\DirectionAdditionalEducation;
 use App\Filament\Resources\DirectionAdditionalEducationResource\Pages;
-use App\Models\DirectionAdditionalEducation;
 use Filament\Forms;
 use Filament\Forms\Components\Grid;
 use Filament\Forms\Components\Section;

app/Filament/Resources/DirectionStudyResource.php

@@ -2,9 +2,9 @@
 
 namespace App\Filament\Resources;
 
-use App\Enums\LevelEducational;
+use App\Containers\Education\Models\DirectionStudy;
 use App\Filament\Resources\DirectionStudyResource\Pages;
-use App\Models\DirectionStudy;
+use App\Ship\Enums\Education\LevelEducational;
 use Filament\Forms;
 use Filament\Forms\Components\Grid;
 use Filament\Forms\Components\Section;

app/Filament/Resources/DivisionResource.php

@@ -2,13 +2,12 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\InstituteStructure\Models\Division;
 use App\Filament\Components\Forms\ItemForm\Pages\ContentBuilderItem;
 use App\Filament\Resources\DivisionResource\Pages;
 use App\Filament\Resources\DivisionResource\RelationManagers;
-use App\Models\Division;
 use Filament\Forms;
 use Filament\Forms\Components\Actions\Action;
-use Filament\Forms\Components\Builder;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Tabs;

app/Filament/Resources/EducationalGroupResource.php

@@ -2,11 +2,10 @@
 
 namespace App\Filament\Resources;
 
-use App\Enums\FormEducation;
+use App\Containers\InstituteStructure\Models\Faculty;
+use App\Containers\Schedule\Models\EducationalGroup;
 use App\Filament\Resources\EducationalGroupResource\Pages;
-use App\Models\EducationalGroup;
-use App\Models\Faculty;
-use Filament\Forms;
+use App\Ship\Enums\Education\FormEducation;
 use Filament\Forms\Components\Grid;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
@@ -14,7 +13,6 @@ use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
-use Filament\Tables\Columns\BadgeColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;

app/Filament/Resources/EducationalProgramResource.php

@@ -2,19 +2,14 @@
 
 namespace App\Filament\Resources;
 
-use App\Enums\EducationalProgramStatus;
-use App\Enums\LevelEducational;
+use App\Containers\Education\Models\EducationalProgram;
 use App\Filament\Components\Forms\ItemForm\Pages\ContentBuilderItem;
 use App\Filament\Resources\EducationalProgramResource\Pages;
 use App\Filament\Resources\EducationalProgramResource\RelationManagers\AdmissionPlansRelationManager;
-use App\Models\EducationalProgram;
-use Filament\Forms;
+use App\Ship\Enums\Education\EducationalProgramStatus;
+use App\Ship\Enums\Education\LevelEducational;
 use Filament\Forms\Components\Builder;
-use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Grid;
-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;

app/Filament/Resources/EducationalProgramResource/Pages/EditEducationalProgram.php

@@ -2,9 +2,7 @@
 
 namespace App\Filament\Resources\EducationalProgramResource\Pages;
 
-use App\Enums\PostStatus;
 use App\Filament\Resources\EducationalProgramResource;
-use Carbon\Carbon;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 use Illuminate\Support\Str;

app/Filament/Resources/EducationalProgramResource/Pages/ListEducationalPrograms.php

@@ -2,10 +2,9 @@
 
 namespace App\Filament\Resources\EducationalProgramResource\Pages;
 
-use App\Enums\EducationalProgramStatus;
-use App\Enums\PostStatus;
+use App\Containers\Education\Models\EducationalProgram;
 use App\Filament\Resources\EducationalProgramResource;
-use App\Models\EducationalProgram;
+use App\Ship\Enums\Education\EducationalProgramStatus;
 use Filament\Actions;
 use Filament\Resources\Components\Tab;
 use Filament\Resources\Pages\ListRecords;

app/Filament/Resources/EducationalProgramResource/RelationManagers/AdmissionPlansRelationManager.php

@@ -2,11 +2,9 @@
 
 namespace App\Filament\Resources\EducationalProgramResource\RelationManagers;
 
-use App\Enums\BudgetEducation;
-use App\Enums\FormEducation;
-use App\Models\AdmissionCampaign;
-use Filament\Forms;
-use Filament\Forms\Components\Grid;
+use App\Containers\Education\Models\AdmissionCampaign;
+use App\Ship\Enums\Education\BudgetEducation;
+use App\Ship\Enums\Education\FormEducation;
 use Filament\Forms\Components\Repeater;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;

app/Filament/Resources/EventCategoryResource.php

@@ -2,9 +2,8 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\Event\Models\EventCategory;
 use App\Filament\Resources\EventCategoryResource\Pages;
-use App\Filament\Resources\EventCategoryResource\RelationManagers;
-use App\Models\EventCategory;
 use Filament\Forms;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
@@ -12,8 +11,6 @@ use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 use Illuminate\Support\Str;
 
 class EventCategoryResource extends Resource

app/Filament/Resources/EventResource.php

@@ -2,15 +2,14 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\Event\Models\Event;
+use App\Containers\Event\Models\EventCategory;
 use App\Filament\Components\Forms\ItemForm\Pages\ContentBuilderItem;
 use App\Filament\Resources\EventResource\Pages;
-use App\Models\Event;
-use App\Models\EventCategory;
 use Filament\Forms;
 use Filament\Forms\Components\Actions\Action;
 use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Components\Grid;
-use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\SpatieTagsInput;
 use Filament\Forms\Components\Tabs;

app/Filament/Resources/FacultyResource.php

@@ -2,24 +2,14 @@
 
 namespace App\Filament\Resources;
 
-use App\Enums\CustomFormStatus;
-use App\Enums\PostStatus;
+use App\Containers\InstituteStructure\Models\Faculty;
 use App\Filament\Components\Forms\ItemForm\Pages\ContentBuilderItem;
 use App\Filament\Resources\FacultyResource\Pages;
 use App\Filament\Resources\FacultyResource\RelationManagers\DepartmentsRelationManager;
 use App\Filament\Resources\FacultyResource\RelationManagers\WorkersRelationManager;
-use App\Models\Category;
-use App\Models\CustomForm;
-use App\Models\Faculty;
-use App\Models\Page;
-use App\Models\PageReferenceList;
-use App\Models\Post;
 use Filament\Forms;
 use Filament\Forms\Components\Actions\Action;
-use Filament\Forms\Components\Builder;
-use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
 use Filament\Forms\Form;

app/Filament/Resources/JournalIssueResource.php

@@ -2,10 +2,9 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\Science\Models\AcademicJournal;
+use App\Containers\Science\Models\JournalIssue;
 use App\Filament\Resources\JournalIssueResource\Pages;
-use App\Filament\Resources\JournalIssueResource\RelationManagers;
-use App\Models\AcademicJournal;
-use App\Models\JournalIssue;
 use Filament\Forms;
 use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Toggle;
@@ -13,8 +12,6 @@ use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 
 class JournalIssueResource extends Resource
 {

app/Filament/Resources/MainSectionResource.php

@@ -2,20 +2,15 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\AppStructure\Models\MainSection;
 use App\Filament\Resources\MainSectionResource\Pages;
 use App\Filament\Resources\MainSectionResource\RelationManagers;
-use App\Models\MainSection;
-use App\Models\SubSection;
-use App\Services\Filament\Icon\ArrayToCollectionService;
 use Filament\Forms;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Guava\FilamentIconPicker\Forms\IconPicker;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 use Illuminate\Support\Str;
 
 class MainSectionResource extends Resource

app/Filament/Resources/MainSectionResource/Pages/CreateMainSection.php

@@ -3,9 +3,6 @@
 namespace App\Filament\Resources\MainSectionResource\Pages;
 
 use App\Filament\Resources\MainSectionResource;
-use App\Models\MainSection;
-use App\Models\SubSection;
-use Filament\Actions;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateMainSection extends CreateRecord

app/Filament/Resources/MainSectionResource/Pages/EditMainSection.php

@@ -2,8 +2,8 @@
 
 namespace App\Filament\Resources\MainSectionResource\Pages;
 
+use App\Containers\AppStructure\Models\SubSection;
 use App\Filament\Resources\MainSectionResource;
-use App\Models\SubSection;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 

app/Filament/Resources/MainSectionResource/RelationManagers/SubSectionsRelationManager.php

@@ -2,15 +2,13 @@
 
 namespace App\Filament\Resources\MainSectionResource\RelationManagers;
 
-use App\Models\SubSection;
+use App\Containers\AppStructure\Models\SubSection;
 use Filament\Forms;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 use Illuminate\Support\Str;
 
 class SubSectionsRelationManager extends RelationManager

app/Filament/Resources/PageReferenceListResource.php

@@ -2,14 +2,9 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\Widget\Models\PageReferenceList;
 use App\Filament\Resources\PageReferenceListResource\Pages;
-use App\Filament\Resources\PageReferenceListResource\RelationManagers;
-use App\Models\Event;
-use App\Models\Page;
-use App\Models\PageReferenceList;
-use App\Models\Post;
 use Filament\Forms;
-use Filament\Forms\Components\ColorPicker;
 use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Repeater;
 use Filament\Forms\Components\Tabs;
@@ -20,8 +15,7 @@ use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
+
 use Illuminate\Support\Str;
 
 class PageReferenceListResource extends Resource

app/Filament/Resources/PageResource.php

@@ -2,39 +2,15 @@
 
 namespace App\Filament\Resources;
 
-use App\Enums\CustomFormStatus;
-use App\Enums\PostStatus;
+
+use App\Containers\AppStructure\Models\Page;
 use App\Filament\Components\Forms\PageForm;
 use App\Filament\Resources\PageResource\Pages;
 use App\Filament\Resources\PageResource\RelationManagers\SectionRelationManager;
-use App\Helpers\ByteConverter;
-use App\Models\Category;
-use App\Models\CustomForm;
-use App\Models\MainSection;
-use App\Models\Page;
-use App\Models\Post;
-use App\Models\SubSection;
-use Filament\Forms\Components\Builder;
-use Filament\Forms;
-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\SpatieTagsInput;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Toggle;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\File;
-use Illuminate\Support\Str;
-use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
-use Mohamedsabil83\FilamentFormsTinyeditor\Components\TinyEditor;
-use Symfony\Component\Finder\Finder;
 
 class PageResource extends Resource
 {

app/Filament/Resources/PageResource/Pages/CreatePage.php

@@ -2,13 +2,10 @@
 
 namespace App\Filament\Resources\PageResource\Pages;
 
+use App\Containers\AppStructure\Models\SubSection;
 use App\Filament\Resources\PageResource;
-use App\Models\SubSection;
-use App\Services\Filament\Domain\Seo\SeoGeneratorService;
 use App\Services\Filament\Traits\SeoGenerate;
-use Filament\Actions;
 use Filament\Resources\Pages\CreateRecord;
-use Illuminate\Support\Str;
 
 class CreatePage extends CreateRecord
 {

app/Filament/Resources/PostResource.php

@@ -2,9 +2,9 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\Article\Models\Post;
 use App\Filament\Components\Forms\PostForm;
 use App\Filament\Resources\PostResource\Pages;
-use App\Models\Post;
 use BezhanSalleh\FilamentShield\Contracts\HasShieldPermissions;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;

app/Filament/Resources/PostResource/Pages/CreatePost.php

@@ -2,15 +2,13 @@
 
 namespace App\Filament\Resources\PostResource\Pages;
 
+use App\Containers\Article\Enums\PostStatus;
 use App\Dto\MainSliderDTO;
-use App\Enums\PostStatus;
 use App\Filament\Resources\PostResource;
 use App\Services\Filament\Domain\Posts\PostDataProcessor;
 use App\Services\Filament\Domain\Posts\PostNotificationService;
-use App\Services\Filament\Domain\Posts\PostSeoGenerator;
 use App\Services\Filament\Domain\Posts\PostSliderService;
 use App\Services\Filament\Domain\Posts\VkPostPublisher;
-use App\Services\Filament\Domain\Seo\SeoGeneratorService;
 use App\Services\Filament\Traits\SeoGenerate;
 use Filament\Resources\Pages\CreateRecord;
 
@@ -41,7 +39,7 @@ class CreatePost extends CreateRecord
 
     protected function processPostData(array $data): array
     {
-        return (new PostDataProcessor())->process($data, 'create');
+        return (new PostDataProcessor())->processCreate($data);
     }
 
     protected function afterCreate(): void

app/Filament/Resources/PostResource/Pages/EditPost.php

@@ -2,13 +2,12 @@
 
 namespace App\Filament\Resources\PostResource\Pages;
 
+use App\Containers\Article\Enums\PostStatus;
+use App\Containers\Article\Models\Post;
 use App\Dto\MainSliderDTO;
-use App\Enums\PostStatus;
 use App\Filament\Resources\PostResource;
-use App\Models\Post;
 use App\Services\Filament\Domain\Posts\PostDataProcessor;
 use App\Services\Filament\Domain\Posts\PostNotificationService;
-use App\Services\Filament\Domain\Posts\PostSeoGenerator;
 use App\Services\Filament\Domain\Posts\PostSliderService;
 use App\Services\Filament\Domain\Posts\VkPostPublisher;
 use App\Services\Filament\Domain\Seo\SeoGeneratorService;
@@ -16,6 +15,7 @@ use App\Services\Filament\Traits\SeoGenerate;
 use Carbon\Carbon;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
+use Illuminate\Support\Facades\DB;
 
 class EditPost extends EditRecord
 {
@@ -27,8 +27,15 @@ class EditPost extends EditRecord
 
     protected array $slideData;
 
+
     protected function mutateFormDataBeforeFill(array $data): array
     {
+        if ($data['publish_at']) {
+            $data['publish_setting']['publish_after'] = true;
+            $data['publish_setting']['publish_at'] = $data['publish_at'];
+        }
+        $data['publication']['vk'] = true;
+        $data['publication']['telegram'] = true;
         $post = Post::query()->with(['seo', 'slide'])->find($data['id']);
         $data['slide'] = $post->slide ? $post->slide->toArray() : null;
         return $data;
@@ -36,6 +43,7 @@ class EditPost extends EditRecord
 
     protected function mutateFormDataBeforeSave(array $data): array
     {
+        $data['publish_at'] = $this->record->publish_at;
         $this->extractAdditionalData($data);
         return $this->processPostData($data);
     }
@@ -49,7 +57,7 @@ class EditPost extends EditRecord
 
     protected function processPostData(array $data): array
     {
-        return (new PostDataProcessor())->process($data, 'edit');
+        return (new PostDataProcessor())->processUpdate($data);
     }
 
     protected function afterSave(): void
@@ -97,7 +105,12 @@ class EditPost extends EditRecord
 
     protected function publishToVk(): void
     {
-        (new VkPostPublisher())->publish($this->publicationAgreements, $this->record);
+        $postRelation = DB::table('posts_vk_posts')->select()->where('post_id', $this->record->id)->first();
+        if($postRelation){
+            (new VkPostPublisher())->update($this->publicationAgreements, $this->record);
+        } else {
+            (new VkPostPublisher())->publish($this->publicationAgreements, $this->record);
+        }
     }
 
     protected function getHeaderActions(): array

app/Filament/Resources/PostResource/Pages/ListPosts.php

@@ -2,9 +2,9 @@
 
 namespace App\Filament\Resources\PostResource\Pages;
 
-use App\Enums\PostStatus;
+use App\Containers\Article\Enums\PostStatus;
+use App\Containers\Article\Models\Post;
 use App\Filament\Resources\PostResource;
-use App\Models\Post;
 use Filament\Actions;
 use Filament\Resources\Components\Tab;
 use Filament\Resources\Pages\ListRecords;

app/Filament/Resources/ScheduleResource.php

@@ -2,21 +2,18 @@
 
 namespace App\Filament\Resources;
 
-use App\Enums\FormEducation;
+use App\Containers\Schedule\Models\EducationalGroup;
+use App\Containers\Schedule\Models\Schedule;
 use App\Filament\Resources\ScheduleResource\Pages;
-use App\Models\EducationalGroup;
-use App\Models\Schedule;
 use Filament\Forms;
 use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Grid;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Toggle;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
-use Filament\Tables\Columns\IconColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 use Illuminate\Support\Carbon;

app/Filament/Resources/ScheduleResource/Pages/EditSchedule.php

@@ -3,7 +3,6 @@
 namespace App\Filament\Resources\ScheduleResource\Pages;
 
 use App\Filament\Resources\ScheduleResource;
-use App\Models\EducationalGroup;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 

app/Filament/Resources/Shield/RoleResource.php

@@ -137,7 +137,7 @@ class RoleResource extends Resource implements HasShieldPermissions
 
     public static function getModel(): string
     {
-        return Utils::getRoleModel();
+        return 'App\\Containers\\User\\Models\\Role';
     }
 
     public static function getModelLabel(): string

app/Filament/Resources/SlideResource.php

@@ -2,12 +2,11 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\AppStructure\Models\Page;
+use App\Containers\Article\Models\Post;
+use App\Containers\Event\Models\Event;
+use App\Containers\Widget\Models\Slide;
 use App\Filament\Resources\SlideResource\Pages;
-use App\Models\Event;
-use App\Models\Page;
-use App\Models\Post;
-use App\Models\Slide;
-use App\Models\Slider;
 use Filament\Forms;
 use Filament\Forms\Components\ColorPicker;
 use Filament\Forms\Components\DateTimePicker;
@@ -18,7 +17,6 @@ use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-
 use Illuminate\Support\Carbon;
 
 class SlideResource extends Resource

app/Filament/Resources/SliderResource.php

@@ -2,9 +2,9 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\Widget\Models\Slider;
 use App\Filament\Resources\SliderResource\Pages;
 use App\Filament\Resources\SliderResource\RelationManagers;
-use App\Models\Slider;
 use Filament\Forms;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\TextInput;

app/Filament/Resources/SliderResource/RelationManagers/SlidesRelationManager.php

@@ -2,9 +2,9 @@
 
 namespace App\Filament\Resources\SliderResource\RelationManagers;
 
-use App\Models\Event;
-use App\Models\Page;
-use App\Models\Post;
+use App\Containers\Event\Models\Event;
+use App\Containers\AppStructure\Models\Page;
+use App\Containers\Article\Models\Post;
 use Filament\Forms;
 use Filament\Forms\Components\ColorPicker;
 use Filament\Forms\Components\DateTimePicker;

app/Filament/Resources/SubSectionResource.php

@@ -2,18 +2,15 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\AppStructure\Models\SubSection;
 use App\Filament\Resources\SubSectionResource\Pages;
 use App\Filament\Resources\SubSectionResource\RelationManagers;
-use App\Models\Page;
-use App\Models\SubSection;
 use Filament\Forms;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 use Illuminate\Support\Str;
 
 class SubSectionResource extends Resource

app/Filament/Resources/SubSectionResource/Pages/CreateSubSection.php

@@ -3,10 +3,6 @@
 namespace App\Filament\Resources\SubSectionResource\Pages;
 
 use App\Filament\Resources\SubSectionResource;
-use App\Models\Page;
-use App\Models\SubSection;
-use Filament\Actions;
-use Filament\Notifications\Notification;
 use Filament\Resources\Pages\CreateRecord;
 
 class CreateSubSection extends CreateRecord

app/Filament/Resources/SubSectionResource/Pages/EditSubSection.php

@@ -3,8 +3,7 @@
 namespace App\Filament\Resources\SubSectionResource\Pages;
 
 use App\Filament\Resources\SubSectionResource;
-use App\Models\Page;
-use App\Models\SubSection;
+use App\Containers\AppStructure\Models\Page;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 

app/Filament/Resources/SubSectionResource/RelationManagers/PagesRelationManager.php

@@ -3,16 +3,12 @@
 namespace App\Filament\Resources\SubSectionResource\RelationManagers;
 
 use App\Filament\Components\Forms\PageForm;
-use App\Models\Page;
-use App\Models\SubSection;
+use App\Containers\AppStructure\Models\Page;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-
 class PagesRelationManager extends RelationManager
 {
     protected static string $relationship = 'pages';

app/Filament/Resources/TagResource.php

@@ -2,16 +2,12 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\Article\Models\Tag;
 use App\Filament\Resources\TagResource\Pages;
-use App\Filament\Resources\TagResource\RelationManagers;
-use App\Models\Tag;
-use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 
 class TagResource extends Resource
 {

app/Filament/Resources/UrlLinkResource.php

@@ -2,14 +2,9 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\AppStructure\Models\Page;
 use App\Filament\Resources\UrlLinkResource\Pages;
-use App\Filament\Resources\UrlLinkResource\RelationManagers;
-use App\Models\Page;
-use App\Models\UrlLink;
 use Filament\Forms;
-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\TextInput;
@@ -18,10 +13,6 @@ use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Filament\Forms\Components\Builder;
-
-use Illuminate\Support\Str;
 
 class UrlLinkResource extends Resource
 {

app/Filament/Resources/UserDetailResource.php

@@ -2,19 +2,13 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\User\Models\UserDetail;
 use App\Filament\Components\Forms\UserDetailForm;
 use App\Filament\Resources\UserDetailResource\Pages;
-use App\Filament\Resources\UserDetailResource\RelationManagers;
-use App\Models\UserDetail;
-use Filament\Forms;
-use Filament\Forms\Components\Tabs;
 use Filament\Forms\Form;
-use Filament\Resources\Components\Tab;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 
 class UserDetailResource extends Resource
 {

app/Filament/Resources/UserResource.php

@@ -2,20 +2,16 @@
 
 namespace App\Filament\Resources;
 
+use App\Containers\User\Models\User;
 use App\Filament\Resources\UserResource\Pages;
 use App\Filament\Resources\UserResource\RelationManagers;
-use App\Models\User;
 use BezhanSalleh\FilamentShield\Contracts\HasShieldPermissions;
 use Filament\Forms;
 use Filament\Forms\Components\Section;
-use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Illuminate\Support\Str;
 
 class UserResource extends Resource implements HasShieldPermissions
 {

app/Filament/Resources/UserResource/Pages/CreateUser.php

@@ -3,7 +3,7 @@
 namespace App\Filament\Resources\UserResource\Pages;
 
 use App\Filament\Resources\UserResource;
-use App\Models\User;
+use App\Containers\User\Models\User;
 use Filament\Actions;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Support\Str;

app/Filament/Resources/UserResource/Pages/EditUser.php

@@ -2,8 +2,8 @@
 
 namespace App\Filament\Resources\UserResource\Pages;
 
+use App\Containers\User\Models\User;
 use App\Filament\Resources\UserResource;
-use App\Models\User;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 use Illuminate\Support\Str;

app/Filament/Resources/UserResource/Pages/ListUsers.php

@@ -2,10 +2,10 @@
 
 namespace App\Filament\Resources\UserResource\Pages;
 
+use App\Containers\User\Mails\InvitationMail;
+use App\Containers\User\Models\Invitation;
 use App\Filament\Resources\UserResource;
-use App\Mail\InvitationMail;
-use App\Models\Invitation;
-use App\Models\User;
+use App\Containers\User\Models\User;
 use Filament\Actions;
 use Filament\Forms\Components\TextInput;
 use Filament\Notifications\Notification;

app/Filament/Resources/UserResource/RelationManagers/UserDetailRelationManager.php

@@ -3,15 +3,11 @@
 namespace App\Filament\Resources\UserResource\RelationManagers;
 
 use App\Filament\Components\Forms\UserDetailForm;
-use App\Models\User;
-use Filament\Forms;
-use Filament\Forms\Components\Tabs;
+use App\Containers\User\Models\User;
 use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 
 class UserDetailRelationManager extends RelationManager
 {