From f0c526da924e47db10b332b215840fa0b308d8d6 Mon Sep 17 00:00:00 2001
From: F4ilji <f4ilj@yandex.ru>
Date: Mon, 7 Apr 2025 14:10:59 +0500
Subject: [PATCH] add slug column, fix bugs

---
 app/Filament/Resources/ScheduleResource.php   |  3 +-
 .../RelationManagers/PagesRelationManager.php |  4 +-
 ...e_direction_additional_education_table.php |  1 -
 ...lumn_to_direction_additional_education.php | 28 ++++++
 .../js/Pages/Client/AcademicJournals/Show.vue |  5 +-
 .../AcademicJournalsItemBreadcrumbs.vue       |  4 +-
 .../AcademicJournalsListBreadcrumbs.vue.vue   |  4 +-
 .../components/PostListBreadcrumbs.vue.vue    | 93 +++++++------------
 8 files changed, 70 insertions(+), 72 deletions(-)
 create mode 100644 database/migrations/2025_04_07_140452_add_slug_column_to_direction_additional_education.php

diff --git a/app/Filament/Resources/ScheduleResource.php b/app/Filament/Resources/ScheduleResource.php
index 57485b5..b617227 100644
--- a/app/Filament/Resources/ScheduleResource.php
+++ b/app/Filament/Resources/ScheduleResource.php
@@ -124,8 +124,7 @@ class ScheduleResource extends Resource
                     ->trueIcon('heroicon-o-academic-cap')
                     ->falseIcon('heroicon-o-building-office')
                     ->trueColor('success')
-                    ->falseColor('primary')
-                    ->formatStateUsing(fn ($state) => $state ? 'Заочная' : 'Очная'),
+                    ->falseColor('primary'),
 
                 TextColumn::make('updated_at')
                     ->label('Обновлено')
diff --git a/app/Filament/Resources/SubSectionResource/RelationManagers/PagesRelationManager.php b/app/Filament/Resources/SubSectionResource/RelationManagers/PagesRelationManager.php
index 91abbd3..fdf2812 100644
--- a/app/Filament/Resources/SubSectionResource/RelationManagers/PagesRelationManager.php
+++ b/app/Filament/Resources/SubSectionResource/RelationManagers/PagesRelationManager.php
@@ -39,12 +39,12 @@ class PagesRelationManager extends RelationManager
                 Tables\Actions\Action::make('associate')
                     ->label('Прикрепить страницу')
                     ->color('success')
-                    ->searchable()
-                    ->preload()
                     ->button()
                     ->form([
                         Forms\Components\Select::make('recordId')
                             ->label('Страница')
+                            ->searchable()
+                            ->preload()
                             ->options(Page::whereNull('sub_section_id')->whereNotNull('title')->pluck('title', 'id'))
                             ->required(),
                     ])
diff --git a/database/migrations/15_2024_07_22_154831_create_direction_additional_education_table.php b/database/migrations/15_2024_07_22_154831_create_direction_additional_education_table.php
index 3a03326..fe941b3 100644
--- a/database/migrations/15_2024_07_22_154831_create_direction_additional_education_table.php
+++ b/database/migrations/15_2024_07_22_154831_create_direction_additional_education_table.php
@@ -14,7 +14,6 @@ return new class extends Migration
         Schema::create('direction_additional_education', function (Blueprint $table) {
             $table->id();
             $table->string('title')->unique();
-            $table->string('slug')->unique();
             $table->boolean('is_active');
             $table->timestamps();
         });
