From 2534ae1f48ddf9f59a3b1bd3b9876ecdb446f934 Mon Sep 17 00:00:00 2001 From: nimtaurel Date: Thu, 24 Apr 2025 13:33:09 +0500 Subject: [PATCH] nim_filter --- app/Http/Controllers/MobileApiController.php | 8 - modules/main/Components/Main.php | 23 +- modules/main/views/main.blade.php | 258 ++++++++++++------- public/css/app.css | 4 +- public/css/app.css.map | 2 +- resources/assets/sass/app.scss | 70 +++-- resources/assets/sass/components/card.scss | 237 ++++++++++++----- 7 files changed, 386 insertions(+), 216 deletions(-) diff --git a/app/Http/Controllers/MobileApiController.php b/app/Http/Controllers/MobileApiController.php index 90246cf..20c1c74 100644 --- a/app/Http/Controllers/MobileApiController.php +++ b/app/Http/Controllers/MobileApiController.php @@ -3,20 +3,12 @@ namespace App\Http\Controllers; use A7kz\Platform\Models\UniModel; -use A7kz\Platform\Modules\Platform\Segment\Facades\Segment; use App\Modules\applications\Enum\ApplicationStatus; use App\Modules\auto\Enums\AutoStatusEnums; use Carbon\CarbonPeriod; -use Exception; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Carbon; -use Illuminate\Support\Facades\DB; -use Illuminate\Support\Facades\Log; -use Illuminate\Support\Facades\Notification; -use Illuminate\Support\Facades\Storage; -use Mpdf\Tag\Mark; -use function PHPUnit\Framework\isEmpty; class MobileApiController extends Controller { diff --git a/modules/main/Components/Main.php b/modules/main/Components/Main.php index dd442fe..40e8ec2 100644 --- a/modules/main/Components/Main.php +++ b/modules/main/Components/Main.php @@ -10,7 +10,7 @@ namespace App\Modules\main\Components; use A7kz\Platform\Modules\Platform\Core\Services\Base\Component; -use Illuminate\Http\Request; +use Illuminate\Support\Facades\Request; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\Http; @@ -21,18 +21,21 @@ class Main extends Component parent::__construct($params, $module); $this->template = 'pipicar::main.views.main'; -// $request = new Request([ -// 'started_at' => Carbon::now()->toDateString(), -// 'ended_at' => Carbon::now()->addDays(3)->toDateString(), -// ]); -// -// $response = (new \App\Http\Controllers\MobileApiController)->getAvailableMarksList($request); -// $this->params['cars'] = $response->getData(true); - $response = Http::get('https://cvm10.a7.kz/api/mobile/getAvailableMarksList', [ + + $request = new \Illuminate\Http\Request([ 'started_at' => Carbon::now()->toDateString(), 'ended_at' => Carbon::now()->addDays(3)->toDateString(), ]); - $this->params['cars'] = collect($response->json()); + + $response = (new \App\Http\Controllers\MobileApiController)->getAvailableMarksList($request); + $this->params['cars'] = collect($response->getData(true)); + +// $class_filters = Request::input('class_filters') ?? null; +// $response = Http::get('https://cvm10.a7.kz/api/mobile/getAvailableMarksList', [ +// 'started_at' => Carbon::now()->toDateString(), +// 'ended_at' => Carbon::now()->addDays(3)->toDateString(), +// ]); +// $this->params['cars'] = collect($response->json()); } } diff --git a/modules/main/views/main.blade.php b/modules/main/views/main.blade.php index 6280092..94eee9d 100644 --- a/modules/main/views/main.blade.php +++ b/modules/main/views/main.blade.php @@ -1,108 +1,174 @@
-

Доступные автомобили

-

Выберите лучший автомобиль

-

У нас есть автомобили разных классов. Выберите свой идеальный вариант и забронируйте его.

-
-