Changes

app/Http/Controllers/ClientAdditionalEducationController.php

@@ -2,6 +2,8 @@
 
 namespace App\Http\Controllers;
 
+use App\Enums\FormEducation;
+use App\Http\Resources\AdditionalEducationCategoryPreviewResource;
 use App\Http\Resources\AdditionalEducationCategoryResource;
 use App\Http\Resources\AdditionalEducationResource;
 use App\Http\Resources\DirectionAdditionalEducationResource;
@@ -15,30 +17,87 @@ class ClientAdditionalEducationController extends Controller
 {
     public function index(Request $request)
     {
+
         $directionAdditionalEducations = DirectionAdditionalEducationResource::collection(
             DirectionAdditionalEducation::query()
                 ->where('is_active', true)
                 ->whereHas('additionalEducationCategories', function ($q) {
                     $q->whereHas('additionalEducations');
-            })
-                ->get());
+            })->get());
+
         $additionalEducations = AdditionalEducationCategoryResource::collection(AdditionalEducationCategory::query()
+            ->WithActivePrograms()
             ->where('is_active', '=', true)
-            ->when($request->input('dir_id'), function ($q, $direction_id) {
-                $q->where('dir_addit_educat_id', $direction_id);
+            ->when($request->input('direction'), function ($q, $direction) {
+                $q->whereHas('direction', function ($query) use ($direction) {
+                    $query->where('slug', $direction);
+                });
+            })
+            ->when(request()->input('form'), function ($query, $form) {
+                $query->whereHas('additionalEducations', function ($q) use ($form) {
+                    $q->where('form_education', FormEducation::fromName($form));
+                });
+                $query->with(['additionalEducations' => function ($q) use ($form) {
+                    $q->where('form_education', FormEducation::fromName($form));
+                }]);
+            })
+            ->when(request()->input('category'), function ($query) {
+                $slugs = request()->input('category');
+                if (is_array($slugs)) {
+                    $query->whereIn('slug', $slugs);
+                }
             })
             ->has('additionalEducations')
-            ->with('additionalEducations')
             ->get());
+
+        $categories = AdditionalEducationCategoryPreviewResource::collection(
+            AdditionalEducationCategory::query()
+                ->where('is_active', true)
+                ->has('additionalEducations')
+                ->get()
+        );
+        $categoriesContent = [];
+        if (request()->input('category')) {
+            foreach (request()->input('category') as $item) {
+                $categoriesContent[$item] = new AdditionalEducationCategoryResource(AdditionalEducationCategory::where('slug', $item)->first());
+            }
+        }
+
+        $forms_education = [];
+        foreach (FormEducation::cases() as $case) {
+            $forms_education[$case->name] = $case->getLabel();
+        }
         $filters = [
-            'dir_id' => request()->input('dir_id')
+            'direction_filter' => [
+                'type' => 'direction',
+                'value' => request()->input('direction'),
+                'param' => 'direction'
+            ],
+            'form_education_filter' => [
+                'type' => 'form',
+                'value' => request()->input('form'),
+                'param' => 'form'
+            ],
+            'category_filter' => [
+                'type' => 'category',
+                'value' => request()->input('category'),
+                'param' => 'category',
+                'content' => $categoriesContent,
+            ],
         ];
-        return Inertia::render('Client/Additional-educations/Index', compact('directionAdditionalEducations', 'additionalEducations', 'filters'));
+        return Inertia::render('Client/Additional-educations/Index',
+            compact(
+                'directionAdditionalEducations',
+                'additionalEducations',
+                'filters',
+                'forms_education',
+                'categories'
+            ));
     }
 
-    public function show(string $id)
+    public function show(string $slug)
     {
-        $additionalEducation = new AdditionalEducationResource(AdditionalEducation::query()->with('category.direction')->find($id));
+        $additionalEducation = new AdditionalEducationResource(AdditionalEducation::query()->with('category.direction')->where('slug', $slug)->first());
         return Inertia::render('Client/Additional-educations/Show', compact('additionalEducation'));
     }
 }

app/Http/Controllers/ClientPostController.php

@@ -58,6 +58,7 @@ class ClientPostController extends Controller
             ->withQueryString());
 
         $categories = CategoryResource::collection(Category::has('posts')->get());
+
         $categoriesContent = [];
         if (request()->input('category')) {
             foreach (request()->input('category') as $item) {

app/Http/Controllers/ClientProgramController.php

@@ -111,9 +111,9 @@ class ClientProgramController extends Controller
             ));
     }
 
