-
-
+
@@ -133,131 +186,59 @@ export default {
+
+
Расписание занятий
-
-
-
+
+
Просто введите название группы
@@ -100,7 +157,7 @@ export default {
id="hs-search-article-1"
class="py-2.5 px-4 block w-full border-transparent rounded-lg disabled:opacity-50 disabled:cursor-not-allowed disabled:bg-gray-100"
placeholder="Поиск"
- :disabled="showFavorites"
+ :disabled="filters.favorite_filter.value !== null"
>
@@ -108,24 +165,20 @@ export default {
-
Расписание занятий
- -
-
+
+
@@ -100,7 +157,7 @@ export default {
id="hs-search-article-1"
class="py-2.5 px-4 block w-full border-transparent rounded-lg disabled:opacity-50 disabled:cursor-not-allowed disabled:bg-gray-100"
placeholder="Поиск"
- :disabled="showFavorites"
+ :disabled="filters.favorite_filter.value !== null"
>
Просто введите название группы
-
-
+
+
-
-
-
-
-
-
-
-
diff --git a/resources/js/Pages/Main.vue b/resources/js/Pages/Main.vue
index 7362f87..868f59c 100644
--- a/resources/js/Pages/Main.vue
+++ b/resources/js/Pages/Main.vue
@@ -4,12 +4,13 @@
-
-
-
-
-
-
-
+
Последние новости
-
-
-
+ Последние новости
+
+
+
+
@@ -184,6 +185,7 @@ import BaseMetaHead from "@/Components/BaseComponents/BaseMetaHead.vue";
import PageResourceList from "@/Components/BuilderUi/Pages/Blocks/PageResourceList.vue";
import AppHead from "@/Components/AppHead.vue";
import ContactSectionBlock from "@/Components/BaseComponents/BaseBuilderUi/Blocks/Contacts/ContactSectionBlock.vue";
+import Cookies from "js-cookie";
@@ -238,6 +240,7 @@ export default {
},
methods: {
+ Cookies,
setSliderRef(ref) {
this.sliderRef = ref;
},
diff --git a/resources/js/Pages/Page.vue b/resources/js/Pages/Page.vue
index 2dd6103..614fbdd 100644
--- a/resources/js/Pages/Page.vue
+++ b/resources/js/Pages/Page.vue
@@ -5,7 +5,7 @@
diff --git a/resources/js/app.js b/resources/js/app.js
index 8c83f16..b6df7b5 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -7,6 +7,7 @@ import { createInertiaApp } from '@inertiajs/vue3';
import { ZiggyVue } from '../../vendor/tightenco/ziggy/dist/vue.m';
import {linksReform} from "@/mixins/LinksReform.js";
import YSmartCaptcha from 'vue3-yandex-smartcaptcha'
+import cookieMixin from "@/mixins/cookieMixin.js";
// const appName = import.meta.env.VITE_APP_NAME || 'НТГСПИ';
@@ -20,6 +21,7 @@ createInertiaApp({
return createSSRApp({ render: () => h(App, props) })
.use(plugin)
.mixin(linksReform)
+ .mixin(cookieMixin)
.use(ZiggyVue)
.use(YSmartCaptcha, {
siteKey: "ysc1_jxb2IcslgBuHgHbmmKY1F7Nvb8zYHuAeBgjoaTka6886f893",
diff --git a/resources/js/mixins/cookieMixin.js b/resources/js/mixins/cookieMixin.js
new file mode 100644
index 0000000..1af551b
--- /dev/null
+++ b/resources/js/mixins/cookieMixin.js
@@ -0,0 +1,43 @@
+export default {
+ methods: {
+ // Устанавливаем куки
+ setCookie(name, value, days) {
+ let expires = "";
+ if (days) {
+ const date = new Date();
+ date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000)); // Устанавливаем срок действия куки
+ expires = "; expires=" + date.toUTCString();
+ }
+ document.cookie = name + "=" + (value || "") + expires + "; path=/"; // Устанавливаем куки
+ },
+
+ // Получаем куки
+ getCookie(name) {
+ const nameEQ = name + "="; // Форматируем имя куки
+ const ca = document.cookie.split(';'); // Разбиваем куки по точке с запятой
+ for (let i = 0; i < ca.length; i++) {
+ let c = ca[i];
+ while (c.charAt(0) === ' ') c = c.substring(1, c.length); // Убираем пробелы
+ if (c.indexOf(nameEQ) === 0) return c.substring(nameEQ.length, c.length); // Если найдено, возвращаем значение
+ }
+ return null; // Если кука не найдена
+ },
+
+ // Удаляем куки
+ deleteCookie(name) {
+ // Получаем текущий домен
+ const domain = window.location.hostname.includes('.') ? '.' + window.location.hostname : window.location.hostname;
+ document.cookie = name + '=; Max-Age=-99999999; path=/; domain=' + domain; // Устанавливаем срок действия в прошлом
+ },
+
+ deleteCookiesWithPrefix(prefix) {
+ const cookies = document.cookie.split(';'); // Получаем все куки
+ for (let cookie of cookies) {
+ const cookieName = cookie.split('=')[0].trim(); // Получаем имя куки
+ if (cookieName.startsWith(prefix)) { // Проверяем, начинается ли имя куки с заданного префикса
+ this.deleteCookie(cookieName); // Удаляем куку
+ }
+ }
+ }
+ }
+};
diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
index bd74b8f..3a62ef3 100644
--- a/resources/views/app.blade.php
+++ b/resources/views/app.blade.php
@@ -30,11 +30,20 @@
z-index: 10000000!important;
}
+ .bvi-active {
+ padding: 0;
+ margin: 0;
+ }
+
.ce-header {
font-weight: bold;
font-size: 20px;
}
+ body .bvi-body {
+ padding: 0;
+ }
+
*, html {
scroll-padding: 6rem;
scroll-behavior: smooth !important;
diff --git a/routes/api.php b/routes/api.php
index cc277ee..5a217e6 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -10,6 +10,7 @@ use App\Http\Controllers\ClientWidgetPageReferenceListController;
use App\Http\Controllers\ClientWidgetPostController;
use App\Http\Controllers\IconController;
use App\Http\Controllers\SearchController;
+use App\Http\Controllers\UpdateEduDataApiController;
use App\Http\Controllers\VkAuthController;
use App\Http\Controllers\VkPostController;
use App\Models\AdmissionCampaign;
@@ -25,6 +26,9 @@ Route::get('/getAcademicYear', function () {
})->name('academic.year');
+
+
+
Route::middleware('ensure.browser')->group(function () {
Route::get('/getNavigation', [NavigateController::class, 'index'])->name('client.main.navigate');
@@ -50,6 +54,8 @@ Route::middleware('ensure.browser')->group(function () {
});
Route::middleware(['auth', 'superadmin'])->group(function () {
+ Route::get('/get-data', [UpdateEduDataApiController::class, 'index']);
+
Route::get('/login/vk', [VkAuthService::class, 'redirectToProvider'])->name('vk.login');
Route::get('/login/vk/callback', [VkAuthService::class, 'handleProviderCallback'])->name('vk.callback');
Route::get('/vk-get-token', [VkAuthService::class, 'getToken'])->name('vk.getToken');
diff --git a/routes/web.php b/routes/web.php
index 52e4ddc..a2321b7 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -86,8 +86,6 @@ Route::middleware('access-check')->group(function () {
Route::get('/divisions', [ClientDivisionController::class, 'index'])->name('client.division.index');
Route::get('/divisions/{slug}', [ClientDivisionController::class, 'show'])->name('client.division.show');
- Route::get('/get-data', [UpdateEduDataApiController::class, 'index']);
-
Route::get('{path}', [PageController::class, 'render'])->where('path', '[0-9,a-z,/,-]+')->name('page.view');
});