diff --git a/database/migrations/2025_04_07_140452_add_slug_column_to_direction_additional_education.php b/database/migrations/2025_04_07_140452_add_slug_column_to_direction_additional_education.php
new file mode 100644
index 0000000..da364f5
--- /dev/null
+++ b/database/migrations/2025_04_07_140452_add_slug_column_to_direction_additional_education.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('direction_additional_education', function (Blueprint $table) {
+            $table->string('slug')->unique()->nullable()->after('title');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('direction_additional_education', function (Blueprint $table) {
+            $table->dropColumn('slug');
+        });
+    }
+};
diff --git a/resources/js/Pages/Client/AcademicJournals/Show.vue b/resources/js/Pages/Client/AcademicJournals/Show.vue
index 037a3c7..0d491c9 100644
--- a/resources/js/Pages/Client/AcademicJournals/Show.vue
+++ b/resources/js/Pages/Client/AcademicJournals/Show.vue
@@ -70,7 +70,8 @@ export default {
 						<!-- Avatar Media -->
 						<!-- End Avatar Media -->
 						<!-- Content -->
-						<div class="space-y-5 md:space-y-8">
+
+            <div class="container max-w-6xl px-2 xl:px-5 lg:py-4 mx-auto space-y-5 md:space-y-8">
               <AcademicJournalsItemBreadcrumbs :title="journal.data.title" />
 							<AcademicJournalsTitle class="text-center" :header="journal.data.title" />
 							<div>
@@ -94,7 +95,7 @@ export default {
 
 								</nav>
 							</div>
-							<div class="container max-w-4xl px-2 xl:px-5 lg:py-4 md:w-4/5 mx-auto">
+							<div class="">
 								<div id="horizontal-alignment-1" role="tabpanel" aria-labelledby="horizontal-alignment-item-1">
 									<Builder :blocks="journal.data.main_info" />
 								</div>
diff --git a/resources/js/componentss/features/academicJournals/components/AcademicJournalsItemBreadcrumbs.vue b/resources/js/componentss/features/academicJournals/components/AcademicJournalsItemBreadcrumbs.vue
index 94fc78b..c4f6645 100644
--- a/resources/js/componentss/features/academicJournals/components/AcademicJournalsItemBreadcrumbs.vue
+++ b/resources/js/componentss/features/academicJournals/components/AcademicJournalsItemBreadcrumbs.vue
@@ -32,14 +32,14 @@
 							</span>
 						</li>
 						<li class="text-sm">
-							<Link :href="route('client.post.index')" class="flex items-center text-gray-500 hover:text-primary-hover">
+							<Link :href="route('client.academicJournals.index')" class="flex items-center text-gray-500 hover:text-primary-hover">
 								<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
 										 width="16" height="16"
 										 viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 									<path d="M5 1L10.6869 7.16086C10.8637 7.35239 10.8637 7.64761 10.6869 7.83914L5 14"
 												stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
 								</svg>
-								{{ textLimit('Новости', 30) }}
+                {{ textLimit('Научные журналы', 30) }}
 							</Link>
 						</li>
 						<li class="text-sm">
diff --git a/resources/js/componentss/features/academicJournals/components/AcademicJournalsListBreadcrumbs.vue.vue b/resources/js/componentss/features/academicJournals/components/AcademicJournalsListBreadcrumbs.vue.vue
index 6681ead..8fd4444 100644
--- a/resources/js/componentss/features/academicJournals/components/AcademicJournalsListBreadcrumbs.vue.vue
+++ b/resources/js/componentss/features/academicJournals/components/AcademicJournalsListBreadcrumbs.vue.vue
@@ -32,14 +32,14 @@
 							</span>
 						</li>
 						<li class="text-sm">
-							<Link :href="route('client.post.index')" class="flex items-center text-gray-500 hover:text-primary-light">
+							<Link :href="route('client.academicJournals.index')" class="flex items-center text-gray-500 hover:text-primary-light">
 								<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
 										 width="16" height="16"
 										 viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 									<path d="M5 1L10.6869 7.16086C10.8637 7.35239 10.8637 7.64761 10.6869 7.83914L5 14"
 												stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
 								</svg>
-								{{ textLimit('Новости', 30) }}
+                {{ textLimit('Научные журналы', 30) }}
 							</Link>
 						</li>
 					</BreadcrumbsWrapper>
diff --git a/resources/js/componentss/features/posts/components/PostListBreadcrumbs.vue.vue b/resources/js/componentss/features/posts/components/PostListBreadcrumbs.vue.vue
index 926c714..a58fedf 100644
--- a/resources/js/componentss/features/posts/components/PostListBreadcrumbs.vue.vue
+++ b/resources/js/componentss/features/posts/components/PostListBreadcrumbs.vue.vue
@@ -3,63 +3,45 @@
 		<div class="flex w-full sm:items-center gap-x-5 sm:gap-x-3">
 			<div class="grow">
 				<div class="grid sm:flex sm:justify-between sm:items-center gap-2">
-					<BreadcrumbsWrapper v-if="breadcrumbs">
-						<li class="text-sm">
-							<Link :href="route('index')" class="flex items-center text-gray-500 hover:text-primary-hover" href="/">
-								<BasicIcon class="size-5" name="home" />
-							</Link>
-						</li>
-						<li v-if="breadcrumbs.mainSection" class="text-sm">
+					<BreadcrumbsWrapper>
+            <li class="text-sm">
+              <Link :href="route('index')" class="flex items-center text-gray-500 hover:text-primary-hover" href="/">
+                <BasicIcon class="size-5" name="home" />
+              </Link>
+            </li>
+            <li v-if="breadcrumbs?.mainSection.data.title" class="text-sm">
 							<span class="flex items-center text-gray-500 hover:text-primary-hover cursor-pointer" @click.prevent="handleSectionClick(breadcrumbs.mainSection)">
 								<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
-										 width="16" height="16"
-										 viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                     width="16" height="16"
+                     viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 								<path d="M5 1L10.6869 7.16086C10.8637 7.35239 10.8637 7.64761 10.6869 7.83914L5 14"
-											stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
+                      stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
 							</svg>
-								{{ textLimit(breadcrumbs.mainSection.data.title, 25) }}
+								{{ TEXT_LIMIT(breadcrumbs.mainSection.data.title, 25) }}
 							</span>
-						</li>
-						<li v-if="breadcrumbs.subSection" class="text-sm">
+            </li>
+            <li v-if="breadcrumbs?.subSection.data.title" class="text-sm">
 							<span class="flex items-center text-gray-500 hover:text-primary-hover cursor-pointer" @click.prevent="handleSubSectionClick(breadcrumbs.mainSection, breadcrumbs.subSection)">
 								<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
-										 width="16" height="16"
-										 viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                     width="16" height="16"
+                     viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
 									<path d="M5 1L10.6869 7.16086C10.8637 7.35239 10.8637 7.64761 10.6869 7.83914L5 14"
-												stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
+                        stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
 								</svg>
-								{{ textLimit(breadcrumbs.subSection.data.title, 25) }}
+								{{ TEXT_LIMIT(breadcrumbs.subSection.data.title, 25) }}
 							</span>
-						</li>
-						<li class="text-sm">
-							<Link :href="route('client.post.index')" class="flex items-center text-gray-500 hover:text-primary-hover">
-								<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
-										 width="16" height="16"
-										 viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-									<path d="M5 1L10.6869 7.16086C10.8637 7.35239 10.8637 7.64761 10.6869 7.83914L5 14"
-												stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
-								</svg>
-								{{ textLimit('Новости', 30) }}
-							</Link>
-						</li>
-					</BreadcrumbsWrapper>
-					<BreadcrumbsWrapper v-else>
-						<li class="text-sm">
-							<Link :href="route('index')" class="flex items-center text-gray-500 hover:text-primary-hover" href="/">
-								<BasicIcon class="size-5" name="home" />
-							</Link>
-						</li>
-						<li class="text-sm">
-							<Link :href="route('client.post.index')" class="flex items-center text-gray-500 hover:text-primary-hover">
-								<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
-										 width="16" height="16"
-										 viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-									<path d="M5 1L10.6869 7.16086C10.8637 7.35239 10.8637 7.64761 10.6869 7.83914L5 14"
-												stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
-								</svg>
-								{{ textLimit('Новости', 30) }}
-							</Link>
-						</li>
+            </li>
+            <li class="text-sm">
+              <Link :href="route('client.post.index')" class="flex items-center text-gray-500 hover:text-primary-hover">
+                <svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
+                     width="16" height="16"
+                     viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+                  <path d="M5 1L10.6869 7.16086C10.8637 7.35239 10.8637 7.64761 10.6869 7.83914L5 14"
+                        stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
+                </svg>
+                {{ TEXT_LIMIT('Новости', 30) }}
+              </Link>
+            </li>
 					</BreadcrumbsWrapper>
 				</div>
 			</div>
@@ -69,25 +51,14 @@
 
 <script>
 import {Link} from "@inertiajs/vue3";
-import slugify from "slugify";
 import BasicIcon from "@/componentss/ui/icons/BasicIcon.vue";
 import BreadcrumbsWrapper from "@/componentss/ui/wrappers/BreadcrumbsWrapper.vue";
+import {helpers} from "@/mixins/Helpers.js";
 export default {
-	name: "PostListBreadcrumbs",
+  mixins: [helpers],
+  name: "PostListBreadcrumbs",
 	components: {BreadcrumbsWrapper, BasicIcon, Link},
-	data() {
-		return {
-		}
-	},
 	methods: {
-		textLimit(text, symbols) {
-			if (text.length > symbols) {
-				let LimitedText
-				LimitedText = text.substring(0, symbols)
-				return LimitedText + "..."
-			}
-			return text
-		},
 		isMobileDevice() {
 			return window.innerWidth < 1024; // Задайте порог для мобильных устройств
 		},