-    public function show($id)
+    public function show(string $slug)
     {
-        $program = new EducationalProgramFullResource(EducationalProgram::query()->where('id', $id)->with(['admission_plans', 'directionStudy'])->first());
+        $program = new EducationalProgramFullResource(EducationalProgram::query()->where('slug', $slug)->with(['admission_plans', 'directionStudy'])->first());
         $formsEducational = BudgetEducation::cases();
         $formsEducational = collect($formsEducational);
         $formsEdu = $formsEducational->mapWithKeys(function ($formEducational) {

app/Http/Controllers/ClientWidgetAdditionalEducationalProgramController.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Enums\PostStatus;
+use App\Http\Resources\AdditionalEducationSearchResource;
+use App\Http\Resources\PostThumbnailResource;
+use App\Models\AdditionalEducation;
+use App\Models\Post;
+use Illuminate\Http\Request;
+
+class ClientWidgetAdditionalEducationalProgramController extends Controller
+{
+    public function index()
+    {
+        return AdditionalEducationSearchResource::collection(
+            AdditionalEducation::query()
+                ->where('is_active', true)
+                ->orderBy('title', 'desc')
+                ->get());
+    }
+
+}

app/Http/Controllers/ClientWidgetEducationalProgramController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Enums\EducationalProgramStatus;
+use App\Http\Resources\EducationalProgramSearchResource;
+use App\Models\EducationalProgram;
+use Illuminate\Http\Request;
+
+class ClientWidgetEducationalProgramController extends Controller
+{
+    public function index()
+    {
+        return EducationalProgramSearchResource::collection(
+            EducationalProgram::query()
+                ->where('status', EducationalProgramStatus::PUBLISHED)
+                ->orderBy('name', 'desc')
+                ->get());
+    }
+}

app/Http/Controllers/ClientWidgetPostController.php

@@ -12,7 +12,6 @@ class ClientWidgetPostController extends Controller
 {
     public function index()
     {
-
         return PostThumbnailResource::collection(
             Post::query()
                 ->where('status', PostStatus::PUBLISHED)

app/Http/Controllers/PageController.php

@@ -4,6 +4,9 @@ namespace App\Http\Controllers;
 
 use App\Http\Requests\Page\StoreRequest;
 use App\Http\Requests\Page\UpdateRequest;
+use App\Http\Resources\ClientBreadcrumbPage;
+use App\Http\Resources\ClientBreadcrumbSection;
+use App\Http\Resources\ClientBreadcrumbSubSection;
 use App\Http\Resources\ClientNavigationResource;
 use App\Http\Resources\MainSectionResource;
 use App\Http\Resources\PageResource;
@@ -45,9 +48,9 @@ class PageController extends Controller
         if (isset($page->section)) {
             $subSectionPages = PageResource::collection($page->section->pages);
             $breadcrumbs = [
-                'mainSection' => $page->section->mainSection->title,
-                'subSection' => $page->section->title,
-                'page' => $page->title,
+                'mainSection' => new ClientBreadcrumbSection($page->section->mainSection),
+                'subSection' => new ClientBreadcrumbSubSection($page->section),
+                'page' => new ClientBreadcrumbPage($page),
             ];
         } else {
             $subSectionPages = null;

app/Http/Controllers/VkPostController.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Services\VK\VkService;
+use Illuminate\Http\Request;
+use VK\Client\VKApiClient;
+use VK\OAuth\Scopes\VKOAuthUserScope;
+use VK\OAuth\VKOAuth;
+use VK\OAuth\VKOAuthDisplay;
+use VK\OAuth\VKOAuthResponseType;
+
+class VkPostController extends Controller
+{
+    private string $wall_token;
+
+    private VkService $vkService;
+
+    public function __construct()
+    {
+        $this->vkService = new VkService(new VKApiClient());
+        $this->wall_token = env('WALL_ACCESS_VK_TOKEN');
+    }
+
+    public function index()
+    {
+        $oauth = new VKOAuth();
+        $client_id = 52468445;
+        $redirect_uri = 'https://crawdad-fresh-bream.ngrok-free.app/';
+        $display = VKOAuthDisplay::PAGE;
+        $scope = array(VKOAuthUserScope::WALL, VKOAuthUserScope::PHOTOS);
+        $state = 'dJZ3N05uZc9jpcEgxD6y';
+        $groups_ids = array(227826614);
+
+        $browser_url = $oauth->getAuthorizeUrl(VKOAuthResponseType::TOKEN, $client_id, $redirect_uri, $display, $scope, $state, $groups_ids);
+        return redirect($browser_url);
+
+    }
+
+    public function wall()
+    {
+        return $this->vkService->createAlbum('Тестовый альбом');
+    }
+
+
+
+
+}