From 218e5ab8e3b069b6b178eeb16b912185f1a0490d Mon Sep 17 00:00:00 2001
From: F4ilji <f4ilj@yandex.ru>
Date: Wed, 25 Jun 2025 22:48:01 +0500
Subject: [PATCH] changes

---
 .../js/Pages/Client/Departments/Show.vue      | 47 ++-----------------
 resources/js/Pages/Client/Programs/Show.vue   | 11 +++--
 resources/js/Pages/Main.vue                   |  6 +--
 resources/js/Pages/Page.vue                   |  2 +-
 .../builder/pageBuilder/blocks/ImageBlock.vue |  7 +--
 .../pageBuilder/blocks/ParagraphBlock.vue     |  4 +-
 .../js/componentss/ui/titles/BasicTitle.vue   |  4 +-
 7 files changed, 24 insertions(+), 57 deletions(-)

diff --git a/resources/js/Pages/Client/Departments/Show.vue b/resources/js/Pages/Client/Departments/Show.vue
index 2fa7c0b..d92d33c 100644
--- a/resources/js/Pages/Client/Departments/Show.vue
+++ b/resources/js/Pages/Client/Departments/Show.vue
@@ -28,46 +28,7 @@
         </nav>
       </div>
 
-      <nav class="order-last hidden w-56 shrink-0 xl:block">
-        <div class="sticky top-[110px] h-[calc(100vh-110px)]">
-          <div class="text-gray-1000 mb-2 text-md font-medium">На этой странице</div>
-          <ul class="max-h-[70vh] space-y-1.5 overflow-hidden py-2 text-sm">
-            <li class="anchor-li">
-              <a :class="{ 'translate-x-2 text-primary-light' : currentNavSection  === 'workers', 'bg-transperant text-gray-600 hover:text-gray-900' : currentNavSection !== 'workers' }"
-                 class="duration-150 block py-1 px-2 leading-[1.6] rounded-md"
-                 href="#workers">Сотрудники кафедры</a>
-            </li>
-            <li class="anchor-li">
-              <a :class="{ 'translate-x-2 text-primary-light' : currentNavSection  === 'teachers', 'bg-transperant text-gray-600 hover:text-gray-900' : currentNavSection !== 'teachers' }"
-                 class="duration-150 block py-1 px-2 leading-[1.6] rounded-md"
-                 href="#teachers">Преподаватели кафедры</a>
-            </li>
-            <li class="anchor-li">
-              <a :class="{ 'translate-x-2 text-primary-light' : currentNavSection  === 'external-teachers', 'bg-transperant text-gray-600 hover:text-gray-900' : currentNavSection !== 'external-teachers' }"
-                 class="duration-150 block py-1 px-2 leading-[1.6] rounded-md"
-                 href="#external-teachers">Внешние совместители</a>
-            </li>
-            <li class="anchor-li">
-              <a :class="{ 'translate-x-2 text-primary-light' : currentNavSection  === 'programs', 'bg-transperant text-gray-600 hover:text-gray-900' : currentNavSection !== 'programs' }"
-                 class="duration-150 block py-1 px-2 leading-[1.6] rounded-md"
-                 href="#programs">Программы</a>
-            </li>
-            <li class="anchor-li">
-              <a :class="{ 'translate-x-2 text-primary-light' : currentNavSection  === 'description', 'bg-transperant text-gray-600 hover:text-gray-900' : currentNavSection !== 'description' }"
-                 class="duration-150 block py-1 px-2 leading-[1.6] rounded-md"
-                 href="#description">Описание</a>
-            </li>
-            <transition name="fade">
-              <li class="anchor-li flex items-center py-2 border-t" v-if="scrollTop" @click.prevent="scrollToTop">
-                <button class="bg-transperant text-gray-600 cursor-pointer hover:text-gray-900 duration-300 block px-2 leading-[1.6] rounded-md">К началу</button>
-                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[17px] text-gray-600">
-                  <path stroke-linecap="round" stroke-linejoin="round" d="M15 11.25l-3-3m0 0l-3 3m3-3v7.5M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
-                </svg>
-              </li>
-            </transition>
-          </ul>
-        </div>
-      </nav>
+      <NavigateLinks :header-navs="headerNavs" />
 
       <article class="w-full min-w-0 mt-1 max-w-6xl px-1 md:px-6" style="">
         <div class="space-y-5 md:space-y-5">
@@ -81,7 +42,7 @@
           <BasicTitle :header="department.data.title" />
 
           <div id="page-area" class="space-y-5 md:space-y-5">
-            <h2 v-if="department.data.workers.length > 0" :id="'anchor-link-' + generateSlug('Сотрудники кафедры')" class="font-bold text-xl">Сотрудники кафедры</h2>
+            <h2 v-if="department.data.workers.length > 0" :id="'anchor-link-' + generateSlug('Профессорско-преподавательский состав')" class="font-bold text-xl">Профессорско-преподавательский состав</h2>
             <template v-for="worker in department.data.workers">
               <DepartmentWorkerCard :worker="worker" />
             </template>
