From f0f9a6fbd20e46f7a8388d032449e7401e916a7e Mon Sep 17 00:00:00 2001 From: F4ilji Date: Sat, 5 Apr 2025 18:36:32 +0500 Subject: [PATCH] add new default color and fix bugs --- .../ClientAdditionalEducationController.php | 34 ++++++++----------- app/Http/Controllers/ClientPostController.php | 14 ++------ resources/js/Navbars/DesktopNavBar.vue | 4 +-- resources/js/Navbars/MainPageNavbar.vue | 1 + resources/js/Navbars/MobileNavbar.vue | 18 +++++----- .../Pages/Client/AcademicJournals/Index.vue | 2 +- .../js/Pages/Client/AcademicJournals/Show.vue | 4 +-- .../Client/Additional-educations/Index.vue | 2 +- .../Client/Additional-educations/Show.vue | 4 +-- .../js/Pages/Client/Departments/Show.vue | 14 ++++---- resources/js/Pages/Client/Divisions/Index.vue | 2 +- resources/js/Pages/Client/Divisions/Show.vue | 6 ++-- resources/js/Pages/Client/Events/Archive.vue | 4 +-- resources/js/Pages/Client/Events/Index.vue | 4 +-- resources/js/Pages/Client/Events/Show.vue | 6 ++-- resources/js/Pages/Client/Faculties/Index.vue | 2 +- resources/js/Pages/Client/Faculties/Show.vue | 8 ++--- resources/js/Pages/Client/Persons/Show.vue | 2 +- resources/js/Pages/Client/Programs/Index.vue | 2 +- resources/js/Pages/Client/Programs/Show.vue | 10 +++--- resources/js/Pages/Client/Schedules/Index.vue | 4 +-- resources/js/Pages/Client/Schedules/Show.vue | 4 +-- resources/js/Pages/Error.vue | 2 +- resources/js/Pages/Main.vue | 31 +++++++++-------- resources/js/Pages/Schedule.vue | 2 +- .../AcademicJournalsItemBreadcrumbs.vue | 16 ++++----- .../AcademicJournalsListBreadcrumbs.vue.vue | 12 +++---- .../AdditionalProgramItemBreadcrumbs.vue | 16 ++++----- .../AdditionalProgramListBreadcrumbs.vue | 12 +++---- .../components/badges/CategoryBadge.vue | 2 +- .../components/badges/FormBadge.vue | 2 +- .../components/filters/BudgetFilter.vue | 2 +- .../components/filters/CategoryFilter.vue | 2 +- .../filters/FormEducationalFilter.vue | 2 +- .../components/DepartmentItemBreadcrumbs.vue | 20 +++++------ .../components/DivisionItemBreadcrumbs.vue | 16 ++++----- .../components/DivisionListBreadcrumbs.vue | 12 +++---- .../components/ProgramItemBreadcrumbs.vue | 16 ++++----- .../components/ProgramListBreadcrumbs.vue | 12 +++---- .../EventArchiveListBreadcrumbs.vue | 14 ++++---- .../components/EventItemBreadcrumbs.vue | 16 ++++----- .../components/EventListBreadcrumbs.vue | 12 +++---- .../events/components/EventListFilter.vue | 4 +-- .../events/components/EventListSelectDate.vue | 2 +- .../components/FacultyItemBreadcrumbs.vue | 16 ++++----- .../components/FacultyListBreadcrumbs.vue | 12 +++---- .../pages/components/PageBreadcrumbs.vue | 12 +++---- .../pages/components/PageNavigateLinks.vue | 2 +- .../pages/components/PageSubSectionLinks.vue | 10 ++---- .../persons/components/PersonBreadcrumbs.vue | 12 +++---- .../persons/components/PersonNavLink.vue | 2 +- .../components/sections/InfoSection.vue | 4 +-- .../posts/components/PostItemBreadcrumbs.vue | 30 ++++++++-------- .../components/PostListBreadcrumbs.vue.vue | 12 +++---- .../posts/components/PostListFilter.vue | 4 +-- .../posts/components/PostListItem.vue | 4 +-- .../components/FormEducationalFilter.vue | 2 +- .../components/ScheduleListFilter.vue | 2 +- .../search/components/GlobalSearch.vue | 8 ++--- .../search/components/StaticSearch.vue | 12 +++---- .../sliders/components/SliderBlockBody.vue | 2 +- .../sliders/components/SliderBody.vue | 2 +- .../shared/badge/badges/CategoryBadge.vue | 2 +- .../shared/badge/badges/IsOnlineBadge.vue | 2 +- .../shared/badge/badges/SearchBadge.vue | 2 +- .../shared/badge/badges/SortingByBadge.vue | 2 +- .../shared/badge/badges/TagBadge.vue | 2 +- .../builder/formBuilder/FormBuilder.vue | 2 +- .../AdditionalEducationalChoiceBlock.vue | 2 +- .../blocks/EducationalChoiceBlock.vue | 2 +- .../blocks/MultipleChoiceBlock.vue | 2 +- .../formBuilder/blocks/PersonalDataBlock.vue | 4 +-- .../formBuilder/blocks/SingleChoiceBlock.vue | 2 +- .../formBuilder/blocks/SubmitBlock.vue | 2 +- .../formBuilder/blocks/TextAreaBlock.vue | 2 +- .../builder/formBuilder/blocks/TextBlock.vue | 2 +- .../builder/pageBuilder/blocks/FormBlock.vue | 2 +- .../pageBuilder/blocks/PageItemBlock.vue | 8 ++--- .../pageBuilder/blocks/PageResourceList.vue | 4 +-- .../pageBuilder/blocks/ParagraphBlock.vue | 4 +-- .../pageBuilder/blocks/PostItemBlock.vue | 2 +- .../pageBuilder/blocks/PostListBlock.vue | 2 +- .../pageBuilder/blocks/StepperBlock.vue | 6 ++-- .../shared/filter/BasicListFilter.vue | 2 +- .../shared/filter/filters/BudgetFilter.vue | 4 +-- .../shared/filter/filters/CategoryFilter.vue | 4 +-- .../shared/filter/filters/DirectionFilter.vue | 4 +-- .../filter/filters/FormEducationalFilter.vue | 4 +-- .../shared/filter/filters/TagFilter.vue | 4 +-- .../shared/navigate/NavigateLinks.vue | 2 +- .../shared/pageResource/PageResourceList.vue | 4 +-- resources/js/footers/BasicFooter.vue | 2 +- .../filament-panels/components/logo.blade.php | 2 +- tailwind.config.js | 21 ++++++++++-- 94 files changed, 317 insertions(+), 318 deletions(-) diff --git a/app/Http/Controllers/ClientAdditionalEducationController.php b/app/Http/Controllers/ClientAdditionalEducationController.php index 7be3893..749f53d 100644 --- a/app/Http/Controllers/ClientAdditionalEducationController.php +++ b/app/Http/Controllers/ClientAdditionalEducationController.php @@ -52,25 +52,21 @@ class ClientAdditionalEducationController extends Controller CacheKeys::ADDITIONAL_EDUCATIONAL_PROGRAMS_PREFIX->value . $cacheKey, now()->addDay(), function () use ($request) { - return AdditionalEducationCategoryResource::collection( - AdditionalEducationCategory::query() - ->WithActivePrograms() - ->where('is_active', true) - ->when($request->direction, fn ($q, $direction) => - $q->whereHas('direction', fn ($query) => $query->where('slug', $direction)) - ) - ->when($request->form, fn ($query, $form) => - $query->whereHas('additionalEducations', fn ($q) => - $q->where('form_education', FormEducation::fromName($form)) - ) - ->when($request->category, fn ($query) => - is_array($request->category) - ? $query->whereIn('slug', $request->category) - : $query + $query = AdditionalEducationCategory::query() + ->WithActivePrograms() + ->where('is_active', true) + ->when($request->direction, function ($q, $direction) use ($request) { + return $q->whereHas('direction', fn($query) => $query->where('slug', $direction)) + ->when($request->form, fn($query, $form) => $query->whereHas('additionalEducations', fn($q) => $q->where('form_education', FormEducation::fromName($form)) ) - ->has('additionalEducations') - ->get() - )); + ->when($request->category, fn($query) => is_array($request->category) + ? $query->whereIn('slug', $request->category) + : $query->where('slug', $request->category) + ) + ->has('additionalEducations')); + }); + + return AdditionalEducationCategoryResource::collection($query->get()); } ); @@ -124,7 +120,6 @@ class ClientAdditionalEducationController extends Controller $seo = $this->seoPageProvider->getSeoForCurrentPage(); - return Inertia::render('Client/Additional-educations/Index', compact( 'directionAdditionalEducations', 'additionalEducations', @@ -134,6 +129,7 @@ class ClientAdditionalEducationController extends Controller 'seo' )); } + public function show(string $slug): \Inertia\Response { $additionalEducationModel = Cache::remember( diff --git a/app/Http/Controllers/ClientPostController.php b/app/Http/Controllers/ClientPostController.php index 73c9009..884ddcd 100644 --- a/app/Http/Controllers/ClientPostController.php +++ b/app/Http/Controllers/ClientPostController.php @@ -25,7 +25,7 @@ class ClientPostController extends Controller { public function __construct(readonly SeoPageProvider $seoPageProvider){} - public function index(Request $request) + public function index(Request $request): \Inertia\Response { // Кешируем список тегов $tagIds = Cache::remember('tag_ids', now()->addHours(), function () { @@ -37,12 +37,10 @@ class ClientPostController extends Controller ->pluck('tag_id'); }); - // Кешируем теги $tags = Cache::remember('tags', now()->addHours(1), function () use ($tagIds) { return \Spatie\Tags\Tag::whereIn('id', $tagIds)->get(); }); - // Кешируем посты с учетом фильтров $cacheKey = 'posts_' . md5(serialize($request->all())); $posts = Cache::remember($cacheKey, now()->addHours(1), function () use ($request) { return ClientPostListResource::collection(Post::query() @@ -74,12 +72,10 @@ class ClientPostController extends Controller ->withQueryString()); }); - // Кешируем категории $categories = Cache::remember('categories', now()->addHours(48), function () { return CategoryResource::collection(Category::has('posts')->get()); }); - // Кешируем контент категорий $categoriesContent = []; if ($request->input('category')) { foreach ($request->input('category') as $item) { @@ -133,12 +129,8 @@ class ClientPostController extends Controller return Inertia::render('Client/Posts/Index', compact('filters', 'posts', 'categories', 'tags', 'seo')); } - public function show(Request $request, $slug) + public function show(Request $request, $slug): \Inertia\Response { - // Уникальный ключ для кеширования - $cacheKey = 'post_' . md5($slug); - - // Пытаемся получить данные из кеша $postData = Cache::remember( CacheKeys::POST_PREFIX->value . $slug, now()->addHours(1), @@ -157,7 +149,7 @@ class ClientPostController extends Controller // Возвращаем ответ с использованием кешированных данных - return Inertia::render('Client/Posts/Show', compact('')); + return Inertia::render('Client/Posts/Show', compact('post', 'seo')); } diff --git a/resources/js/Navbars/DesktopNavBar.vue b/resources/js/Navbars/DesktopNavBar.vue index 31a8eab..805c4e2 100644 --- a/resources/js/Navbars/DesktopNavBar.vue +++ b/resources/js/Navbars/DesktopNavBar.vue @@ -14,7 +14,7 @@ :id="'nav-section-btn-' + section.slug" type="button" :class="!underSliderHeader ? 'text-white' : 'text-black'" - class="duration-300 flex items-center w-full hover:text-primaryBlue font-medium hs-dropdown-open:mb-4 md:hs-dropdown-open:mb-0"> + class="duration-300 flex items-center w-full hover:text-primary-hover font-medium hs-dropdown-open:mb-4 md:hs-dropdown-open:mb-0"> {{ section.title }}
diff --git a/resources/js/Navbars/MainPageNavbar.vue b/resources/js/Navbars/MainPageNavbar.vue index ce37127..fd9fbfe 100644 --- a/resources/js/Navbars/MainPageNavbar.vue +++ b/resources/js/Navbars/MainPageNavbar.vue @@ -133,6 +133,7 @@ export default { computed: { ...mapGetters(['lastSlider', 'isBviActive']), currentLogo() { + console.log(this.isBviActive) if (this.isBviActive) { return this.logos.default } diff --git a/resources/js/Navbars/MobileNavbar.vue b/resources/js/Navbars/MobileNavbar.vue index 97cc127..777b2fe 100644 --- a/resources/js/Navbars/MobileNavbar.vue +++ b/resources/js/Navbars/MobileNavbar.vue @@ -1,8 +1,8 @@