From 00f475c9c3fb1cb6839d5c0737004e24b34eb8cd Mon Sep 17 00:00:00 2001 From: F4ilji Date: Mon, 26 May 2025 12:03:02 +0500 Subject: [PATCH] fix bugs --- _docker/nginx/prod/conf.d/nginx.conf | 6 +++++- .../Article/UI/WEB/Controllers/ShowPostController.php | 2 +- .../Article/UI/WEB/Transformers/CategoryResource.php | 1 - .../Article/UI/WEB/Transformers/TagResource.php | 2 +- .../UI/WEB/Controllers/ClientProgramController.php | 2 +- .../Event/UI/WEB/Controllers/ClientEventController.php | 2 +- .../UI/WEB/Controllers/ClientFacultyController.php | 2 +- app/Containers/Search/Services/StaticFileSearch.php | 2 +- app/Containers/Widget/UI/WEB/Controllers/TvController.php | 2 +- app/Filament/Resources/DirectionStudyResource.php | 8 ++++++++ 10 files changed, 20 insertions(+), 9 deletions(-) diff --git a/_docker/nginx/prod/conf.d/nginx.conf b/_docker/nginx/prod/conf.d/nginx.conf index 6f2d106..0ab3bbf 100644 --- a/_docker/nginx/prod/conf.d/nginx.conf +++ b/_docker/nginx/prod/conf.d/nginx.conf @@ -65,6 +65,8 @@ server { alias /var/www/public/sveden/; index index.html; try_files $uri $uri/ /sveden/index.html; + expires epoch; + add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0"; } location = /sveden { @@ -74,7 +76,9 @@ server { location /abitur/ { alias /var/www/public/abitur/; index index.html; - try_files $uri $uri/ /sveden/index.html; + try_files $uri $uri/ /abitur/index.html; + expires epoch; + add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0"; } location = /abitur { diff --git a/app/Containers/Article/UI/WEB/Controllers/ShowPostController.php b/app/Containers/Article/UI/WEB/Controllers/ShowPostController.php index 7718a60..db95d8c 100644 --- a/app/Containers/Article/UI/WEB/Controllers/ShowPostController.php +++ b/app/Containers/Article/UI/WEB/Controllers/ShowPostController.php @@ -6,7 +6,7 @@ use App\Containers\Article\Models\Post; use App\Containers\Article\UI\WEB\Transformers\PostItemResource; use App\Ship\Enums\CacheKeys; use App\Ship\Contracts\SeoServiceInterface; -use App\Ship\Requests\Request; + use Carbon\Carbon; use Illuminate\Support\Facades\Cache; use Inertia\Inertia; diff --git a/app/Containers/Article/UI/WEB/Transformers/CategoryResource.php b/app/Containers/Article/UI/WEB/Transformers/CategoryResource.php index 180dad7..2efa1a3 100644 --- a/app/Containers/Article/UI/WEB/Transformers/CategoryResource.php +++ b/app/Containers/Article/UI/WEB/Transformers/CategoryResource.php @@ -4,7 +4,6 @@ namespace App\Containers\Article\UI\WEB\Transformers; -use App\Ship\Requests\Request; use App\Ship\Resources\JsonResource; class CategoryResource extends JsonResource diff --git a/app/Containers/Article/UI/WEB/Transformers/TagResource.php b/app/Containers/Article/UI/WEB/Transformers/TagResource.php index 2e1120e..4988717 100644 --- a/app/Containers/Article/UI/WEB/Transformers/TagResource.php +++ b/app/Containers/Article/UI/WEB/Transformers/TagResource.php @@ -3,7 +3,7 @@ namespace App\Containers\Article\UI\WEB\Transformers; -use App\Ship\Requests\Request; +use Illuminate\Http\Request; use App\Ship\Resources\JsonResource; class TagResource extends JsonResource diff --git a/app/Containers/Education/UI/WEB/Controllers/ClientProgramController.php b/app/Containers/Education/UI/WEB/Controllers/ClientProgramController.php index 0e6a177..9290f59 100644 --- a/app/Containers/Education/UI/WEB/Controllers/ClientProgramController.php +++ b/app/Containers/Education/UI/WEB/Controllers/ClientProgramController.php @@ -14,7 +14,7 @@ use App\Ship\Enums\CacheKeys; use App\Ship\Enums\Education\BudgetEducation; use App\Ship\Enums\Education\FormEducation; use App\Ship\Enums\Education\LevelEducational; -use App\Ship\Requests\Request; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Str; use Inertia\Inertia; diff --git a/app/Containers/Event/UI/WEB/Controllers/ClientEventController.php b/app/Containers/Event/UI/WEB/Controllers/ClientEventController.php index cdb12df..a0580c1 100644 --- a/app/Containers/Event/UI/WEB/Controllers/ClientEventController.php +++ b/app/Containers/Event/UI/WEB/Controllers/ClientEventController.php @@ -10,7 +10,7 @@ use App\Containers\Event\UI\WEB\Transformers\EventResource; use App\Ship\Contracts\SeoServiceInterface; use App\Ship\Controllers\Controller; use App\Ship\Enums\CacheKeys; -use App\Ship\Requests\Request; +use Illuminate\Http\Request; use Carbon\Carbon; use DateTime; use Illuminate\Support\Facades\Cache; diff --git a/app/Containers/InstituteStructure/UI/WEB/Controllers/ClientFacultyController.php b/app/Containers/InstituteStructure/UI/WEB/Controllers/ClientFacultyController.php index 49bf64a..a437b2c 100644 --- a/app/Containers/InstituteStructure/UI/WEB/Controllers/ClientFacultyController.php +++ b/app/Containers/InstituteStructure/UI/WEB/Controllers/ClientFacultyController.php @@ -9,7 +9,7 @@ use App\Containers\InstituteStructure\UI\WEB\Transformers\FacultyResource; use App\Ship\Contracts\SeoServiceInterface; use App\Ship\Controllers\Controller; use App\Ship\Enums\CacheKeys; -use App\Ship\Requests\Request; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Cache; use Inertia\Inertia; diff --git a/app/Containers/Search/Services/StaticFileSearch.php b/app/Containers/Search/Services/StaticFileSearch.php index ffd9928..643f20b 100644 --- a/app/Containers/Search/Services/StaticFileSearch.php +++ b/app/Containers/Search/Services/StaticFileSearch.php @@ -2,7 +2,7 @@ namespace App\Containers\Search\Services; -use App\Ship\Requests\Request; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; diff --git a/app/Containers/Widget/UI/WEB/Controllers/TvController.php b/app/Containers/Widget/UI/WEB/Controllers/TvController.php index 1c8c983..3b17ce8 100644 --- a/app/Containers/Widget/UI/WEB/Controllers/TvController.php +++ b/app/Containers/Widget/UI/WEB/Controllers/TvController.php @@ -3,7 +3,7 @@ namespace App\Containers\Widget\UI\WEB\Controllers; use App\Ship\Controllers\Controller; -use App\Ship\Requests\Request; +use Illuminate\Http\Request; class TvController extends Controller { diff --git a/app/Filament/Resources/DirectionStudyResource.php b/app/Filament/Resources/DirectionStudyResource.php index 420ca00..8977a39 100644 --- a/app/Filament/Resources/DirectionStudyResource.php +++ b/app/Filament/Resources/DirectionStudyResource.php @@ -49,6 +49,14 @@ class DirectionStudyResource extends Resource }) ->helperText('Полное название направления подготовки'), + TextInput::make('uuid') + ->label('uuid') + ->required() + ->maxLength(255) + ->unique(ignoreRecord: true) + ->helperText('UUID'), + + TextInput::make('slug') ->label('URL-идентификатор') ->required()