@@ -105,7 +66,7 @@
                 <div id="hs-basic-with-title-and-arrow-stretched-collapse-three" class="hs-accordion-content hidden w-full overflow-hidden transition-[height] duration-300" role="region" aria-labelledby="hs-basic-with-title-and-arrow-stretched-heading-three">
                   <ul class="list-disc list-outside space-y-3 ps-5 text-lg text-gray-800 dark:text-neutral-200">
                     <li v-for="program in direction" class="ps-2">
-                      <Link :href="route('client.program.show', program.id)" class="text-base text-primary decoration-2 hover:underline focus:outline-none focus:underline font-medium dark:text-blue-500">{{ program.name }}</Link>
+                      <Link :href="route('client.program.show', program.slug)" class="text-base text-primary decoration-2 hover:underline focus:outline-none focus:underline font-medium dark:text-blue-500">{{ program.name }}</Link>
                     </li>
                   </ul>
                 </div>
@@ -161,6 +122,7 @@ import SortingByFilter from "@/componentss/shared/filter/filters/SortingByFilter
 import NavigateVisor from "@/componentss/shared/visor/NavigateVisor.vue";
 import BreadcrumbsItem from "@/componentss/shared/Breadcrumbs/BreadcrumbsItem.vue";
 import BaseBreadcrumbs from "@/componentss/shared/Breadcrumbs/BaseBreadcrumbs.vue";
