diff --git a/app/Containers/Widget/Tasks/FindSliderBySlugTask.php b/app/Containers/Widget/Tasks/FindSliderBySlugTask.php index 7109e7c..3188bf0 100644 --- a/app/Containers/Widget/Tasks/FindSliderBySlugTask.php +++ b/app/Containers/Widget/Tasks/FindSliderBySlugTask.php @@ -4,7 +4,7 @@ namespace App\Containers\Widget\Tasks; use App\Containers\Widget\Models\Slider; use Illuminate\Support\Facades\Cache; -use Illuminate\Support\Carbon; +use Illuminate\Support\Carbon; // Убедитесь, что Carbon импортирован class FindSliderBySlugTask { @@ -13,7 +13,7 @@ class FindSliderBySlugTask $cacheKey = 'slider_' . $slug; return Cache::remember($cacheKey, now()->addHour(), function () use ($slug) { - $now = Carbon::now(); // Получаем текущее время один раз + $now = Carbon::now(); $slider = Slider::query() ->where('slug', $slug) @@ -21,7 +21,13 @@ class FindSliderBySlugTask ->with(['slides' => function($query) use ($now) { $query->where('is_active', true) ->where('start_time', '<=', $now) - ->where('end_time', '>=', $now); + // Добавляем условие для end_time + ->where(function ($q) use ($now) { + // Показываем слайд, если end_time еще не наступил + $q->where('end_time', '>=', $now) + // ИЛИ если end_time вообще не указан (NULL) + ->orWhereNull('end_time'); + }); }]) ->firstOrFail(); diff --git a/app/Http/Middleware/HandleInertiaRequests.php b/app/Http/Middleware/HandleInertiaRequests.php index c3274a8..1915d40 100644 --- a/app/Http/Middleware/HandleInertiaRequests.php +++ b/app/Http/Middleware/HandleInertiaRequests.php @@ -39,6 +39,7 @@ class HandleInertiaRequests extends Middleware } return 'empty'; }, + 'yandex_metrika_id' => config('services.yandex_metrika.id'), ]; } } diff --git a/app/Ship/Middleware/HandleInertiaRequests.php b/app/Ship/Middleware/HandleInertiaRequests.php index 88fd8f7..49cea60 100644 --- a/app/Ship/Middleware/HandleInertiaRequests.php +++ b/app/Ship/Middleware/HandleInertiaRequests.php @@ -44,6 +44,7 @@ class HandleInertiaRequests extends Middleware } return 'empty'; }, + 'yandex_metrika_id' => config('services.yandex_metrika.id'), ]; } } diff --git a/config/services.php b/config/services.php index 0ace530..1d56945 100644 --- a/config/services.php +++ b/config/services.php @@ -31,4 +31,8 @@ return [ 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), ], + 'yandex_metrika' => [ + 'id' => env('YANDEX_METRIKA_ID'), + ], + ]; diff --git a/resources/js/app.js b/resources/js/app.js index 78df97a..4fd7a8f 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -5,22 +5,17 @@ import 'virtual:svg-icons-register' import { createSSRApp, h } from 'vue'; -import { createInertiaApp } from '@inertiajs/vue3'; +import { createInertiaApp, router } from '@inertiajs/vue3'; import { ZiggyVue } from '../../vendor/tightenco/ziggy/dist/vue.m'; import {linksReform} from "@/mixins/LinksReform.js"; import cookieMixin from "@/mixins/cookieMixin.js"; import store from '@/store/index.js'; import '@vuepic/vue-datepicker/dist/main.css'; - - -// const appName = import.meta.env.VITE_APP_NAME || 'НТГСПИ'; - createInertiaApp({ resolve: name => { const pages = import.meta.glob('./Pages/**/*.vue') return pages[`./Pages/${name}.vue`]() - // resolvePageComponent(`./Pages/${name}.vue`, import.meta.glob('./Pages/**/*.vue')) }, setup({ el, App, props, plugin }) { return createSSRApp({ render: () => h(App, props) }) @@ -37,4 +32,13 @@ createInertiaApp({ }, }); +router.on('navigate', (event) => { + const metrikaId = event.detail.page.props.yandex_metrika_id; + if (metrikaId && typeof ym === 'function') { + ym(metrikaId, 'hit', window.location.href, { + title: document.title, + referer: event.detail.page.props.ziggy?.previous_url || document.referrer, + }); + } +}); \ No newline at end of file diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php index ea9bb96..ccc6f25 100644 --- a/resources/views/app.blade.php +++ b/resources/views/app.blade.php @@ -6,7 +6,7 @@ @if (env('NGINX_ENV') === 'prod') @endif -{{--