From a3f3e97b2fa0793756efc3da7f68683bab4da645 Mon Sep 17 00:00:00 2001 From: F4ilji Date: Tue, 27 May 2025 14:55:34 +0500 Subject: [PATCH] fix bugs, added accordion type in tabs --- .../UpdateEduDataApiController.php | 1 - .../Forms/ItemForm/Blocks/TabBlock.php | 5 ++ app/Jobs/CreateDirectionStudy.php | 1 + app/Jobs/CreateEducationalProgram.php | 1 + resources/js/Pages/Client/Divisions/Index.vue | 84 ++++++++----------- .../builder/pageBuilder/blocks/FileBlock.vue | 2 +- .../builder/pageBuilder/blocks/TabBlock.vue | 33 ++++++-- 7 files changed, 68 insertions(+), 59 deletions(-) diff --git a/app/Containers/Education/UI/API/Controllers/UpdateEduDataApiController.php b/app/Containers/Education/UI/API/Controllers/UpdateEduDataApiController.php index 4565a05..0e6c5a3 100644 --- a/app/Containers/Education/UI/API/Controllers/UpdateEduDataApiController.php +++ b/app/Containers/Education/UI/API/Controllers/UpdateEduDataApiController.php @@ -5,7 +5,6 @@ namespace App\Containers\Education\UI\API\Controllers; use App\Http\Controllers\Controller; use App\Jobs\CreateDirectionStudy; use App\Jobs\CreateEducationalProgram; -use App\Services\Vicon\EducationalProgram\EducationalProgramService; class UpdateEduDataApiController extends Controller { diff --git a/app/Filament/Components/Forms/ItemForm/Blocks/TabBlock.php b/app/Filament/Components/Forms/ItemForm/Blocks/TabBlock.php index b84c204..69e92bf 100644 --- a/app/Filament/Components/Forms/ItemForm/Blocks/TabBlock.php +++ b/app/Filament/Components/Forms/ItemForm/Blocks/TabBlock.php @@ -9,7 +9,9 @@ use Filament\Forms\Components\Builder; use Filament\Forms\Components\FileUpload; use Filament\Forms\Components\Hidden; use Filament\Forms\Components\Repeater; +use Filament\Forms\Components\Section; use Filament\Forms\Components\TextInput; +use Filament\Forms\Components\Toggle; use Illuminate\Support\Carbon; use Illuminate\Support\Str; use Livewire\Features\SupportFileUploads\TemporaryUploadedFile; @@ -20,6 +22,9 @@ class TabBlock implements BlockSchema public static function schema(): array { return [ + Section::make()->schema([ + Toggle::make('settings.is_accordion')->label('Выводить вкладки в виде аккордиона')->default(false), + ]), Repeater::make('tab') ->label('Вкладки') ->helperText('Добавьте вкладки с контентом') diff --git a/app/Jobs/CreateDirectionStudy.php b/app/Jobs/CreateDirectionStudy.php index 0333960..7c10090 100644 --- a/app/Jobs/CreateDirectionStudy.php +++ b/app/Jobs/CreateDirectionStudy.php @@ -4,6 +4,7 @@ namespace App\Jobs; use App\Containers\Education\Models\DirectionStudy; use App\Services\Vicon\DirectionStudy\DirectionStudyService; +use App\Ship\Enums\Education\LevelEducational; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; diff --git a/app/Jobs/CreateEducationalProgram.php b/app/Jobs/CreateEducationalProgram.php index b1e8a6f..7368c30 100644 --- a/app/Jobs/CreateEducationalProgram.php +++ b/app/Jobs/CreateEducationalProgram.php @@ -5,6 +5,7 @@ namespace App\Jobs; use App\Containers\Education\Models\DirectionStudy; use App\Containers\Education\Models\EducationalProgram; use App\Services\Vicon\EducationalProgram\EducationalProgramService; +use App\Ship\Enums\Education\LevelEducational; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; diff --git a/resources/js/Pages/Client/Divisions/Index.vue b/resources/js/Pages/Client/Divisions/Index.vue index 7a31484..a0c2808 100644 --- a/resources/js/Pages/Client/Divisions/Index.vue +++ b/resources/js/Pages/Client/Divisions/Index.vue @@ -7,10 +7,14 @@ import DivisionListBreadcrumbs from "@/componentss/features/divisions/components import BasicFooter from "@/footers/BasicFooter.vue"; import BreadcrumbsItem from "@/componentss/shared/Breadcrumbs/BreadcrumbsItem.vue"; import BaseBreadcrumbs from "@/componentss/shared/Breadcrumbs/BaseBreadcrumbs.vue"; +import BasicPageWrapper from "@/componentss/ui/wrappers/BasicPageWrapper.vue"; +import FacultyListTitle from "@/componentss/features/faculties/components/FacultyListTitle.vue"; +import BasicPageContainer from "@/componentss/ui/templates/BasicPageContainer.vue"; export default { name: "Index", components: { + BasicPageContainer, FacultyListTitle, BasicPageWrapper, BaseBreadcrumbs, BreadcrumbsItem, BasicFooter, DivisionListTitle, @@ -44,60 +48,40 @@ export default { -
-
-
-
-
- - - -
-
- -
+ + + + + + - + +
+ - - - +
+ + + - -
- -
- -
- -
-
- -
-
-
-
- - -
diff --git a/resources/js/componentss/shared/builder/pageBuilder/blocks/FileBlock.vue b/resources/js/componentss/shared/builder/pageBuilder/blocks/FileBlock.vue index c0a73a7..10fe6bc 100644 --- a/resources/js/componentss/shared/builder/pageBuilder/blocks/FileBlock.vue +++ b/resources/js/componentss/shared/builder/pageBuilder/blocks/FileBlock.vue @@ -5,7 +5,7 @@
- +
{{ textLimit(file.title, 70) }}
diff --git a/resources/js/componentss/shared/builder/pageBuilder/blocks/TabBlock.vue b/resources/js/componentss/shared/builder/pageBuilder/blocks/TabBlock.vue index 7bd22d2..8c83a92 100644 --- a/resources/js/componentss/shared/builder/pageBuilder/blocks/TabBlock.vue +++ b/resources/js/componentss/shared/builder/pageBuilder/blocks/TabBlock.vue @@ -1,7 +1,27 @@