+import NavigateLinks from "@/componentss/shared/navigate/NavigateLinks.vue";
 
 
 export default {
@@ -193,6 +155,7 @@ export default {
 	},
 
 	components: {
+    NavigateLinks,
     BaseBreadcrumbs, BreadcrumbsItem,
     NavigateVisor,
     SortingByFilter,
diff --git a/resources/js/Pages/Client/Programs/Show.vue b/resources/js/Pages/Client/Programs/Show.vue
index e73aa2b..231224f 100644
--- a/resources/js/Pages/Client/Programs/Show.vue
+++ b/resources/js/Pages/Client/Programs/Show.vue
@@ -138,7 +138,7 @@ export default {
             </div>
             <div class="mt-3">
               <h3 class="text-lg font-semibold text-gray-800">Количество мест на прием</h3>
-              <template v-for="admissionPlan in program.data.admissionPlans">
+              <template v-if="Object.keys(program.data.admissionPlans).length !== 0" v-for="admissionPlan in program.data.admissionPlans">
                 <template v-for="(contests, form) in groupContestsByFormEducation(admissionPlan.contests)">
                   <div class="border rounded my-2 py-1">
                     <span class="text-gray-500 text-[14px]">{{ EducationForm.fromValue(form).label }}</span>
@@ -149,6 +149,9 @@ export default {
                   </div>
                 </template>
               </template>
+              <template v-else>
+                <span class="font-light text-sm mt-2">Прием по данной образовательной программе на текущий образовательный год не проводится</span>
+              </template>
             </div>
           </div>
           <!-- End Icon Block -->
@@ -156,7 +159,7 @@ export default {
       </div>
       <div>
         <div class="hs-accordion-group">
-          <div class="hs-accordion bg-white border -mt-px first:rounded-t-lg last:rounded-b-lg" id="hs-bordered-heading-one">
+          <div v-if="Object.keys(program.data.admissionPlans).length !== 0" class="hs-accordion bg-white border -mt-px first:rounded-t-lg last:rounded-b-lg" id="hs-bordered-heading-one">
             <button class="hs-accordion-toggle hs-accordion-active:text-primary inline-flex items-center gap-x-3 w-full font-semibold text-start text-gray-800 py-4 px-5 hover:text-gray-500 disabled:opacity-50 disabled:pointer-events-none" aria-controls="hs-basic-bordered-collapse-two">
               <svg class="hs-accordion-active:hidden block size-3.5" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
                 <path d="M5 12h14"></path>
@@ -188,7 +191,7 @@ export default {
             </div>
           </div>
 
-          <div class="hs-accordion bg-white border -mt-px first:rounded-t-lg last:rounded-b-lg" id="hs-bordered-heading-two">
+          <div v-if="program.data.about_program" class="hs-accordion bg-white border -mt-px first:rounded-t-lg last:rounded-b-lg" id="hs-bordered-heading-two">
             <button class="hs-accordion-toggle hs-accordion-active:text-primary inline-flex items-center gap-x-3 w-full font-semibold text-start text-gray-800 py-4 px-5 hover:text-gray-500 disabled:opacity-50 disabled:pointer-events-none" aria-controls="hs-basic-bordered-collapse-two">
               <svg class="hs-accordion-active:hidden block size-3.5" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
                 <path d="M5 12h14"></path>
@@ -206,7 +209,7 @@ export default {
             </div>
           </div>
 
-          <div class="hs-accordion bg-white border -mt-px first:rounded-t-lg last:rounded-b-lg" id="hs-bordered-heading-three">
+          <div v-if="program.data.program_features" class="hs-accordion bg-white border -mt-px first:rounded-t-lg last:rounded-b-lg" id="hs-bordered-heading-three">
             <button class="hs-accordion-toggle hs-accordion-active:text-primary inline-flex items-center gap-x-3 w-full font-semibold text-start text-gray-800 py-4 px-5 hover:text-gray-500 disabled:opacity-50 disabled:pointer-events-none" aria-controls="hs-basic-bordered-collapse-three">
               <svg class="hs-accordion-active:hidden block size-3.5" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
                 <path d="M5 12h14"></path>
diff --git a/resources/js/Pages/Main.vue b/resources/js/Pages/Main.vue
index 8f42e0e..373d443 100644
--- a/resources/js/Pages/Main.vue
+++ b/resources/js/Pages/Main.vue
@@ -6,9 +6,9 @@
 
   <section class="max-w-screen-xl w-full mx-auto px-4 py-3 pb-10">
     <PostSection :posts="posts" />
-    <div>
-      <EventSection :events="events" />
-    </div>
+<!--    <div>-->
+<!--      <EventSection :events="events" />-->
+<!--    </div>-->
     <EducationSection :educations="educations" />
   </section>
 	<PageResourceList resource-id="glavnaia-stranica-resurs" />
diff --git a/resources/js/Pages/Page.vue b/resources/js/Pages/Page.vue
index e10b9c8..7f30e3a 100644
--- a/resources/js/Pages/Page.vue
+++ b/resources/js/Pages/Page.vue
@@ -9,7 +9,7 @@
       <PageSubSectionLinks v-if="!settings?.hide_page_sub_section_links" :sub-section-pages="subSectionPages" :current-section="page.data.section"/>
       <NavigateLinks v-if="!settings?.hide_page_navigate_links"  :header-navs="headerNavs"/>
       <div class="w-full min-w-0 mt-1 max-w-6xl px-1 md:px-6" style="">
-        <div class="space-y-5 md:space-y-5">
+        <div class="space-y-2 md:space-y-5">
           <BaseBreadcrumbs v-if="!settings?.hide_breadcrumbs" :breadcrumbs="breadcrumbs">
             <BreadcrumbsItem :title="breadcrumbs.page.data.title" :url="route('page.view', breadcrumbs.page.data.path)" />
           </BaseBreadcrumbs>
diff --git a/resources/js/componentss/shared/builder/pageBuilder/blocks/ImageBlock.vue b/resources/js/componentss/shared/builder/pageBuilder/blocks/ImageBlock.vue
index fdc5b58..17db8cf 100644
--- a/resources/js/componentss/shared/builder/pageBuilder/blocks/ImageBlock.vue
+++ b/resources/js/componentss/shared/builder/pageBuilder/blocks/ImageBlock.vue
@@ -12,11 +12,12 @@
         :src="'/storage/' + block.data.url"
         alt=""
     />
-      <div v-if="block.data.alt" class="mt-3 text-sm text-center text-gray-500 dark:text-neutral-500">
-        {{ block.data.alt }}
-      </div>
+
     </div>
   </div>
+  <div v-if="block.data.alt" class="mt-3 text-sm text-center text-gray-500 dark:text-neutral-500">
+    {{ block.data.alt }}
+  </div>
 
   <FsLightbox class="" :toggler="toggler" :sources="[domainPath + '/storage/' + block.data.url]"/>
 </template>
diff --git a/resources/js/componentss/shared/builder/pageBuilder/blocks/ParagraphBlock.vue b/resources/js/componentss/shared/builder/pageBuilder/blocks/ParagraphBlock.vue
index cfbbf7a..1c6adcd 100644
--- a/resources/js/componentss/shared/builder/pageBuilder/blocks/ParagraphBlock.vue
+++ b/resources/js/componentss/shared/builder/pageBuilder/blocks/ParagraphBlock.vue
@@ -1,6 +1,5 @@
 <template>
-
-	<div class="text-normal leading-7 md:leading-8 tracking-wide font-light text-gray-600 md:text-[15px] md:text-[#374151] md:font-normal paragraph-container" v-html="wrapTables(block).data.content" />
+	<div class="text-normal leading-7 md:leading-8 tracking-wide font-light text-gray-600 md:text-[16px] md:text-[#374151] md:font-normal paragraph-container" v-html="wrapTables(block).data.content" />
 </template>
 
 <script>
@@ -120,4 +119,5 @@ export default {
 
 
 
+
 </style>
\ No newline at end of file
diff --git a/resources/js/componentss/ui/titles/BasicTitle.vue b/resources/js/componentss/ui/titles/BasicTitle.vue
index 97b099b..205a096 100644
--- a/resources/js/componentss/ui/titles/BasicTitle.vue
+++ b/resources/js/componentss/ui/titles/BasicTitle.vue
@@ -1,7 +1,7 @@
 <template>
 
-	<div class="space-y-3">
-		<h1 class="text-2xl mb-10 font-bold md:text-3xl">{{ header }}</h1>
+	<div>
+		<h1 class="text-2xl mb-5 font-bold md:text-3xl">{{ header }}</h1>
 	</div>
 
 </template>