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

fix bugs

Browse Source
This commit is contained in:
F4ilji
2025-05-19 22:16:03 +05:00
parent 7f000877ee
commit 115d084837
10 changed files with 32 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/Filament/Domain/Posts/PostDataProcessor.php
+2 -2
View File
@@ -22,7 +22,7 @@ class PostDataProcessor
// Устанавливаем текст для предпросмотра
$data['preview_text'] = $this->setPreviewText($data);
if (($data['status'] === PostStatus::PUBLISHED->value)) {
if (($data['status']->value === PostStatus::PUBLISHED->value)) {
$data['publish_at'] = $this->setPublishDateTime();
}
@@ -55,7 +55,7 @@ class PostDataProcessor
$data['preview_text'] = $this->setPreviewText($data);
if (!$data['publish_at'] && ($data['status'] === PostStatus::PUBLISHED->value)) {
if (!$data['publish_at'] && ($data['status']->value === PostStatus::PUBLISHED->value)) {
$data['publish_at'] = $this->setPublishDateTime();
}
resources/js/Pages/Client/Additional-educations/Index.vue
+5 -7
View File
@@ -23,10 +23,12 @@ import Builder from "@/componentss/shared/builder/pageBuilder/Builder.vue";
import ProgramTitle from "@/componentss/features/educationalPrograms/components/ProgramTitle.vue";
import BreadcrumbsItem from "@/componentss/shared/Breadcrumbs/BreadcrumbsItem.vue";
import BasicIcon from "@/componentss/ui/icons/BasicIcon.vue";
import BaseBreadcrumbs from "@/componentss/shared/Breadcrumbs/BaseBreadcrumbs.vue";
export default {
name: "Index",
components: {
BaseBreadcrumbs,
BasicIcon, BreadcrumbsItem,
ProgramTitle, Builder, BackButton, BasicPageWrapper, BasicPageContainer, AdditionalProgramItemBreadcrumbs,
BasicListBadge,
@@ -106,13 +108,9 @@ export default {
<AdditionalProgramTitle class="text-center" header="Дополнительное образование" />
<div class="space-y-3 mx-auto max-w-3xl w-full">
<div class="my-10 w-full">
<AdditionalProgramListBreadcrumbs :breadcrumbs="breadcrumbs" />
<BreadcrumbsItem :breadcrumbs="breadcrumbs">
<Link :href="route('client.additionalEducation.index')" class="flex items-center text-gray-500 hover:text-primary-hover">
<BasicIcon class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400" name="breadcrumb-tag" />
Дополнительное образование
</Link>
</BreadcrumbsItem>
<BaseBreadcrumbs :breadcrumbs="breadcrumbs">
<BreadcrumbsItem title="Дополнительное образование" :url="route('client.additionalEducation.index')" />
</BaseBreadcrumbs>
<div class="flex items-center gap-x-2">
<LevelEduFilter :directions="directionAdditionalEducations" :direction_filter="filters.direction_filter" />
<BasicListFilter>
resources/js/Pages/Client/Additional-educations/Show.vue
+6 -6
View File
@@ -17,11 +17,13 @@ import FormBlock from "@/componentss/shared/builder/pageBuilder/blocks/FormBlock
import FormBuilder from "@/componentss/shared/builder/formBuilder/FormBuilder.vue";
import BreadcrumbsItem from "@/componentss/shared/Breadcrumbs/BreadcrumbsItem.vue";
import BasicIcon from "@/componentss/ui/icons/BasicIcon.vue";
import BaseBreadcrumbs from "@/componentss/shared/Breadcrumbs/BaseBreadcrumbs.vue";
export default {
name: "Show",
components: {
BaseBreadcrumbs,
BasicIcon, BreadcrumbsItem,
FormBuilder,
FormBlock,
@@ -79,12 +81,10 @@ export default {
<BasicPageContainer>
<div class="space-y-3">
<BackButton link="client.additionalEducation.index" title="Все программы"/>
<BreadcrumbsItem :breadcrumbs="breadcrumbs">
<Link :href="$page.url" class="flex items-center text-gray-500 hover:text-primary-light">
<BasicIcon class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400" name="breadcrumb-tag" />
{{ additionalEducation.data.title }}
</Link>
</BreadcrumbsItem>
<BaseBreadcrumbs :breadcrumbs="breadcrumbs">
<BreadcrumbsItem title="Дополнительное образование" :url="route('client.additionalEducation.index')" />
<BreadcrumbsItem :title="additionalEducation.data.title" :url="$page.url" />
</BaseBreadcrumbs>
<ProgramTitle :header="additionalEducation.data.title" class="text-center" />
</div>
resources/js/Pages/Client/Departments/Show.vue
+2 -10
View File
@@ -9,7 +9,7 @@
<NavigateVisor />
<div class="sticky top-[110px] hidden h-[calc(100vh-110px)] max-w-[20%] md:flex md:shrink-0 md:flex-col md:justify-between">
<div class="sticky top-[110px] hidden h-[calc(100vh-110px)] max-w-[20%] lg:flex lg:shrink-0 lg:flex-col lg:justify-between">
<nav v-if="departments"
class="flex h-[calc(100vh-200px)] flex-col overflow-hidden pr-2 pb-4">
<div class="text-gray-1000 mb-2 text-md font-medium">Кафедры факультета - {{ department.data.faculty.abbreviation }}</div>
@@ -28,7 +28,7 @@
</nav>
</div>
<nav class="order-last hidden w-56 shrink-0 lg:block">
<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">
@@ -72,19 +72,11 @@
<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">
<div class="flex justify-between items-center mb-6">
<div class="flex w-full sm:items-center gap-x-5 sm:gap-x-3 truncate">
<div class="grow">
<div class="grid sm:flex sm:justify-between sm:items-center gap-2">
<BaseBreadcrumbs :breadcrumbs="breadcrumbs">
<BreadcrumbsItem title="Факультеты" :url="route('client.faculty.index')" />
<BreadcrumbsItem :title="department.data.faculty.abbreviation" :url="route('client.faculty.show', department.data.faculty.slug)" />
<BreadcrumbsItem :title="department.data.title" :url="$page.url" />
</BaseBreadcrumbs>
</div>
</div>
</div>
</div>
<BasicTitle :header="department.data.title" />
resources/js/Pages/Client/Divisions/Show.vue
-9
View File
@@ -56,19 +56,10 @@
<main 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="flex justify-between items-center mb-6">
<div class="flex w-full sm:items-center gap-x-5 sm:gap-x-3 truncate">
<div class="grow">
<div class="grid sm:flex sm:justify-between sm:items-center gap-2">
<DivisionItemBreadcrumbs :division-title="division.data.title" />
<BaseBreadcrumbs :breadcrumbs="breadcrumbs">
<BreadcrumbsItem title="Подразделения института" :url="route('client.division.index')" />
<BreadcrumbsItem :title="division.data.title" :url="$page.url" />
</BaseBreadcrumbs>
</div>
</div>
</div>
</div>
<div class="space-y-3">
<h1 class="text-2xl mb-10 font-bold md:text-3xl">{{ division.data.title }}</h1>
resources/js/Pages/Client/Faculties/Index.vue
-1
View File
@@ -70,7 +70,6 @@ export default {
<FacultyListTitle
bottom-text="Информация о наших факультетах и кафедрах"
header="Факультеты и кафедры" />
<FacultyListBreadcrumbs />
<BaseBreadcrumbs :breadcrumbs="breadcrumbs">
<BreadcrumbsItem title="Факультеты" :url="route('client.faculty.index')" />
</BaseBreadcrumbs>
resources/js/Pages/Client/Faculties/Show.vue
-8
View File
@@ -31,18 +31,10 @@
<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">
<div class="flex justify-between items-center mb-6">
<div class="flex w-full sm:items-center gap-x-5 sm:gap-x-3 truncate">
<div class="grow">
<div class="grid sm:flex sm:justify-between sm:items-center gap-2">
<BaseBreadcrumbs :breadcrumbs="breadcrumbs">
<BreadcrumbsItem title="Факультеты" :url="route('client.faculty.index')" />
<BreadcrumbsItem :title="faculty.data.shortTitle" :url="$page.url" />
</BaseBreadcrumbs>
</div>
</div>
</div>
</div>
<div class="space-y-3">
<h1 class="text-2xl mb-10 font-bold md:text-3xl">{{ faculty.data.title }}</h1>
resources/js/Pages/Client/Programs/Index.vue
-1
View File
@@ -107,7 +107,6 @@ export default {
<div>
<div class="">
<div class="mt-10 mb-5 w-full">
<ProgramListBreadcrumbs />
<BaseBreadcrumbs :breadcrumbs="breadcrumbs">
<BreadcrumbsItem title="Образовательные программы" :url="route('client.program.index')" />
</BaseBreadcrumbs>
resources/js/componentss/shared/Breadcrumbs/BaseBreadcrumbs.vue
+2 -2
View File
@@ -1,8 +1,8 @@
<template>
<div class="flex justify-between pb-4 items-center">
<div class="flex w-full sm:items-center gap-x-5 sm:gap-x-3 truncate mask-fade">
<div class="flex w-full md:items-center gap-x-5 md:gap-x-3 truncate mask-fade">
<div class="grow">
<div class="grid sm:flex sm:justify-between sm:items-center gap-2">
<div class="grid md:flex md:justify-between md:items-center gap-2">
<BreadcrumbsWrapper>
<li class="text-sm">
<Link :href="route('index')" class="flex items-center text-gray-500 hover:text-primary-hover" href="/">
resources/js/footers/BasicFooter.vue
+2 -2
View File
@@ -23,8 +23,8 @@ export default {
<div>
<div class="mt-3 grid space-y-3 text-sm">
<p><a class="underline inline-flex gap-x-2 hover:text-gray-200 text-[12px]" href="http://localhost/sveden/">Сведения об образовательной организации</a></p>
<p><a class="underline inline-flex gap-x-2 hover:text-gray-200 text-[12px]" href="https://ntspi.ru/upload/824_%D0%9E%D0%B1_%D1%83%D1%82%D0%B2_%D0%9F%D0%BE%D0%BB%D0%B8%D1%82_%D0%BE%D0%B1%D1%80_%D0%B7%D0%B0%D1%89%D0%B8%D1%82_%D0%BF%D0%B5%D1%80%D1%81_%D0%B4%D0%B0%D0%BD.pdf">Политика обработки персональных данных</a></p>
<p><a class="underline inline-flex gap-x-2 hover:text-gray-200 text-[12px]" target="_blank" href="/sveden/">Сведения об образовательной организации</a></p>
<p><a class="underline inline-flex gap-x-2 hover:text-gray-200 text-[12px]" target="_blank" href="/upload/824_%D0%9E%D0%B1_%D1%83%D1%82%D0%B2_%D0%9F%D0%BE%D0%BB%D0%B8%D1%82_%D0%BE%D0%B1%D1%80_%D0%B7%D0%B0%D1%89%D0%B8%D1%82_%D0%BF%D0%B5%D1%80%D1%81_%D0%B4%D0%B0%D0%BD.pdf">Политика обработки персональных данных</a></p>
</div>
</div>