fix bugs and errors
This commit is contained in:
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
namespace App\Http\Middleware;
|
namespace App\Http\Middleware;
|
||||||
|
|
||||||
use App\Ship\Requests\Request;
|
|
||||||
use Closure;
|
use Closure;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\Support\Facades\Auth;
|
use Illuminate\Support\Facades\Auth;
|
||||||
use Inertia\Inertia;
|
use Inertia\Inertia;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
|
|||||||
+2
-1
@@ -8,6 +8,7 @@
|
|||||||
"php": "^8.1",
|
"php": "^8.1",
|
||||||
"ext-curl": "*",
|
"ext-curl": "*",
|
||||||
"ext-zip": "*",
|
"ext-zip": "*",
|
||||||
|
"alxdorosenco/porto-for-laravel": "^10.0",
|
||||||
"askerakbar/checkpoint": "^0.0.1",
|
"askerakbar/checkpoint": "^0.0.1",
|
||||||
"awcodes/filament-tiptap-editor": "^3.0",
|
"awcodes/filament-tiptap-editor": "^3.0",
|
||||||
"bezhansalleh/filament-shield": "^3.2",
|
"bezhansalleh/filament-shield": "^3.2",
|
||||||
@@ -16,7 +17,7 @@
|
|||||||
"guava/filament-icon-picker": "^2.0",
|
"guava/filament-icon-picker": "^2.0",
|
||||||
"guzzlehttp/guzzle": "^7.8",
|
"guzzlehttp/guzzle": "^7.8",
|
||||||
"imangazaliev/didom": "^2.0",
|
"imangazaliev/didom": "^2.0",
|
||||||
"inertiajs/inertia-laravel": "^1.3",
|
"inertiajs/inertia-laravel": "^2.0",
|
||||||
"intervention/image": "^2.7",
|
"intervention/image": "^2.7",
|
||||||
"joshembling/image-optimizer": "^1.4",
|
"joshembling/image-optimizer": "^1.4",
|
||||||
"laravel/framework": "^10.10",
|
"laravel/framework": "^10.10",
|
||||||
|
|||||||
Generated
+1171
-1032
File diff suppressed because it is too large
Load Diff
Generated
+398
-320
File diff suppressed because it is too large
Load Diff
+6
-6
@@ -6,19 +6,19 @@
|
|||||||
"build": "vite build && vite build --ssr"
|
"build": "vite build && vite build --ssr"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@inertiajs/vue3": "^1.0.0",
|
"@inertiajs/vue3": "^2.0.8",
|
||||||
"@tailwindcss/forms": "^0.5.3",
|
"@tailwindcss/forms": "^0.5.3",
|
||||||
"@types/lodash": "^4.17.13",
|
"@types/lodash": "^4.17.13",
|
||||||
"@vitejs/plugin-vue": "^4.6.2",
|
"@vitejs/plugin-vue": "^5.2.3",
|
||||||
"autoprefixer": "^10.4.12",
|
"autoprefixer": "^10.4.12",
|
||||||
"axios": "^1.1.2",
|
"axios": "^1.9.0",
|
||||||
"bvi": "^1.0.2",
|
"bvi": "^1.0.2",
|
||||||
"i": "^0.3.7",
|
"i": "^0.3.7",
|
||||||
"laravel-vite-plugin": "^0.8.1",
|
"laravel-vite-plugin": "^1.2.0",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"npm": "^10.9.0",
|
"npm": "^10.9.0",
|
||||||
"postcss": "^8.4.18",
|
"postcss": "^8.4.18",
|
||||||
"rollup": "^4.40.0",
|
"rollup": "^3.29.4",
|
||||||
"tailwindcss": "^3.2.1",
|
"tailwindcss": "^3.2.1",
|
||||||
"terser": "^5.39.0",
|
"terser": "^5.39.0",
|
||||||
"vue": "^3.2.41"
|
"vue": "^3.2.41"
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
"js-cookie": "^3.0.5",
|
"js-cookie": "^3.0.5",
|
||||||
"preline": "^1.9.0",
|
"preline": "^1.9.0",
|
||||||
"slugify": "^1.6.6",
|
"slugify": "^1.6.6",
|
||||||
"vite": "^5.3.3",
|
"vite": "^6.3.5",
|
||||||
"vue3-yandex-smartcaptcha": "^1.0.0",
|
"vue3-yandex-smartcaptcha": "^1.0.0",
|
||||||
"vuex": "^4.1.0"
|
"vuex": "^4.1.0"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -135,7 +135,7 @@ export default {
|
|||||||
Link,
|
Link,
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
...mapActions(['toggleBvi'])
|
...mapActions(['toggleBvi', 'initializeBvi'])
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -122,8 +122,8 @@ export default {
|
|||||||
window.addEventListener('scroll', this.handleScroll);
|
window.addEventListener('scroll', this.handleScroll);
|
||||||
|
|
||||||
// Вызываем action, только если на клиенте и $store доступен
|
// Вызываем action, только если на клиенте и $store доступен
|
||||||
if (typeof window !== 'undefined' && this.$store && this.initializeBvi) {
|
if (typeof window !== 'undefined' && this.$store && this.$store.dispatch('initializeBvi')) {
|
||||||
this.initializeBvi();
|
this.$store.dispatch('initializeBvi');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
beforeDestroy() {
|
beforeDestroy() {
|
||||||
|
|||||||
+2
-2
@@ -43,7 +43,7 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
<li class="text-sm">
|
<li class="text-sm">
|
||||||
<Link :href="$page.props.ziggy.location" class="flex items-center text-gray-500 hover:text-primary-hover">
|
<Link :href="$page.url" class="flex items-center text-gray-500 hover:text-primary-hover">
|
||||||
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
||||||
width="16" height="16"
|
width="16" height="16"
|
||||||
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
@@ -78,7 +78,7 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
<li class="text-sm">
|
<li class="text-sm">
|
||||||
<Link :href="$page.props.ziggy.location" class="flex items-center text-gray-500 hover:text-primary-light">
|
<Link :href="$page.url" class="flex items-center text-gray-500 hover:text-primary-light">
|
||||||
{{ textLimit(title, 60) }}
|
{{ textLimit(title, 60) }}
|
||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
+2
-2
@@ -43,7 +43,7 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
<li class="text-sm">
|
<li class="text-sm">
|
||||||
<Link :href="$page.props.ziggy.location" class="flex items-center text-gray-500 hover:text-primary-hover">
|
<Link :href="$page.url" class="flex items-center text-gray-500 hover:text-primary-hover">
|
||||||
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
||||||
width="16" height="16"
|
width="16" height="16"
|
||||||
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
@@ -72,7 +72,7 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
<li class="text-sm">
|
<li class="text-sm">
|
||||||
<Link :href="$page.props.ziggy.location" class="flex items-center text-gray-500 hover:text-primary-hover">
|
<Link :href="$page.url" class="flex items-center text-gray-500 hover:text-primary-hover">
|
||||||
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
||||||
width="16" height="16"
|
width="16" height="16"
|
||||||
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
|||||||
+2
-2
@@ -54,7 +54,7 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
<li class="text-sm">
|
<li class="text-sm">
|
||||||
<Link :href="$page.props.ziggy.location" class="flex items-center text-gray-500 hover:text-primary-hover">
|
<Link :href="$page.url" class="flex items-center text-gray-500 hover:text-primary-hover">
|
||||||
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
||||||
width="16" height="16"
|
width="16" height="16"
|
||||||
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
@@ -94,7 +94,7 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
<li class="text-sm">
|
<li class="text-sm">
|
||||||
<Link :href="$page.props.ziggy.location" class="flex items-center text-gray-500 hover:text-primary-hover">
|
<Link :href="$page.url" class="flex items-center text-gray-500 hover:text-primary-hover">
|
||||||
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
||||||
width="16" height="16"
|
width="16" height="16"
|
||||||
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
<li class="text-sm">
|
<li class="text-sm">
|
||||||
<Link :href="$page.props.ziggy.location" class="flex items-center text-gray-500 hover:text-primary-hover">
|
<Link :href="$page.url" class="flex items-center text-gray-500 hover:text-primary-hover">
|
||||||
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
||||||
width="16" height="16"
|
width="16" height="16"
|
||||||
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
@@ -72,7 +72,7 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
<li class="text-sm">
|
<li class="text-sm">
|
||||||
<Link :href="$page.props.ziggy.location" class="flex items-center text-gray-500 hover:text-primary-hover">
|
<Link :href="$page.url" class="flex items-center text-gray-500 hover:text-primary-hover">
|
||||||
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
||||||
width="16" height="16"
|
width="16" height="16"
|
||||||
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
|||||||
+2
-2
@@ -43,7 +43,7 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
<li class="text-sm">
|
<li class="text-sm">
|
||||||
<Link :href="$page.props.ziggy.location" class="flex items-center text-gray-500 hover:text-primary-hover">
|
<Link :href="$page.url" class="flex items-center text-gray-500 hover:text-primary-hover">
|
||||||
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
||||||
width="16" height="16"
|
width="16" height="16"
|
||||||
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
@@ -72,7 +72,7 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
<li class="text-sm">
|
<li class="text-sm">
|
||||||
<Link :href="$page.props.ziggy.location" class="flex items-center text-gray-500 hover:text-primary-hover">
|
<Link :href="$page.url" class="flex items-center text-gray-500 hover:text-primary-hover">
|
||||||
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
||||||
width="16" height="16"
|
width="16" height="16"
|
||||||
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
<li class="text-sm">
|
<li class="text-sm">
|
||||||
<Link :href="$page.props.ziggy.location" class="flex items-center text-gray-500 hover:text-primary-hover">
|
<Link :href="$page.url" class="flex items-center text-gray-500 hover:text-primary-hover">
|
||||||
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
||||||
width="16" height="16"
|
width="16" height="16"
|
||||||
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
@@ -72,7 +72,7 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
<li class="text-sm">
|
<li class="text-sm">
|
||||||
<Link :href="$page.props.ziggy.location" class="flex items-center text-gray-500 hover:text-primary-hover">
|
<Link :href="$page.url" class="flex items-center text-gray-500 hover:text-primary-hover">
|
||||||
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
||||||
width="16" height="16"
|
width="16" height="16"
|
||||||
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
<li class="text-sm">
|
<li class="text-sm">
|
||||||
<Link :href="$page.props.ziggy.location" class="flex items-center text-gray-500 hover:text-primary-hover">
|
<Link :href="$page.url" class="flex items-center text-gray-500 hover:text-primary-hover">
|
||||||
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
||||||
width="16" height="16"
|
width="16" height="16"
|
||||||
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
@@ -72,7 +72,7 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
<li class="text-sm">
|
<li class="text-sm">
|
||||||
<Link :href="$page.props.ziggy.location" class="flex items-center text-gray-500 hover:text-primary-hover">
|
<Link :href="$page.url" class="flex items-center text-gray-500 hover:text-primary-hover">
|
||||||
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
||||||
width="16" height="16"
|
width="16" height="16"
|
||||||
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
</span>
|
</span>
|
||||||
</li>
|
</li>
|
||||||
<li class="text-sm">
|
<li class="text-sm">
|
||||||
<Link :href="$page.props.ziggy.location" class="flex items-center text-gray-500 hover:text-primary-hover">
|
<Link :href="$page.url" class="flex items-center text-gray-500 hover:text-primary-hover">
|
||||||
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
||||||
width="16" height="16"
|
width="16" height="16"
|
||||||
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
@@ -56,7 +56,7 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
<li class="text-sm">
|
<li class="text-sm">
|
||||||
<Link :href="$page.props.ziggy.location" class="flex items-center text-gray-500 hover:text-primary-hover">
|
<Link :href="$page.url" class="flex items-center text-gray-500 hover:text-primary-hover">
|
||||||
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
||||||
width="16" height="16"
|
width="16" height="16"
|
||||||
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
<li class="text-sm">
|
<li class="text-sm">
|
||||||
<Link :href="$page.props.ziggy.location" class="flex items-center text-gray-500 hover:text-primary-hover">
|
<Link :href="$page.url" class="flex items-center text-gray-500 hover:text-primary-hover">
|
||||||
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
<svg class="flex-shrink-0 mx-2 overflow-visible h-2.5 w-2.5 text-gray-400"
|
||||||
width="16" height="16"
|
width="16" height="16"
|
||||||
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||||
@@ -78,7 +78,7 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
<li class="text-sm">
|
<li class="text-sm">
|
||||||
<Link :href="$page.props.ziggy.location" class="flex items-center text-gray-500 hover:text-primary-hover">
|
<Link :href="$page.url" class="flex items-center text-gray-500 hover:text-primary-hover">
|
||||||
{{ textLimit(postTitle, 60) }}
|
{{ textLimit(postTitle, 60) }}
|
||||||
</Link>
|
</Link>
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="border-b w-full">
|
<div class="border-b w-full">
|
||||||
<a v-if="item.tag === 'User'" :href="route('client.person.show', item.data.slug)" target="_blank" class="rounded-lg hover:bg-[#F2F2F2] my-1 px-4 w-full flex items-center">
|
<a v-if="item.tag === 'User'" :href="route('client.person.show', item.data.slug)" target="_blank" class="rounded-lg hover:bg-[#F2F2F2] my-1 px-4 w-full flex items-center">
|
||||||
<BasicIcon name="post_search" class="w-5 h-5 flex-shrink-0 text-gray-500" />
|
<BasicIcon name="person_search" class="w-5 h-5 flex-shrink-0 text-gray-500" />
|
||||||
<div class="px-4 space-y-1 py-2">
|
<div class="px-4 space-y-1 py-2">
|
||||||
<p class="text-sm">{{ item.data.title }}</p>
|
<p class="text-sm">{{ item.data.name }}</p>
|
||||||
<div v-if="item.matches.length !== 0" class="">
|
<div v-if="item.matches.length !== 0" class="">
|
||||||
<p class="text-[13px] text-gray-500 text-ellipsis">{{ item.matches[0] }}</p>
|
<p class="text-[13px] text-gray-500 text-ellipsis">{{ item.matches[0] }}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ export default createStore({
|
|||||||
updateLastSlider({ commit }, value) {
|
updateLastSlider({ commit }, value) {
|
||||||
commit('setLastSlider', value);
|
commit('setLastSlider', value);
|
||||||
},
|
},
|
||||||
initializeBvi(context) { // Получаем весь context
|
initializeBvi(context) {
|
||||||
if (!context.state.bvi) {
|
if (!context.state.bvi) {
|
||||||
const bviInstance = new isvek.Bvi(context.state.bviSettings);
|
const bviInstance = new isvek.Bvi(context.state.bviSettings);
|
||||||
context.commit('setBviInstance', bviInstance);
|
context.commit('setBviInstance', bviInstance);
|
||||||
|
|||||||
Reference in New Issue
Block a user